From 8e2c11be442960765757619edf4696fbbdb741d2 Mon Sep 17 00:00:00 2001 From: Marc Lopez Rubio Date: Wed, 8 Dec 2021 10:08:06 +0800 Subject: [PATCH 1/2] release: Prepare `v1.15.0` version Signed-off-by: Marc Lopez Rubio --- CHANGELOG.asciidoc | 11 +++++++---- docs/upgrading.asciidoc | 1 + internal/apmgodog/go.mod | 6 +++--- internal/apmversion/version.go | 2 +- internal/tracecontexttest/go.mod | 2 +- module/apmawssdkgo/go.mod | 4 ++-- module/apmazure/go.mod | 4 ++-- module/apmbeego/go.mod | 6 +++--- module/apmchi/go.mod | 4 ++-- module/apmchiv5/go.mod | 4 ++-- module/apmecho/go.mod | 4 ++-- module/apmechov4/go.mod | 4 ++-- module/apmelasticsearch/go.mod | 4 ++-- module/apmelasticsearch/internal/integration/go.mod | 4 ++-- module/apmfasthttp/go.mod | 4 ++-- module/apmfiber/go.mod | 6 +++--- module/apmgin/go.mod | 4 ++-- module/apmgocql/go.mod | 2 +- module/apmgokit/go.mod | 6 +++--- module/apmgometrics/go.mod | 2 +- module/apmgopg/go.mod | 4 ++-- module/apmgopgv10/go.mod | 4 ++-- module/apmgoredis/go.mod | 2 +- module/apmgoredisv8/go.mod | 2 +- module/apmgorilla/go.mod | 4 ++-- module/apmgorm/go.mod | 4 ++-- module/apmgormv2/go.mod | 4 ++-- module/apmgrpc/go.mod | 4 ++-- module/apmhttp/go.mod | 2 +- module/apmhttprouter/go.mod | 4 ++-- module/apmlambda/go.mod | 2 +- module/apmlogrus/go.mod | 2 +- module/apmmongo/go.mod | 2 +- module/apmnegroni/go.mod | 4 ++-- module/apmot/go.mod | 4 ++-- module/apmprometheus/go.mod | 2 +- module/apmredigo/go.mod | 2 +- module/apmrestful/go.mod | 4 ++-- module/apmrestfulv3/go.mod | 4 ++-- module/apmsql/go.mod | 2 +- module/apmzap/go.mod | 2 +- module/apmzerolog/go.mod | 2 +- scripts/genmod/go.mod | 2 +- version.go | 2 +- 44 files changed, 79 insertions(+), 75 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index e8d903a40..0cbe93586 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -21,7 +21,13 @@ endif::[] [[unreleased]] === Unreleased -https://github.com/elastic/apm-agent-go/compare/v1.14.0...master[View commits] +https://github.com/elastic/apm-agent-go/compare/v1.15.0...master[View commits] + +[[release-notes-1.x]] +=== Go Agent version 1.x + +[[release-notes-1.15.0]] +==== 1.15.0 - 2021/12/08 - Deprecate `http.request.socket.encrypted` and stop recording it in `module/apmhttp`, `module/apmgrpc` and `module/apmfiber`. {pull}1129[#(1129)] - Collect and send span destination service timing statistics about the dropped spans to the apm-server. {pull}1132[#(1132)] @@ -32,9 +38,6 @@ https://github.com/elastic/apm-agent-go/compare/v1.14.0...master[View commits] - Fixed a data race related to HTTP request header sanitisation {pull}1159[#(1159)] - `apm.CaptureError`, `apm.Error.SetTransaction`, and `apm.Error.SetSpan` will now set the associated transaction or span's default outcome to "failure" {pull}1160[#(1160)] -[[release-notes-1.x]] -=== Go Agent version 1.x - [[release-notes-1.14.0]] ==== 1.14.0 - 2021/09/22 diff --git a/docs/upgrading.asciidoc b/docs/upgrading.asciidoc index e4acfa154..ddbcb9ca3 100644 --- a/docs/upgrading.asciidoc +++ b/docs/upgrading.asciidoc @@ -21,6 +21,7 @@ The table below is a simplified description of this policy. [options="header"] |==== |Agent version |EOL Date |Maintained until +|1.14.x |2023-06-07 |1.16.0 |1.14.x |2023/03/22 |1.15.0 |1.13.x |2023/02/03 |1.14.0 |1.12.x |2022/11/25 |1.13.0 diff --git a/internal/apmgodog/go.mod b/internal/apmgodog/go.mod index 073cf13dd..b6e5e252e 100644 --- a/internal/apmgodog/go.mod +++ b/internal/apmgodog/go.mod @@ -4,9 +4,9 @@ go 1.13 require ( github.com/cucumber/godog v0.12.2 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmgrpc v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmgrpc v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 go.elastic.co/fastjson v1.1.0 google.golang.org/grpc v1.21.1 ) diff --git a/internal/apmversion/version.go b/internal/apmversion/version.go index b80a34ac1..d7e77a5fe 100644 --- a/internal/apmversion/version.go +++ b/internal/apmversion/version.go @@ -19,5 +19,5 @@ package apmversion const ( // AgentVersion is the Elastic APM Go Agent version. - AgentVersion = "1.14.0" + AgentVersion = "1.15.0" ) diff --git a/internal/tracecontexttest/go.mod b/internal/tracecontexttest/go.mod index 8d6a7f31c..fc47bdfec 100644 --- a/internal/tracecontexttest/go.mod +++ b/internal/tracecontexttest/go.mod @@ -1,6 +1,6 @@ module tracecontexttest -require go.elastic.co/apm/module/apmhttp v1.14.0 +require go.elastic.co/apm/module/apmhttp v1.15.0 replace go.elastic.co/apm => ../.. diff --git a/module/apmawssdkgo/go.mod b/module/apmawssdkgo/go.mod index 14a7fb259..0d9ae1010 100644 --- a/module/apmawssdkgo/go.mod +++ b/module/apmawssdkgo/go.mod @@ -5,8 +5,8 @@ go 1.15 require ( github.com/aws/aws-sdk-go v1.38.14 github.com/stretchr/testify v1.7.0 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmazure/go.mod b/module/apmazure/go.mod index b88d56e91..dea1fe130 100644 --- a/module/apmazure/go.mod +++ b/module/apmazure/go.mod @@ -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.7.0 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect ) diff --git a/module/apmbeego/go.mod b/module/apmbeego/go.mod index a63e900d7..8bbefa4fd 100644 --- a/module/apmbeego/go.mod +++ b/module/apmbeego/go.mod @@ -3,9 +3,9 @@ module go.elastic.co/apm/module/apmbeego require ( github.com/astaxie/beego v1.11.1 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 - go.elastic.co/apm/module/apmsql v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 + go.elastic.co/apm/module/apmsql v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmchi/go.mod b/module/apmchi/go.mod index 494d4e0c4..56a238b85 100644 --- a/module/apmchi/go.mod +++ b/module/apmchi/go.mod @@ -3,8 +3,8 @@ module go.elastic.co/apm/module/apmchi require ( github.com/go-chi/chi v1.5.1 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmchiv5/go.mod b/module/apmchiv5/go.mod index 187f2a4d4..9d934a18c 100644 --- a/module/apmchiv5/go.mod +++ b/module/apmchiv5/go.mod @@ -3,8 +3,8 @@ module go.elastic.co/apm/module/apmchiv5 require ( github.com/go-chi/chi/v5 v5.0.2 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmecho/go.mod b/module/apmecho/go.mod index ca76f59c0..8a07c0f7d 100644 --- a/module/apmecho/go.mod +++ b/module/apmecho/go.mod @@ -9,8 +9,8 @@ require ( github.com/stretchr/testify v1.6.1 github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 // indirect - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect ) diff --git a/module/apmechov4/go.mod b/module/apmechov4/go.mod index 093181343..57936a28a 100644 --- a/module/apmechov4/go.mod +++ b/module/apmechov4/go.mod @@ -4,8 +4,8 @@ require ( github.com/labstack/echo/v4 v4.0.0 github.com/pkg/errors v0.8.1 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect ) diff --git a/module/apmelasticsearch/go.mod b/module/apmelasticsearch/go.mod index de4a88757..7575866d4 100644 --- a/module/apmelasticsearch/go.mod +++ b/module/apmelasticsearch/go.mod @@ -2,8 +2,8 @@ module go.elastic.co/apm/module/apmelasticsearch require ( github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b ) diff --git a/module/apmelasticsearch/internal/integration/go.mod b/module/apmelasticsearch/internal/integration/go.mod index ce00d9d7a..7ec42a9c4 100644 --- a/module/apmelasticsearch/internal/integration/go.mod +++ b/module/apmelasticsearch/internal/integration/go.mod @@ -6,8 +6,8 @@ require ( github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 // indirect github.com/olivere/elastic v6.2.16+incompatible github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmelasticsearch v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmelasticsearch v1.15.0 ) replace go.elastic.co/apm => ../../../.. diff --git a/module/apmfasthttp/go.mod b/module/apmfasthttp/go.mod index 4049e7ced..66b262d69 100644 --- a/module/apmfasthttp/go.mod +++ b/module/apmfasthttp/go.mod @@ -6,8 +6,8 @@ require ( github.com/stretchr/testify v1.6.1 github.com/valyala/bytebufferpool v1.0.0 github.com/valyala/fasthttp v1.26.0 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 ) replace ( diff --git a/module/apmfiber/go.mod b/module/apmfiber/go.mod index 7db91588b..e8f8859e7 100644 --- a/module/apmfiber/go.mod +++ b/module/apmfiber/go.mod @@ -5,9 +5,9 @@ require ( github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.7.0 github.com/valyala/fasthttp v1.29.0 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmfasthttp v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmfasthttp v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgin/go.mod b/module/apmgin/go.mod index 4fe67c58e..3c039c869 100644 --- a/module/apmgin/go.mod +++ b/module/apmgin/go.mod @@ -4,8 +4,8 @@ require ( github.com/gin-gonic/gin v1.7.2 github.com/pkg/errors v0.8.1 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgocql/go.mod b/module/apmgocql/go.mod index 4e33189cd..c9dafe4a9 100644 --- a/module/apmgocql/go.mod +++ b/module/apmgocql/go.mod @@ -5,7 +5,7 @@ require ( github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect github.com/gocql/gocql v0.0.0-20181124151448-70385f88b28b github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 gopkg.in/yaml.v2 v2.2.2 // indirect ) diff --git a/module/apmgokit/go.mod b/module/apmgokit/go.mod index 9d9081e0e..41a58f5d9 100644 --- a/module/apmgokit/go.mod +++ b/module/apmgokit/go.mod @@ -6,9 +6,9 @@ require ( github.com/go-stack/stack v1.8.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmgrpc v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmgrpc v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b google.golang.org/grpc v1.17.0 ) diff --git a/module/apmgometrics/go.mod b/module/apmgometrics/go.mod index 5700fef78..63eceab27 100644 --- a/module/apmgometrics/go.mod +++ b/module/apmgometrics/go.mod @@ -3,7 +3,7 @@ module go.elastic.co/apm/module/apmgometrics require ( github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 gopkg.in/yaml.v2 v2.2.2 // indirect ) diff --git a/module/apmgopg/go.mod b/module/apmgopg/go.mod index cba90a7d7..da151d556 100644 --- a/module/apmgopg/go.mod +++ b/module/apmgopg/go.mod @@ -6,8 +6,8 @@ require ( github.com/onsi/ginkgo v1.8.0 // indirect github.com/onsi/gomega v1.5.0 // indirect github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmsql v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmsql v1.15.0 mellium.im/sasl v0.2.1 // indirect ) diff --git a/module/apmgopgv10/go.mod b/module/apmgopgv10/go.mod index d87f3ed98..8bc3fb2fd 100644 --- a/module/apmgopgv10/go.mod +++ b/module/apmgopgv10/go.mod @@ -4,8 +4,8 @@ require ( github.com/go-pg/pg/v10 v10.7.3 github.com/pkg/errors v0.8.1 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmsql v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmsql v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgoredis/go.mod b/module/apmgoredis/go.mod index ebfbcfc7c..ea90fb4be 100644 --- a/module/apmgoredis/go.mod +++ b/module/apmgoredis/go.mod @@ -7,7 +7,7 @@ require ( github.com/onsi/ginkgo v1.8.0 // indirect github.com/onsi/gomega v1.5.0 // indirect github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 gopkg.in/yaml.v2 v2.2.2 // indirect ) diff --git a/module/apmgoredisv8/go.mod b/module/apmgoredisv8/go.mod index 1f5b22cf3..56a5b5200 100644 --- a/module/apmgoredisv8/go.mod +++ b/module/apmgoredisv8/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/go-redis/redis/v8 v8.0.0-beta.2 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgorilla/go.mod b/module/apmgorilla/go.mod index e6eda19e9..aeb08d275 100644 --- a/module/apmgorilla/go.mod +++ b/module/apmgorilla/go.mod @@ -4,8 +4,8 @@ require ( github.com/gorilla/context v1.1.1 // indirect github.com/gorilla/mux v1.6.2 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgorm/go.mod b/module/apmgorm/go.mod index 09f36e5fe..d06f12a1d 100644 --- a/module/apmgorm/go.mod +++ b/module/apmgorm/go.mod @@ -5,8 +5,8 @@ require ( github.com/jinzhu/gorm v1.9.10 github.com/pkg/errors v0.8.1 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmsql v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmsql v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgormv2/go.mod b/module/apmgormv2/go.mod index 5be9bdbfe..926895ec2 100644 --- a/module/apmgormv2/go.mod +++ b/module/apmgormv2/go.mod @@ -2,8 +2,8 @@ module go.elastic.co/apm/module/apmgormv2 require ( github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmsql v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmsql v1.15.0 gorm.io/driver/mysql v1.0.2 gorm.io/driver/postgres v1.0.2 gorm.io/driver/sqlite v1.1.4-0.20200928065301-698e250a3b0d diff --git a/module/apmgrpc/go.mod b/module/apmgrpc/go.mod index cc577c78a..82609b0bb 100644 --- a/module/apmgrpc/go.mod +++ b/module/apmgrpc/go.mod @@ -4,8 +4,8 @@ require ( github.com/golang/protobuf v1.2.0 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b google.golang.org/grpc v1.17.0 ) diff --git a/module/apmhttp/go.mod b/module/apmhttp/go.mod index 1f39cbcb3..a25d03edd 100644 --- a/module/apmhttp/go.mod +++ b/module/apmhttp/go.mod @@ -3,7 +3,7 @@ module go.elastic.co/apm/module/apmhttp require ( github.com/pkg/errors v0.8.1 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b golang.org/x/text v0.3.2 // indirect gopkg.in/yaml.v2 v2.2.2 // indirect diff --git a/module/apmhttprouter/go.mod b/module/apmhttprouter/go.mod index c90380ed6..b745f4b59 100644 --- a/module/apmhttprouter/go.mod +++ b/module/apmhttprouter/go.mod @@ -3,8 +3,8 @@ module go.elastic.co/apm/module/apmhttprouter require ( github.com/julienschmidt/httprouter v1.2.0 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmlambda/go.mod b/module/apmlambda/go.mod index 80bf6e0f5..f2c4076d2 100644 --- a/module/apmlambda/go.mod +++ b/module/apmlambda/go.mod @@ -2,7 +2,7 @@ module go.elastic.co/apm/module/apmlambda require ( github.com/aws/aws-lambda-go v1.8.0 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmlogrus/go.mod b/module/apmlogrus/go.mod index 809b5fa14..01ae3fb26 100644 --- a/module/apmlogrus/go.mod +++ b/module/apmlogrus/go.mod @@ -4,7 +4,7 @@ require ( github.com/pkg/errors v0.8.1 github.com/sirupsen/logrus v1.2.0 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect gopkg.in/yaml.v2 v2.2.2 // indirect ) diff --git a/module/apmmongo/go.mod b/module/apmmongo/go.mod index 7edb84874..8cdfe291d 100644 --- a/module/apmmongo/go.mod +++ b/module/apmmongo/go.mod @@ -2,7 +2,7 @@ module go.elastic.co/apm/module/apmmongo require ( github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 go.mongodb.org/mongo-driver v1.5.1 ) diff --git a/module/apmnegroni/go.mod b/module/apmnegroni/go.mod index b3517adbe..9c8ee0d3b 100644 --- a/module/apmnegroni/go.mod +++ b/module/apmnegroni/go.mod @@ -5,8 +5,8 @@ go 1.13 require ( github.com/stretchr/testify v1.6.1 github.com/urfave/negroni v1.0.0 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmot/go.mod b/module/apmot/go.mod index a965f9242..927fe3a35 100644 --- a/module/apmot/go.mod +++ b/module/apmot/go.mod @@ -3,8 +3,8 @@ module go.elastic.co/apm/module/apmot require ( github.com/opentracing/opentracing-go v1.1.0 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmprometheus/go.mod b/module/apmprometheus/go.mod index c3cecc7e4..12789add4 100644 --- a/module/apmprometheus/go.mod +++ b/module/apmprometheus/go.mod @@ -5,7 +5,7 @@ require ( github.com/prometheus/client_golang v0.9.2 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 gopkg.in/yaml.v2 v2.2.2 // indirect ) diff --git a/module/apmredigo/go.mod b/module/apmredigo/go.mod index c1ce39638..d896f3c2d 100644 --- a/module/apmredigo/go.mod +++ b/module/apmredigo/go.mod @@ -3,7 +3,7 @@ module go.elastic.co/apm/module/apmredigo require ( github.com/gomodule/redigo v1.8.2 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmrestful/go.mod b/module/apmrestful/go.mod index 6ec126a10..123b20876 100644 --- a/module/apmrestful/go.mod +++ b/module/apmrestful/go.mod @@ -6,8 +6,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.1 // indirect github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmrestfulv3/go.mod b/module/apmrestfulv3/go.mod index 83181ae51..e7eafbc56 100644 --- a/module/apmrestfulv3/go.mod +++ b/module/apmrestfulv3/go.mod @@ -4,8 +4,8 @@ require ( github.com/emicklei/go-restful/v3 v3.5.1 github.com/json-iterator/go v1.1.11 // indirect github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 - go.elastic.co/apm/module/apmhttp v1.14.0 + go.elastic.co/apm v1.15.0 + go.elastic.co/apm/module/apmhttp v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmsql/go.mod b/module/apmsql/go.mod index 615f15cee..38f2b457a 100644 --- a/module/apmsql/go.mod +++ b/module/apmsql/go.mod @@ -6,7 +6,7 @@ require ( github.com/lib/pq v1.3.0 github.com/mattn/go-sqlite3 v1.10.0 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmzap/go.mod b/module/apmzap/go.mod index c8adf383a..a5478624e 100644 --- a/module/apmzap/go.mod +++ b/module/apmzap/go.mod @@ -3,7 +3,7 @@ module go.elastic.co/apm/module/apmzap require ( github.com/pkg/errors v0.8.1 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 go.uber.org/atomic v1.3.2 // indirect go.uber.org/multierr v1.1.0 // indirect go.uber.org/zap v1.9.1 diff --git a/module/apmzerolog/go.mod b/module/apmzerolog/go.mod index d6ba39a92..e79fbeb64 100644 --- a/module/apmzerolog/go.mod +++ b/module/apmzerolog/go.mod @@ -4,7 +4,7 @@ require ( github.com/pkg/errors v0.8.1 github.com/rs/zerolog v1.14.3 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 gopkg.in/yaml.v2 v2.2.2 // indirect ) diff --git a/scripts/genmod/go.mod b/scripts/genmod/go.mod index af60a739e..d9de28c4a 100644 --- a/scripts/genmod/go.mod +++ b/scripts/genmod/go.mod @@ -2,7 +2,7 @@ module genmod require ( github.com/pkg/errors v0.8.1 - go.elastic.co/apm v1.14.0 + go.elastic.co/apm v1.15.0 ) replace go.elastic.co/apm => ../.. diff --git a/version.go b/version.go index 7cc1862f1..801437a37 100644 --- a/version.go +++ b/version.go @@ -19,5 +19,5 @@ package apm // import "go.elastic.co/apm" const ( // AgentVersion is the Elastic APM Go Agent version. - AgentVersion = "1.14.0" + AgentVersion = "1.15.0" ) From ff193b8797cdd8207b3211b5df1303f8b6b3710c Mon Sep 17 00:00:00 2001 From: Marc Lopez Rubio Date: Wed, 8 Dec 2021 10:30:32 +0800 Subject: [PATCH 2/2] Update docs/upgrading.asciidoc Co-authored-by: Andrew Wilkins --- docs/upgrading.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/upgrading.asciidoc b/docs/upgrading.asciidoc index ddbcb9ca3..8718d567c 100644 --- a/docs/upgrading.asciidoc +++ b/docs/upgrading.asciidoc @@ -21,7 +21,7 @@ The table below is a simplified description of this policy. [options="header"] |==== |Agent version |EOL Date |Maintained until -|1.14.x |2023-06-07 |1.16.0 +|1.15.x |2023-06-07 |1.16.0 |1.14.x |2023/03/22 |1.15.0 |1.13.x |2023/02/03 |1.14.0 |1.12.x |2022/11/25 |1.13.0