Skip to content

chore: move remaining dependency from collector/semconv #39991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

chore: move remaining dependency from collector/semconv #39991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee2973d
[chore] update dependency to use otelgo semconv
codeboten May 9, 2025
fa41d77
update gomod/gosum
codeboten May 9, 2025
cad1269
more fixes
codeboten May 9, 2025
07a5974
more fixes
codeboten May 9, 2025
2e2f699
more fixes
codeboten May 9, 2025
33fe51b
more fixes
codeboten May 9, 2025
b716a3b
more fixes
codeboten May 9, 2025
016373d
chore: move remaining dependency from collector/semconv
codeboten May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion cmd/opampsupervisor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ require (
go.opentelemetry.io/collector/confmap/provider/envprovider v1.31.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.31.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/pdata v1.31.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/semconv v0.125.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/service v0.125.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0
go.opentelemetry.io/contrib/otelconf v0.15.0
Expand Down
2 changes: 0 additions & 2 deletions cmd/opampsupervisor/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions cmd/opampsupervisor/supervisor/supervisor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ import (
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/confmap"
"go.opentelemetry.io/collector/pdata/pcommon"
semconv "go.opentelemetry.io/collector/semconv/v1.21.0"
"go.opentelemetry.io/contrib/bridges/otelzap"
telemetryconfig "go.opentelemetry.io/contrib/otelconf/v0.3.0"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/log"
semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
"go.opentelemetry.io/otel/trace"
"go.uber.org/multierr"
"go.uber.org/zap"
Expand Down Expand Up @@ -228,17 +228,17 @@ func initTelemetrySettings(logger *zap.Logger, cfg config.Telemetry) (telemetryS
pcommonRes.Attributes().PutStr(k, *v)
}

if _, ok := cfg.Resource[semconv.AttributeServiceName]; !ok {
pcommonRes.Attributes().PutStr(semconv.AttributeServiceName, "opamp-supervisor")
if _, ok := cfg.Resource[string(semconv.ServiceNameKey)]; !ok {
pcommonRes.Attributes().PutStr(string(semconv.ServiceNameKey), "opamp-supervisor")
}

if _, ok := cfg.Resource[semconv.AttributeServiceInstanceID]; !ok {
if _, ok := cfg.Resource[string(semconv.ServiceInstanceIDKey)]; !ok {
instanceUUID, _ := uuid.NewRandom()
instanceID := instanceUUID.String()
pcommonRes.Attributes().PutStr(semconv.AttributeServiceInstanceID, instanceID)
pcommonRes.Attributes().PutStr(string(semconv.ServiceInstanceIDKey), instanceID)
}

// TODO currently we do not have the build info containing the version available to set semconv.AttributeServiceVersion
// TODO currently we do not have the build info containing the version available to set semconv.ServiceVersionKey

var attrs []telemetryconfig.AttributeNameValue
for k, v := range pcommonRes.Attributes().All() {
Expand Down Expand Up @@ -459,7 +459,7 @@ func (s *Supervisor) getBootstrapInfo() (err error) {
identAttr := message.AgentDescription.IdentifyingAttributes

for _, attr := range identAttr {
if attr.Key == semconv.AttributeServiceInstanceID {
if attr.Key == string(semconv.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",
Expand Down
1 change: 0 additions & 1 deletion cmd/telemetrygen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ require (
github.com/spf13/pflag v1.0.6
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/pdata v1.31.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/semconv v0.125.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/otel v1.35.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.11.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.11.0
Expand Down
2 changes: 0 additions & 2 deletions cmd/telemetrygen/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion cmd/telemetrygen/internal/e2etest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ require (
go.opentelemetry.io/collector/receiver v1.31.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/receiver/receiverhelper v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/semconv v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions cmd/telemetrygen/internal/e2etest/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/telemetrygen/pkg/metrics/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"sync/atomic"
"time"

semconv "go.opentelemetry.io/collector/semconv/v1.13.0"
"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc"
"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp"
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
"go.opentelemetry.io/otel/sdk/resource"
semconv "go.opentelemetry.io/otel/semconv/v1.13.0"
"go.uber.org/zap"
"golang.org/x/time/rate"

Expand Down
1 change: 0 additions & 1 deletion connector/countconnector/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ require (
go.opentelemetry.io/collector/internal/fanoutconsumer v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/internal/telemetry v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/semconv v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/log v0.11.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions connector/countconnector/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions connector/datadogconnector/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"
semconv "go.opentelemetry.io/collector/semconv/v1.27.0"
"go.opentelemetry.io/otel/metric/noop"
semconv "go.opentelemetry.io/otel/semconv/v1.27.0"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog"
Expand Down Expand Up @@ -181,7 +181,7 @@ func (c *traceToMetricConnector) populateContainerTagsCache(traces ptrace.Traces
rs := traces.ResourceSpans().At(i)
attrs := rs.Resource().Attributes()

containerID, ok := attrs.Get(semconv.AttributeContainerID)
containerID, ok := attrs.Get(string(semconv.ContainerIDKey))
if !ok {
continue
}
Expand Down
2 changes: 1 addition & 1 deletion connector/datadogconnector/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ require (
go.opentelemetry.io/collector/processor/batchprocessor v0.125.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/receiver v1.31.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/receiver/otlpreceiver v0.125.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/semconv v0.125.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/otel v1.35.0
go.opentelemetry.io/otel/metric v1.35.0
go.uber.org/zap v1.27.0
Expand Down Expand Up @@ -317,6 +316,7 @@ require (
go.opentelemetry.io/collector/receiver/receiverhelper v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/semconv v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/service v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/service/hostcapabilities v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
Expand Down
10 changes: 5 additions & 5 deletions connector/exceptionsconnector/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ package exceptionsconnector // import "github.com/open-telemetry/opentelemetry-c

import (
"go.opentelemetry.io/collector/pdata/pcommon"
conventions "go.opentelemetry.io/collector/semconv/v1.27.0"
conventions "go.opentelemetry.io/otel/semconv/v1.27.0"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil"
)

const (
serviceNameKey = conventions.AttributeServiceName
exceptionTypeKey = conventions.AttributeExceptionType
exceptionMessageKey = conventions.AttributeExceptionMessage
exceptionStacktraceKey = conventions.AttributeExceptionStacktrace
serviceNameKey = string(conventions.ServiceNameKey)
exceptionTypeKey = string(conventions.ExceptionTypeKey)
exceptionMessageKey = string(conventions.ExceptionMessageKey)
exceptionStacktraceKey = string(conventions.ExceptionStacktraceKey)
// TODO(marctc): formalize these constants in the OpenTelemetry specification.
spanKindKey = "span.kind" // OpenTelemetry non-standard constant.
spanNameKey = "span.name" // OpenTelemetry non-standard constant.
Expand Down
4 changes: 2 additions & 2 deletions connector/exceptionsconnector/connector_logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.27.0"
conventions "go.opentelemetry.io/otel/semconv/v1.27.0"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/traceutil"
Expand Down Expand Up @@ -53,7 +53,7 @@ func (c *logsConnector) ConsumeTraces(ctx context.Context, traces ptrace.Traces)
for i := 0; i < traces.ResourceSpans().Len(); i++ {
rspans := traces.ResourceSpans().At(i)
resourceAttr := rspans.Resource().Attributes()
serviceAttr, ok := resourceAttr.Get(conventions.AttributeServiceName)
serviceAttr, ok := resourceAttr.Get(string(conventions.ServiceNameKey))
if !ok {
continue
}
Expand Down
4 changes: 2 additions & 2 deletions connector/exceptionsconnector/connector_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.27.0"
conventions "go.opentelemetry.io/otel/semconv/v1.27.0"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/traceutil"
Expand Down Expand Up @@ -76,7 +76,7 @@ func (c *metricsConnector) ConsumeTraces(ctx context.Context, traces ptrace.Trac
for i := 0; i < traces.ResourceSpans().Len(); i++ {
rspans := traces.ResourceSpans().At(i)
resourceAttr := rspans.Resource().Attributes()
serviceAttr, ok := resourceAttr.Get(conventions.AttributeServiceName)
serviceAttr, ok := resourceAttr.Get(string(conventions.ServiceNameKey))
if !ok {
continue
}
Expand Down
1 change: 0 additions & 1 deletion connector/exceptionsconnector/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ require (
go.opentelemetry.io/collector/consumer/consumertest v0.125.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/pdata v1.31.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/pipeline v0.125.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/semconv v0.125.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/otel v1.35.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
Expand Down
2 changes: 0 additions & 2 deletions connector/exceptionsconnector/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion connector/routingconnector/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ require (
go.opentelemetry.io/collector/internal/telemetry v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/collector/semconv v0.125.1-0.20250509190408-4ca0f1829e0a // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/log v0.11.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions connector/routingconnector/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions connector/servicegraphconnector/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.opentelemetry.io/collector/processor"
semconv "go.opentelemetry.io/collector/semconv/v1.25.0"
semconv "go.opentelemetry.io/otel/semconv/v1.25.0"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector/internal/metadata"
Expand All @@ -45,10 +45,10 @@ var (
}

defaultPeerAttributes = []string{
semconv.AttributePeerService, semconv.AttributeDBName, semconv.AttributeDBSystem,
string(semconv.PeerServiceKey), string(semconv.DBNameKey), string(semconv.DBSystemKey),
}

defaultDatabaseNameAttributes = []string{semconv.AttributeDBName}
defaultDatabaseNameAttributes = []string{string(semconv.DBNameKey)}

defaultMetricsFlushInterval = 60 * time.Second // 1 DPM
)
Expand Down
1 change: 0 additions & 1 deletion connector/servicegraphconnector/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ require (
go.opentelemetry.io/collector/pdata v1.31.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/pipeline v0.125.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/processor v1.31.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/collector/semconv v0.125.1-0.20250509190408-4ca0f1829e0a
go.opentelemetry.io/otel v1.35.0
go.opentelemetry.io/otel/metric v1.35.0
go.opentelemetry.io/otel/sdk/metric v1.35.0
Expand Down
2 changes: 0 additions & 2 deletions connector/servicegraphconnector/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions connector/servicegraphconnector/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ package servicegraphconnector // import "github.com/open-telemetry/opentelemetry

import (
"go.opentelemetry.io/collector/pdata/pcommon"
semconv "go.opentelemetry.io/collector/semconv/v1.25.0"
semconv "go.opentelemetry.io/otel/semconv/v1.25.0"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil"
)

func findServiceName(attributes pcommon.Map) (string, bool) {
return pdatautil.GetAttributeValue(semconv.AttributeServiceName, attributes)
return pdatautil.GetAttributeValue(string(semconv.ServiceNameKey), attributes)
}

func getFirstMatchingValue(keys []string, attributes ...pcommon.Map) (string, bool) {
Expand Down
Loading
Loading