Skip to content

Commit ba4516d

Browse files
NeurostepNeurostep
authored
Merge pull request #140 from scribd/maksimt/DEVPLAT-3092/upgrade-go
[DEVPLAT-3092] Upgrade go to `v1.24`
2 parents 5344118 + 93028e3 commit ba4516d

File tree

9 files changed

+391
-2914
lines changed

9 files changed

+391
-2914
lines changed

‎Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# build stage
33
# =============================================================================
44

5-
FROM golang:1.23.0-alpine AS builder
5+
FROM golang:1.24.0-alpine AS builder
66

77
WORKDIR /sdk
88

@@ -33,15 +33,15 @@ FROM builder AS linter
3333

3434
# binary will be $(go env GOPATH)/bin/golangci-lint
3535
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
36-
| sh -s -- -b $(go env GOPATH)/bin v1.60.1
36+
| sh -s -- -b $(go env GOPATH)/bin v1.64.5
3737

3838
# install goimports
39-
RUN go install golang.org/x/tools/cmd/goimports@v0.24.0
39+
RUN go install golang.org/x/tools/cmd/goimports@v0.30.0
4040

4141
# =============================================================================
4242
# development stage
4343
# =============================================================================
4444

4545
FROM linter AS development
4646

47-
RUN go install github.com/go-delve/delve/cmd/dlv@v1.23.0
47+
RUN go install github.com/go-delve/delve/cmd/dlv@v1.24.0

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ SDK, the Go version.
6767

6868
## Prerequisites
6969

