From 098b8cb9ceaef9470ed67a81dacd0901ba7b502a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 17:38:29 +0000 Subject: [PATCH 1/2] build(deps): bump github.com/elastic/apm-data from 1.16.0 to 1.18.0 (#15702) * build(deps): bump github.com/elastic/apm-data from 1.16.0 to 1.18.0 Bumps [github.com/elastic/apm-data](https://github.com/elastic/apm-data) from 1.16.0 to 1.18.0. - [Release notes](https://github.com/elastic/apm-data/releases) - [Commits](https://github.com/elastic/apm-data/compare/v1.16.0...v1.18.0) --- updated-dependencies: - dependency-name: github.com/elastic/apm-data dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.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 ea604f0e0b7202dd861304f040a4faae69adc9dc) # Conflicts: # go.mod # go.sum --- NOTICE.txt | 4 ++-- go.mod | 8 ++++++++ go.sum | 7 +++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 0cd4ebda03..9d8520f637 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -393,11 +393,11 @@ these terms. -------------------------------------------------------------------------------- Dependency : github.com/elastic/apm-data -Version: v1.16.0 +Version: v1.18.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.16.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.18.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 7016d512be..189f51195a 100644 --- a/go.mod +++ b/go.mod @@ -8,11 +8,19 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.4 github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v1.2.0 +<<<<<<< HEAD github.com/elastic/apm-data v1.16.0 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250217102615-d62161b1e6e7 github.com/elastic/elastic-agent-client/v7 v7.17.0 github.com/elastic/elastic-agent-libs v0.18.2 github.com/elastic/elastic-agent-system-metrics v0.11.7 +======= + github.com/elastic/apm-data v1.18.0 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250212065937-70533dae87f5 + github.com/elastic/elastic-agent-client/v7 v7.17.1 + github.com/elastic/elastic-agent-libs v0.18.6 + github.com/elastic/elastic-agent-system-metrics v0.11.8 +>>>>>>> ea604f0e (build(deps): bump github.com/elastic/apm-data from 1.16.0 to 1.18.0 (#15702)) github.com/elastic/gmux v0.3.2 github.com/elastic/go-docappender/v2 v2.4.0 github.com/elastic/go-elasticsearch/v8 v8.17.0 diff --git a/go.sum b/go.sum index 63e831a13c..fd3708c7c4 100644 --- a/go.sum +++ b/go.sum @@ -130,10 +130,17 @@ github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/ github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/elastic/apm-aggregation v1.2.0 h1:UndqG3ccBTjyxTqHujBVjcbVLb9qG1clxRcrp9JRelI= github.com/elastic/apm-aggregation v1.2.0/go.mod h1:YllYwPYVV27pbuPfjRtQAKo6eSSrh13PZr38RKYd810= +<<<<<<< HEAD github.com/elastic/apm-data v1.16.0 h1:LkJFoNkadIyqXNo3EMm98J38j9HWDMWUe6F74GaXtJ4= github.com/elastic/apm-data v1.16.0/go.mod h1:ST2P1yshhN2U3IbBYyn+Ni3VOFTifavNzMfh7E9zLHY= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250217102615-d62161b1e6e7 h1:TzXOSHr4G4ZQH4+zG0D5/fyeQ6E9bzLKFWZLQc22dJ4= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250217102615-d62161b1e6e7/go.mod h1:G0sLmyFR7XdE8ig14yiuNZ9jnGnW5dCl3tAakyrOjxU= +======= +github.com/elastic/apm-data v1.18.0 h1:GaWnrIoh7+UPmsbkQGls3tSCVk54sJng2v2YCYGpwyM= +github.com/elastic/apm-data v1.18.0/go.mod h1:Bm4VpGkWHwVRAA32kVyVk1f9urv0dnh86DGFdOIiewk= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250212065937-70533dae87f5 h1:Ur1ZtaDyArNhl7RRBkyJjSRiMxZekeaI239ALOx3Q1E= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250212065937-70533dae87f5/go.mod h1:A3OQ9JLS2gNVO2MayjAqFDhqwCj3NN1GnVjramGhj+s= +>>>>>>> ea604f0e (build(deps): bump github.com/elastic/apm-data from 1.16.0 to 1.18.0 (#15702)) github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0JojNasPgYIA47gpuuns= github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4= github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo= From 5cae114f6aa0d4375278502bb9a3362838821124 Mon Sep 17 00:00:00 2001 From: simitt Date: Tue, 18 Feb 2025 12:56:21 +0100 Subject: [PATCH 2/2] cleanup conflicts --- go.mod | 12 ++---------- go.sum | 15 ++++----------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 189f51195a..bce7a2c091 100644 --- a/go.mod +++ b/go.mod @@ -8,19 +8,11 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.4 github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v1.2.0 -<<<<<<< HEAD - github.com/elastic/apm-data v1.16.0 + github.com/elastic/apm-data v1.18.0 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250217102615-d62161b1e6e7 github.com/elastic/elastic-agent-client/v7 v7.17.0 github.com/elastic/elastic-agent-libs v0.18.2 github.com/elastic/elastic-agent-system-metrics v0.11.7 -======= - github.com/elastic/apm-data v1.18.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250212065937-70533dae87f5 - github.com/elastic/elastic-agent-client/v7 v7.17.1 - github.com/elastic/elastic-agent-libs v0.18.6 - github.com/elastic/elastic-agent-system-metrics v0.11.8 ->>>>>>> ea604f0e (build(deps): bump github.com/elastic/apm-data from 1.16.0 to 1.18.0 (#15702)) github.com/elastic/gmux v0.3.2 github.com/elastic/go-docappender/v2 v2.4.0 github.com/elastic/go-elasticsearch/v8 v8.17.0 @@ -59,7 +51,7 @@ require ( go.uber.org/zap v1.27.0 go.uber.org/zap/exp v0.3.0 golang.org/x/net v0.34.0 - golang.org/x/sync v0.10.0 + golang.org/x/sync v0.11.0 golang.org/x/term v0.28.0 golang.org/x/time v0.9.0 google.golang.org/grpc v1.70.0 diff --git a/go.sum b/go.sum index fd3708c7c4..1baddadfbe 100644 --- a/go.sum +++ b/go.sum @@ -130,17 +130,10 @@ github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/ github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/elastic/apm-aggregation v1.2.0 h1:UndqG3ccBTjyxTqHujBVjcbVLb9qG1clxRcrp9JRelI= github.com/elastic/apm-aggregation v1.2.0/go.mod h1:YllYwPYVV27pbuPfjRtQAKo6eSSrh13PZr38RKYd810= -<<<<<<< HEAD -github.com/elastic/apm-data v1.16.0 h1:LkJFoNkadIyqXNo3EMm98J38j9HWDMWUe6F74GaXtJ4= -github.com/elastic/apm-data v1.16.0/go.mod h1:ST2P1yshhN2U3IbBYyn+Ni3VOFTifavNzMfh7E9zLHY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250217102615-d62161b1e6e7 h1:TzXOSHr4G4ZQH4+zG0D5/fyeQ6E9bzLKFWZLQc22dJ4= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250217102615-d62161b1e6e7/go.mod h1:G0sLmyFR7XdE8ig14yiuNZ9jnGnW5dCl3tAakyrOjxU= -======= github.com/elastic/apm-data v1.18.0 h1:GaWnrIoh7+UPmsbkQGls3tSCVk54sJng2v2YCYGpwyM= github.com/elastic/apm-data v1.18.0/go.mod h1:Bm4VpGkWHwVRAA32kVyVk1f9urv0dnh86DGFdOIiewk= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250212065937-70533dae87f5 h1:Ur1ZtaDyArNhl7RRBkyJjSRiMxZekeaI239ALOx3Q1E= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250212065937-70533dae87f5/go.mod h1:A3OQ9JLS2gNVO2MayjAqFDhqwCj3NN1GnVjramGhj+s= ->>>>>>> ea604f0e (build(deps): bump github.com/elastic/apm-data from 1.16.0 to 1.18.0 (#15702)) +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250217102615-d62161b1e6e7 h1:TzXOSHr4G4ZQH4+zG0D5/fyeQ6E9bzLKFWZLQc22dJ4= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250217102615-d62161b1e6e7/go.mod h1:G0sLmyFR7XdE8ig14yiuNZ9jnGnW5dCl3tAakyrOjxU= github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0JojNasPgYIA47gpuuns= github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4= github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo= @@ -572,8 +565,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=