[chore] replace semconv import in test (#14300)

Use their string values in the tests to prevernt regressions.

Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com>

Author: codeboten

service/internal/resource/config_test.go

@@ -10,7 +10,6 @@ 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.37.0"
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/pdata/pcommon"
@@ -137,9 +136,9 @@ func TestBuildResource(t *testing.T) {
 
 	// Check override by nil
 	resMap = map[string]*string{
-		string(semconv.ServiceNameKey):       nil,
-		string(semconv.ServiceVersionKey):    nil,
-		string(semconv.ServiceInstanceIDKey): nil,
+		"service.name":        nil,
+		"service.version":     nil,
+		"service.instance.id": nil,
 	}
 	otelRes = New(buildInfo, resMap)
 	res = pdataFromSdk(otelRes)
@@ -150,9 +149,9 @@ func TestBuildResource(t *testing.T) {
 	// Check override values
 	strPtr := func(v string) *string { return &v }
 	resMap = map[string]*string{
-		string(semconv.ServiceNameKey):       strPtr("a"),
-		string(semconv.ServiceVersionKey):    strPtr("b"),
-		string(semconv.ServiceInstanceIDKey): strPtr("c"),
+		"service.name":        strPtr("a"),
+		"service.version":     strPtr("b"),
+		"service.instance.id": strPtr("c"),
 	}
 	otelRes = New(buildInfo, resMap)
 	res = pdataFromSdk(otelRes)

service/telemetry/otelconftelemetry/logger_test.go

@@ -18,7 +18,6 @@ import (
 	"github.com/stretchr/testify/require"
 	config "go.opentelemetry.io/contrib/otelconf/v0.3.0"
 	"go.opentelemetry.io/otel/attribute"
-	semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest/observer"
@@ -185,9 +184,9 @@ func TestCreateLoggerWithResource(t *testing.T) {
 			},
 			resourceConfig: map[string]*string{},
 			wantFields: map[string]string{
-				string(semconv.ServiceNameKey):       "mycommand",
-				string(semconv.ServiceVersionKey):    "1.0.0",
-				string(semconv.ServiceInstanceIDKey): "",
+				"service.name":        "mycommand",
+				"service.version":     "1.0.0",
+				"service.instance.id": "",
 			},
 		},
 		{
@@ -197,12 +196,12 @@ func TestCreateLoggerWithResource(t *testing.T) {
 				Version: "1.0.0",
 			},
 			resourceConfig: map[string]*string{
-				string(semconv.ServiceNameKey): ptr("custom-service"),
+				"service.name": ptr("custom-service"),
 			},
 			wantFields: map[string]string{
-				string(semconv.ServiceNameKey):       "custom-service",
-				string(semconv.ServiceVersionKey):    "1.0.0",
-				string(semconv.ServiceInstanceIDKey): "",
+				"service.name":        "custom-service",
+				"service.version":     "1.0.0",
+				"service.instance.id": "",
 			},
 		},
 		{
@@ -212,12 +211,12 @@ func TestCreateLoggerWithResource(t *testing.T) {
 				Version: "1.0.0",
 			},
 			resourceConfig: map[string]*string{
-				string(semconv.ServiceVersionKey): ptr("2.0.0"),
+				"service.version": ptr("2.0.0"),
 			},
 			wantFields: map[string]string{
-				string(semconv.ServiceNameKey):       "mycommand",
-				string(semconv.ServiceVersionKey):    "2.0.0",
-				string(semconv.ServiceInstanceIDKey): "",
+				"service.name":        "mycommand",
+				"service.version":     "2.0.0",
+				"service.instance.id": "",
 			},
 		},
 		{
@@ -230,10 +229,10 @@ func TestCreateLoggerWithResource(t *testing.T) {
 				"custom.field": ptr("custom-value"),
 			},
 			wantFields: map[string]string{
-				string(semconv.ServiceNameKey):       "mycommand",
-				string(semconv.ServiceVersionKey):    "1.0.0",
-				string(semconv.ServiceInstanceIDKey): "", // Just check presence
-				"custom.field":                       "custom-value",
+				"service.name":        "mycommand",
+				"service.version":     "1.0.0",
+				"service.instance.id": "", // Just check presence
+				"custom.field":        "custom-value",
 			},
 		},
 		{
@@ -242,7 +241,7 @@ func TestCreateLoggerWithResource(t *testing.T) {
 			resourceConfig: nil,
 			wantFields: map[string]string{
 				// A random UUID is injected for service.instance.id by default
-				string(semconv.ServiceInstanceIDKey): "", // Just check presence
+				"service.instance.id": "", // Just check presence
 			},
 		},
 		{
@@ -308,7 +307,7 @@ func TestCreateLoggerWithResource(t *testing.T) {
 
 			// Verify all expected fields
 			for k, v := range tt.wantFields {
-				if k == string(semconv.ServiceInstanceIDKey) {
+				if k == "service.instance.id" {
 					// For service.instance.id just verify it exists since it's auto-generated
 					assert.Contains(t, enc.Fields, k)
 				} else {
@@ -368,16 +367,16 @@ func TestLogger_OTLP(t *testing.T) {
 		rl := logs.ResourceLogs().At(0)
 
 		resourceAttrs := rl.Resource().Attributes().AsRaw()
-		assert.Equal(t, service, resourceAttrs[string(semconv.ServiceNameKey)])
-		assert.Equal(t, version, resourceAttrs[string(semconv.ServiceVersionKey)])
+		assert.Equal(t, service, resourceAttrs["service.name"])
+		assert.Equal(t, version, resourceAttrs["service.version"])
 		assert.Equal(t, testValue, resourceAttrs[testAttribute])
 
 		// Check that the resource attributes are not duplicated in the log records
 		sl := rl.ScopeLogs().At(0)
 		logRecord := sl.LogRecords().At(0)
 		attrs := logRecord.Attributes().AsRaw()
-		assert.NotContains(t, attrs, string(semconv.ServiceNameKey))
-		assert.NotContains(t, attrs, string(semconv.ServiceVersionKey))
+		assert.NotContains(t, attrs, "service.name")
+		assert.NotContains(t, attrs, "service.version")
 		assert.NotContains(t, attrs, testAttribute)
 
 		receivedLogs++
@@ -417,9 +416,9 @@ func newOTLPLogger(t *testing.T, level zapcore.Level, handler func(plogotlp.Expo
 			// written to the OTLP processor
 		},
 		Resource: map[string]*string{
-			string(semconv.ServiceNameKey):    ptr(service),
-			string(semconv.ServiceVersionKey): ptr(version),
-			testAttribute:                     ptr(testValue),
+			"service.name":    ptr(service),
+			"service.version": ptr(version),
+			testAttribute:     ptr(testValue),
 		},
 	}
 

service/telemetry/otelconftelemetry/metrics_test.go

@@ -20,7 +20,6 @@ import (
 	config "go.opentelemetry.io/contrib/otelconf/v0.3.0"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
-	semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest/observer"
@@ -113,9 +112,9 @@ func TestCreateMeterProvider(t *testing.T) {
 			},
 		}
 		cfg.Resource = map[string]*string{
-			string(semconv.ServiceNameKey):       ptr("otelcol"),
-			string(semconv.ServiceVersionKey):    ptr("latest"),
-			string(semconv.ServiceInstanceIDKey): ptr(testInstanceID),
+			"service.name":        ptr("otelcol"),
+			"service.version":     ptr("latest"),
+			"service.instance.id": ptr(testInstanceID),
 		}
 
 		t.Run(tt.name, func(t *testing.T) {
@@ -164,13 +163,13 @@ func createTestMetrics(t *testing.T, mp metric.MeterProvider) {
 	grpcExampleCounter, err := mp.Meter("go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc").Int64Counter(metricPrefix + grpcPrefix + counterName)
 	require.NoError(t, err)
 	grpcExampleCounter.Add(context.Background(), 11, metric.WithAttributeSet(attribute.NewSet(
-		attribute.String(string(semconv.RPCSystemKey), "grpc"),
+		attribute.String("rpc.system", "grpc"),
 	)))
 
 	httpExampleCounter, err := mp.Meter("go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp").Int64Counter(metricPrefix + httpPrefix + counterName)
 	require.NoError(t, err)
 	httpExampleCounter.Add(context.Background(), 10, metric.WithAttributeSet(attribute.NewSet(
-		attribute.String(string(semconv.HTTPRequestMethodKey), "GET"),
+		attribute.String("http.request.method", "GET"),
 	)))
 }