70-
* [Go](https://golang.org) (version `1.23.0`).
70+
* [Go](https://golang.org) (version `1.24.0`).
7171
* [Docker](https://www.docker.com/) (version `19.03.2`).
7272

7373
## SDK functionality
@@ -1736,7 +1736,7 @@ You can enter the docker environment to build, run and debug your service:
17361736
```
17371737
$ docker-compose run --rm sdk /bin/bash
17381738
root@1f31fa8e5c49:/sdk# go version
1739-
go version go1.23.0 linux/amd64
1739+
go version go1.24.0 linux/amd64
17401740
```
17411741

17421742
Refer to the

‎go.mod

Lines changed: 107 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,93 @@
11
module github.com/scribd/go-sdk
22

3-
go 1.23
3+
go 1.24
44

55
require (
6-
github.com/DATA-DOG/go-sqlmock v1.5.0
7-
github.com/DATA-DOG/go-txdb v0.1.9
8-
github.com/DataDog/datadog-go v4.8.2+incompatible
9-
github.com/aws/aws-sdk-go v1.44.327
10-
github.com/aws/aws-sdk-go-v2 v1.32.3
11-
github.com/aws/aws-sdk-go-v2/config v1.28.1
12-
github.com/aws/aws-sdk-go-v2/credentials v1.17.42
13-
github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2
14-
github.com/aws/aws-sdk-go-v2/service/sagemakerruntime v1.32.3
15-
github.com/aws/aws-sdk-go-v2/service/sfn v1.33.3
16-
github.com/aws/aws-sdk-go-v2/service/sqs v1.36.3
17-
github.com/aws/aws-sdk-go-v2/service/sts v1.32.3
18-
github.com/aws/smithy-go v1.22.0
19-
github.com/getsentry/sentry-go v0.12.0
6+
github.com/DATA-DOG/go-sqlmock v1.5.2
7+
github.com/DATA-DOG/go-txdb v0.2.0
8+
github.com/DataDog/datadog-go v4.8.3+incompatible
9+
github.com/aws/aws-sdk-go v1.55.6
10+
github.com/aws/aws-sdk-go-v2 v1.36.1
11+
github.com/aws/aws-sdk-go-v2/config v1.29.6
12+
github.com/aws/aws-sdk-go-v2/credentials v1.17.59
13+
github.com/aws/aws-sdk-go-v2/service/s3 v1.77.0
14+
github.com/aws/aws-sdk-go-v2/service/sagemakerruntime v1.32.16
15+
github.com/aws/aws-sdk-go-v2/service/sfn v1.34.12
16+
github.com/aws/aws-sdk-go-v2/service/sqs v1.37.14
17+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.14
18+
github.com/aws/smithy-go v1.22.2
19+
github.com/getsentry/sentry-go v0.31.1
2020
github.com/go-kit/kit v0.13.0
21-
github.com/go-kit/log v0.2.0
22-
github.com/go-sql-driver/mysql v1.7.1
21+
github.com/go-kit/log v0.2.1
22+
github.com/go-sql-driver/mysql v1.8.1
2323
github.com/google/uuid v1.6.0
24-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
24+
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
2525
github.com/magefile/mage v1.15.0
26-
github.com/redis/go-redis/v9 v9.5.1
27-
github.com/rs/cors v1.7.0
26+
github.com/redis/go-redis/v9 v9.7.0
27+
github.com/rs/cors v1.11.1
2828
github.com/sirupsen/logrus v1.9.3
29-
github.com/spf13/viper v1.10.1
30-
github.com/statsig-io/go-sdk v1.26.0
31-
github.com/stretchr/testify v1.9.0
32-
github.com/twmb/franz-go v1.17.0
33-
github.com/twmb/franz-go/pkg/kmsg v1.8.0
34-
google.golang.org/grpc v1.60.1
35-
google.golang.org/protobuf v1.33.0
36-
gopkg.in/DataDog/dd-trace-go.v1 v1.69.1
29+
github.com/spf13/viper v1.19.0
30+
github.com/statsig-io/go-sdk v1.34.0
31+
github.com/stretchr/testify v1.10.0
32+
github.com/twmb/franz-go v1.18.1
33+
github.com/twmb/franz-go/pkg/kmsg v1.9.0
34+
google.golang.org/grpc v1.70.0
35+
google.golang.org/protobuf v1.36.5
36+
gopkg.in/DataDog/dd-trace-go.v1 v1.71.1
3737
gopkg.in/natefinch/lumberjack.v2 v2.2.1
38-
gorm.io/driver/mysql v1.4.6
39-
gorm.io/driver/sqlite v1.4.4
40-
gorm.io/gorm v1.25.3
38+
gorm.io/driver/mysql v1.5.7
39+
gorm.io/driver/sqlite v1.5.7
40+
gorm.io/gorm v1.25.12
4141
)
4242

4343
require (
44-
github.com/DataDog/appsec-internal-go v1.8.0 // indirect
45-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 // indirect
46-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.57.0 // indirect
47-
github.com/DataDog/datadog-go/v5 v5.3.0 // indirect
48-
github.com/DataDog/go-libddwaf/v3 v3.4.0 // indirect
44+
filippo.io/edwards25519 v1.1.0 // indirect
45+
github.com/DataDog/appsec-internal-go v1.9.0 // indirect
46+
github.com/DataDog/datadog-agent/pkg/obfuscate v0.58.0 // indirect
47+
github.com/DataDog/datadog-agent/pkg/proto v0.58.0 // indirect
48+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.58.0 // indirect
49+
github.com/DataDog/datadog-agent/pkg/trace v0.58.0 // indirect
50+
github.com/DataDog/datadog-agent/pkg/util/log v0.58.0 // indirect
51+
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.58.0 // indirect
52+
github.com/DataDog/datadog-go/v5 v5.5.0 // indirect
53+
github.com/DataDog/go-libddwaf/v3 v3.5.1 // indirect
54+
github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20241206090539-a14610dc22b6 // indirect
55+
github.com/DataDog/go-sqllexer v0.0.14 // indirect
4956
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
5057
github.com/DataDog/gostackparse v0.7.0 // indirect
58+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.20.0 // indirect
5159
github.com/DataDog/sketches-go v1.4.5 // indirect
52-
github.com/Microsoft/go-winio v0.6.1 // indirect
53-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
54-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 // indirect
55-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 // indirect
56-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 // indirect
57-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
58-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.36.3 // indirect
60-
github.com/aws/aws-sdk-go-v2/service/ec2 v1.187.0 // indirect
61-
github.com/aws/aws-sdk-go-v2/service/eventbridge v1.35.3 // indirect
62-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
63-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.3 // indirect
64-
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.3 // indirect
65-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 // indirect
66-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.3 // indirect
67-
github.com/aws/aws-sdk-go-v2/service/kinesis v1.32.3 // indirect
68-
github.com/aws/aws-sdk-go-v2/service/sns v1.33.3 // indirect
69-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 // indirect
70-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 // indirect
71-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
60+
github.com/Microsoft/go-winio v0.6.2 // indirect
61+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.9 // indirect
62+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28 // indirect
63+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32 // indirect
64+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32 // indirect
65+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
66+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.32 // indirect
67+
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.40.1 // indirect
68+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.203.0 // indirect
69+
github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.11 // indirect
70+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
71+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.0 // indirect
72+
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.13 // indirect
73+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13 // indirect
74+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.13 // indirect
75+
github.com/aws/aws-sdk-go-v2/service/kinesis v1.32.19 // indirect
76+
github.com/aws/aws-sdk-go-v2/service/sns v1.33.19 // indirect
77+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.15 // indirect
78+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.14 // indirect
79+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
80+
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
7281
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7382
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
7483
github.com/dustin/go-humanize v1.0.1 // indirect
7584
github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
7685
github.com/ebitengine/purego v0.6.0-alpha.5 // indirect
77-
github.com/fsnotify/fsnotify v1.6.0 // indirect
86+
github.com/fsnotify/fsnotify v1.7.0 // indirect
7887
github.com/go-logfmt/logfmt v0.6.0 // indirect
79-
github.com/golang/protobuf v1.5.3 // indirect
88+
github.com/go-ole/go-ole v1.2.6 // indirect
89+
github.com/gogo/protobuf v1.3.2 // indirect
90+
github.com/golang/protobuf v1.5.4 // indirect
8091
github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
8192
github.com/gorilla/mux v1.8.0 // indirect
8293
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 // indirect
@@ -86,39 +97,60 @@ require (
8697
github.com/jinzhu/inflection v1.0.0 // indirect
8798
github.com/jinzhu/now v1.1.5 // indirect
8899
github.com/jmespath/go-jmespath v0.4.0 // indirect
89-
github.com/klauspost/compress v1.17.8 // indirect
100+
github.com/json-iterator/go v1.1.12 // indirect
101+
github.com/klauspost/compress v1.17.11 // indirect
102+
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
90103
github.com/magiconair/properties v1.8.7 // indirect
91104
github.com/mattn/go-sqlite3 v1.14.22 // indirect
92-
github.com/mitchellh/mapstructure v1.5.0 // indirect
105+
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
106+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
107+
github.com/modern-go/reflect2 v1.0.2 // indirect
93108
github.com/outcaste-io/ristretto v0.2.3 // indirect
94-
github.com/pelletier/go-toml v1.9.5 // indirect
109+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
95110
github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect
96-
github.com/pierrec/lz4/v4 v4.1.21 // indirect
111+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
97112
github.com/pkg/errors v0.9.1 // indirect
98113
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
114+
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
99115
github.com/richardartoul/molecule v1.0.1-0.20240531184615-7ca0df43c0b3 // indirect
100116
github.com/ryanuber/go-glob v1.0.0 // indirect
117+
github.com/sagikazarmark/locafero v0.4.0 // indirect
118+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
101119
github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
120+
github.com/shirou/gopsutil/v3 v3.24.4 // indirect
121+
github.com/shoenig/go-m1cpu v0.1.6 // indirect
122+
github.com/sourcegraph/conc v0.3.0 // indirect
102123
github.com/spaolacci/murmur3 v1.1.0 // indirect
103-
github.com/spf13/afero v1.9.2 // indirect
104-
github.com/spf13/cast v1.4.1 // indirect
105-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
124+
github.com/spf13/afero v1.11.0 // indirect
125+
github.com/spf13/cast v1.6.0 // indirect
106126
github.com/spf13/pflag v1.0.5 // indirect
107127
github.com/statsig-io/ip3country-go v0.2.0 // indirect
108-
github.com/subosito/gotenv v1.2.0 // indirect
128+
github.com/subosito/gotenv v1.6.0 // indirect
109129
github.com/tinylib/msgp v1.2.1 // indirect
130+
github.com/tklauser/go-sysconf v0.3.12 // indirect
131+
github.com/tklauser/numcpus v0.6.1 // indirect
110132
github.com/ua-parser/uap-go v0.0.0-20211112212520-00c877edfe0f // indirect
133+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
134+
go.opentelemetry.io/collector/component v0.104.0 // indirect
135+
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
136+
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
137+
go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect
138+
go.opentelemetry.io/collector/semconv v0.104.0 // indirect
139+
go.opentelemetry.io/otel v1.32.0 // indirect
140+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
141+
go.opentelemetry.io/otel/trace v1.32.0 // indirect
111142
go.uber.org/atomic v1.11.0 // indirect
112-
golang.org/x/mod v0.18.0 // indirect
113-
golang.org/x/net v0.26.0 // indirect
114-
golang.org/x/sync v0.7.0 // indirect
115-
golang.org/x/sys v0.23.0 // indirect
116-
golang.org/x/text v0.16.0 // indirect
117-
golang.org/x/time v0.3.0 // indirect
118-
golang.org/x/tools v0.22.0 // indirect
143+
go.uber.org/multierr v1.11.0 // indirect
144+
go.uber.org/zap v1.27.0 // indirect
145+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
146+
golang.org/x/mod v0.20.0 // indirect
147+
golang.org/x/net v0.33.0 // indirect
148+
golang.org/x/sys v0.28.0 // indirect
149+
golang.org/x/text v0.21.0 // indirect
150+
golang.org/x/time v0.6.0 // indirect
119151
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
120-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
121-
gopkg.in/ini.v1 v1.66.2 // indirect
152+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
153+
gopkg.in/ini.v1 v1.67.0 // indirect
122154
gopkg.in/yaml.v2 v2.4.0 // indirect
123155
gopkg.in/yaml.v3 v3.0.1 // indirect
124156
)

0 commit comments

Comments
 (0)