feat: Support mixed categories for semconv opt-in (#7274)

Co-authored-by: Robert Pająk <[email protected]>
Co-authored-by: Damien Mathieu <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -68,6 +68,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Removed a duplicate instance of the `Changed` subheader under `1.18.0/0.43.0/0.12.0` in `./CHANGELOG.md`. (#7163)
 - Check for TLS related options to be set before creating TLS config `go.opentelemetry.io/contrib/otelconf`. (#6984)
 - Fixed handling of the `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable in `go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin`. (#7215)
+- Support mixed categories for `OTEL_SEMCONV_STABILITY_OPT_IN` opt-in in the following packages. (#7246)
+  - `go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful`.
+  - `go.opentelemetry.io/contrib/instrumentation/gin-gonic/gin/otelgin`.
+  - `go.opentelemetry.io/contrib/instrumentation/gorilla/mux/otelmux`.
+  - `go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo`.
+  - `go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace`.
+  - `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp`.
 
 ### Removed
 

instrumentation/github.com/emicklei/go-restful/otelrestful/internal/semconv/env.go

@@ -65,20 +65,38 @@ func WithCommandAttributeDisabled(disabled bool) AttributeOption {
 	}
 }
 
+// hasOptIn returns true if the comma-separated version string contains the
+// exact optIn value.
+func hasOptIn(version, optIn string) bool {
+	for _, v := range strings.Split(version, ",") {
+		if strings.TrimSpace(v) == optIn {
+			return true
+		}
+	}
+	return false
+}
+
 // CommandStartedTraceAttrs generates trace attributes for a CommandStartedEvent
 // based on the EventMonitor version.
 func (m EventMonitor) CommandStartedTraceAttrs(
 	evt *event.CommandStartedEvent,
 	opts ...AttributeOption,
 ) []attribute.KeyValue {
-	switch m.version {
-	case semconvOptIn1260:
+	// Dup implies both v1.26.0 and v1.21.0
+	if hasOptIn(m.version, semconvOptInDup) {
+		return append(
+			commandStartedTraceAttrsV1260(evt, opts...),
+			commandStartedTraceAttrsV1210(evt, opts...)...,
+		)
+	}
+
+	// Check for the 1.26.0 opt-in
+	if hasOptIn(m.version, semconvOptIn1260) {
 		return commandStartedTraceAttrsV1260(evt, opts...)
-	case semconvOptInDup:
-		return append(commandStartedTraceAttrsV1260(evt, opts...), commandStartedTraceAttrsV1210(evt, opts...)...)
-	default:
-		return commandStartedTraceAttrsV1210(evt, opts...)
 	}
+
+	// Fallback to v1.21.0
+	return commandStartedTraceAttrsV1210(evt, opts...)
 }
 
 // peerInfo extracts the hostname and port from a CommandStartedEvent.

instrumentation/github.com/emicklei/go-restful/otelrestful/internal/semconv/env_test.go

@@ -135,6 +135,12 @@ func TestCommandStartedTraceAttrs(t *testing.T) {
 			version:   "database/dup",
 			want:      append(v1210, v1260...),
 		},
+		{
+			name:      "mixed categories",
+			initAttrs: []attribute.KeyValue{},
+			version:   "database/dup,http",
+			want:      append(v1210, v1260...),
+		},
 	}
 
 	for _, test := range tests {