From ef4da4306c3fe72555c9ec513bd64fe925a3462f Mon Sep 17 00:00:00 2001 From: alex boten <223565+codeboten@users.noreply.github.com> Date: Wed, 10 Dec 2025 07:52:28 -0800 Subject: [PATCH 01/11] introduce internal/conventions package The intention of this package is to simplify updating references to upstream semconv in the future. Today maybe components in this repository rely on the upstream semconv and every time the package updates, there are many changes required to follow it. My suggestion with this change is to provide an internal package that components can use instead to reeduce maintainer burden. Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> --- internal/conventions/Makefile | 1 + internal/conventions/conventions.go | 17 +++++++++++++++++ internal/conventions/conventions_test.go | 23 +++++++++++++++++++++++ internal/conventions/go.mod | 15 +++++++++++++++ internal/conventions/go.sum | 16 ++++++++++++++++ internal/conventions/metadata.yaml | 3 +++ versions.yaml | 1 + 7 files changed, 76 insertions(+) create mode 100644 internal/conventions/Makefile create mode 100644 internal/conventions/conventions.go create mode 100644 internal/conventions/conventions_test.go create mode 100644 internal/conventions/go.mod create mode 100644 internal/conventions/go.sum create mode 100644 internal/conventions/metadata.yaml diff --git a/internal/conventions/Makefile b/internal/conventions/Makefile new file mode 100644 index 0000000000000..ded7a36092dc3 --- /dev/null +++ b/internal/conventions/Makefile @@ -0,0 +1 @@ +include ../../Makefile.Common diff --git a/internal/conventions/conventions.go b/internal/conventions/conventions.go new file mode 100644 index 0000000000000..171fb51b7bdb2 --- /dev/null +++ b/internal/conventions/conventions.go @@ -0,0 +1,17 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package conventions + +import semconv "go.opentelemetry.io/otel/semconv/v1.38.0" + +// stable as of v1.38.0 +const ( + ServiceNameKey = semconv.ServiceNameKey + ServiceInstanceIDKey = semconv.ServiceInstanceIDKey +) + +// development as of v1.38.0 +const ( + HostNameKey = semconv.HostNameKey +) diff --git a/internal/conventions/conventions_test.go b/internal/conventions/conventions_test.go new file mode 100644 index 0000000000000..008914daa14b3 --- /dev/null +++ b/internal/conventions/conventions_test.go @@ -0,0 +1,23 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package conventions_test + +import ( + "testing" + + "github.com/stretchr/testify/require" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" +) + +// The purpose of the tests in this file is to highlight changes in semconv upstream + +func TestStableConventions(t *testing.T) { + require.Equal(t, "service.name", string(conventions.ServiceNameKey)) + require.Equal(t, "service.instance.id", string(conventions.ServiceInstanceIDKey)) +} + +func TestDevelopmentConventions(t *testing.T) { + require.Equal(t, "host.name", string(conventions.HostNameKey)) +} diff --git a/internal/conventions/go.mod b/internal/conventions/go.mod new file mode 100644 index 0000000000000..90b1efa5fe8d1 --- /dev/null +++ b/internal/conventions/go.mod @@ -0,0 +1,15 @@ +module github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions + +go 1.24.0 + +require ( + github.com/stretchr/testify v1.11.1 + go.opentelemetry.io/otel v1.39.0 +) + +require ( + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/internal/conventions/go.sum b/internal/conventions/go.sum new file mode 100644 index 0000000000000..ce028138264f9 --- /dev/null +++ b/internal/conventions/go.sum @@ -0,0 +1,16 @@ +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48= +go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/conventions/metadata.yaml b/internal/conventions/metadata.yaml new file mode 100644 index 0000000000000..0fed4e8facdcd --- /dev/null +++ b/internal/conventions/metadata.yaml @@ -0,0 +1,3 @@ +status: + codeowners: + active: [open-telemetry/collector-approvers] diff --git a/versions.yaml b/versions.yaml index c5bb1919ee109..c7a9435561acb 100644 --- a/versions.yaml +++ b/versions.yaml @@ -137,6 +137,7 @@ module-sets: - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray/testdata/sampleserver - github.com/open-telemetry/opentelemetry-collector-contrib/internal/collectd - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal - github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog - github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog/e2e From 28c2d02bec57f9c6b0a2ddffe743ea24a63740a0 Mon Sep 17 00:00:00 2001 From: alex boten <223565+codeboten@users.noreply.github.com> Date: Wed, 10 Dec 2025 08:53:06 -0800 Subject: [PATCH 02/11] porto Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> --- internal/conventions/conventions.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/conventions/conventions.go b/internal/conventions/conventions.go index 171fb51b7bdb2..77de185b2204d 100644 --- a/internal/conventions/conventions.go +++ b/internal/conventions/conventions.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package conventions +package conventions // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" import semconv "go.opentelemetry.io/otel/semconv/v1.38.0" From f6a779a38337e32ae55817f07483f48408c5539d Mon Sep 17 00:00:00 2001 From: alex boten <223565+codeboten@users.noreply.github.com> Date: Wed, 10 Dec 2025 08:58:41 -0800 Subject: [PATCH 03/11] gencodeowners Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> --- .github/CODEOWNERS | 1 + .github/ISSUE_TEMPLATE/beta_stability.yaml | 1 + .github/ISSUE_TEMPLATE/bug_report.yaml | 1 + .github/ISSUE_TEMPLATE/feature_request.yaml | 1 + .github/ISSUE_TEMPLATE/other.yaml | 1 + .github/ISSUE_TEMPLATE/unmaintained.yaml | 1 + 6 files changed, 6 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d0edbf573ae39..2ea0ce28a8b8f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -140,6 +140,7 @@ extension/sumologicextension/ @open-telemetry internal/aws/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia internal/collectd/ @open-telemetry/collector-contrib-approvers @atoulme internal/common/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers +internal/conventions/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers internal/coreinternal/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers internal/datadog/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd @IbraheemA internal/datadog/e2e/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd @IbraheemA diff --git a/.github/ISSUE_TEMPLATE/beta_stability.yaml b/.github/ISSUE_TEMPLATE/beta_stability.yaml index 645389e1d3426..44138f9cb7a2d 100644 --- a/.github/ISSUE_TEMPLATE/beta_stability.yaml +++ b/.github/ISSUE_TEMPLATE/beta_stability.yaml @@ -137,6 +137,7 @@ body: - internal/aws - internal/collectd - internal/common + - internal/conventions - internal/core - internal/datadog - internal/datadog/e2e diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 31d56a82b893d..82392f569d723 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -140,6 +140,7 @@ body: - internal/aws - internal/collectd - internal/common + - internal/conventions - internal/core - internal/datadog - internal/datadog/e2e diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index fef4922dacc08..b00773384a9ae 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -134,6 +134,7 @@ body: - internal/aws - internal/collectd - internal/common + - internal/conventions - internal/core - internal/datadog - internal/datadog/e2e diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml index 94682c0b32c6f..08aa05a973be5 100644 --- a/.github/ISSUE_TEMPLATE/other.yaml +++ b/.github/ISSUE_TEMPLATE/other.yaml @@ -134,6 +134,7 @@ body: - internal/aws - internal/collectd - internal/common + - internal/conventions - internal/core - internal/datadog - internal/datadog/e2e diff --git a/.github/ISSUE_TEMPLATE/unmaintained.yaml b/.github/ISSUE_TEMPLATE/unmaintained.yaml index 2e9c9d8d89b4d..6963f6b38523c 100644 --- a/.github/ISSUE_TEMPLATE/unmaintained.yaml +++ b/.github/ISSUE_TEMPLATE/unmaintained.yaml @@ -139,6 +139,7 @@ body: - internal/aws - internal/collectd - internal/common + - internal/conventions - internal/core - internal/datadog - internal/datadog/e2e From 3bd4928633472b1d555eac32cb55b48278c96026 Mon Sep 17 00:00:00 2001 From: alex boten <223565+codeboten@users.noreply.github.com> Date: Wed, 10 Dec 2025 09:01:55 -0800 Subject: [PATCH 04/11] use internal conventions package Follow up to #44886, use the internal/conventions package in components in this repo. Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> --- receiver/skywalkingreceiver/go.mod | 5 ++++- .../internal/metrics/skywalkingproto_to_metrics.go | 7 ++++--- receiver/splunkhecreceiver/factory.go | 2 +- receiver/splunkhecreceiver/go.mod | 5 ++++- receiver/splunkhecreceiver/splunk_to_logdata_test.go | 3 ++- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index a6ba1690c4f34..49d7db9b6db61 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -4,6 +4,7 @@ go 1.24.0 require ( github.com/gorilla/mux v1.8.1 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.141.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/skywalking v0.141.0 github.com/stretchr/testify v1.11.1 @@ -23,7 +24,6 @@ require ( go.opentelemetry.io/collector/receiver v1.47.1-0.20251210054218-8f51a1792add go.opentelemetry.io/collector/receiver/receiverhelper v0.141.1-0.20251210054218-8f51a1792add go.opentelemetry.io/collector/receiver/receivertest v0.141.1-0.20251210054218-8f51a1792add - go.opentelemetry.io/otel v1.39.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 google.golang.org/grpc v1.77.0 @@ -74,6 +74,7 @@ require ( go.opentelemetry.io/collector/receiver/xreceiver v0.141.1-0.20251210054218-8f51a1792add // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect + go.opentelemetry.io/otel v1.39.0 // indirect go.opentelemetry.io/otel/metric v1.39.0 // indirect go.opentelemetry.io/otel/sdk v1.39.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect @@ -92,6 +93,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/share replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/skywalking => ../../pkg/translator/skywalking +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions => ../../internal/conventions + retract ( v0.76.2 v0.76.1 diff --git a/receiver/skywalkingreceiver/internal/metrics/skywalkingproto_to_metrics.go b/receiver/skywalkingreceiver/internal/metrics/skywalkingproto_to_metrics.go index 8a42546a3f2e4..71f658ceb7f9d 100644 --- a/receiver/skywalkingreceiver/internal/metrics/skywalkingproto_to_metrics.go +++ b/receiver/skywalkingreceiver/internal/metrics/skywalkingproto_to_metrics.go @@ -8,9 +8,10 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" - semconv "go.opentelemetry.io/otel/semconv/v1.27.0" common "skywalking.apache.org/repo/goapi/collect/common/v3" agent "skywalking.apache.org/repo/goapi/collect/language/agent/v3" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" ) const ( @@ -40,8 +41,8 @@ func SwMetricsToMetrics(collection *agent.JVMMetricCollection) pmetric.Metrics { func jvmMetricToResource(serviceName, serviceInstance string, resource pcommon.Resource) { attrs := resource.Attributes() attrs.EnsureCapacity(2) - attrs.PutStr(string(semconv.ServiceNameKey), serviceName) - attrs.PutStr(string(semconv.ServiceInstanceIDKey), serviceInstance) + attrs.PutStr(string(conventions.ServiceNameKey), serviceName) + attrs.PutStr(string(conventions.ServiceInstanceIDKey), serviceInstance) } func jvmMetricToResourceMetrics(jvmMetric *agent.JVMMetric, sm pmetric.ScopeMetrics) { diff --git a/receiver/splunkhecreceiver/factory.go b/receiver/splunkhecreceiver/factory.go index 14c998d8e500d..72dd4072b17d4 100644 --- a/receiver/splunkhecreceiver/factory.go +++ b/receiver/splunkhecreceiver/factory.go @@ -10,8 +10,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - conventions "go.opentelemetry.io/otel/semconv/v1.27.0" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver/internal/metadata" diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index fbb2222fccb5a..6b2e82bd4d971 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -9,6 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.141.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.141.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.141.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.141.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.141.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.141.0 @@ -28,7 +29,6 @@ require ( go.opentelemetry.io/collector/receiver v1.47.1-0.20251210054218-8f51a1792add go.opentelemetry.io/collector/receiver/receiverhelper v0.141.1-0.20251210054218-8f51a1792add go.opentelemetry.io/collector/receiver/receivertest v0.141.1-0.20251210054218-8f51a1792add - go.opentelemetry.io/otel v1.39.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.1 ) @@ -85,6 +85,7 @@ require ( go.opentelemetry.io/collector/pipeline v1.47.1-0.20251210054218-8f51a1792add // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.141.1-0.20251210054218-8f51a1792add // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect + go.opentelemetry.io/otel v1.39.0 // indirect go.opentelemetry.io/otel/metric v1.39.0 // indirect go.opentelemetry.io/otel/sdk v1.39.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect @@ -107,6 +108,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splun replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions => ../../internal/conventions + replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil diff --git a/receiver/splunkhecreceiver/splunk_to_logdata_test.go b/receiver/splunkhecreceiver/splunk_to_logdata_test.go index df93168b38e65..ac23bfbce8e1a 100644 --- a/receiver/splunkhecreceiver/splunk_to_logdata_test.go +++ b/receiver/splunkhecreceiver/splunk_to_logdata_test.go @@ -13,9 +13,10 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" - conventions "go.opentelemetry.io/otel/semconv/v1.27.0" + "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk" ) From 2a7a5c5b4d9b8c17f2dac18ca8ae32b84c0fcccf Mon Sep 17 00:00:00 2001 From: alex boten <223565+codeboten@users.noreply.github.com> Date: Wed, 10 Dec 2025 09:41:53 -0800 Subject: [PATCH 05/11] more packages Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> --- connector/exceptionsconnector/connector.go | 2 +- connector/exceptionsconnector/connector_logs.go | 2 +- connector/exceptionsconnector/connector_metrics.go | 2 +- connector/exceptionsconnector/connector_test.go | 3 ++- connector/exceptionsconnector/go.mod | 3 +++ internal/conventions/conventions.go | 7 +++++-- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/connector/exceptionsconnector/connector.go b/connector/exceptionsconnector/connector.go index d83ae4104fcf4..b1259e66c1353 100644 --- a/connector/exceptionsconnector/connector.go +++ b/connector/exceptionsconnector/connector.go @@ -5,8 +5,8 @@ package exceptionsconnector // import "github.com/open-telemetry/opentelemetry-c import ( "go.opentelemetry.io/collector/pdata/pcommon" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil" ) diff --git a/connector/exceptionsconnector/connector_logs.go b/connector/exceptionsconnector/connector_logs.go index c5a2431fab615..45bcf60aa9e8c 100644 --- a/connector/exceptionsconnector/connector_logs.go +++ b/connector/exceptionsconnector/connector_logs.go @@ -11,9 +11,9 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/ptrace" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/traceutil" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil" ) diff --git a/connector/exceptionsconnector/connector_metrics.go b/connector/exceptionsconnector/connector_metrics.go index bbad949d7e65c..2aa5440165769 100644 --- a/connector/exceptionsconnector/connector_metrics.go +++ b/connector/exceptionsconnector/connector_metrics.go @@ -14,9 +14,9 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/traceutil" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil" ) diff --git a/connector/exceptionsconnector/connector_test.go b/connector/exceptionsconnector/connector_test.go index d92c01ac2a580..1b2e8d3068a2c 100644 --- a/connector/exceptionsconnector/connector_test.go +++ b/connector/exceptionsconnector/connector_test.go @@ -8,7 +8,8 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" - conventions "go.opentelemetry.io/otel/semconv/v1.27.0" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" ) const ( diff --git a/connector/exceptionsconnector/go.mod b/connector/exceptionsconnector/go.mod index 1d45fe46287be..e5d30d5d6cf72 100644 --- a/connector/exceptionsconnector/go.mod +++ b/connector/exceptionsconnector/go.mod @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/connector/excep go 1.24.0 require ( + github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.141.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.141.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.141.0 @@ -61,6 +62,8 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions => ../../internal/conventions + replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil => ../../internal/pdatautil diff --git a/internal/conventions/conventions.go b/internal/conventions/conventions.go index 77de185b2204d..c3b76b128cce7 100644 --- a/internal/conventions/conventions.go +++ b/internal/conventions/conventions.go @@ -7,8 +7,11 @@ import semconv "go.opentelemetry.io/otel/semconv/v1.38.0" // stable as of v1.38.0 const ( - ServiceNameKey = semconv.ServiceNameKey - ServiceInstanceIDKey = semconv.ServiceInstanceIDKey + ExceptionMessageKey = semconv.ExceptionMessageKey + ExceptionStacktraceKey = semconv.ExceptionStacktraceKey + ExceptionTypeKey = semconv.ExceptionTypeKey + ServiceNameKey = semconv.ServiceNameKey + ServiceInstanceIDKey = semconv.ServiceInstanceIDKey ) // development as of v1.38.0 From b2c3892089b2200eaf8ef4cd2bb90570b721c18c Mon Sep 17 00:00:00 2001 From: alex boten <223565+codeboten@users.noreply.github.com> Date: Wed, 10 Dec 2025 09:51:19 -0800 Subject: [PATCH 06/11] more packages Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> --- exporter/alertmanagerexporter/alertmanager_exporter_test.go | 2 +- exporter/alertmanagerexporter/go.mod | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/exporter/alertmanagerexporter/alertmanager_exporter_test.go b/exporter/alertmanagerexporter/alertmanager_exporter_test.go index f6d0d7b2276aa..a2776619c5dd1 100644 --- a/exporter/alertmanagerexporter/alertmanager_exporter_test.go +++ b/exporter/alertmanagerexporter/alertmanager_exporter_test.go @@ -21,10 +21,10 @@ import ( "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" - conventions "go.opentelemetry.io/otel/semconv/v1.27.0" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" ) func createTracesAndSpan() (ptrace.Traces, ptrace.Span) { diff --git a/exporter/alertmanagerexporter/go.mod b/exporter/alertmanagerexporter/go.mod index b52ecd3d86e36..f3ce9682413f2 100644 --- a/exporter/alertmanagerexporter/go.mod +++ b/exporter/alertmanagerexporter/go.mod @@ -5,6 +5,7 @@ go 1.24.0 require ( github.com/cenkalti/backoff/v5 v5.0.3 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.141.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions v0.0.0-00010101000000-000000000000 github.com/prometheus/common v0.67.4 github.com/stretchr/testify v1.11.1 go.opentelemetry.io/collector/component v1.47.1-0.20251210054218-8f51a1792add @@ -21,7 +22,6 @@ require ( go.opentelemetry.io/collector/exporter/exporterhelper v0.141.1-0.20251210054218-8f51a1792add go.opentelemetry.io/collector/exporter/exportertest v0.141.1-0.20251210054218-8f51a1792add go.opentelemetry.io/collector/pdata v1.47.1-0.20251210054218-8f51a1792add - go.opentelemetry.io/otel v1.39.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.1 ) @@ -74,6 +74,7 @@ require ( go.opentelemetry.io/collector/receiver/receivertest v0.141.1-0.20251210054218-8f51a1792add // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.141.1-0.20251210054218-8f51a1792add // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect + go.opentelemetry.io/otel v1.39.0 // indirect go.opentelemetry.io/otel/metric v1.39.0 // indirect go.opentelemetry.io/otel/sdk v1.39.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect @@ -98,3 +99,5 @@ retract ( ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common + +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions => ../../internal/conventions From ea2df507cc65a5eb52b65dcd21e792fe137d8e84 Mon Sep 17 00:00:00 2001 From: alex boten <223565+codeboten@users.noreply.github.com> Date: Wed, 10 Dec 2025 10:06:20 -0800 Subject: [PATCH 07/11] update cmd/opampsupervisor Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> --- cmd/opampsupervisor/e2e_test.go | 28 ++++++++++---------- cmd/opampsupervisor/go.mod | 3 +++ cmd/opampsupervisor/supervisor/supervisor.go | 14 +++++----- internal/conventions/conventions.go | 9 +++++-- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/cmd/opampsupervisor/e2e_test.go b/cmd/opampsupervisor/e2e_test.go index 790f2aa1f39a6..c5e9b115a8648 100644 --- a/cmd/opampsupervisor/e2e_test.go +++ b/cmd/opampsupervisor/e2e_test.go @@ -42,7 +42,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/ptrace" - semconv "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" "go.uber.org/zap/zapcore" "google.golang.org/protobuf/proto" @@ -50,6 +49,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor" "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/config" "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/telemetry" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" ) @@ -980,9 +980,9 @@ func TestSupervisorBootstrapsCollector(t *testing.T) { identAttr := ad.IdentifyingAttributes for _, attr := range identAttr { switch attr.Key { - case string(semconv.ServiceNameKey): + case string(conventions.ServiceNameKey): agentName = attr.Value.GetStringValue() - case string(semconv.ServiceVersionKey): + case string(conventions.ServiceVersionKey): agentVersion = attr.Value.GetStringValue() } } @@ -1080,9 +1080,9 @@ func TestSupervisorBootstrapsCollectorAvailableComponents(t *testing.T) { identAttr := ad.IdentifyingAttributes for _, attr := range identAttr { switch attr.Key { - case string(semconv.ServiceNameKey): + case string(conventions.ServiceNameKey): agentName = attr.Value.GetStringValue() - case string(semconv.ServiceVersionKey): + case string(conventions.ServiceVersionKey): agentVersion = attr.Value.GetStringValue() } } @@ -1239,15 +1239,15 @@ func TestSupervisorAgentDescriptionConfigApplies(t *testing.T) { expectedDescription := &protobufs.AgentDescription{ IdentifyingAttributes: []*protobufs.KeyValue{ stringKeyValue("client.id", "my-client-id"), - stringKeyValue(string(semconv.ServiceInstanceIDKey), uuid.UUID(ad.InstanceUid).String()), - stringKeyValue(string(semconv.ServiceNameKey), command), - stringKeyValue(string(semconv.ServiceVersionKey), version), + stringKeyValue(string(conventions.ServiceInstanceIDKey), uuid.UUID(ad.InstanceUid).String()), + stringKeyValue(string(conventions.ServiceNameKey), command), + stringKeyValue(string(conventions.ServiceVersionKey), version), }, NonIdentifyingAttributes: []*protobufs.KeyValue{ stringKeyValue("env", "prod"), - stringKeyValue(string(semconv.HostArchKey), runtime.GOARCH), - stringKeyValue(string(semconv.HostNameKey), host), - stringKeyValue(string(semconv.OSTypeKey), runtime.GOOS), + stringKeyValue(string(conventions.HostArchKey), runtime.GOARCH), + stringKeyValue(string(conventions.HostNameKey), host), + stringKeyValue(string(conventions.OSTypeKey), runtime.GOOS), }, } @@ -2496,9 +2496,9 @@ func TestSupervisorEmitBootstrapTelemetry(t *testing.T) { identAttr := ad.IdentifyingAttributes for _, attr := range identAttr { switch attr.Key { - case string(semconv.ServiceNameKey): + case string(conventions.ServiceNameKey): agentName = attr.Value.GetStringValue() - case string(semconv.ServiceVersionKey): + case string(conventions.ServiceVersionKey): agentVersion = attr.Value.GetStringValue() } } @@ -2516,7 +2516,7 @@ func TestSupervisorEmitBootstrapTelemetry(t *testing.T) { }, 10*time.Second, 250*time.Millisecond) require.Equal(t, 1, mockBackend.ReceivedTraces[0].ResourceSpans().Len()) - gotServiceName, ok := mockBackend.ReceivedTraces[0].ResourceSpans().At(0).Resource().Attributes().Get(string(semconv.ServiceNameKey)) + gotServiceName, ok := mockBackend.ReceivedTraces[0].ResourceSpans().At(0).Resource().Attributes().Get(string(conventions.ServiceNameKey)) require.True(t, ok) require.Equal(t, "opamp-supervisor", gotServiceName.Str()) diff --git a/cmd/opampsupervisor/go.mod b/cmd/opampsupervisor/go.mod index 1a08359c8ec94..cdb5811c59592 100644 --- a/cmd/opampsupervisor/go.mod +++ b/cmd/opampsupervisor/go.mod @@ -10,6 +10,7 @@ require ( github.com/knadh/koanf/providers/rawbytes v1.0.0 github.com/knadh/koanf/v2 v2.3.0 github.com/open-telemetry/opamp-go v0.22.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.141.0 github.com/stretchr/testify v1.11.1 go.opentelemetry.io/collector/component v1.47.1-0.20251210054218-8f51a1792add @@ -337,6 +338,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/metad replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => ../../internal/k8sconfig +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions => ../../internal/conventions + replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog => ../../pkg/datadog diff --git a/cmd/opampsupervisor/supervisor/supervisor.go b/cmd/opampsupervisor/supervisor/supervisor.go index 0dd270b0c6c51..062ded201982a 100644 --- a/cmd/opampsupervisor/supervisor/supervisor.go +++ b/cmd/opampsupervisor/supervisor/supervisor.go @@ -44,7 +44,6 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/log" - semconv "go.opentelemetry.io/otel/semconv/v1.37.0" "go.opentelemetry.io/otel/trace" "go.uber.org/multierr" "go.uber.org/zap" @@ -54,6 +53,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/commander" "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/config" supervisorTelemetry "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/telemetry" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" ) var ( @@ -254,14 +254,14 @@ func initTelemetrySettings(ctx context.Context, logger *zap.Logger, cfg config.T pcommonRes.Attributes().PutStr(k, *v) } - if _, ok := cfg.Resource[string(semconv.ServiceNameKey)]; !ok { - pcommonRes.Attributes().PutStr(string(semconv.ServiceNameKey), "opamp-supervisor") + if _, ok := cfg.Resource[string(conventions.ServiceNameKey)]; !ok { + pcommonRes.Attributes().PutStr(string(conventions.ServiceNameKey), "opamp-supervisor") } - if _, ok := cfg.Resource[string(semconv.ServiceInstanceIDKey)]; !ok { + if _, ok := cfg.Resource[string(conventions.ServiceInstanceIDKey)]; !ok { instanceUUID, _ := uuid.NewRandom() instanceID := instanceUUID.String() - pcommonRes.Attributes().PutStr(string(semconv.ServiceInstanceIDKey), instanceID) + pcommonRes.Attributes().PutStr(string(conventions.ServiceInstanceIDKey), instanceID) } // TODO currently we do not have the build info containing the version available to set semconv.ServiceVersionKey @@ -271,7 +271,7 @@ func initTelemetrySettings(ctx context.Context, logger *zap.Logger, cfg config.T attrs = append(attrs, telemetryconfig.AttributeNameValue{Name: k, Value: v.Str()}) } - sch := semconv.SchemaURL + sch := conventions.SchemaURL sdk, err := telemetryconfig.NewSDK( telemetryconfig.WithContext(ctx), @@ -497,7 +497,7 @@ func (s *Supervisor) getBootstrapInfo() (err error) { identAttr := message.AgentDescription.IdentifyingAttributes for _, attr := range identAttr { - if attr.Key == string(semconv.ServiceInstanceIDKey) { + if attr.Key == string(conventions.ServiceInstanceIDKey) { if attr.Value.GetStringValue() != s.persistentState.InstanceID.String() { done <- fmt.Errorf( "the Collector's instance ID (%s) does not match with the instance ID set by the Supervisor (%s): %w", diff --git a/internal/conventions/conventions.go b/internal/conventions/conventions.go index c3b76b128cce7..0a525345e106f 100644 --- a/internal/conventions/conventions.go +++ b/internal/conventions/conventions.go @@ -5,16 +5,21 @@ package conventions // import "github.com/open-telemetry/opentelemetry-collector import semconv "go.opentelemetry.io/otel/semconv/v1.38.0" +const SchemaURL = semconv.SchemaURL + // stable as of v1.38.0 const ( ExceptionMessageKey = semconv.ExceptionMessageKey ExceptionStacktraceKey = semconv.ExceptionStacktraceKey ExceptionTypeKey = semconv.ExceptionTypeKey ServiceNameKey = semconv.ServiceNameKey - ServiceInstanceIDKey = semconv.ServiceInstanceIDKey + ServiceVersionKey = semconv.ServiceVersionKey ) // development as of v1.38.0 const ( - HostNameKey = semconv.HostNameKey + HostNameKey = semconv.HostNameKey + HostArchKey = semconv.HostArchKey + OSTypeKey = semconv.OSTypeKey + ServiceInstanceIDKey = semconv.ServiceInstanceIDKey ) From 92dc5b89b87b4c62d6f3361d9caf3e6693ae74c0 Mon Sep 17 00:00:00 2001 From: alex boten <223565+codeboten@users.noreply.github.com> Date: Wed, 10 Dec 2025 10:07:56 -0800 Subject: [PATCH 08/11] tidy Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> --- connector/exceptionsconnector/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connector/exceptionsconnector/go.mod b/connector/exceptionsconnector/go.mod index e5d30d5d6cf72..9da3d018a1ec3 100644 --- a/connector/exceptionsconnector/go.mod +++ b/connector/exceptionsconnector/go.mod @@ -19,7 +19,6 @@ require ( go.opentelemetry.io/collector/consumer/consumertest v0.141.1-0.20251210054218-8f51a1792add go.opentelemetry.io/collector/pdata v1.47.1-0.20251210054218-8f51a1792add go.opentelemetry.io/collector/pipeline v1.47.1-0.20251210054218-8f51a1792add - go.opentelemetry.io/otel v1.39.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.1 google.golang.org/grpc v1.77.0 @@ -52,6 +51,7 @@ require ( go.opentelemetry.io/collector/internal/fanoutconsumer v0.141.1-0.20251210054218-8f51a1792add // indirect go.opentelemetry.io/collector/pdata/pprofile v0.141.1-0.20251210054218-8f51a1792add // indirect go.opentelemetry.io/collector/pipeline/xpipeline v0.141.1-0.20251210054218-8f51a1792add // indirect + go.opentelemetry.io/otel v1.39.0 // indirect go.opentelemetry.io/otel/metric v1.39.0 // indirect go.opentelemetry.io/otel/sdk v1.39.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect From b8199aad139ce18e4430512370af16b89370e530 Mon Sep 17 00:00:00 2001 From: alex boten <223565+codeboten@users.noreply.github.com> Date: Wed, 10 Dec 2025 10:36:43 -0800 Subject: [PATCH 09/11] spanmetrics connector Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> --- connector/spanmetricsconnector/connector.go | 2 +- connector/spanmetricsconnector/connector_test.go | 2 +- connector/spanmetricsconnector/go.mod | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/connector/spanmetricsconnector/connector.go b/connector/spanmetricsconnector/connector.go index bac96d924c4c3..3c4fe29f2d713 100644 --- a/connector/spanmetricsconnector/connector.go +++ b/connector/spanmetricsconnector/connector.go @@ -18,11 +18,11 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" - conventions "go.opentelemetry.io/otel/semconv/v1.27.0" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector/internal/cache" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector/internal/metrics" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/traceutil" utilattri "github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil" diff --git a/connector/spanmetricsconnector/connector_test.go b/connector/spanmetricsconnector/connector_test.go index 2a77366d4ea43..b58affbe0f517 100644 --- a/connector/spanmetricsconnector/connector_test.go +++ b/connector/spanmetricsconnector/connector_test.go @@ -24,7 +24,6 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" - conventions "go.opentelemetry.io/otel/semconv/v1.27.0" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest" @@ -32,6 +31,7 @@ import ( "google.golang.org/grpc/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector/internal/metrics" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil" ) diff --git a/connector/spanmetricsconnector/go.mod b/connector/spanmetricsconnector/go.mod index 495e8f509700a..e6a6e7bcd656a 100644 --- a/connector/spanmetricsconnector/go.mod +++ b/connector/spanmetricsconnector/go.mod @@ -7,6 +7,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/jonboulle/clockwork v0.5.0 github.com/lightstep/go-expohisto v1.0.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.141.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.141.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.141.0 @@ -23,7 +24,6 @@ require ( go.opentelemetry.io/collector/featuregate v1.47.1-0.20251210054218-8f51a1792add go.opentelemetry.io/collector/pdata v1.47.1-0.20251210054218-8f51a1792add go.opentelemetry.io/collector/pipeline v1.47.1-0.20251210054218-8f51a1792add - go.opentelemetry.io/otel v1.39.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.1 google.golang.org/grpc v1.77.0 @@ -52,6 +52,7 @@ require ( go.opentelemetry.io/collector/internal/fanoutconsumer v0.141.1-0.20251210054218-8f51a1792add // indirect go.opentelemetry.io/collector/pdata/pprofile v0.141.1-0.20251210054218-8f51a1792add // indirect go.opentelemetry.io/collector/pipeline/xpipeline v0.141.1-0.20251210054218-8f51a1792add // indirect + go.opentelemetry.io/otel v1.39.0 // indirect go.opentelemetry.io/otel/metric v1.39.0 // indirect go.opentelemetry.io/otel/sdk v1.39.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect @@ -76,3 +77,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil => ../../internal/pdatautil + +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions => ../../internal/conventions From 104841f5742d71bf5077a16f21bfcafdce0ada19 Mon Sep 17 00:00:00 2001 From: alex boten <223565+codeboten@users.noreply.github.com> Date: Wed, 10 Dec 2025 10:38:30 -0800 Subject: [PATCH 10/11] signals connector Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> --- connector/signaltometricsconnector/connector_test.go | 8 ++++---- connector/signaltometricsconnector/go.mod | 5 ++++- .../internal/model/collectorinstanceinfo.go | 6 +++--- .../internal/model/collectorinstanceinfo_test.go | 7 ++++--- .../signaltometricsconnector/internal/model/model_test.go | 4 ++-- internal/conventions/conventions.go | 1 + 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/connector/signaltometricsconnector/connector_test.go b/connector/signaltometricsconnector/connector_test.go index 7f66753ad4736..b9e6f983ee66c 100644 --- a/connector/signaltometricsconnector/connector_test.go +++ b/connector/signaltometricsconnector/connector_test.go @@ -22,12 +22,12 @@ import ( "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" - semconv "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector/config" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector/internal/metadata" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest" ) @@ -348,9 +348,9 @@ func telemetryResource(t *testing.T) pcommon.Resource { t.Helper() r := pcommon.NewResource() - r.Attributes().PutStr(string(semconv.ServiceInstanceIDKey), "627cc493-f310-47de-96bd-71410b7dec09") - r.Attributes().PutStr(string(semconv.ServiceNameKey), "signaltometrics") - r.Attributes().PutStr(string(semconv.ServiceNamespaceKey), "test") + r.Attributes().PutStr(string(conventions.ServiceInstanceIDKey), "627cc493-f310-47de-96bd-71410b7dec09") + r.Attributes().PutStr(string(conventions.ServiceNameKey), "signaltometrics") + r.Attributes().PutStr(string(conventions.ServiceNamespaceKey), "test") return r } diff --git a/connector/signaltometricsconnector/go.mod b/connector/signaltometricsconnector/go.mod index 92f71e1d00b20..cadede8511266 100644 --- a/connector/signaltometricsconnector/go.mod +++ b/connector/signaltometricsconnector/go.mod @@ -5,6 +5,7 @@ go 1.24.0 require ( github.com/google/go-cmp v0.7.0 github.com/lightstep/go-expohisto v1.0.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.141.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.141.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.141.0 @@ -24,7 +25,6 @@ require ( go.opentelemetry.io/collector/pdata v1.47.1-0.20251210054218-8f51a1792add go.opentelemetry.io/collector/pdata/pprofile v0.141.1-0.20251210054218-8f51a1792add go.opentelemetry.io/collector/pipeline v1.47.1-0.20251210054218-8f51a1792add - go.opentelemetry.io/otel v1.39.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.1 ) @@ -67,6 +67,7 @@ require ( go.opentelemetry.io/collector/featuregate v1.47.1-0.20251210054218-8f51a1792add // indirect go.opentelemetry.io/collector/internal/fanoutconsumer v0.141.1-0.20251210054218-8f51a1792add // indirect go.opentelemetry.io/collector/pipeline/xpipeline v0.141.1-0.20251210054218-8f51a1792add // indirect + go.opentelemetry.io/otel v1.39.0 // indirect go.opentelemetry.io/otel/metric v1.39.0 // indirect go.opentelemetry.io/otel/sdk v1.39.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect @@ -83,6 +84,8 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl => ../../pkg/ottl +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions => ../../internal/conventions + replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil diff --git a/connector/signaltometricsconnector/internal/model/collectorinstanceinfo.go b/connector/signaltometricsconnector/internal/model/collectorinstanceinfo.go index 6466ed5a79417..aac4ca4f33405 100644 --- a/connector/signaltometricsconnector/internal/model/collectorinstanceinfo.go +++ b/connector/signaltometricsconnector/internal/model/collectorinstanceinfo.go @@ -6,9 +6,9 @@ package model // import "github.com/open-telemetry/opentelemetry-collector-contr import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" - semconv "go.opentelemetry.io/otel/semconv/v1.37.0" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector/internal/metadata" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" ) var prefix = metadata.Type.String() @@ -27,7 +27,7 @@ func NewCollectorInstanceInfo( ) CollectorInstanceInfo { var info CollectorInstanceInfo for k, v := range set.Resource.Attributes().All() { - if k == string(semconv.ServiceInstanceIDKey) { + if k == string(conventions.ServiceInstanceIDKey) { if str := v.Str(); str != "" { info.serviceInstanceID = v.Str() info.size++ @@ -46,7 +46,7 @@ func (info CollectorInstanceInfo) Size() int { func (info CollectorInstanceInfo) Copy(to pcommon.Map) { to.EnsureCapacity(info.Size()) if info.serviceInstanceID != "" { - to.PutStr(keyWithPrefix(string(semconv.ServiceInstanceIDKey)), info.serviceInstanceID) + to.PutStr(keyWithPrefix(string(conventions.ServiceInstanceIDKey)), info.serviceInstanceID) } } diff --git a/connector/signaltometricsconnector/internal/model/collectorinstanceinfo_test.go b/connector/signaltometricsconnector/internal/model/collectorinstanceinfo_test.go index a4ef1ecd5a7f2..80a7c69121ae7 100644 --- a/connector/signaltometricsconnector/internal/model/collectorinstanceinfo_test.go +++ b/connector/signaltometricsconnector/internal/model/collectorinstanceinfo_test.go @@ -12,7 +12,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" - semconv "go.opentelemetry.io/otel/semconv/v1.37.0" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" ) func TestCollectorInstanceInfo(t *testing.T) { @@ -30,13 +31,13 @@ func TestCollectorInstanceInfo(t *testing.T) { name: "with_service_instance_id", input: func() component.TelemetrySettings { ts := componenttest.NewNopTelemetrySettings() - ts.Resource.Attributes().PutStr(string(semconv.ServiceInstanceIDKey), "627cc493-f310-47de-96bd-71410b7dec09") + ts.Resource.Attributes().PutStr(string(conventions.ServiceInstanceIDKey), "627cc493-f310-47de-96bd-71410b7dec09") return ts }(), expected: func() pcommon.Map { m := pcommon.NewMap() m.PutStr( - "signaltometrics."+string(semconv.ServiceInstanceIDKey), + "signaltometrics."+string(conventions.ServiceInstanceIDKey), "627cc493-f310-47de-96bd-71410b7dec09", ) return m diff --git a/connector/signaltometricsconnector/internal/model/model_test.go b/connector/signaltometricsconnector/internal/model/model_test.go index 8957745f4e033..9657c461b11fa 100644 --- a/connector/signaltometricsconnector/internal/model/model_test.go +++ b/connector/signaltometricsconnector/internal/model/model_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" - semconv "go.opentelemetry.io/otel/semconv/v1.37.0" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/contexts/ottlspan" ) @@ -168,7 +168,7 @@ func testCollectorInstanceInfo(t *testing.T) CollectorInstanceInfo { t.Helper() set := componenttest.NewNopTelemetrySettings() - set.Resource.Attributes().PutStr(string(semconv.ServiceInstanceIDKey), testServiceInstanceID) + set.Resource.Attributes().PutStr(string(conventions.ServiceInstanceIDKey), testServiceInstanceID) return NewCollectorInstanceInfo(set) } diff --git a/internal/conventions/conventions.go b/internal/conventions/conventions.go index 0a525345e106f..5f7bbc3d1c4c8 100644 --- a/internal/conventions/conventions.go +++ b/internal/conventions/conventions.go @@ -22,4 +22,5 @@ const ( HostArchKey = semconv.HostArchKey OSTypeKey = semconv.OSTypeKey ServiceInstanceIDKey = semconv.ServiceInstanceIDKey + ServiceNamespaceKey = semconv.ServiceNamespaceKey ) From bb90dc5e2549549c114ccb5714f9ff2c0bca6d93 Mon Sep 17 00:00:00 2001 From: alex boten <223565+codeboten@users.noreply.github.com> Date: Wed, 10 Dec 2025 15:22:51 -0800 Subject: [PATCH 11/11] resource detection Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> --- processor/resourcedetectionprocessor/go.mod | 3 +++ processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go | 2 +- .../resourcedetectionprocessor/internal/aws/eks/detector.go | 2 +- .../internal/aws/eks/detector_test.go | 2 +- .../internal/aws/elasticbeanstalk/elasticbeanstalk.go | 2 +- .../resourcedetectionprocessor/internal/aws/lambda/lambda.go | 2 +- .../internal/aws/lambda/lambda_test.go | 5 +++-- .../resourcedetectionprocessor/internal/consul/consul.go | 2 +- .../internal/consul/consul_test.go | 2 +- .../internal/digitalocean/digitalocean.go | 2 +- .../internal/digitalocean/digitalocean_test.go | 2 +- .../resourcedetectionprocessor/internal/docker/docker.go | 2 +- .../internal/docker/docker_test.go | 2 +- .../resourcedetectionprocessor/internal/heroku/heroku.go | 2 +- .../internal/heroku/heroku_test.go | 2 +- .../resourcedetectionprocessor/internal/hetzner/hetzner.go | 2 +- .../internal/hetzner/hetzner_test.go | 2 +- .../resourcedetectionprocessor/internal/k8snode/k8snode.go | 2 +- 18 files changed, 22 insertions(+), 18 deletions(-) diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 0eda27c80605e..b6c416490ce10 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -17,6 +17,7 @@ require ( github.com/linode/go-metadata v0.2.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.141.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.141.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.141.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.141.0 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35 @@ -193,6 +194,8 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions => ../../internal/conventions + replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil => ../../internal/aws/ecsutil replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders => ../../internal/metadataproviders diff --git a/processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go b/processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go index eb199007153d8..235667b072ce2 100644 --- a/processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go +++ b/processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go @@ -16,9 +16,9 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ec2/types" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/processor" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" ec2provider "github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders/aws/ec2" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/aws/ec2/internal/metadata" diff --git a/processor/resourcedetectionprocessor/internal/aws/eks/detector.go b/processor/resourcedetectionprocessor/internal/aws/eks/detector.go index 9e0e214303f6c..69ee0a7fd6e90 100644 --- a/processor/resourcedetectionprocessor/internal/aws/eks/detector.go +++ b/processor/resourcedetectionprocessor/internal/aws/eks/detector.go @@ -15,9 +15,9 @@ import ( "github.com/aws/aws-sdk-go-v2/feature/ec2/imds" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/processor" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" imdsprovider "github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders/aws/ec2" apiprovider "github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders/aws/eks" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" diff --git a/processor/resourcedetectionprocessor/internal/aws/eks/detector_test.go b/processor/resourcedetectionprocessor/internal/aws/eks/detector_test.go index dbf21a427eb0a..46e12217a42a8 100644 --- a/processor/resourcedetectionprocessor/internal/aws/eks/detector_test.go +++ b/processor/resourcedetectionprocessor/internal/aws/eks/detector_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/processor" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" "go.uber.org/zap/zaptest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" apiprovider "github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders/aws/eks" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/aws/eks/internal/metadata" ) diff --git a/processor/resourcedetectionprocessor/internal/aws/elasticbeanstalk/elasticbeanstalk.go b/processor/resourcedetectionprocessor/internal/aws/elasticbeanstalk/elasticbeanstalk.go index cf82c044a82d1..3056d8262c7e0 100644 --- a/processor/resourcedetectionprocessor/internal/aws/elasticbeanstalk/elasticbeanstalk.go +++ b/processor/resourcedetectionprocessor/internal/aws/elasticbeanstalk/elasticbeanstalk.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/processor" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/aws/elasticbeanstalk/internal/metadata" ) diff --git a/processor/resourcedetectionprocessor/internal/aws/lambda/lambda.go b/processor/resourcedetectionprocessor/internal/aws/lambda/lambda.go index b3a196f5bf444..5c6649c4227d0 100644 --- a/processor/resourcedetectionprocessor/internal/aws/lambda/lambda.go +++ b/processor/resourcedetectionprocessor/internal/aws/lambda/lambda.go @@ -9,9 +9,9 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/processor" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/aws/lambda/internal/metadata" ) diff --git a/processor/resourcedetectionprocessor/internal/aws/lambda/lambda_test.go b/processor/resourcedetectionprocessor/internal/aws/lambda/lambda_test.go index 3a7bfaa602da5..869affa6c248b 100644 --- a/processor/resourcedetectionprocessor/internal/aws/lambda/lambda_test.go +++ b/processor/resourcedetectionprocessor/internal/aws/lambda/lambda_test.go @@ -9,7 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/processor/processortest" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" ) // Tests Lambda resource detector running in Lambda environment @@ -43,4 +44,4 @@ func TestNotLambda(t *testing.T) { require.NotNil(t, res) assert.Equal(t, 0, res.Attributes().Len(), "Resource object should be empty") -} +} \ No newline at end of file diff --git a/processor/resourcedetectionprocessor/internal/consul/consul.go b/processor/resourcedetectionprocessor/internal/consul/consul.go index 263ae822ebaad..2df07a5e3817e 100644 --- a/processor/resourcedetectionprocessor/internal/consul/consul.go +++ b/processor/resourcedetectionprocessor/internal/consul/consul.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/consul/api" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/processor" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders/consul" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/consul/internal/metadata" diff --git a/processor/resourcedetectionprocessor/internal/consul/consul_test.go b/processor/resourcedetectionprocessor/internal/consul/consul_test.go index 62b6b9af451f7..797dc878e3139 100644 --- a/processor/resourcedetectionprocessor/internal/consul/consul_test.go +++ b/processor/resourcedetectionprocessor/internal/consul/consul_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders/consul" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/consul/internal/metadata" ) diff --git a/processor/resourcedetectionprocessor/internal/digitalocean/digitalocean.go b/processor/resourcedetectionprocessor/internal/digitalocean/digitalocean.go index 6969f6f4b4267..333ddcaecf60f 100644 --- a/processor/resourcedetectionprocessor/internal/digitalocean/digitalocean.go +++ b/processor/resourcedetectionprocessor/internal/digitalocean/digitalocean.go @@ -10,9 +10,9 @@ import ( do "github.com/digitalocean/go-metadata" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/processor" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/digitalocean/internal/metadata" ) diff --git a/processor/resourcedetectionprocessor/internal/digitalocean/digitalocean_test.go b/processor/resourcedetectionprocessor/internal/digitalocean/digitalocean_test.go index ec5d465b141be..ef83fa0c868a8 100644 --- a/processor/resourcedetectionprocessor/internal/digitalocean/digitalocean_test.go +++ b/processor/resourcedetectionprocessor/internal/digitalocean/digitalocean_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/processor/processortest" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" ) diff --git a/processor/resourcedetectionprocessor/internal/docker/docker.go b/processor/resourcedetectionprocessor/internal/docker/docker.go index ed1eebe15fcb8..b7a6f55dbfcf7 100644 --- a/processor/resourcedetectionprocessor/internal/docker/docker.go +++ b/processor/resourcedetectionprocessor/internal/docker/docker.go @@ -9,9 +9,9 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/processor" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders/docker" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/docker/internal/metadata" diff --git a/processor/resourcedetectionprocessor/internal/docker/docker_test.go b/processor/resourcedetectionprocessor/internal/docker/docker_test.go index c3cee0d88e0b4..7fdbeb3710a9a 100644 --- a/processor/resourcedetectionprocessor/internal/docker/docker_test.go +++ b/processor/resourcedetectionprocessor/internal/docker/docker_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/processor/processortest" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders/docker" ) diff --git a/processor/resourcedetectionprocessor/internal/heroku/heroku.go b/processor/resourcedetectionprocessor/internal/heroku/heroku.go index d3696fe485bb8..3ad515b77474a 100644 --- a/processor/resourcedetectionprocessor/internal/heroku/heroku.go +++ b/processor/resourcedetectionprocessor/internal/heroku/heroku.go @@ -9,9 +9,9 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/processor" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/heroku/internal/metadata" ) diff --git a/processor/resourcedetectionprocessor/internal/heroku/heroku_test.go b/processor/resourcedetectionprocessor/internal/heroku/heroku_test.go index e830ae9530913..7c6eb53849e98 100644 --- a/processor/resourcedetectionprocessor/internal/heroku/heroku_test.go +++ b/processor/resourcedetectionprocessor/internal/heroku/heroku_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/processor/processortest" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" ) diff --git a/processor/resourcedetectionprocessor/internal/hetzner/hetzner.go b/processor/resourcedetectionprocessor/internal/hetzner/hetzner.go index 3cb227169cede..b2f8af9195964 100644 --- a/processor/resourcedetectionprocessor/internal/hetzner/hetzner.go +++ b/processor/resourcedetectionprocessor/internal/hetzner/hetzner.go @@ -10,9 +10,9 @@ import ( hcloudmeta "github.com/hetznercloud/hcloud-go/v2/hcloud/metadata" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/processor" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/hetzner/internal/metadata" ) diff --git a/processor/resourcedetectionprocessor/internal/hetzner/hetzner_test.go b/processor/resourcedetectionprocessor/internal/hetzner/hetzner_test.go index 83ac93e6d4914..3a7231cc41ee8 100644 --- a/processor/resourcedetectionprocessor/internal/hetzner/hetzner_test.go +++ b/processor/resourcedetectionprocessor/internal/hetzner/hetzner_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/processor/processortest" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" ) diff --git a/processor/resourcedetectionprocessor/internal/k8snode/k8snode.go b/processor/resourcedetectionprocessor/internal/k8snode/k8snode.go index df9bb3d9b67d3..bef70cc5ea747 100644 --- a/processor/resourcedetectionprocessor/internal/k8snode/k8snode.go +++ b/processor/resourcedetectionprocessor/internal/k8snode/k8snode.go @@ -10,9 +10,9 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/processor" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/conventions" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders/k8snode" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/k8snode/internal/metadata"