Merge pull request #605 from axw/release-v1.5.0

Update to v1.5.0
elastic · Jul 31, 2019 · a6e8c6c · a6e8c6c
2 parents 245fbdc + 6a7ebd0
commit a6e8c6c
Show file tree

Hide file tree

Showing 34 changed files with 52 additions and 52 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
-## [Unreleased](https://github.com/elastic/apm-agent-go/compare/v1.4.0...master)
+## [Unreleased](https://github.com/elastic/apm-agent-go/compare/v1.5.0...master)
+
+## [v1.5.0](https://github.com/elastic/apm-agent-go/releases/tag/v1.5.0)
 
  - Add Context.SetCustom (#581)
  - Add support for extracting UUID-like container IDs (#577)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -78,7 +78,7 @@ adequately cover the code using `go test -cover`.
 
 ### Release procedure
 
-1. Update version.go and then run "make update-modules"
+1. Update version.go and internal/apmversion/version.go, and then run "make update-modules"
 2. Update CHANGELOG.md, adding a new version heading and changing the base tag of the Unreleased comparison URL
 3. Merge changes into github.com/elastic/apm-agent-go@master
 4. Create tags: vN.N.N, and module/$MODULE/vN.N.N for each instrumentation module

diff --git 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.4.0"
+	AgentVersion = "1.5.0"
 )
diff --git a/internal/tracecontexttest/go.mod b/internal/tracecontexttest/go.mod
@@ -1,6 +1,6 @@
 module tracecontexttest
 
-require go.elastic.co/apm/module/apmhttp v1.4.0
+require go.elastic.co/apm/module/apmhttp v1.5.0
 
 replace go.elastic.co/apm => ../..
 

diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmhttp v1.4.0
-	go.elastic.co/apm/module/apmsql v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmhttp v1.5.0
+	go.elastic.co/apm/module/apmsql v1.5.0
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
 )
 

diff --git 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 v4.0.2+incompatible
 	github.com/stretchr/testify v1.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmhttp v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmhttp v1.5.0
 )
 
 replace go.elastic.co/apm => ../..

diff --git a/module/apmecho/go.mod b/module/apmecho/go.mod
@@ -9,8 +9,8 @@ require (
 	github.com/stretchr/testify v1.3.0
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 // indirect
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmhttp v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmhttp v1.5.0
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
 )
 

diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmhttp v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmhttp v1.5.0
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
 )
 

diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmhttp v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmhttp v1.5.0
 	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
 )
 

diff --git a/module/apmelasticsearch/internal/integration/go.mod b/module/apmelasticsearch/internal/integration/go.mod
@@ -5,8 +5,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.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmelasticsearch v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmelasticsearch v1.5.0
 )
 
 replace go.elastic.co/apm => ../../../..

diff --git a/module/apmgin/go.mod b/module/apmgin/go.mod
@@ -4,8 +4,8 @@ require (
 	github.com/gin-gonic/gin v1.4.0
 	github.com/pkg/errors v0.8.1
 	github.com/stretchr/testify v1.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmhttp v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmhttp v1.5.0
 )
 
 replace go.elastic.co/apm => ../..

diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
+	go.elastic.co/apm v1.5.0
 )
 
 replace go.elastic.co/apm => ../..
diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmgrpc v1.4.0
-	go.elastic.co/apm/module/apmhttp v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmgrpc v1.5.0
+	go.elastic.co/apm/module/apmhttp v1.5.0
 	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
 	google.golang.org/grpc v1.17.0
 )

diff --git a/module/apmgokit/go.sum b/module/apmgokit/go.sum
@@ -52,8 +52,6 @@ go.elastic.co/fastjson v1.0.0/go.mod h1:PmeUOMMtLHQr9ZS9J9owrAVg0FkaZDRZJEFTTGHt
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis=
-golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=

diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
+	go.elastic.co/apm v1.5.0
 )
 
 replace go.elastic.co/apm => ../..
diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmsql v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmsql v1.5.0
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
 	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 // indirect
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect

diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
+	go.elastic.co/apm v1.5.0
 )
 
 replace go.elastic.co/apm => ../..
diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmhttp v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmhttp v1.5.0
 )
 
 replace go.elastic.co/apm => ../..

diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmsql v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmsql v1.5.0
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
 	google.golang.org/appengine v1.6.1 // indirect
 )

diff --git a/module/apmgrpc/go.mod b/module/apmgrpc/go.mod
@@ -3,8 +3,8 @@ module go.elastic.co/apm/module/apmgrpc
 require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0
 	github.com/stretchr/testify v1.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmhttp v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmhttp v1.5.0
 	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
 	google.golang.org/grpc v1.17.0
 )

diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
+	go.elastic.co/apm v1.5.0
 	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
 	golang.org/x/text v0.3.2 // indirect
 )

diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmhttp v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmhttp v1.5.0
 )
 
 replace go.elastic.co/apm => ../..

diff --git 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.4.0
+	go.elastic.co/apm v1.5.0
 )
 
 replace go.elastic.co/apm => ../..
diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
+	go.elastic.co/apm v1.5.0
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
 )
 

diff --git a/module/apmmongo/go.mod b/module/apmmongo/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51 // indirect
 	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
 	github.com/xdg/stringprep v1.0.0 // indirect
-	go.elastic.co/apm v1.4.0
+	go.elastic.co/apm v1.5.0
 	go.mongodb.org/mongo-driver v1.0.0
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect

diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmhttp v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmhttp v1.5.0
 )
 
 replace go.elastic.co/apm => ../..

diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
+	go.elastic.co/apm v1.5.0
 )
 
 replace go.elastic.co/apm => ../..
diff --git 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 v2.0.0+incompatible
 	github.com/stretchr/testify v1.3.0
-	go.elastic.co/apm v1.4.0
+	go.elastic.co/apm v1.5.0
 )
 
 replace go.elastic.co/apm => ../..
diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
-	go.elastic.co/apm/module/apmhttp v1.4.0
+	go.elastic.co/apm v1.5.0
+	go.elastic.co/apm/module/apmhttp v1.5.0
 )
 
 replace go.elastic.co/apm => ../..

diff --git a/module/apmsql/go.mod b/module/apmsql/go.mod
@@ -5,7 +5,7 @@ require (
 	github.com/lib/pq v1.0.0
 	github.com/mattn/go-sqlite3 v1.10.0
 	github.com/stretchr/testify v1.3.0
-	go.elastic.co/apm v1.4.0
+	go.elastic.co/apm v1.5.0
 	google.golang.org/appengine v1.4.0 // indirect
 )
 

diff --git 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.3.0
-	go.elastic.co/apm v1.4.0
+	go.elastic.co/apm v1.5.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
@@ -4,7 +4,7 @@ require (
 	github.com/pkg/errors v0.8.1
 	github.com/rs/zerolog v1.12.0
 	github.com/stretchr/testify v1.3.0
-	go.elastic.co/apm v1.4.0
+	go.elastic.co/apm v1.5.0
 )
 
 replace go.elastic.co/apm => ../..
diff --git 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.4.0
+	go.elastic.co/apm v1.5.0
 )
 
 replace go.elastic.co/apm => ../..
diff --git a/version.go b/version.go
@@ -19,5 +19,5 @@ package apm
 
 const (
 	// AgentVersion is the Elastic APM Go Agent version.
-	AgentVersion = "1.4.0"
+	AgentVersion = "1.5.0"
 )