From c7b16d050463f7c9d98bff2c3536148a4a5825a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Nov 2025 18:19:23 +0000 Subject: [PATCH] build(deps): bump the go-agent group with 3 updates (#19757) * build(deps): bump the go-agent group with 3 updates Bumps the go-agent group with 3 updates: [go.elastic.co/apm/module/apmhttp/v2](https://github.com/elastic/apm-agent-go), [go.elastic.co/apm/module/apmotel/v2](https://github.com/elastic/apm-agent-go) and [go.elastic.co/apm/v2](https://github.com/elastic/apm-agent-go). Updates `go.elastic.co/apm/module/apmhttp/v2` from 2.7.1 to 2.7.2 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.7.1...v2.7.2) Updates `go.elastic.co/apm/module/apmotel/v2` from 2.7.1 to 2.7.2 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.7.1...v2.7.2) Updates `go.elastic.co/apm/v2` from 2.7.1 to 2.7.2 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.7.1...v2.7.2) --- updated-dependencies: - dependency-name: go.elastic.co/apm/module/apmhttp/v2 dependency-version: 2.7.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-agent - dependency-name: go.elastic.co/apm/module/apmotel/v2 dependency-version: 2.7.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-agent - dependency-name: go.elastic.co/apm/v2 dependency-version: 2.7.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-agent ... Signed-off-by: dependabot[bot] * Update NOTICE.txt * Update NOTICE-fips.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit 3c433e9939dc3e2bd5ea46c8d6bfd5daf59f2c73) # Conflicts: # go.mod --- NOTICE-fips.txt | 12 ++++++------ NOTICE.txt | 12 ++++++------ go.mod | 6 ++++++ go.sum | 12 ++++++------ 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt index 8d6c0a6caf..2369449c42 100644 --- a/NOTICE-fips.txt +++ b/NOTICE-fips.txt @@ -2989,11 +2989,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmhttp/v2 -Version: v2.7.1 +Version: v2.7.2 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.7.1/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.7.2/LICENSE: Apache License Version 2.0, January 2004 @@ -3200,11 +3200,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmotel/v2 -Version: v2.7.1 +Version: v2.7.2 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v2@v2.7.1/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v2@v2.7.2/LICENSE: Apache License Version 2.0, January 2004 @@ -3411,11 +3411,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/v2 -Version: v2.7.1 +Version: v2.7.2 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.7.1/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.7.2/LICENSE: Apache License Version 2.0, January 2004 diff --git a/NOTICE.txt b/NOTICE.txt index 6cf9761260..a9e68b31d2 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2989,11 +2989,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmhttp/v2 -Version: v2.7.1 +Version: v2.7.2 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.7.1/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.7.2/LICENSE: Apache License Version 2.0, January 2004 @@ -3200,11 +3200,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmotel/v2 -Version: v2.7.1 +Version: v2.7.2 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v2@v2.7.1/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v2@v2.7.2/LICENSE: Apache License Version 2.0, January 2004 @@ -3411,11 +3411,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/v2 -Version: v2.7.1 +Version: v2.7.2 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.7.1/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.7.2/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 59fd7e70b3..462e90a599 100644 --- a/go.mod +++ b/go.mod @@ -28,10 +28,16 @@ require ( github.com/spf13/cobra v1.10.1 github.com/spf13/pflag v1.0.10 github.com/stretchr/testify v1.11.1 +<<<<<<< HEAD go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.1 go.elastic.co/apm/module/apmhttp/v2 v2.7.1 go.elastic.co/apm/module/apmotel/v2 v2.7.1 go.elastic.co/apm/v2 v2.7.1 +======= + go.elastic.co/apm/module/apmhttp/v2 v2.7.2 + go.elastic.co/apm/module/apmotel/v2 v2.7.2 + go.elastic.co/apm/v2 v2.7.2 +>>>>>>> 3c433e99 (build(deps): bump the go-agent group with 3 updates (#19757)) go.elastic.co/fastjson v1.5.1 go.opentelemetry.io/collector/pdata v1.46.0 go.opentelemetry.io/otel v1.38.0 diff --git a/go.sum b/go.sum index aa5c6708d1..5ef55c86f9 100644 --- a/go.sum +++ b/go.sum @@ -624,12 +624,12 @@ gitlab.com/digitalxero/go-conventional-commit v1.0.7 h1:8/dO6WWG+98PMhlZowt/Yjui gitlab.com/digitalxero/go-conventional-commit v1.0.7/go.mod h1:05Xc2BFsSyC5tKhK0y+P3bs0AwUtNuTp+mTpbCU/DZ0= go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.1 h1:nA7I325lIxf6hlVN1SdoOuVJG3gadWlejWngfadGUP8= go.elastic.co/apm/module/apmelasticsearch/v2 v2.7.1/go.mod h1:+Xna0uioc2zNzfQzal40RfZ5PPLd2jRBsv49TGHmF8Y= -go.elastic.co/apm/module/apmhttp/v2 v2.7.1 h1:1uPHesdm9nKytQ/N0bPmlS7F69oXvkzW+IlvzQuDUs8= -go.elastic.co/apm/module/apmhttp/v2 v2.7.1/go.mod h1:DlBnNivf+eArsEI1QtUx7fygo/JDbdMIcU9+i/Wid1U= -go.elastic.co/apm/module/apmotel/v2 v2.7.1 h1:9MPo0NM1yvBe2bzII9zS27fWfik+WL4DVTiKCbgty2o= -go.elastic.co/apm/module/apmotel/v2 v2.7.1/go.mod h1:ugfpg8kfqEVPUWVtfoh7MxotJmwoQ4+ThKZT0Q6Musw= -go.elastic.co/apm/v2 v2.7.1 h1:OFjARuESjBsxw7wHrEAnfSVNCHGBATXSI/kPvBARY/A= -go.elastic.co/apm/v2 v2.7.1/go.mod h1:tQhBAjwh93b2leuAdzGwta/sP7Yc7QoKTSjeIHHDuog= +go.elastic.co/apm/module/apmhttp/v2 v2.7.2 h1:grLycchDH4B6aGRkZjIV/sweAivJDl8IcP+nCorktm8= +go.elastic.co/apm/module/apmhttp/v2 v2.7.2/go.mod h1:N9CJn3x7cyFnZ54WKxgm/t76drcsmSpu6aU8zGwP4zQ= +go.elastic.co/apm/module/apmotel/v2 v2.7.2 h1:cAs0vv6laivMlhPGrgsdTqoG1u6fuiDctoWizHaqQOA= +go.elastic.co/apm/module/apmotel/v2 v2.7.2/go.mod h1:CwPbr5N0/9xS8MNwxxGigoxM97vfFhKB/byefKVKt7Y= +go.elastic.co/apm/v2 v2.7.2 h1:0blxpxOMOcpBTz034RBqvEw806y0CDJwo/ut+2wZsHA= +go.elastic.co/apm/v2 v2.7.2/go.mod h1:KJcwwsaouDzcLd8EviAO+y8yrfZzD6PhUCEg82bvLV4= go.elastic.co/ecszap v1.0.3 h1:RQtagS3uSftE8mPZ3msqb6mVI67jgcDuy1PUqiMv8ow= go.elastic.co/ecszap v1.0.3/go.mod h1:fM1RLWDU25TB/L48RUJgz5Le2AnoCeY/g0zf2op8gDU= go.elastic.co/fastjson v1.5.1 h1:zeh1xHrFH79aQ6Xsw7YxixvnOdAl3OSv0xch/jRDzko=