From bd04e1a7f15b96a6756b235a76645d7e10da5f99 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 10 Jan 2020 11:30:49 +0800 Subject: [PATCH] v1.6.0 --- CHANGELOG.asciidoc | 16 ++++++++++++---- 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 ++-- .../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/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/apmsql/go.mod | 2 +- module/apmzap/go.mod | 2 +- module/apmzerolog/go.mod | 2 +- scripts/genmod/go.mod | 2 +- version.go | 2 +- 33 files changed, 62 insertions(+), 54 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index dc7ca1c77..a9c4e8890 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -21,14 +21,22 @@ endif::[] [[unreleased]] === Unreleased -https://github.com/elastic/apm-agent-go/compare/v1.6.0...master[View commits] - - - Add support for API Key auth {pull}698[(#698)] - - module/apmsql: report rows affected {pull}700[(#700)] +https://github.com/elastic/apm-agent-go/compare/v1.7.0...master[View commits] [[release-notes-1.x]] === Go Agent version 1.x +[[release-notes-1.7.0]] +==== 1.7.0 - 2020/01/10 + +https://github.com/elastic/apm-agent-go/releases/tag/v1.7.0[View release] + + - Add span.context.destination.* {pull}664[(#664)] + - transport: fix Content-Type for pprof data {pull}679[(#679)] + - Add "tracestate" propagation {pull}690[(#690)] + - Add support for API Key auth {pull}698[(#698)] + - module/apmsql: report rows affected {pull}700[(#700)] + [[release-notes-1.6.0]] ==== 1.6.0 - 2019/11/17 diff --git a/internal/apmversion/version.go b/internal/apmversion/version.go index 23abceb5b..0d819c466 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.6.0" + AgentVersion = "1.7.0" ) diff --git a/internal/tracecontexttest/go.mod b/internal/tracecontexttest/go.mod index 8dc349292..6c85c38ed 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.6.0 +require go.elastic.co/apm/module/apmhttp v1.7.0 replace go.elastic.co/apm => ../.. diff --git a/module/apmbeego/go.mod b/module/apmbeego/go.mod index e1fdc895c..89c42dd8f 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.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmhttp v1.6.0 - go.elastic.co/apm/module/apmsql v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmhttp v1.7.0 + go.elastic.co/apm/module/apmsql v1.7.0 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect ) diff --git a/module/apmchi/go.mod b/module/apmchi/go.mod index 2e54c6bf3..1cb165f1d 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 v4.0.2+incompatible github.com/stretchr/testify v1.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmhttp v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmhttp v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmecho/go.mod b/module/apmecho/go.mod index c409259ef..6418c0835 100644 --- a/module/apmecho/go.mod +++ b/module/apmecho/go.mod @@ -9,8 +9,8 @@ require ( github.com/stretchr/testify v1.4.0 github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 // indirect - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmhttp v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmhttp v1.7.0 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect ) diff --git a/module/apmechov4/go.mod b/module/apmechov4/go.mod index b93e76fa2..95891e425 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.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmhttp v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmhttp v1.7.0 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect ) diff --git a/module/apmelasticsearch/go.mod b/module/apmelasticsearch/go.mod index b7b2a4eb8..e5dc395df 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.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmhttp v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmhttp v1.7.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 index cc8cceecf..c1bd91d32 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.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmelasticsearch v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmelasticsearch v1.7.0 ) replace go.elastic.co/apm => ../../../.. diff --git a/module/apmgin/go.mod b/module/apmgin/go.mod index 5e3edb53a..3a5b63b2f 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.1 github.com/stretchr/testify v1.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmhttp v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmhttp v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgocql/go.mod b/module/apmgocql/go.mod index 213c2f5ea..19de50285 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.4.0 - go.elastic.co/apm v1.6.0 + go.elastic.co/apm v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgokit/go.mod b/module/apmgokit/go.mod index ef16cfa5f..13d279e16 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.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmgrpc v1.6.0 - go.elastic.co/apm/module/apmhttp v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmgrpc v1.7.0 + go.elastic.co/apm/module/apmhttp v1.7.0 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 google.golang.org/grpc v1.17.0 ) diff --git a/module/apmgometrics/go.mod b/module/apmgometrics/go.mod index 9553425a5..7f8c13819 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.4.0 - go.elastic.co/apm v1.6.0 + go.elastic.co/apm v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgopg/go.mod b/module/apmgopg/go.mod index 9fc4d113a..b5e382fdc 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.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmsql v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmsql v1.7.0 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 // indirect golang.org/x/text v0.3.2 // indirect diff --git a/module/apmgoredis/go.mod b/module/apmgoredis/go.mod index 700bc137c..799bb6123 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.4.0 - go.elastic.co/apm v1.6.0 + go.elastic.co/apm v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgorilla/go.mod b/module/apmgorilla/go.mod index 63b808990..1ab1fe8f6 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.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmhttp v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmhttp v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgorm/go.mod b/module/apmgorm/go.mod index 768dd1f0b..8d9b314d7 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.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmsql v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmsql v1.7.0 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect google.golang.org/appengine v1.6.1 // indirect ) diff --git a/module/apmgrpc/go.mod b/module/apmgrpc/go.mod index f9bd0d262..f599dbd35 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.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmhttp v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmhttp v1.7.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 index f6938270b..6be9d9400 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.4.0 - go.elastic.co/apm v1.6.0 + go.elastic.co/apm v1.7.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 index b2eca36f3..c8f6cc732 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.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmhttp v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmhttp v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmlambda/go.mod b/module/apmlambda/go.mod index 15c4f8d00..5c5b5d6d1 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.6.0 + go.elastic.co/apm v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmlogrus/go.mod b/module/apmlogrus/go.mod index 34644b265..8fb63cc68 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.4.0 - go.elastic.co/apm v1.6.0 + go.elastic.co/apm v1.7.0 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect ) diff --git a/module/apmmongo/go.mod b/module/apmmongo/go.mod index 1b1b95029..1e67f8809 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.6.0 + go.elastic.co/apm v1.7.0 go.mongodb.org/mongo-driver v1.0.0 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect golang.org/x/text v0.3.2 // indirect diff --git a/module/apmnegroni/go.mod b/module/apmnegroni/go.mod index 8c899f6f5..3eaf8ca07 100644 --- a/module/apmnegroni/go.mod +++ b/module/apmnegroni/go.mod @@ -5,8 +5,8 @@ go 1.13 require ( github.com/stretchr/testify v1.4.0 github.com/urfave/negroni v1.0.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmhttp v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmhttp v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmot/go.mod b/module/apmot/go.mod index 2ae5bb374..e16cb19d5 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.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmhttp v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmhttp v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmprometheus/go.mod b/module/apmprometheus/go.mod index 1cda412a4..60fbbb634 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.4.0 - go.elastic.co/apm v1.6.0 + go.elastic.co/apm v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmredigo/go.mod b/module/apmredigo/go.mod index 22b18ad24..15b38d898 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.4.0 - go.elastic.co/apm v1.6.0 + go.elastic.co/apm v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmrestful/go.mod b/module/apmrestful/go.mod index 19a2c8b6b..9a6fb1384 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.4.0 - go.elastic.co/apm v1.6.0 - go.elastic.co/apm/module/apmhttp v1.6.0 + go.elastic.co/apm v1.7.0 + go.elastic.co/apm/module/apmhttp v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmsql/go.mod b/module/apmsql/go.mod index ed0f5fc8c..9e5173f12 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.4.0 - go.elastic.co/apm v1.6.0 + go.elastic.co/apm v1.7.0 google.golang.org/appengine v1.4.0 // indirect ) diff --git a/module/apmzap/go.mod b/module/apmzap/go.mod index fef254c63..384c89ee5 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.4.0 - go.elastic.co/apm v1.6.0 + go.elastic.co/apm v1.7.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 d7089f776..d89cf002f 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.4.0 - go.elastic.co/apm v1.6.0 + go.elastic.co/apm v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/scripts/genmod/go.mod b/scripts/genmod/go.mod index 9f2cd7873..801a20605 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.6.0 + go.elastic.co/apm v1.7.0 ) replace go.elastic.co/apm => ../.. diff --git a/version.go b/version.go index 31281ec67..385f038b8 100644 --- a/version.go +++ b/version.go @@ -19,5 +19,5 @@ package apm const ( // AgentVersion is the Elastic APM Go Agent version. - AgentVersion = "1.6.0" + AgentVersion = "1.7.0" )