Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update module go.elastic.co/apm/module/apmelasticsearch/v2 to v2.2.0 #6129

Merged
merged 4 commits into from
Nov 15, 2022
Merged

Update module go.elastic.co/apm/module/apmelasticsearch/v2 to v2.2.0 #6129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3afff3d
Update module go.elastic.co/apm/module/apmelasticsearch/v2 to v2.2.0
renovate[bot] Nov 1, 2022
1df2236
span.Context.SetDestinationService is deprecated: use SetServiceTarget
naemono Nov 2, 2022
be2bb3b
Update all apm libraries to v2.2.0, along with updating notice/deps f…
naemono Nov 2, 2022
25b0c10
Add a staticcheck ignore block to golangci.yaml for apmv2 deprecation.
naemono Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,7 @@ issues:
- path: (^test/.*\.go|.*_test\.go)
linters:
- unparam
- path: pkg/controller/common/tracing/apmclientgo/client.go
linters:
- staticcheck
text: SA1019
18 changes: 9 additions & 9 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2940,11 +2940,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--------------------------------------------------------------------------------
Module : go.elastic.co/apm/module/apmelasticsearch/v2
Version : v2.1.0
Time : 2022-05-20T09:45:34Z
Version : v2.2.0
Time : 2022-11-01T00:01:43Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.1.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.2.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -3151,11 +3151,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti

--------------------------------------------------------------------------------
Module : go.elastic.co/apm/module/apmhttp/v2
Version : v2.1.0
Time : 2022-05-20T09:45:34Z
Version : v2.2.0
Time : 2022-11-01T00:01:43Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.1.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.2.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -3573,11 +3573,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzap/v2

