From 2dde298acf91f5b4d12cacd850a1528761609b4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:42:39 +0000 Subject: [PATCH 1/2] build(deps): bump go.opentelemetry.io/collector/pdata from 1.21.0 to 1.22.0 in the otel group (#14986) * build(deps): bump go.opentelemetry.io/collector/pdata in the otel group Bumps the otel group with 1 update: [go.opentelemetry.io/collector/pdata](https://github.com/open-telemetry/opentelemetry-collector). Updates `go.opentelemetry.io/collector/pdata` from 1.21.0 to 1.22.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.21.0...pdata/v1.22.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/collector/pdata dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel ... 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> Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> (cherry picked from commit 98d405e5a124035da41c07009a0e8537207d852a) # Conflicts: # go.mod --- NOTICE.txt | 4 ++-- go.mod | 4 ++++ go.sum | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 1ed09763bf..8a975e5a27 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -5378,11 +5378,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/pdata -Version: v1.21.0 +Version: v1.22.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.21.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.22.0/LICENSE: Apache License diff --git a/go.mod b/go.mod index 991eb21a74..65cd9c6f3e 100644 --- a/go.mod +++ b/go.mod @@ -42,8 +42,12 @@ require ( go.elastic.co/apm/module/apmotel/v2 v2.6.2 go.elastic.co/apm/v2 v2.6.2 go.elastic.co/fastjson v1.4.0 +<<<<<<< HEAD go.opentelemetry.io/collector/consumer v1.21.0 go.opentelemetry.io/collector/pdata v1.21.0 +======= + go.opentelemetry.io/collector/pdata v1.22.0 +>>>>>>> 98d405e5 (build(deps): bump go.opentelemetry.io/collector/pdata from 1.21.0 to 1.22.0 in the otel group (#14986)) go.opentelemetry.io/otel v1.33.0 go.opentelemetry.io/otel/metric v1.33.0 go.opentelemetry.io/otel/sdk/metric v1.33.0 diff --git a/go.sum b/go.sum index a4bfb8b29c..b1f3125bb6 100644 --- a/go.sum +++ b/go.sum @@ -473,8 +473,8 @@ go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJyS go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/collector/consumer v1.21.0 h1:THKZ2Vbi6GkamjTBI2hFq5Dc4kINZTWGwQNa8d/Ty9g= go.opentelemetry.io/collector/consumer v1.21.0/go.mod h1:FQcC4ThMtRYY41dv+IPNK8POLLhAFY3r1YR5fuP7iiY= -go.opentelemetry.io/collector/pdata v1.21.0 h1:PG+UbiFMJ35X/WcAR7Rf/PWmWtRdW0aHlOidsR6c5MA= -go.opentelemetry.io/collector/pdata v1.21.0/go.mod h1:GKb1/zocKJMvxKbS+sl0W85lxhYBTFJ6h6I1tphVyDU= +go.opentelemetry.io/collector/pdata v1.22.0 h1:3yhjL46NLdTMoP8rkkcE9B0pzjf2973crn0KKhX5UrI= +go.opentelemetry.io/collector/pdata v1.22.0/go.mod h1:nLLf6uDg8Kn5g3WNZwGyu8+kf77SwOqQvMTb5AXEbEY= go.opentelemetry.io/collector/semconv v0.115.0 h1:SoqMvg4ZEB3mz2EdAb6XYa+TuMo5Mir5FRBr3nVFUDY= go.opentelemetry.io/collector/semconv v0.115.0/go.mod h1:N6XE8Q0JKgBN2fAhkUQtqK9LT7rEGR6+Wu/Rtbal1iI= go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw= From cc5fcb8f03cd95fd487bc3b7c95493d2ed7aede3 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Fri, 20 Dec 2024 17:45:56 +0100 Subject: [PATCH 2/2] Update go.mod --- go.mod | 4 ---- 1 file changed, 4 deletions(-) diff --git a/go.mod b/go.mod index 65cd9c6f3e..b39b954d9f 100644 --- a/go.mod +++ b/go.mod @@ -42,12 +42,8 @@ require ( go.elastic.co/apm/module/apmotel/v2 v2.6.2 go.elastic.co/apm/v2 v2.6.2 go.elastic.co/fastjson v1.4.0 -<<<<<<< HEAD go.opentelemetry.io/collector/consumer v1.21.0 - go.opentelemetry.io/collector/pdata v1.21.0 -======= go.opentelemetry.io/collector/pdata v1.22.0 ->>>>>>> 98d405e5 (build(deps): bump go.opentelemetry.io/collector/pdata from 1.21.0 to 1.22.0 in the otel group (#14986)) go.opentelemetry.io/otel v1.33.0 go.opentelemetry.io/otel/metric v1.33.0 go.opentelemetry.io/otel/sdk/metric v1.33.0