Skip to content

Commit 66f2115

Browse files
authored
Drop support for go 1.22 (#1697)
* drop support for go 1.22 * upgrade fastjson * remove patch version
1 parent 3fa4440 commit 66f2115

File tree

50 files changed

+71
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+71
-71
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
TEST_TIMEOUT?=5m
22
GO_LICENSER_EXCLUDE=stacktrace/testdata
3-
GO_LANGUAGE_VERSION=1.22
3+
GO_LANGUAGE_VERSION=1.23
44

55
.PHONY: check
66
check: precheck check-modules test

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ require (
2121
howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
2222
)
2323

24-
go 1.22
24+
go 1.23

internal/apmgodog/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module apmgodog/v2
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/cucumber/godog v0.12.2
@@ -31,9 +31,9 @@ require (
3131
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084 // indirect
3232
github.com/spf13/pflag v1.0.5 // indirect
3333
github.com/stretchr/testify v1.8.4 // indirect
34-
golang.org/x/net v0.23.0 // indirect
35-
golang.org/x/sys v0.18.0 // indirect
36-
golang.org/x/text v0.14.0 // indirect
34+
golang.org/x/net v0.33.0 // indirect
35+
golang.org/x/sys v0.28.0 // indirect
36+
golang.org/x/text v0.21.0 // indirect
3737
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
3838
google.golang.org/protobuf v1.33.0 // indirect
3939
gopkg.in/yaml.v3 v3.0.1 // indirect

internal/apmgodog/go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn
257257
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
258258
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
259259
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
260-
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
261-
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
260+
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
261+
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
262262
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
263263
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
264264
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -282,13 +282,13 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
282282
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
283283
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
284284
golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
285-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
286-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
285+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
286+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
287287
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
288288
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
289289
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
290-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
291-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
290+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
291+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
292292
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
293293
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
294294
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

internal/apmschema/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.elastic.co/apm/internal/apmschema/v2
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/pkg/errors v0.9.1

internal/tracecontexttest/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ replace go.elastic.co/apm/v2 => ../..
1919

2020
replace go.elastic.co/apm/module/apmhttp/v2 => ../../module/apmhttp
2121

22-
go 1.22
22+
go 1.23

module/apmawssdkgo/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.elastic.co/apm/module/apmawssdkgo/v2
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/aws/aws-sdk-go v1.38.14

module/apmazure/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.elastic.co/apm/module/apmazure/v2
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/Azure/azure-pipeline-go v0.2.3

module/apmbeego/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
4545

4646
replace go.elastic.co/apm/module/apmsql/v2 => ../apmsql
4747

48-
go 1.22
48+
go 1.23

module/apmchi/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ replace go.elastic.co/apm/v2 => ../..
2727

2828
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
2929

30-
go 1.22
30+
go 1.23

module/apmchiv5/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ replace go.elastic.co/apm/v2 => ../..
2727

2828
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
2929

30-
go 1.22
30+
go 1.23

module/apmecho/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ replace go.elastic.co/apm/v2 => ../..
3535

3636
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
3737

38-
go 1.22
38+
go 1.23

module/apmechov4/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ replace go.elastic.co/apm/v2 => ../..
3535

3636
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
3737

38-
go 1.22
38+
go 1.23

module/apmelasticsearch/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ replace go.elastic.co/apm/v2 => ../..
2626

2727
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
2828

29-
go 1.22
29+
go 1.23

module/apmelasticsearch/internal/integration/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ replace go.elastic.co/apm/module/apmelasticsearch/v2 => ../..
3333

3434
replace go.elastic.co/apm/module/apmhttp/v2 => ../../../apmhttp
3535

36-
go 1.22
36+
go 1.23

module/apmfasthttp/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.elastic.co/apm/module/apmfasthttp/v2
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/stretchr/testify v1.8.4

module/apmfiber/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
4040

4141
replace go.elastic.co/apm/module/apmfasthttp/v2 => ../apmfasthttp
4242

43-
go 1.22
43+
go 1.23

module/apmgin/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ replace go.elastic.co/apm/v2 => ../..
4949

5050
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
5151

52-
go 1.22
52+
go 1.23

module/apmgocql/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ require (
2929

3030
replace go.elastic.co/apm/v2 => ../..
3131

32-
go 1.22
32+
go 1.23

module/apmgokit/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ replace go.elastic.co/apm/module/apmgrpc/v2 => ../apmgrpc
4141

4242
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
4343

44-
go 1.22
44+
go 1.23

module/apmgometrics/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ require (
2424

2525
replace go.elastic.co/apm/v2 => ../..
2626

27-
go 1.22
27+
go 1.23

module/apmgopg/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ replace go.elastic.co/apm/v2 => ../..
3232

3333
replace go.elastic.co/apm/module/apmsql/v2 => ../apmsql
3434

35-
go 1.22
35+
go 1.23

module/apmgopgv10/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ replace go.elastic.co/apm/v2 => ../..
3636

3737
replace go.elastic.co/apm/module/apmsql/v2 => ../apmsql
3838

39-
go 1.22
39+
go 1.23

module/apmgoredis/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.elastic.co/apm/module/apmgoredis/v2
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/go-redis/redis v6.15.9+incompatible

module/apmgoredisv8/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.elastic.co/apm/module/apmgoredisv8/v2
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/go-redis/redis/v8 v8.11.4

module/apmgorilla/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ replace go.elastic.co/apm/v2 => ../..
2828

2929
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
3030

31-
go 1.22
31+
go 1.23

module/apmgorm/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ replace go.elastic.co/apm/v2 => ../..
3131

3232
replace go.elastic.co/apm/module/apmsql/v2 => ../apmsql
3333

34-
go 1.22
34+
go 1.23

module/apmgormv2/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ replace go.elastic.co/apm/v2 => ../..
5252

5353
replace go.elastic.co/apm/module/apmsql/v2 => ../apmsql
5454

55-
go 1.22
55+
go 1.23

module/apmgrpc/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ replace go.elastic.co/apm/v2 => ../..
3434

3535
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
3636

37-
go 1.22
37+
go 1.23

module/apmhttp/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ require (
2323

2424
replace go.elastic.co/apm/v2 => ../..
2525

26-
go 1.22
26+
go 1.23

module/apmhttprouter/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ replace go.elastic.co/apm/v2 => ../..
2727

2828
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
2929

30-
go 1.22
30+
go 1.23

module/apmlambda/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ require (
1919

2020
replace go.elastic.co/apm/v2 => ../..
2121

22-
go 1.22
22+
go 1.23

module/apmlogrus/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ require (
2424

2525
replace go.elastic.co/apm/v2 => ../..
2626

27-
go 1.22
27+
go 1.23

module/apmmongo/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ require (
3636

3737
replace go.elastic.co/apm/v2 => ../..
3838

39-
go 1.22
39+
go 1.23

module/apmnegroni/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.elastic.co/apm/module/apmnegroni/v2
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/stretchr/testify v1.8.4

module/apmot/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ replace go.elastic.co/apm/v2 => ../..
2727

2828
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
2929

30-
go 1.22
30+
go 1.23

module/apmotel/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ replace go.elastic.co/apm/v2 => ../..
3333

3434
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
3535

36-
go 1.22
36+
go 1.23

module/apmpgx/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.elastic.co/apm/module/apmpgx/v2
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/jackc/pgx/v4 v4.18.2

module/apmpgxv5/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.elastic.co/apm/module/apmpgxv5/v2
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/jackc/pgx/v5 v5.5.4

module/apmprometheus/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ require (
3131

3232
replace go.elastic.co/apm/v2 => ../..
3333

34-
go 1.22
34+
go 1.23

module/apmredigo/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ require (
2424

2525
replace go.elastic.co/apm/v2 => ../..
2626

27-
go 1.22
27+
go 1.23

module/apmrestful/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ replace go.elastic.co/apm/v2 => ../..
2727

2828
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
2929

30-
go 1.22
30+
go 1.23

module/apmrestfulv3/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ replace go.elastic.co/apm/v2 => ../..
3030

3131
replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp
3232

33-
go 1.22
33+
go 1.23

module/apmslog/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ require (
2323

2424
replace go.elastic.co/apm/v2 => ../..
2525

26-
go 1.22
26+
go 1.23

module/apmsql/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ require (
3939

4040
replace go.elastic.co/apm/v2 => ../..
4141

42-
go 1.22
42+
go 1.23

module/apmzap/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ require (
2626

2727
replace go.elastic.co/apm/v2 => ../..
2828

29-
go 1.22
29+
go 1.23

module/apmzerolog/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ require (
2424

2525
replace go.elastic.co/apm/v2 => ../..
2626

27-
go 1.22
27+
go 1.23

scripts/genmod/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ require (
1616

1717
replace go.elastic.co/apm/v2 => ../..
1818

19-
go 1.22
19+
go 1.23

tools/go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module go.elastic.co/apm/v2/tools
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/elastic/go-licenser v0.4.0
77
github.com/jcchavezs/porto v0.1.0
8-
go.elastic.co/fastjson v1.2.0
9-
golang.org/x/tools v0.9.3
8+
go.elastic.co/fastjson v1.5.0
9+
golang.org/x/tools v0.30.0
1010
)
1111

1212
require (
13-
golang.org/x/mod v0.10.0 // indirect
14-
golang.org/x/sys v0.8.0 // indirect
13+
golang.org/x/mod v0.23.0 // indirect
14+
golang.org/x/sync v0.11.0 // indirect
1515
)

0 commit comments

Comments
 (0)