Skip to content

Commit

Permalink
release v2.6.2 (#1648)
Browse files Browse the repository at this point in the history
  • Loading branch information
kruskall authored Aug 30, 2024
1 parent 9b26590 commit 096f5c0
Show file tree
Hide file tree
Showing 48 changed files with 92 additions and 82 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,21 @@ endif::[]
[[unreleased]]
=== Unreleased
https://github.com/elastic/apm-agent-go/compare/v2.6.0...main[View commits]
https://github.com/elastic/apm-agent-go/compare/v2.6.2...main[View commits]
[[release-notes-2.x]]
=== Go Agent version 2.x
[[release-notes-2.6.2]]
==== 2.6.2 - 2024/08/29
- update version string
[[release-notes-2.6.1]]
==== 2.6.1 - 2024/08/29
- apm.DefaultTracer misbehaves when transport configuration is invalid by {pull}1618[#1618]
- gin web framework does not properly sanitize filename parameter of Context.FileAttachment function {pull}1620[#1620]
- support all upstream GOOS {pull}1646[#1646]
[[release-notes-2.6.0]]
==== 2.6.0 - 2024/04/11
Expand Down
6 changes: 3 additions & 3 deletions internal/apmgodog/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ go 1.21

require (
github.com/cucumber/godog v0.12.2
go.elastic.co/apm/module/apmgrpc/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmgrpc/v2 v2.6.2
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
go.elastic.co/fastjson v1.1.0
google.golang.org/grpc v1.57.1
google.golang.org/grpc/examples v0.0.0-20230831183909-e498bbc9bd37
Expand Down
2 changes: 1 addition & 1 deletion internal/apmschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/pkg/errors v0.9.1
github.com/santhosh-tekuri/jsonschema v1.2.4
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
2 changes: 1 addition & 1 deletion internal/apmversion/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ package apmversion

const (
// AgentVersion is the Elastic APM Go Agent version.
AgentVersion = "2.6.0"
AgentVersion = "2.6.2"
)
4 changes: 2 additions & 2 deletions internal/tracecontexttest/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module tracecontexttest/v2

require go.elastic.co/apm/module/apmhttp/v2 v2.6.0
require go.elastic.co/apm/module/apmhttp/v2 v2.6.2

require (
github.com/armon/go-radix v1.0.0 // indirect
Expand All @@ -9,7 +9,7 @@ require (
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0 // indirect
go.elastic.co/apm/v2 v2.6.0 // indirect
go.elastic.co/apm/v2 v2.6.2 // indirect
go.elastic.co/fastjson v1.1.0 // indirect
golang.org/x/sys v0.8.0 // indirect
howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
Expand Down
4 changes: 2 additions & 2 deletions module/apmawssdkgo/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.21
require (
github.com/aws/aws-sdk-go v1.38.14
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmazure/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/Azure/azure-storage-file-go v0.8.0
github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
6 changes: 3 additions & 3 deletions module/apmbeego/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module go.elastic.co/apm/module/apmbeego/v2
require (
github.com/astaxie/beego v1.12.3
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/module/apmsql/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/module/apmsql/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmchi/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module go.elastic.co/apm/module/apmchi/v2
require (
github.com/go-chi/chi v1.5.1
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmchiv5/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module go.elastic.co/apm/module/apmchiv5/v2
require (
github.com/go-chi/chi/v5 v5.0.2
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmecho/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ require (
github.com/labstack/echo v3.3.10+incompatible
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmechov4/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ require (
github.com/labstack/echo/v4 v4.9.0
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmelasticsearch/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ module go.elastic.co/apm/module/apmelasticsearch/v2

require (
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
6 changes: 3 additions & 3 deletions module/apmelasticsearch/internal/integration/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ require (
github.com/elastic/go-elasticsearch/v7 v7.5.0
github.com/olivere/elastic v6.2.16+incompatible
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand All @@ -20,7 +20,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0 // indirect
go.elastic.co/apm/module/apmhttp/v2 v2.6.0 // indirect
go.elastic.co/apm/module/apmhttp/v2 v2.6.2 // indirect
go.elastic.co/fastjson v1.1.0 // indirect
golang.org/x/sys v0.8.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions module/apmfasthttp/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ require (
github.com/stretchr/testify v1.8.4
github.com/valyala/bytebufferpool v1.0.0
github.com/valyala/fasthttp v1.34.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
6 changes: 3 additions & 3 deletions module/apmfiber/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ require (
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.4
github.com/valyala/fasthttp v1.51.0
go.elastic.co/apm/module/apmfasthttp/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmfasthttp/v2 v2.6.2
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmgin/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ require (
github.com/gin-gonic/gin v1.9.1
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
2 changes: 1 addition & 1 deletion module/apmgocql/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module go.elastic.co/apm/module/apmgocql/v2
require (
github.com/gocql/gocql v0.0.0-20181124151448-70385f88b28b
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
6 changes: 3 additions & 3 deletions module/apmgokit/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ require (
github.com/go-kit/kit v0.8.0
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmgrpc/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmgrpc/v2 v2.6.2
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
google.golang.org/grpc v1.57.1
google.golang.org/grpc/examples v0.0.0-20230831183909-e498bbc9bd37
)
Expand Down
2 changes: 1 addition & 1 deletion module/apmgometrics/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module go.elastic.co/apm/module/apmgometrics/v2
require (
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmgopg/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module go.elastic.co/apm/module/apmgopg/v2
require (
github.com/go-pg/pg v8.0.7+incompatible
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmsql/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmsql/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmgopgv10/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ require (
github.com/go-pg/pg/v10 v10.7.3
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmsql/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmsql/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
2 changes: 1 addition & 1 deletion module/apmgoredis/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21
require (
github.com/go-redis/redis v6.15.9+incompatible
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
2 changes: 1 addition & 1 deletion module/apmgoredisv8/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21
require (
github.com/go-redis/redis/v8 v8.11.4
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmgorilla/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module go.elastic.co/apm/module/apmgorilla/v2
require (
github.com/gorilla/mux v1.6.2
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmgorm/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ require (
github.com/jinzhu/gorm v1.9.10
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmsql/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmsql/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmgormv2/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ module go.elastic.co/apm/module/apmgormv2/v2

require (
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmsql/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmsql/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
gorm.io/driver/mysql v1.5.2
gorm.io/driver/postgres v1.5.4
gorm.io/driver/sqlite v1.5.4
Expand Down
4 changes: 2 additions & 2 deletions module/apmgrpc/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ require (
github.com/google/go-cmp v0.5.9
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
google.golang.org/grpc v1.57.1
google.golang.org/grpc/examples v0.0.0-20230831183909-e498bbc9bd37
google.golang.org/protobuf v1.33.0
Expand Down
2 changes: 1 addition & 1 deletion module/apmhttp/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module go.elastic.co/apm/module/apmhttp/v2
require (
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmhttprouter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module go.elastic.co/apm/module/apmhttprouter/v2
require (
github.com/julienschmidt/httprouter v1.2.0
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
2 changes: 1 addition & 1 deletion module/apmlambda/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module go.elastic.co/apm/module/apmlambda/v2

require (
github.com/aws/aws-lambda-go v1.8.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
2 changes: 1 addition & 1 deletion module/apmlogrus/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ require (
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.2.0
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
2 changes: 1 addition & 1 deletion module/apmmongo/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module go.elastic.co/apm/module/apmmongo/v2

require (
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.2
go.mongodb.org/mongo-driver v1.5.1
)

Expand Down
4 changes: 2 additions & 2 deletions module/apmnegroni/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.21
require (
github.com/stretchr/testify v1.8.4
github.com/urfave/negroni v1.0.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions module/apmot/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module go.elastic.co/apm/module/apmot/v2
require (
github.com/opentracing/opentracing-go v1.1.0
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
)

require (
Expand Down
Loading

0 comments on commit 096f5c0

Please sign in to comment.