diff --git a/Makefile b/Makefile index 9f2be03a6..df8e9702e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ TEST_TIMEOUT?=5m GO_LICENSER_EXCLUDE=stacktrace/testdata -GO_LANGUAGE_VERSION=1.23.0 +GO_LANGUAGE_VERSION=1.24.0 .PHONY: check check: precheck check-modules test diff --git a/go.mod b/go.mod index cf23902e6..1198354aa 100644 --- a/go.mod +++ b/go.mod @@ -21,4 +21,4 @@ require ( howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect ) -go 1.23.0 +go 1.24.0 diff --git a/internal/apmgodog/go.mod b/internal/apmgodog/go.mod index df5707de2..901e54ecb 100644 --- a/internal/apmgodog/go.mod +++ b/internal/apmgodog/go.mod @@ -1,6 +1,6 @@ module apmgodog/v2 -go 1.23.0 +go 1.24.0 require ( github.com/cucumber/godog v0.12.2 diff --git a/internal/apmschema/go.mod b/internal/apmschema/go.mod index 277e907a1..fc204ca3e 100644 --- a/internal/apmschema/go.mod +++ b/internal/apmschema/go.mod @@ -1,6 +1,6 @@ module go.elastic.co/apm/internal/apmschema/v2 -go 1.23.0 +go 1.24.0 require ( github.com/pkg/errors v0.9.1 diff --git a/internal/tracecontexttest/go.mod b/internal/tracecontexttest/go.mod index ecbce7922..371cbd5a9 100644 --- a/internal/tracecontexttest/go.mod +++ b/internal/tracecontexttest/go.mod @@ -19,4 +19,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../../module/apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmawssdkgo/go.mod b/module/apmawssdkgo/go.mod index 625871fe4..d1573ba4b 100644 --- a/module/apmawssdkgo/go.mod +++ b/module/apmawssdkgo/go.mod @@ -1,6 +1,6 @@ module go.elastic.co/apm/module/apmawssdkgo/v2 -go 1.23.0 +go 1.24.0 require ( github.com/aws/aws-sdk-go v1.38.14 diff --git a/module/apmazure/go.mod b/module/apmazure/go.mod index aa328a1d7..ed146f61e 100644 --- a/module/apmazure/go.mod +++ b/module/apmazure/go.mod @@ -1,6 +1,6 @@ module go.elastic.co/apm/module/apmazure/v2 -go 1.23.0 +go 1.24.0 require ( github.com/Azure/azure-pipeline-go v0.2.3 diff --git a/module/apmbeego/go.mod b/module/apmbeego/go.mod index 8edc729f7..80e3d54de 100644 --- a/module/apmbeego/go.mod +++ b/module/apmbeego/go.mod @@ -45,4 +45,4 @@ replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp replace go.elastic.co/apm/module/apmsql/v2 => ../apmsql -go 1.23.0 +go 1.24.0 diff --git a/module/apmchi/go.mod b/module/apmchi/go.mod index b7bb59a9b..64aa14659 100644 --- a/module/apmchi/go.mod +++ b/module/apmchi/go.mod @@ -27,4 +27,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmchiv5/go.mod b/module/apmchiv5/go.mod index ed4043cbe..ebda412a8 100644 --- a/module/apmchiv5/go.mod +++ b/module/apmchiv5/go.mod @@ -27,4 +27,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmecho/go.mod b/module/apmecho/go.mod index 79c7618c7..bbbcc6185 100644 --- a/module/apmecho/go.mod +++ b/module/apmecho/go.mod @@ -35,4 +35,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmechov4/go.mod b/module/apmechov4/go.mod index 584e9333e..c78a575f7 100644 --- a/module/apmechov4/go.mod +++ b/module/apmechov4/go.mod @@ -35,4 +35,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmelasticsearch/go.mod b/module/apmelasticsearch/go.mod index 8aff33591..c470a0344 100644 --- a/module/apmelasticsearch/go.mod +++ b/module/apmelasticsearch/go.mod @@ -26,4 +26,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmelasticsearch/internal/integration/go.mod b/module/apmelasticsearch/internal/integration/go.mod index 787990f93..cb6212820 100644 --- a/module/apmelasticsearch/internal/integration/go.mod +++ b/module/apmelasticsearch/internal/integration/go.mod @@ -33,4 +33,4 @@ replace go.elastic.co/apm/module/apmelasticsearch/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../../../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmfasthttp/go.mod b/module/apmfasthttp/go.mod index 43b4eb285..2da06df12 100644 --- a/module/apmfasthttp/go.mod +++ b/module/apmfasthttp/go.mod @@ -1,6 +1,6 @@ module go.elastic.co/apm/module/apmfasthttp/v2 -go 1.23.0 +go 1.24.0 require ( github.com/stretchr/testify v1.8.4 diff --git a/module/apmfiber/go.mod b/module/apmfiber/go.mod index 88a239f9f..ad9c5cbd9 100644 --- a/module/apmfiber/go.mod +++ b/module/apmfiber/go.mod @@ -40,4 +40,4 @@ replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp replace go.elastic.co/apm/module/apmfasthttp/v2 => ../apmfasthttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmgin/go.mod b/module/apmgin/go.mod index 3b8861797..df41e2e2e 100644 --- a/module/apmgin/go.mod +++ b/module/apmgin/go.mod @@ -49,4 +49,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmgocql/go.mod b/module/apmgocql/go.mod index 8bdd84cea..8996744fe 100644 --- a/module/apmgocql/go.mod +++ b/module/apmgocql/go.mod @@ -29,4 +29,4 @@ require ( replace go.elastic.co/apm/v2 => ../.. -go 1.23.0 +go 1.24.0 diff --git a/module/apmgokit/go.mod b/module/apmgokit/go.mod index 21ca2bb71..bcfb69dda 100644 --- a/module/apmgokit/go.mod +++ b/module/apmgokit/go.mod @@ -41,4 +41,4 @@ replace go.elastic.co/apm/module/apmgrpc/v2 => ../apmgrpc replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmgometrics/go.mod b/module/apmgometrics/go.mod index 58b553921..8f83e1374 100644 --- a/module/apmgometrics/go.mod +++ b/module/apmgometrics/go.mod @@ -24,4 +24,4 @@ require ( replace go.elastic.co/apm/v2 => ../.. -go 1.23.0 +go 1.24.0 diff --git a/module/apmgopg/go.mod b/module/apmgopg/go.mod index 03b3c26b9..df31477bf 100644 --- a/module/apmgopg/go.mod +++ b/module/apmgopg/go.mod @@ -32,4 +32,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmsql/v2 => ../apmsql -go 1.23.0 +go 1.24.0 diff --git a/module/apmgopgv10/go.mod b/module/apmgopgv10/go.mod index 4d507eb7c..1c37477da 100644 --- a/module/apmgopgv10/go.mod +++ b/module/apmgopgv10/go.mod @@ -36,4 +36,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmsql/v2 => ../apmsql -go 1.23.0 +go 1.24.0 diff --git a/module/apmgoredis/go.mod b/module/apmgoredis/go.mod index a3b2c87a7..f6e7087de 100644 --- a/module/apmgoredis/go.mod +++ b/module/apmgoredis/go.mod @@ -1,6 +1,6 @@ module go.elastic.co/apm/module/apmgoredis/v2 -go 1.23.0 +go 1.24.0 require ( github.com/go-redis/redis v6.15.9+incompatible diff --git a/module/apmgoredisv8/go.mod b/module/apmgoredisv8/go.mod index b97608bde..fb7e45708 100644 --- a/module/apmgoredisv8/go.mod +++ b/module/apmgoredisv8/go.mod @@ -1,6 +1,6 @@ module go.elastic.co/apm/module/apmgoredisv8/v2 -go 1.23.0 +go 1.24.0 require ( github.com/go-redis/redis/v8 v8.11.4 diff --git a/module/apmgorilla/go.mod b/module/apmgorilla/go.mod index 9ba9a9cdc..17327ab2c 100644 --- a/module/apmgorilla/go.mod +++ b/module/apmgorilla/go.mod @@ -28,4 +28,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmgorm/go.mod b/module/apmgorm/go.mod index 35388c510..5a4d38642 100644 --- a/module/apmgorm/go.mod +++ b/module/apmgorm/go.mod @@ -31,4 +31,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmsql/v2 => ../apmsql -go 1.23.0 +go 1.24.0 diff --git a/module/apmgormv2/go.mod b/module/apmgormv2/go.mod index d645afbdf..51ccf6cc3 100644 --- a/module/apmgormv2/go.mod +++ b/module/apmgormv2/go.mod @@ -52,4 +52,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmsql/v2 => ../apmsql -go 1.23.0 +go 1.24.0 diff --git a/module/apmgrpc/go.mod b/module/apmgrpc/go.mod index 986a32be8..72b484125 100644 --- a/module/apmgrpc/go.mod +++ b/module/apmgrpc/go.mod @@ -34,4 +34,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmhttp/client_test.go b/module/apmhttp/client_test.go index a6298b0a6..b53971b9c 100644 --- a/module/apmhttp/client_test.go +++ b/module/apmhttp/client_test.go @@ -330,7 +330,7 @@ func TestWithClientTrace(t *testing.T) { }) require.Len(t, spans, 4) - assert.Equal(t, fmt.Sprintf(fmt.Sprintf("Connect %s", server.Listener.Addr())), spans[0].Name) + assert.Equal(t, fmt.Sprintf("Connect %s", server.Listener.Addr()), spans[0].Name) assert.Equal(t, "Request", spans[1].Name) assert.Equal(t, "Response", spans[2].Name) } diff --git a/module/apmhttp/go.mod b/module/apmhttp/go.mod index a2b4ec2c1..f3c696b98 100644 --- a/module/apmhttp/go.mod +++ b/module/apmhttp/go.mod @@ -23,4 +23,4 @@ require ( replace go.elastic.co/apm/v2 => ../.. -go 1.23.0 +go 1.24.0 diff --git a/module/apmhttprouter/go.mod b/module/apmhttprouter/go.mod index a1f75ea01..22ad1d82c 100644 --- a/module/apmhttprouter/go.mod +++ b/module/apmhttprouter/go.mod @@ -27,4 +27,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmlambda/go.mod b/module/apmlambda/go.mod index 92234272c..e76b9c517 100644 --- a/module/apmlambda/go.mod +++ b/module/apmlambda/go.mod @@ -19,4 +19,4 @@ require ( replace go.elastic.co/apm/v2 => ../.. -go 1.23.0 +go 1.24.0 diff --git a/module/apmlogrus/go.mod b/module/apmlogrus/go.mod index fa998ff20..48fba5aff 100644 --- a/module/apmlogrus/go.mod +++ b/module/apmlogrus/go.mod @@ -24,4 +24,4 @@ require ( replace go.elastic.co/apm/v2 => ../.. -go 1.23.0 +go 1.24.0 diff --git a/module/apmmongo/go.mod b/module/apmmongo/go.mod index 72d55bee1..2608b08db 100644 --- a/module/apmmongo/go.mod +++ b/module/apmmongo/go.mod @@ -36,4 +36,4 @@ require ( replace go.elastic.co/apm/v2 => ../.. -go 1.23.0 +go 1.24.0 diff --git a/module/apmnegroni/go.mod b/module/apmnegroni/go.mod index 012ba6169..865648c14 100644 --- a/module/apmnegroni/go.mod +++ b/module/apmnegroni/go.mod @@ -1,6 +1,6 @@ module go.elastic.co/apm/module/apmnegroni/v2 -go 1.23.0 +go 1.24.0 require ( github.com/stretchr/testify v1.8.4 diff --git a/module/apmot/go.mod b/module/apmot/go.mod index 7b62be5b2..5e80784b7 100644 --- a/module/apmot/go.mod +++ b/module/apmot/go.mod @@ -27,4 +27,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmotel/go.mod b/module/apmotel/go.mod index e19043092..2f605282e 100644 --- a/module/apmotel/go.mod +++ b/module/apmotel/go.mod @@ -33,4 +33,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmpgx/go.mod b/module/apmpgx/go.mod index e7b2f5f94..5c56cc958 100644 --- a/module/apmpgx/go.mod +++ b/module/apmpgx/go.mod @@ -1,6 +1,6 @@ module go.elastic.co/apm/module/apmpgx/v2 -go 1.23.0 +go 1.24.0 require ( github.com/jackc/pgx/v4 v4.18.2 diff --git a/module/apmpgxv5/go.mod b/module/apmpgxv5/go.mod index 3dea08e85..b7117707e 100644 --- a/module/apmpgxv5/go.mod +++ b/module/apmpgxv5/go.mod @@ -1,6 +1,6 @@ module go.elastic.co/apm/module/apmpgxv5/v2 -go 1.23.0 +go 1.24.0 require ( github.com/jackc/pgx/v5 v5.5.4 diff --git a/module/apmprometheus/go.mod b/module/apmprometheus/go.mod index 6006044ff..71cb29082 100644 --- a/module/apmprometheus/go.mod +++ b/module/apmprometheus/go.mod @@ -31,4 +31,4 @@ require ( replace go.elastic.co/apm/v2 => ../.. -go 1.23.0 +go 1.24.0 diff --git a/module/apmredigo/go.mod b/module/apmredigo/go.mod index d1f7a6a46..e72866b66 100644 --- a/module/apmredigo/go.mod +++ b/module/apmredigo/go.mod @@ -24,4 +24,4 @@ require ( replace go.elastic.co/apm/v2 => ../.. -go 1.23.0 +go 1.24.0 diff --git a/module/apmrestful/go.mod b/module/apmrestful/go.mod index b71e7b099..ddda9e5eb 100644 --- a/module/apmrestful/go.mod +++ b/module/apmrestful/go.mod @@ -27,4 +27,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmrestfulv3/go.mod b/module/apmrestfulv3/go.mod index 701ea6490..41c123b87 100644 --- a/module/apmrestfulv3/go.mod +++ b/module/apmrestfulv3/go.mod @@ -30,4 +30,4 @@ replace go.elastic.co/apm/v2 => ../.. replace go.elastic.co/apm/module/apmhttp/v2 => ../apmhttp -go 1.23.0 +go 1.24.0 diff --git a/module/apmslog/go.mod b/module/apmslog/go.mod index bf0ab8a13..fbbc843be 100644 --- a/module/apmslog/go.mod +++ b/module/apmslog/go.mod @@ -23,4 +23,4 @@ require ( replace go.elastic.co/apm/v2 => ../.. -go 1.23.0 +go 1.24.0 diff --git a/module/apmsql/go.mod b/module/apmsql/go.mod index 86c7262f3..e3580834f 100644 --- a/module/apmsql/go.mod +++ b/module/apmsql/go.mod @@ -39,4 +39,4 @@ require ( replace go.elastic.co/apm/v2 => ../.. -go 1.23.0 +go 1.24.0 diff --git a/module/apmzap/go.mod b/module/apmzap/go.mod index 41a56646d..544cb49b7 100644 --- a/module/apmzap/go.mod +++ b/module/apmzap/go.mod @@ -26,4 +26,4 @@ require ( replace go.elastic.co/apm/v2 => ../.. -go 1.23.0 +go 1.24.0 diff --git a/module/apmzerolog/go.mod b/module/apmzerolog/go.mod index 575f1e4e6..1b09ea963 100644 --- a/module/apmzerolog/go.mod +++ b/module/apmzerolog/go.mod @@ -24,4 +24,4 @@ require ( replace go.elastic.co/apm/v2 => ../.. -go 1.23.0 +go 1.24.0 diff --git a/scripts/genmod/go.mod b/scripts/genmod/go.mod index b2392f6ae..81ae2971d 100644 --- a/scripts/genmod/go.mod +++ b/scripts/genmod/go.mod @@ -16,4 +16,4 @@ require ( replace go.elastic.co/apm/v2 => ../.. -go 1.23.0 +go 1.24.0