--------------------------------------------------------------------------------
Module : go.elastic.co/apm/v2
Version : v2.1.0
Time : 2022-05-20T09:45:34Z
Version : v2.2.0
Time : 2022-11-01T00:01:43Z
Licence : Apache-2.0

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.1.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.2.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
6 changes: 3 additions & 3 deletions docs/reference/dependencies.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ This page lists the third-party dependencies used to build {n}.
| link:https://github.com/spf13/viper[$$github.com/spf13/viper$$] | v1.13.0 | MIT
| link:https://github.com/stretchr/testify[$$github.com/stretchr/testify$$] | v1.8.1 | MIT
| link:https://github.com/tsenart/vegeta[$$github.com/tsenart/vegeta/v12$$] | v12.8.4 | MIT
| link:https://go.elastic.co/apm/module/apmelasticsearch/v2[$$go.elastic.co/apm/module/apmelasticsearch/v2$$] | v2.1.0 | Apache-2.0
| link:https://go.elastic.co/apm/module/apmhttp/v2[$$go.elastic.co/apm/module/apmhttp/v2$$] | v2.1.0 | Apache-2.0
| link:https://go.elastic.co/apm/module/apmelasticsearch/v2[$$go.elastic.co/apm/module/apmelasticsearch/v2$$] | v2.2.0 | Apache-2.0
| link:https://go.elastic.co/apm/module/apmhttp/v2[$$go.elastic.co/apm/module/apmhttp/v2$$] | v2.2.0 | Apache-2.0
| link:https://go.elastic.co/apm/module/apmzap/v2[$$go.elastic.co/apm/module/apmzap/v2$$] | v2.1.0 | Apache-2.0
| link:https://go.elastic.co/apm/v2[$$go.elastic.co/apm/v2$$] | v2.1.0 | Apache-2.0
| link:https://go.elastic.co/apm/v2[$$go.elastic.co/apm/v2$$] | v2.2.0 | Apache-2.0
| link:https://go.uber.org/automaxprocs[$$go.uber.org/automaxprocs$$] | v1.5.1 | MIT
| link:https://go.uber.org/zap[$$go.uber.org/zap$$] | v1.23.0 | MIT
| link:https://golang.org/x/crypto[$$golang.org/x/crypto$$] | v0.1.0 | BSD-3-Clause
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ require (
github.com/spf13/viper v1.13.0
github.com/stretchr/testify v1.8.1
github.com/tsenart/vegeta/v12 v12.8.4
go.elastic.co/apm/module/apmelasticsearch/v2 v2.1.0
go.elastic.co/apm/module/apmhttp/v2 v2.1.0
go.elastic.co/apm/module/apmelasticsearch/v2 v2.2.0
go.elastic.co/apm/module/apmhttp/v2 v2.2.0
go.elastic.co/apm/module/apmzap/v2 v2.1.0
go.elastic.co/apm/v2 v2.1.0
go.elastic.co/apm/v2 v2.2.0
go.uber.org/automaxprocs v1.5.1
go.uber.org/zap v1.23.0
golang.org/x/crypto v0.1.0
Expand Down
11 changes: 6 additions & 5 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,14 +539,15 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
go.elastic.co/apm/module/apmelasticsearch/v2 v2.1.0 h1:fM29oVjmdwN07KB/sesNH2AfGEeYz8rVEEPdV/8FA/Y=
go.elastic.co/apm/module/apmelasticsearch/v2 v2.1.0/go.mod h1:9BTZi9SRWtcA1JR0Tf6B182Aza9dY8Q24Fi0eLfnS/0=
go.elastic.co/apm/module/apmhttp/v2 v2.1.0 h1:3knDFopO6LmgrqY5z9HlmCaIG+PtM9HwZGhByFCCjh4=
go.elastic.co/apm/module/apmhttp/v2 v2.1.0/go.mod h1:cKGRK1snYy5Sl/zs0GD+msE9b/amcM0CWbZn8XXBa9s=
go.elastic.co/apm/module/apmelasticsearch/v2 v2.2.0 h1:Swkcjk/V4CrwQuBmwU3KstCSV2bW751klEE5xU2VmeA=
go.elastic.co/apm/module/apmelasticsearch/v2 v2.2.0/go.mod h1:LkilzzHm6a88afobN+JyzGEjSdfbFIDiTFCUP6AgTzw=
go.elastic.co/apm/module/apmhttp/v2 v2.2.0 h1:FH+rZLLfkKiqhjqHZjiSdi8jn6VcqIkwUR2lLuWQFZU=
go.elastic.co/apm/module/apmhttp/v2 v2.2.0/go.mod h1:lA/MHCxZkURm66gWHzgggOhArLr8a3DlHuX0YJ8oZqY=
go.elastic.co/apm/module/apmzap/v2 v2.1.0 h1:AYBGgT52cbujs5qsAD+hCAIp9PdlD3DVjYq7WQJe1X0=
go.elastic.co/apm/module/apmzap/v2 v2.1.0/go.mod h1:RZzpU7mCisnDcqNCX2E69549U+zcnVL3hFFYyZw5ikc=
go.elastic.co/apm/v2 v2.1.0 h1:rkJSHE4ggekHhUR5v0KKkoMbrRSJN8YoBiEgQnkV1OY=
go.elastic.co/apm/v2 v2.1.0/go.mod h1:KGQn56LtRmkQjt2qw4+c1Jz8gv9rCBUU/m21uxrqcps=
go.elastic.co/apm/v2 v2.2.0 h1:F4iM9XJKzZEcXU+NPOFLYXLXQf/3hU7rrcNRKWufKGQ=
go.elastic.co/apm/v2 v2.2.0/go.mod h1:KGQn56LtRmkQjt2qw4+c1Jz8gv9rCBUU/m21uxrqcps=
go.elastic.co/fastjson v1.1.0 h1:3MrGBWWVIxe/xvsbpghtkFoPciPhOCmjsR/HfwEeQR4=
go.elastic.co/fastjson v1.1.0/go.mod h1:boNGISWMjQsUPy/t6yqt2/1Wx4YNPSe+mZjlyw9vKKI=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
Expand Down