From aa1f33a130928935ad2744d5350a18329e2b412e Mon Sep 17 00:00:00 2001 From: Chao Date: Sat, 8 Feb 2025 19:51:08 +0800 Subject: [PATCH 1/2] [chore] Update version of component/componentattribute to unblock update-otel in contrib --- cmd/otelcorecol/go.mod | 2 +- otelcol/go.mod | 2 +- otelcol/otelcoltest/go.mod | 2 +- processor/memorylimiterprocessor/go.mod | 2 +- receiver/otlpreceiver/go.mod | 2 +- service/go.mod | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index c2e4f66babb5..edd3d3d7cd46 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -94,7 +94,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect go.opentelemetry.io/collector/config/configtls v1.25.0 // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250207221750-83d93cd7cf86 // indirect go.opentelemetry.io/collector/connector/connectortest v0.119.0 // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.0 // indirect go.opentelemetry.io/collector/consumer v1.25.0 // indirect diff --git a/otelcol/go.mod b/otelcol/go.mod index 5870df34e04a..7b22a5c5551d 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -9,7 +9,7 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.119.0 go.opentelemetry.io/collector/config/configtelemetry v0.119.0 go.opentelemetry.io/collector/confmap v1.25.0 - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250207221750-83d93cd7cf86 go.opentelemetry.io/collector/connector v0.119.0 go.opentelemetry.io/collector/connector/connectortest v0.119.0 go.opentelemetry.io/collector/exporter v0.119.0 diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index b5ab4ed73cbc..9858f4744b76 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -10,7 +10,7 @@ require ( go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0 go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.0 go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.0 - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250207221750-83d93cd7cf86 go.opentelemetry.io/collector/connector v0.119.0 go.opentelemetry.io/collector/connector/connectortest v0.119.0 go.opentelemetry.io/collector/exporter v0.119.0 diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index db8f58419ea3..583ac52b670d 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -5,7 +5,7 @@ go 1.22.0 require ( github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/component v0.119.0 - go.opentelemetry.io/collector/component/componentattribute v0.119.0 + go.opentelemetry.io/collector/component/componentattribute v0.0.0-20250207221750-83d93cd7cf86 go.opentelemetry.io/collector/component/componenttest v0.119.0 go.opentelemetry.io/collector/confmap v1.25.0 go.opentelemetry.io/collector/consumer v1.25.0 diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index ea4fef3db9f8..b1636025007b 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -17,7 +17,7 @@ require ( go.opentelemetry.io/collector/config/confignet v1.25.0 go.opentelemetry.io/collector/config/configtls v1.25.0 go.opentelemetry.io/collector/confmap v1.25.0 - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250207221750-83d93cd7cf86 go.opentelemetry.io/collector/consumer v1.25.0 go.opentelemetry.io/collector/consumer/consumererror v0.119.0 go.opentelemetry.io/collector/consumer/consumertest v0.119.0 diff --git a/service/go.mod b/service/go.mod index 138e190d4bc3..928fccbf0777 100644 --- a/service/go.mod +++ b/service/go.mod @@ -16,7 +16,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.119.0 go.opentelemetry.io/collector/config/configtelemetry v0.119.0 go.opentelemetry.io/collector/confmap v1.25.0 - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250207221750-83d93cd7cf86 go.opentelemetry.io/collector/connector v0.119.0 go.opentelemetry.io/collector/connector/connectortest v0.119.0 go.opentelemetry.io/collector/connector/xconnector v0.119.0 From a20163f621d1dfd8773336e609fec4d993d80bc6 Mon Sep 17 00:00:00 2001 From: Chao Date: Sat, 8 Feb 2025 20:13:47 +0800 Subject: [PATCH 2/2] Fix --- cmd/otelcorecol/go.mod | 2 +- otelcol/go.mod | 2 +- otelcol/otelcoltest/go.mod | 2 +- receiver/otlpreceiver/go.mod | 4 ++-- service/go.mod | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index edd3d3d7cd46..c2e4f66babb5 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -94,7 +94,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect go.opentelemetry.io/collector/config/configtls v1.25.0 // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250207221750-83d93cd7cf86 // indirect + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect go.opentelemetry.io/collector/connector/connectortest v0.119.0 // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.0 // indirect go.opentelemetry.io/collector/consumer v1.25.0 // indirect diff --git a/otelcol/go.mod b/otelcol/go.mod index 7b22a5c5551d..5870df34e04a 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -9,7 +9,7 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.119.0 go.opentelemetry.io/collector/config/configtelemetry v0.119.0 go.opentelemetry.io/collector/confmap v1.25.0 - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250207221750-83d93cd7cf86 + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/connector v0.119.0 go.opentelemetry.io/collector/connector/connectortest v0.119.0 go.opentelemetry.io/collector/exporter v0.119.0 diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index 9858f4744b76..b5ab4ed73cbc 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -10,7 +10,7 @@ require ( go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.0 go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.0 go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.0 - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250207221750-83d93cd7cf86 + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/connector v0.119.0 go.opentelemetry.io/collector/connector/connectortest v0.119.0 go.opentelemetry.io/collector/exporter v0.119.0 diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index b1636025007b..10641dbd87a5 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector v0.119.0 go.opentelemetry.io/collector/component v0.119.0 - go.opentelemetry.io/collector/component/componentattribute v0.119.0 + go.opentelemetry.io/collector/component/componentattribute v0.0.0-20250207221750-83d93cd7cf86 go.opentelemetry.io/collector/component/componentstatus v0.119.0 go.opentelemetry.io/collector/component/componenttest v0.119.0 go.opentelemetry.io/collector/config/configauth v0.119.0 @@ -17,7 +17,7 @@ require ( go.opentelemetry.io/collector/config/confignet v1.25.0 go.opentelemetry.io/collector/config/configtls v1.25.0 go.opentelemetry.io/collector/confmap v1.25.0 - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250207221750-83d93cd7cf86 + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/consumer v1.25.0 go.opentelemetry.io/collector/consumer/consumererror v0.119.0 go.opentelemetry.io/collector/consumer/consumertest v0.119.0 diff --git a/service/go.mod b/service/go.mod index 928fccbf0777..b5bcde0d6ff2 100644 --- a/service/go.mod +++ b/service/go.mod @@ -10,13 +10,13 @@ require ( github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector v0.119.0 go.opentelemetry.io/collector/component v0.119.0 - go.opentelemetry.io/collector/component/componentattribute v0.119.0 + go.opentelemetry.io/collector/component/componentattribute v0.0.0-20250207221750-83d93cd7cf86 go.opentelemetry.io/collector/component/componentstatus v0.119.0 go.opentelemetry.io/collector/component/componenttest v0.119.0 go.opentelemetry.io/collector/config/confighttp v0.119.0 go.opentelemetry.io/collector/config/configtelemetry v0.119.0 go.opentelemetry.io/collector/confmap v1.25.0 - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250207221750-83d93cd7cf86 + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/connector v0.119.0 go.opentelemetry.io/collector/connector/connectortest v0.119.0 go.opentelemetry.io/collector/connector/xconnector v0.119.0