From 94c7f5ab9d38a753eff37fc8086d155341e68fc2 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 20 May 2022 17:45:34 +0800 Subject: [PATCH] Bump version to 2.1.0 (#1249) --- CHANGELOG.asciidoc | 12 ++++++++---- docs/upgrading.asciidoc | 1 + internal/apmgodog/go.mod | 6 +++--- internal/apmversion/version.go | 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/apmfiber/go.sum | 5 ----- 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(+), 79 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index be1132a3f..7422d6b85 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -21,13 +21,18 @@ endif::[] [[unreleased]] === Unreleased -https://github.com/elastic/apm-agent-go/compare/v2.0.0...main[View commits] - -- Fetch initial server version async to prevent blocking NewTracer for 10 seconds {pull}1239[#(1239)] +https://github.com/elastic/apm-agent-go/compare/v2.1.0...main[View commits] [[release-notes-2.x]] === Go Agent version 2.x +[[release-notes-2.1.0]] +==== 2.1.0 - 2022/05/20 + +- Replace `authorization` with `*auth*` pattern for sanitizing field names {pull}1230[#(1230)] +- Fetch initial server version async to prevent blocking NewTracer for 10 seconds {pull}1239[#(1239)] +- Fix race in `apm.DefaultTracer` which could lead to multiple tracers being created {pull}1248[#(1248)] + [[release-notes-2.0.0]] ==== 2.0.0 - 2022/03/17 @@ -47,7 +52,6 @@ https://github.com/elastic/apm-agent-go/compare/v2.0.0...main[View commits] - Drop unsampled txs when connected to an APM Server >= 8.0 {pull}1208[#(1208)] - Removed SetTag {pull}1218[(#1218)] - Unexport Tracer's fields -- TracerOptions must be used instead {pull}1219[#(1219)] -- Replace `authorization` with `*auth*` pattern for sanitizing field names {pull}1230[#(1230)] [[release-notes-1.x]] === Go Agent version 1.x diff --git a/docs/upgrading.asciidoc b/docs/upgrading.asciidoc index 1db0a9f22..f0cdd3c1d 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 +|2.1.x |2023-11-20 |2.2.0 |2.0.x |2023-09-17 |2.1.0 |1.15.x |2023-06-07 |1.16.0 |1.14.x |2023/03/22 |1.15.0 diff --git a/internal/apmgodog/go.mod b/internal/apmgodog/go.mod index 9b767bd1a..b62e254c6 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/module/apmgrpc/v2 v2.0.0 - go.elastic.co/apm/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmgrpc/v2 v2.1.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.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 d0e1f745b..3c3caa6e7 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 = "2.0.0" + AgentVersion = "2.1.0" ) diff --git a/module/apmawssdkgo/go.mod b/module/apmawssdkgo/go.mod index f05e560d6..7885d8093 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/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmazure/go.mod b/module/apmazure/go.mod index 050ff3197..aff407c9e 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/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect ) diff --git a/module/apmbeego/go.mod b/module/apmbeego/go.mod index d483fae7d..d5c53c62f 100644 --- a/module/apmbeego/go.mod +++ b/module/apmbeego/go.mod @@ -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.6.1 - go.elastic.co/apm/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/module/apmsql/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/module/apmsql/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/module/apmchi/go.mod b/module/apmchi/go.mod index 397a826af..fbc9f1391 100644 --- a/module/apmchi/go.mod +++ b/module/apmchi/go.mod @@ -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.6.1 - go.elastic.co/apm/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmchiv5/go.mod b/module/apmchiv5/go.mod index ed424f305..6e715c1e4 100644 --- a/module/apmchiv5/go.mod +++ b/module/apmchiv5/go.mod @@ -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.6.1 - go.elastic.co/apm/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmecho/go.mod b/module/apmecho/go.mod index d6f9f8d4a..064a18ef7 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/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect ) diff --git a/module/apmechov4/go.mod b/module/apmechov4/go.mod index db0d720bf..d1c4e5289 100644 --- a/module/apmechov4/go.mod +++ b/module/apmechov4/go.mod @@ -4,8 +4,8 @@ require ( github.com/labstack/echo/v4 v4.6.1 github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmelasticsearch/go.mod b/module/apmelasticsearch/go.mod index fdf8871c5..ac3150876 100644 --- a/module/apmelasticsearch/go.mod +++ b/module/apmelasticsearch/go.mod @@ -2,8 +2,8 @@ module go.elastic.co/apm/module/apmelasticsearch/v2 require ( github.com/stretchr/testify v1.6.1 - go.elastic.co/apm/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f ) diff --git a/module/apmelasticsearch/internal/integration/go.mod b/module/apmelasticsearch/internal/integration/go.mod index a1b4e2806..0bbcd01af 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/module/apmelasticsearch/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmelasticsearch/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../../../.. diff --git a/module/apmfasthttp/go.mod b/module/apmfasthttp/go.mod index 9fa968fae..f7961f909 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.34.0 - go.elastic.co/apm/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace ( diff --git a/module/apmfiber/go.mod b/module/apmfiber/go.mod index 33637aa48..a3f17be4a 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.34.0 - go.elastic.co/apm/module/apmfasthttp/v2 v2.0.0 - go.elastic.co/apm/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmfasthttp/v2 v2.1.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmfiber/go.sum b/module/apmfiber/go.sum index 275faa924..b68e7d5c8 100644 --- a/module/apmfiber/go.sum +++ b/module/apmfiber/go.sum @@ -23,7 +23,6 @@ github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJS github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4= github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak= github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.14.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.0 h1:xqfchp4whNFxn5A4XFyyYtitiWI8Hy5EW59jEwcyL6U= github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -50,7 +49,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.29.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus= -github.com/valyala/fasthttp v1.33.0/go.mod h1:KJRK/MXx0J+yd0c5hlR+s1tIHD72sniU8ZJjl97LIw4= github.com/valyala/fasthttp v1.34.0 h1:d3AAQJ2DRcxJYHm7OXNXtXt2as1vMDfxeIcFvhmGGm4= github.com/valyala/fasthttp v1.34.0/go.mod h1:epZA5N+7pY6ZaEKRmstzOuYJx9HI8DI1oaCGZpdH4h0= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= @@ -63,7 +61,6 @@ go.elastic.co/fastjson v1.1.0/go.mod h1:boNGISWMjQsUPy/t6yqt2/1Wx4YNPSe+mZjlyw9v golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= @@ -80,7 +77,6 @@ golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -101,7 +97,6 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211102192858-4dd72447c267/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/module/apmgin/go.mod b/module/apmgin/go.mod index a5c50cd88..1d48a6a59 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.9.1 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmgocql/go.mod b/module/apmgocql/go.mod index e20faf918..ba0aaad61 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/v2 v2.0.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmgokit/go.mod b/module/apmgokit/go.mod index 3b3536b5d..d9acd91bf 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/module/apmgrpc/v2 v2.0.0 - go.elastic.co/apm/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmgrpc/v2 v2.1.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f google.golang.org/grpc v1.17.0 ) diff --git a/module/apmgometrics/go.mod b/module/apmgometrics/go.mod index 61a44f5b8..0dc8c5d86 100644 --- a/module/apmgometrics/go.mod +++ b/module/apmgometrics/go.mod @@ -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.6.1 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmgopg/go.mod b/module/apmgopg/go.mod index 353f48a91..de5deb492 100644 --- a/module/apmgopg/go.mod +++ b/module/apmgopg/go.mod @@ -6,8 +6,8 @@ require ( github.com/onsi/ginkgo v1.16.5 // indirect github.com/onsi/gomega v1.18.1 // indirect github.com/stretchr/testify v1.6.1 - go.elastic.co/apm/module/apmsql/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmsql/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 mellium.im/sasl v0.2.1 // indirect ) diff --git a/module/apmgopgv10/go.mod b/module/apmgopgv10/go.mod index db23af35e..c9bcc21f5 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.9.1 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm/module/apmsql/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmsql/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmgoredis/go.mod b/module/apmgoredis/go.mod index 1ab8e3735..3acf9dfb9 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/v2 v2.0.0 + go.elastic.co/apm/v2 v2.1.0 gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/module/apmgoredisv8/go.mod b/module/apmgoredisv8/go.mod index 89888d11e..404d6ffa1 100644 --- a/module/apmgoredisv8/go.mod +++ b/module/apmgoredisv8/go.mod @@ -5,7 +5,7 @@ go 1.15 require ( github.com/go-redis/redis/v8 v8.11.4 github.com/stretchr/testify v1.7.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmgorilla/go.mod b/module/apmgorilla/go.mod index 0368c47c1..2750248e3 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/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmgorm/go.mod b/module/apmgorm/go.mod index c128caaf9..c0e644be3 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.9.1 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm/module/apmsql/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmsql/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmgormv2/go.mod b/module/apmgormv2/go.mod index 08ef7be47..96826b569 100644 --- a/module/apmgormv2/go.mod +++ b/module/apmgormv2/go.mod @@ -2,8 +2,8 @@ module go.elastic.co/apm/module/apmgormv2/v2 require ( github.com/stretchr/testify v1.6.1 - go.elastic.co/apm/module/apmsql/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmsql/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.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 03ce9ce79..80d0eefc8 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/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f google.golang.org/grpc v1.17.0 ) diff --git a/module/apmhttp/go.mod b/module/apmhttp/go.mod index 2ea55ad3b..3f8153f23 100644 --- a/module/apmhttp/go.mod +++ b/module/apmhttp/go.mod @@ -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.6.1 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/v2 v2.1.0 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f ) diff --git a/module/apmhttprouter/go.mod b/module/apmhttprouter/go.mod index 9a976ff1a..4abe7a41c 100644 --- a/module/apmhttprouter/go.mod +++ b/module/apmhttprouter/go.mod @@ -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.6.1 - go.elastic.co/apm/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmlambda/go.mod b/module/apmlambda/go.mod index 90a095ab3..41008cdbf 100644 --- a/module/apmlambda/go.mod +++ b/module/apmlambda/go.mod @@ -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.0.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmlogrus/go.mod b/module/apmlogrus/go.mod index e3256788a..5197c9445 100644 --- a/module/apmlogrus/go.mod +++ b/module/apmlogrus/go.mod @@ -4,7 +4,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.2.0 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/v2 v2.1.0 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect ) diff --git a/module/apmmongo/go.mod b/module/apmmongo/go.mod index 16cccff2c..fc0c10786 100644 --- a/module/apmmongo/go.mod +++ b/module/apmmongo/go.mod @@ -2,7 +2,7 @@ module go.elastic.co/apm/module/apmmongo/v2 require ( github.com/stretchr/testify v1.6.1 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/v2 v2.1.0 go.mongodb.org/mongo-driver v1.5.1 ) diff --git a/module/apmnegroni/go.mod b/module/apmnegroni/go.mod index b68a41e12..755a93e7d 100644 --- a/module/apmnegroni/go.mod +++ b/module/apmnegroni/go.mod @@ -5,8 +5,8 @@ go 1.15 require ( github.com/stretchr/testify v1.6.1 github.com/urfave/negroni v1.0.0 - go.elastic.co/apm/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmot/go.mod b/module/apmot/go.mod index 5337c6c7d..82cfe1043 100644 --- a/module/apmot/go.mod +++ b/module/apmot/go.mod @@ -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.6.1 - go.elastic.co/apm/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmprometheus/go.mod b/module/apmprometheus/go.mod index 9a1e9235f..8a0948f6c 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/v2 v2.0.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmredigo/go.mod b/module/apmredigo/go.mod index 747aa6310..4cd4cc4bd 100644 --- a/module/apmredigo/go.mod +++ b/module/apmredigo/go.mod @@ -3,7 +3,7 @@ module go.elastic.co/apm/module/apmredigo/v2 require ( github.com/gomodule/redigo v1.8.2 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmrestful/go.mod b/module/apmrestful/go.mod index 034858952..2d37ec910 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/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmrestfulv3/go.mod b/module/apmrestfulv3/go.mod index 150924a11..20d1ed369 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/module/apmhttp/v2 v2.0.0 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/module/apmhttp/v2 v2.1.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmsql/go.mod b/module/apmsql/go.mod index 77c99f146..2a3720efe 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/v2 v2.0.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/module/apmzap/go.mod b/module/apmzap/go.mod index 1240ebc68..faa1a6df1 100644 --- a/module/apmzap/go.mod +++ b/module/apmzap/go.mod @@ -3,7 +3,7 @@ module go.elastic.co/apm/module/apmzap/v2 require ( github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/v2 v2.1.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 b9ce26e40..cae23c282 100644 --- a/module/apmzerolog/go.mod +++ b/module/apmzerolog/go.mod @@ -4,7 +4,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.14.3 github.com/stretchr/testify v1.6.1 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/scripts/genmod/go.mod b/scripts/genmod/go.mod index 67d584c08..4aec1af1a 100644 --- a/scripts/genmod/go.mod +++ b/scripts/genmod/go.mod @@ -2,7 +2,7 @@ module genmod require ( github.com/pkg/errors v0.9.1 - go.elastic.co/apm/v2 v2.0.0 + go.elastic.co/apm/v2 v2.1.0 ) replace go.elastic.co/apm/v2 => ../.. diff --git a/version.go b/version.go index 331748d49..a7fd037f5 100644 --- a/version.go +++ b/version.go @@ -19,5 +19,5 @@ package apm // import "go.elastic.co/apm/v2" const ( // AgentVersion is the Elastic APM Go Agent version. - AgentVersion = "2.0.0" + AgentVersion = "2.1.0" )