otelmongo: default to new semconv

Author: dmathieu

instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/internal/semconv/event_monitor.go

@@ -14,14 +14,13 @@ import (
 	"go.mongodb.org/mongo-driver/event"
 	"go.opentelemetry.io/otel/attribute"
 	semconv1210 "go.opentelemetry.io/otel/semconv/v1.21.0"
-	semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.30.0"
 )
 
 // Constants for environment variable keys and versions.
 const (
-	semconvOptIn     = "OTEL_SEMCONV_STABILITY_OPT_IN"
-	semconvOptInDup  = "database/dup"
-	semconvOptIn1260 = "database"
+	semconvOptIn    = "OTEL_SEMCONV_STABILITY_OPT_IN"
+	semconvOptInDup = "database/dup"
 )
 
 // EventMonitor is responsible for monitoring events with a specified semantic
@@ -88,13 +87,7 @@ func (m EventMonitor) CommandStartedTraceAttrs(
 		)
 	}
 
-	// Check for the 1.26.0 opt-in
-	if hasOptIn(m.version, semconvOptIn1260) {
-		return commandStartedTraceAttrs(evt, opts...)
-	}
-
-	// Fallback to v1.21.0
-	return commandStartedTraceAttrsV1210(evt, opts...)
+	return commandStartedTraceAttrs(evt, opts...)
 }
 
 // peerInfo extracts the hostname and port from a CommandStartedEvent.

instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/internal/semconv/event_monitor_test.go

@@ -27,11 +27,6 @@ func TestNewEventMonitor(t *testing.T) {
 			version: "",
 			want:    "",
 		},
-		{
-			name:    "Version 1260",
-			version: semconvOptIn1260,
-			want:    "database",
-		},
 		{
 			name:    "Duplicate Version",
 			version: semconvOptInDup,
@@ -114,18 +109,12 @@ func TestCommandStartedTraceAttrs(t *testing.T) {
 			name:      "no version",
 			initAttrs: []attribute.KeyValue{},
 			version:   "",
-			want:      v1210,
+			want:      v1260,
 		},
 		{
 			name:      "unsupported version",
 			initAttrs: []attribute.KeyValue{},
 			version:   "database/foo",
-			want:      v1210,
-		},
-		{
-			name:      "database",
-			initAttrs: []attribute.KeyValue{},
-			version:   "database",
 			want:      v1260,
 		},
 		{