diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 9d2a68bee..46bc423e4 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -21,13 +21,18 @@ endif::[] [[unreleased]] === Unreleased -https://github.com/elastic/apm-agent-go/compare/v1.7.0...master[View commits] - -- Fix segfault on 32-bit architectures {pull}728[(#728)] +https://github.com/elastic/apm-agent-go/compare/v1.7.1...master[View commits] [[release-notes-1.x]] === Go Agent version 1.x +[[release-notes-1.7.1]] +==== 1.7.1 - 2020/03/05 + +https://github.com/elastic/apm-agent-go/releases/tag/v1.7.1[View release] + +- Fix segfault on 32-bit architectures {pull}728[(#728)] + [[release-notes-1.7.0]] ==== 1.7.0 - 2020/01/10 diff --git a/internal/apmversion/version.go b/internal/apmversion/version.go index 0d819c466..34fa4b976 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.7.0" + AgentVersion = "1.7.1" ) diff --git a/internal/tracecontexttest/go.mod b/internal/tracecontexttest/go.mod index 6c85c38ed..e7f56dae1 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.7.0 +require go.elastic.co/apm/module/apmhttp v1.7.1 replace go.elastic.co/apm => ../.. diff --git a/module/apmbeego/go.mod b/module/apmbeego/go.mod index 89c42dd8f..2e8e6f29d 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.7.0 - go.elastic.co/apm/module/apmhttp v1.7.0 - go.elastic.co/apm/module/apmsql v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmhttp v1.7.1 + go.elastic.co/apm/module/apmsql v1.7.1 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect ) diff --git a/module/apmchi/go.mod b/module/apmchi/go.mod index 1cb165f1d..f1ca37c10 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.7.0 - go.elastic.co/apm/module/apmhttp v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmhttp v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmecho/go.mod b/module/apmecho/go.mod index 6418c0835..ae1ccc0c3 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.7.0 - go.elastic.co/apm/module/apmhttp v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmhttp v1.7.1 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect ) diff --git a/module/apmechov4/go.mod b/module/apmechov4/go.mod index 95891e425..5be821c11 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.7.0 - go.elastic.co/apm/module/apmhttp v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmhttp v1.7.1 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect ) diff --git a/module/apmelasticsearch/go.mod b/module/apmelasticsearch/go.mod index e5dc395df..7b482cf01 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.7.0 - go.elastic.co/apm/module/apmhttp v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmhttp v1.7.1 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 c1bd91d32..541d48f31 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.7.0 - go.elastic.co/apm/module/apmelasticsearch v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmelasticsearch v1.7.1 ) replace go.elastic.co/apm => ../../../.. diff --git a/module/apmgin/go.mod b/module/apmgin/go.mod index 3a5b63b2f..36b51c9a2 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.7.0 - go.elastic.co/apm/module/apmhttp v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmhttp v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgocql/go.mod b/module/apmgocql/go.mod index 19de50285..af4f6fa70 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.7.0 + go.elastic.co/apm v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgokit/go.mod b/module/apmgokit/go.mod index 13d279e16..a7c4e3f59 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.7.0 - go.elastic.co/apm/module/apmgrpc v1.7.0 - go.elastic.co/apm/module/apmhttp v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmgrpc v1.7.1 + go.elastic.co/apm/module/apmhttp v1.7.1 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 7f8c13819..518278464 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.7.0 + go.elastic.co/apm v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgopg/go.mod b/module/apmgopg/go.mod index b5e382fdc..3ba5887d1 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.7.0 - go.elastic.co/apm/module/apmsql v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmsql v1.7.1 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 799bb6123..4ad83f391 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.7.0 + go.elastic.co/apm v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgorilla/go.mod b/module/apmgorilla/go.mod index 1ab1fe8f6..612f97810 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.7.0 - go.elastic.co/apm/module/apmhttp v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmhttp v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgorm/go.mod b/module/apmgorm/go.mod index 090e67bc7..0c675fdc7 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.7.0 - go.elastic.co/apm/module/apmsql v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmsql v1.7.1 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect ) diff --git a/module/apmgrpc/go.mod b/module/apmgrpc/go.mod index f599dbd35..f06f2a405 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.7.0 - go.elastic.co/apm/module/apmhttp v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmhttp v1.7.1 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 6be9d9400..8634c8370 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.7.0 + go.elastic.co/apm v1.7.1 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 c8f6cc732..5e742db1f 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.7.0 - go.elastic.co/apm/module/apmhttp v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmhttp v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmlambda/go.mod b/module/apmlambda/go.mod index 5c5b5d6d1..39d669847 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.7.0 + go.elastic.co/apm v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmlogrus/go.mod b/module/apmlogrus/go.mod index 8fb63cc68..e50f1d9ef 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.7.0 + go.elastic.co/apm v1.7.1 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect ) diff --git a/module/apmmongo/go.mod b/module/apmmongo/go.mod index 1e67f8809..7b5f80414 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.7.0 + go.elastic.co/apm v1.7.1 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 3eaf8ca07..9cfa9922d 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.7.0 - go.elastic.co/apm/module/apmhttp v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmhttp v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmot/go.mod b/module/apmot/go.mod index e16cb19d5..83b022cf2 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.7.0 - go.elastic.co/apm/module/apmhttp v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmhttp v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmprometheus/go.mod b/module/apmprometheus/go.mod index 60fbbb634..e7e00744e 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.7.0 + go.elastic.co/apm v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmredigo/go.mod b/module/apmredigo/go.mod index 15b38d898..629e12988 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.7.0 + go.elastic.co/apm v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmrestful/go.mod b/module/apmrestful/go.mod index 9a6fb1384..2e79ecb1e 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.7.0 - go.elastic.co/apm/module/apmhttp v1.7.0 + go.elastic.co/apm v1.7.1 + go.elastic.co/apm/module/apmhttp v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmsql/go.mod b/module/apmsql/go.mod index ebec6fc65..3bba30e4d 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.7.0 + go.elastic.co/apm v1.7.1 google.golang.org/appengine v1.4.0 // indirect ) diff --git a/module/apmsql/go.sum b/module/apmsql/go.sum index 75378c6bd..0e96367dd 100644 --- a/module/apmsql/go.sum +++ b/module/apmsql/go.sum @@ -14,6 +14,7 @@ github.com/elastic/go-windows v1.0.0 h1:qLURgZFkkrYyTTkvYpsZIgf83AUsdIHfvlJaqaZ7 github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU= github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= diff --git a/module/apmzap/go.mod b/module/apmzap/go.mod index 384c89ee5..c911bbbf1 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.7.0 + go.elastic.co/apm v1.7.1 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 d89cf002f..32ba4e753 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.7.0 + go.elastic.co/apm v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/scripts/genmod/go.mod b/scripts/genmod/go.mod index 801a20605..3200da77f 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.7.0 + go.elastic.co/apm v1.7.1 ) replace go.elastic.co/apm => ../.. diff --git a/version.go b/version.go index 385f038b8..0920bae1d 100644 --- a/version.go +++ b/version.go @@ -19,5 +19,5 @@ package apm const ( // AgentVersion is the Elastic APM Go Agent version. - AgentVersion = "1.7.0" + AgentVersion = "1.7.1" )