From c497b72e76dcd8d846c3935be0883004b81ecb72 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Thu, 20 Jun 2019 17:19:30 +0800 Subject: [PATCH] Bump version to v1.4.0 --- CHANGELOG.md | 4 +++- internal/apmversion/version.go | 2 +- internal/tracecontexttest/go.mod | 2 +- module/apmbeego/go.mod | 6 +++--- module/apmchi/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/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/apmgoredis/go.mod | 2 +- module/apmgorilla/go.mod | 4 ++-- module/apmgorm/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/apmot/go.mod | 4 ++-- module/apmprometheus/go.mod | 2 +- module/apmredigo/go.mod | 2 +- module/apmrestful/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 +- 32 files changed, 51 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b9895a98..16b1b0820 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog -## [Unreleased](https://github.com/elastic/apm-agent-go/compare/v1.3.0...master) +## [Unreleased](https://github.com/elastic/apm-agent-go/compare/v1.4.0...master) + +## [v1.4.0](https://github.com/elastic/apm-agent-go/releases/tag/v1.4.0) - Update opentracing-go dependency to v1.1.0 - Update HTTP routers to return " unknown route" if route cannot be matched (#486) diff --git a/internal/apmversion/version.go b/internal/apmversion/version.go index 65ef4a747..0b16005bd 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.3.0" + AgentVersion = "1.4.0" ) diff --git a/internal/tracecontexttest/go.mod b/internal/tracecontexttest/go.mod index fa1dfc06c..52d9c0f35 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.3.0 +require go.elastic.co/apm/module/apmhttp v1.4.0 replace go.elastic.co/apm => ../.. diff --git a/module/apmbeego/go.mod b/module/apmbeego/go.mod index acbc8948a..8fe286f9d 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.2.2 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmhttp v1.3.0 - go.elastic.co/apm/module/apmsql 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 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmchi/go.mod b/module/apmchi/go.mod index 15734da09..ea51711e0 100644 --- a/module/apmchi/go.mod +++ b/module/apmchi/go.mod @@ -4,8 +4,8 @@ require ( github.com/go-chi/chi v4.0.2+incompatible github.com/prometheus/procfs v0.0.0-20190328153300-af7bedc223fb // indirect github.com/stretchr/testify v1.2.2 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmhttp v1.3.0 + go.elastic.co/apm v1.4.0 + go.elastic.co/apm/module/apmhttp v1.4.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmecho/go.mod b/module/apmecho/go.mod index 73f8d0caf..8c384e15a 100644 --- a/module/apmecho/go.mod +++ b/module/apmecho/go.mod @@ -9,8 +9,8 @@ require ( github.com/stretchr/testify v1.2.2 github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 // indirect - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmhttp v1.3.0 + go.elastic.co/apm v1.4.0 + go.elastic.co/apm/module/apmhttp v1.4.0 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 // indirect ) diff --git a/module/apmechov4/go.mod b/module/apmechov4/go.mod index 88fd057b5..459adc91c 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.0 github.com/stretchr/testify v1.3.0 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmhttp v1.3.0 + go.elastic.co/apm v1.4.0 + go.elastic.co/apm/module/apmhttp v1.4.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmelasticsearch/go.mod b/module/apmelasticsearch/go.mod index a6d94bc68..eaf09797c 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.2.2 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmhttp v1.3.0 + go.elastic.co/apm v1.4.0 + go.elastic.co/apm/module/apmhttp v1.4.0 golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 ) diff --git a/module/apmelasticsearch/internal/integration/go.mod b/module/apmelasticsearch/internal/integration/go.mod index 10b26e494..41154fd3f 100644 --- 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.2.2 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmelasticsearch v1.3.0 + go.elastic.co/apm v1.4.0 + go.elastic.co/apm/module/apmelasticsearch v1.4.0 ) replace go.elastic.co/apm => ../../../.. diff --git a/module/apmgin/go.mod b/module/apmgin/go.mod index f25fbc2c5..a72cc82ff 100644 --- 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.0 github.com/stretchr/testify v1.3.0 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmhttp v1.3.0 + go.elastic.co/apm v1.4.0 + go.elastic.co/apm/module/apmhttp v1.4.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgocql/go.mod b/module/apmgocql/go.mod index ffe130c70..10e680e69 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.2.2 - go.elastic.co/apm v1.3.0 + go.elastic.co/apm v1.4.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgokit/go.mod b/module/apmgokit/go.mod index 23b41c889..cabbc4161 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.2.2 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmgrpc v1.3.0 - go.elastic.co/apm/module/apmhttp 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 golang.org/x/net v0.0.0-20181220203305-927f97764cc3 google.golang.org/grpc v1.17.0 ) diff --git a/module/apmgometrics/go.mod b/module/apmgometrics/go.mod index 6e018526d..a53eb3163 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.2.2 - go.elastic.co/apm v1.3.0 + go.elastic.co/apm v1.4.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgopg/go.mod b/module/apmgopg/go.mod index 8dff033e4..8439da50f 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.2.2 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmsql v1.3.0 + go.elastic.co/apm v1.4.0 + go.elastic.co/apm/module/apmsql v1.4.0 mellium.im/sasl v0.2.1 // indirect ) diff --git a/module/apmgoredis/go.mod b/module/apmgoredis/go.mod index b902eba58..fc6f46191 100644 --- a/module/apmgoredis/go.mod +++ b/module/apmgoredis/go.mod @@ -5,7 +5,7 @@ go 1.12 require ( github.com/go-redis/redis v6.15.3-0.20190424063336-97e6ed817821+incompatible github.com/stretchr/testify v1.2.2 - go.elastic.co/apm v1.3.0 + go.elastic.co/apm v1.4.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgorilla/go.mod b/module/apmgorilla/go.mod index 70b02ea5d..286833042 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.2.2 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmhttp v1.3.0 + go.elastic.co/apm v1.4.0 + go.elastic.co/apm/module/apmhttp v1.4.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgorm/go.mod b/module/apmgorm/go.mod index 43ef4d7b4..9f70ff4dd 100644 --- a/module/apmgorm/go.mod +++ b/module/apmgorm/go.mod @@ -10,8 +10,8 @@ require ( github.com/jinzhu/now v0.0.0-20181116074157-8ec929ed50c3 // indirect github.com/pkg/errors v0.8.0 github.com/stretchr/testify v1.2.2 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmsql v1.3.0 + go.elastic.co/apm v1.4.0 + go.elastic.co/apm/module/apmsql v1.4.0 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 // indirect ) diff --git a/module/apmgrpc/go.mod b/module/apmgrpc/go.mod index 5c6db692c..4fedf2d46 100644 --- 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.2.2 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmhttp v1.3.0 + go.elastic.co/apm v1.4.0 + go.elastic.co/apm/module/apmhttp v1.4.0 golang.org/x/net v0.0.0-20181220203305-927f97764cc3 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect google.golang.org/grpc v1.17.0 diff --git a/module/apmhttp/go.mod b/module/apmhttp/go.mod index 3c2b90f5f..ecbbf636d 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.0 github.com/stretchr/testify v1.2.2 - go.elastic.co/apm v1.3.0 + go.elastic.co/apm v1.4.0 golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 golang.org/x/text v0.3.0 // indirect ) diff --git a/module/apmhttprouter/go.mod b/module/apmhttprouter/go.mod index f45180134..b8d4be44a 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.2.2 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmhttp v1.3.0 + go.elastic.co/apm v1.4.0 + go.elastic.co/apm/module/apmhttp v1.4.0 golang.org/x/net v0.0.0-20181220203305-927f97764cc3 // indirect ) diff --git a/module/apmlambda/go.mod b/module/apmlambda/go.mod index b8b553682..bf924511c 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.3.0 + go.elastic.co/apm v1.4.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmlogrus/go.mod b/module/apmlogrus/go.mod index 857ea74b1..561edefbb 100644 --- a/module/apmlogrus/go.mod +++ b/module/apmlogrus/go.mod @@ -4,7 +4,7 @@ require ( github.com/pkg/errors v0.8.0 github.com/sirupsen/logrus v1.2.0 github.com/stretchr/testify v1.2.2 - go.elastic.co/apm v1.3.0 + go.elastic.co/apm v1.4.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmmongo/go.mod b/module/apmmongo/go.mod index 63c58079c..4b5be6942 100644 --- 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.3.0 + go.elastic.co/apm v1.4.0 go.mongodb.org/mongo-driver v1.0.0 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67 // indirect golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect diff --git a/module/apmot/go.mod b/module/apmot/go.mod index 3baf1ff30..f9f775506 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.2.2 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmhttp v1.3.0 + go.elastic.co/apm v1.4.0 + go.elastic.co/apm/module/apmhttp v1.4.0 golang.org/x/net v0.0.0-20181220203305-927f97764cc3 // indirect ) diff --git a/module/apmprometheus/go.mod b/module/apmprometheus/go.mod index a2e350969..c893b0a5a 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.2.2 - go.elastic.co/apm v1.3.0 + go.elastic.co/apm v1.4.0 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect ) diff --git a/module/apmredigo/go.mod b/module/apmredigo/go.mod index 0b290fe37..fc3f93d85 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 v2.0.0+incompatible github.com/stretchr/testify v1.2.2 - go.elastic.co/apm v1.3.0 + go.elastic.co/apm v1.4.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmrestful/go.mod b/module/apmrestful/go.mod index 10c4e2747..501869368 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.2.2 - go.elastic.co/apm v1.3.0 - go.elastic.co/apm/module/apmhttp v1.3.0 + go.elastic.co/apm v1.4.0 + go.elastic.co/apm/module/apmhttp v1.4.0 golang.org/x/net v0.0.0-20181220203305-927f97764cc3 // indirect ) diff --git a/module/apmsql/go.mod b/module/apmsql/go.mod index 48cfdc23d..8ac8adab3 100644 --- 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.2.2 - go.elastic.co/apm v1.3.0 + go.elastic.co/apm v1.4.0 google.golang.org/appengine v1.4.0 // indirect ) diff --git a/module/apmzap/go.mod b/module/apmzap/go.mod index 47a4d901d..6c7068723 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.0 github.com/stretchr/testify v1.3.0 - go.elastic.co/apm v1.3.0 + go.elastic.co/apm v1.4.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 680828911..fe6b96ff8 100644 --- a/module/apmzerolog/go.mod +++ b/module/apmzerolog/go.mod @@ -4,7 +4,7 @@ require ( github.com/pkg/errors v0.8.0 github.com/rs/zerolog v1.12.0 github.com/stretchr/testify v1.2.2 - go.elastic.co/apm v1.3.0 + go.elastic.co/apm v1.4.0 ) replace go.elastic.co/apm => ../.. diff --git a/scripts/genmod/go.mod b/scripts/genmod/go.mod index a127a7e7b..347047f36 100644 --- a/scripts/genmod/go.mod +++ b/scripts/genmod/go.mod @@ -2,7 +2,7 @@ module genmod require ( github.com/pkg/errors v0.8.0 - go.elastic.co/apm v1.3.0 + go.elastic.co/apm v1.4.0 ) replace go.elastic.co/apm => ../.. diff --git a/version.go b/version.go index bb80bf3e3..6e9b0524d 100644 --- a/version.go +++ b/version.go @@ -19,5 +19,5 @@ package apm const ( // AgentVersion is the Elastic APM Go Agent version. - AgentVersion = "1.3.0" + AgentVersion = "1.4.0" )