update semconv dependency to otelgo's semconv package

.chloggen/codeboten_remove-internal-semconv-dep.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: service
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Replace `go.opentelemetry.io/collector/semconv` usage with `go.opentelemetry.io/otel/semconv`"
+
+# One or more tracking issues or pull requests related to the change
+issues: [12991]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []

cmd/builder/internal/builder/main_test.go

@@ -109,7 +109,6 @@ var replaceModules = []string{
 	"/receiver/receivertest",
 	"/receiver/receiverhelper",
 	"/receiver/xreceiver",
-	"/semconv",
 	"/service",
 	"/service/hostcapabilities",
 }

cmd/mdatagen/go.mod

@@ -23,7 +23,7 @@ require (
 	go.opentelemetry.io/collector/receiver/receivertest v0.125.0
 	go.opentelemetry.io/collector/scraper v0.125.0
 	go.opentelemetry.io/collector/scraper/scrapertest v0.125.0
-	go.opentelemetry.io/collector/semconv v0.125.0
+	go.opentelemetry.io/otel v1.35.0
 	go.opentelemetry.io/otel/metric v1.35.0
 	go.opentelemetry.io/otel/sdk/metric v1.35.0
 	go.opentelemetry.io/otel/trace v1.35.0
@@ -66,7 +66,6 @@ require (
 	go.opentelemetry.io/collector/processor/xprocessor v0.125.0 // indirect
 	go.opentelemetry.io/collector/receiver/xreceiver v0.125.0 // 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
 	go.opentelemetry.io/otel/sdk v1.35.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
@@ -95,8 +94,6 @@ replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata
 
 replace go.opentelemetry.io/collector/receiver => ../../receiver
 
-replace go.opentelemetry.io/collector/semconv => ../../semconv
-
 replace go.opentelemetry.io/collector/consumer => ../../consumer
 
 replace go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/receivertest

cmd/mdatagen/internal/templates/logs.go.tmpl

@@ -10,7 +10,7 @@ import (
 	"go.opentelemetry.io/collector/{{ .Status.Class }}"
 	{{- end }}
 	{{- if .SemConvVersion }}
-	conventions "go.opentelemetry.io/collector/semconv/v{{ .SemConvVersion }}"
+	conventions "go.opentelemetry.io/otel/semconv/v{{ .SemConvVersion }}"
 	{{- end }}
 )
 

cmd/mdatagen/internal/templates/metrics.go.tmpl

@@ -16,7 +16,7 @@ import (
 	"go.opentelemetry.io/collector/{{ .Status.Class }}"
 	{{- end }}
 	{{- if .SemConvVersion }}
-	conventions "go.opentelemetry.io/collector/semconv/v{{ .SemConvVersion }}"
+	conventions "go.opentelemetry.io/otel/semconv/v{{ .SemConvVersion }}"
 	{{- end }}
 	{{ if .ResourceAttributes -}}
 	"go.opentelemetry.io/collector/filter"

cmd/otelcorecol/builder-config.yaml

@@ -110,6 +110,5 @@ replaces:
   - go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver
   - go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/receivertest
   - go.opentelemetry.io/collector/receiver/xreceiver => ../../receiver/xreceiver
-  - go.opentelemetry.io/collector/semconv => ../../semconv
   - go.opentelemetry.io/collector/service => ../../service
   - go.opentelemetry.io/collector/service/hostcapabilities => ../../service/hostcapabilities

cmd/otelcorecol/go.mod

@@ -131,7 +131,6 @@ require (
 	go.opentelemetry.io/collector/receiver/receiverhelper v0.125.0 // indirect
 	go.opentelemetry.io/collector/receiver/receivertest v0.125.0 // indirect
 	go.opentelemetry.io/collector/receiver/xreceiver v0.125.0 // indirect
-	go.opentelemetry.io/collector/semconv v0.125.0 // indirect
 	go.opentelemetry.io/collector/service v0.125.0 // indirect
 	go.opentelemetry.io/collector/service/hostcapabilities v0.125.0 // indirect
 	go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
@@ -320,8 +319,6 @@ replace go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/re
 
 replace go.opentelemetry.io/collector/receiver/xreceiver => ../../receiver/xreceiver
 
-replace go.opentelemetry.io/collector/semconv => ../../semconv
-
 replace go.opentelemetry.io/collector/service => ../../service
 
 replace go.opentelemetry.io/collector/service/hostcapabilities => ../../service/hostcapabilities

internal/e2e/go.mod

@@ -108,7 +108,6 @@ require (
 	go.opentelemetry.io/collector/processor/xprocessor v0.125.0 // indirect
 	go.opentelemetry.io/collector/receiver/receiverhelper v0.125.0 // indirect
 	go.opentelemetry.io/collector/receiver/xreceiver v0.125.0 // indirect
-	go.opentelemetry.io/collector/semconv v0.125.0 // indirect
 	go.opentelemetry.io/collector/service/hostcapabilities v0.125.0 // 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
@@ -214,8 +213,6 @@ replace go.opentelemetry.io/collector/connector => ../../connector
 
 replace go.opentelemetry.io/collector/connector/connectortest => ../../connector/connectortest
 
-replace go.opentelemetry.io/collector/semconv => ../../semconv
-
 replace go.opentelemetry.io/collector/processor => ../../processor
 
 replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension

otelcol/go.mod

@@ -90,7 +90,6 @@ require (
 	go.opentelemetry.io/collector/pipeline/xpipeline v0.125.0 // indirect
 	go.opentelemetry.io/collector/processor/xprocessor v0.125.0 // indirect
 	go.opentelemetry.io/collector/receiver/xreceiver v0.125.0 // indirect
-	go.opentelemetry.io/collector/semconv v0.125.0 // indirect
 	go.opentelemetry.io/collector/service/hostcapabilities v0.125.0 // indirect
 	go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
 	go.opentelemetry.io/contrib/propagators/b3 v1.35.0 // indirect
@@ -158,8 +157,6 @@ replace go.opentelemetry.io/collector/processor => ../processor
 
 replace go.opentelemetry.io/collector/consumer => ../consumer
 
-replace go.opentelemetry.io/collector/semconv => ../semconv
-
 replace go.opentelemetry.io/collector/receiver => ../receiver
 
 replace go.opentelemetry.io/collector/featuregate => ../featuregate

otelcol/otelcoltest/go.mod

@@ -86,7 +86,6 @@ require (
 	go.opentelemetry.io/collector/processor/xprocessor v0.125.0 // indirect
 	go.opentelemetry.io/collector/receiver v1.31.0 // indirect
 	go.opentelemetry.io/collector/receiver/xreceiver v0.125.0 // indirect
-	go.opentelemetry.io/collector/semconv v0.125.0 // indirect
 	go.opentelemetry.io/collector/service/hostcapabilities v0.125.0 // indirect
 	go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
 	go.opentelemetry.io/contrib/otelconf v0.15.0 // indirect
@@ -163,8 +162,6 @@ replace go.opentelemetry.io/collector/extension => ../../extension
 
 replace go.opentelemetry.io/collector/exporter => ../../exporter
 
-replace go.opentelemetry.io/collector/semconv => ../../semconv
-
 replace go.opentelemetry.io/collector/consumer/xconsumer => ../../consumer/xconsumer
 
 replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest

service/go.mod

@@ -44,7 +44,6 @@ require (
 	go.opentelemetry.io/collector/receiver v1.31.0
 	go.opentelemetry.io/collector/receiver/receivertest v0.125.0
 	go.opentelemetry.io/collector/receiver/xreceiver v0.125.0
-	go.opentelemetry.io/collector/semconv v0.125.0
 	go.opentelemetry.io/collector/service/hostcapabilities v0.125.0
 	go.opentelemetry.io/contrib/otelconf v0.15.0
 	go.opentelemetry.io/contrib/propagators/b3 v1.35.0
@@ -179,8 +178,6 @@ replace go.opentelemetry.io/collector/processor/processortest => ../processor/pr
 
 replace go.opentelemetry.io/collector/consumer => ../consumer
 
-replace go.opentelemetry.io/collector/semconv => ../semconv
-
 replace go.opentelemetry.io/collector/service/hostcapabilities => ./hostcapabilities
 
 replace go.opentelemetry.io/collector/receiver => ../receiver

service/hostcapabilities/go.mod

@@ -80,7 +80,7 @@ replace (
 	go.opentelemetry.io/collector/receiver => ../../receiver
 	go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/receivertest
 	go.opentelemetry.io/collector/receiver/xreceiver => ../../receiver/xreceiver
-	go.opentelemetry.io/collector/semconv => ../../semconv
+
 	go.opentelemetry.io/collector/service => ..
 )
 

service/internal/resource/config.go

@@ -7,9 +7,9 @@ import (
 	"github.com/google/uuid"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/sdk/resource"
+	semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
 
 	"go.opentelemetry.io/collector/component"
-	semconv "go.opentelemetry.io/collector/semconv/v1.18.0"
 )
 
 // New resource from telemetry configuration.
@@ -23,22 +23,22 @@ func New(buildInfo component.BuildInfo, resourceCfg map[string]*string) *resourc
 		}
 	}
 
-	if _, ok := resourceCfg[semconv.AttributeServiceName]; !ok {
+	if _, ok := resourceCfg[string(semconv.ServiceNameKey)]; !ok {
 		// AttributeServiceName is not specified in the config. Use the default service name.
-		telAttrs = append(telAttrs, attribute.String(semconv.AttributeServiceName, buildInfo.Command))
+		telAttrs = append(telAttrs, semconv.ServiceNameKey.String(buildInfo.Command))
 	}
 
-	if _, ok := resourceCfg[semconv.AttributeServiceInstanceID]; !ok {
+	if _, ok := resourceCfg[string(semconv.ServiceInstanceIDKey)]; !ok {
 		// AttributeServiceInstanceID is not specified in the config. Auto-generate one.
 		instanceUUID, _ := uuid.NewRandom()
 		instanceID := instanceUUID.String()
-		telAttrs = append(telAttrs, attribute.String(semconv.AttributeServiceInstanceID, instanceID))
+		telAttrs = append(telAttrs, semconv.ServiceInstanceIDKey.String(instanceID))
 	}
 
-	if _, ok := resourceCfg[semconv.AttributeServiceVersion]; !ok {
+	if _, ok := resourceCfg[string(semconv.ServiceVersionKey)]; !ok {
 		// AttributeServiceVersion is not specified in the config. Use the actual
 		// build version.
-		telAttrs = append(telAttrs, attribute.String(semconv.AttributeServiceVersion, buildInfo.Version))
+		telAttrs = append(telAttrs, semconv.ServiceVersionKey.String(buildInfo.Version))
 	}
 	return resource.NewWithAttributes(semconv.SchemaURL, telAttrs...)
 }

service/internal/resource/config_test.go

@@ -10,10 +10,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	sdkresource "go.opentelemetry.io/otel/sdk/resource"
+	semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/pdata/pcommon"
-	semconv "go.opentelemetry.io/collector/semconv/v1.18.0"
 )
 
 const (
@@ -125,21 +125,21 @@ func TestBuildResource(t *testing.T) {
 	res := pdataFromSdk(otelRes)
 
 	assert.Equal(t, 3, res.Attributes().Len())
-	value, ok := res.Attributes().Get(semconv.AttributeServiceName)
+	value, ok := res.Attributes().Get("service.name")
 	assert.True(t, ok)
 	assert.Equal(t, buildInfo.Command, value.AsString())
-	value, ok = res.Attributes().Get(semconv.AttributeServiceVersion)
+	value, ok = res.Attributes().Get("service.version")
 	assert.True(t, ok)
 	assert.Equal(t, buildInfo.Version, value.AsString())
 
-	_, ok = res.Attributes().Get(semconv.AttributeServiceInstanceID)
+	_, ok = res.Attributes().Get("service.instance.id")
 	assert.True(t, ok)
 
 	// Check override by nil
 	resMap = map[string]*string{
-		semconv.AttributeServiceName:       nil,
-		semconv.AttributeServiceVersion:    nil,
-		semconv.AttributeServiceInstanceID: nil,
+		string(semconv.ServiceNameKey):       nil,
+		string(semconv.ServiceVersionKey):    nil,
+		string(semconv.ServiceInstanceIDKey): nil,
 	}
 	otelRes = New(buildInfo, resMap)
 	res = pdataFromSdk(otelRes)
@@ -150,21 +150,21 @@ func TestBuildResource(t *testing.T) {
 	// Check override values
 	strPtr := func(v string) *string { return &v }
 	resMap = map[string]*string{
-		semconv.AttributeServiceName:       strPtr("a"),
-		semconv.AttributeServiceVersion:    strPtr("b"),
-		semconv.AttributeServiceInstanceID: strPtr("c"),
+		string(semconv.ServiceNameKey):       strPtr("a"),
+		string(semconv.ServiceVersionKey):    strPtr("b"),
+		string(semconv.ServiceInstanceIDKey): strPtr("c"),
 	}
 	otelRes = New(buildInfo, resMap)
 	res = pdataFromSdk(otelRes)
 
 	assert.Equal(t, 3, res.Attributes().Len())
-	value, ok = res.Attributes().Get(semconv.AttributeServiceName)
+	value, ok = res.Attributes().Get("service.name")
 	assert.True(t, ok)
 	assert.Equal(t, "a", value.AsString())
-	value, ok = res.Attributes().Get(semconv.AttributeServiceVersion)
+	value, ok = res.Attributes().Get("service.version")
 	assert.True(t, ok)
 	assert.Equal(t, "b", value.AsString())
-	value, ok = res.Attributes().Get(semconv.AttributeServiceInstanceID)
+	value, ok = res.Attributes().Get("service.instance.id")
 	assert.True(t, ok)
 	assert.Equal(t, "c", value.AsString())
 }