otelgin: Add a WithSpanOptions option

Author: arshukla98

CHANGELOG.md

@@ -21,6 +21,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Allow configuring samplers in `go.opentelemetry.io/contrib/otelconf`. (#7148)
 - Slog log bridge now sets `SeverityText` attribute using source value in `go.opentelemetry.io/contrib/bridges/otelslog`. (#7198)
 - Add `http.route` metric attribute in `go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin`. (#7275)
+- Add the `WithSpanOptions` option to add extra attributes, links, etc. to the spans it generates in `go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin`. (#7261)
 
 ### Changed
 

instrumentation/github.com/gin-gonic/gin/otelgin/config.go

@@ -21,6 +21,7 @@ import (
 type config struct {
 	TracerProvider       oteltrace.TracerProvider
 	Propagators          propagation.TextMapPropagator
+	SpanStartOptions     []oteltrace.SpanStartOption
 	Filters              []Filter
 	GinFilters           []GinFilter
 	SpanNameFormatter    SpanNameFormatter
@@ -89,6 +90,14 @@ func WithPropagators(propagators propagation.TextMapPropagator) Option {
 	})
 }
 
+// WithSpanOptions configures an additional set of
+// trace.SpanOptions, which are applied to each new span.
+func WithSpanOptions(opts ...oteltrace.SpanStartOption) Option {
+	return optionFunc(func(c *config) {
+		c.SpanStartOptions = append(c.SpanStartOptions, opts...)
+	})
+}
+
 // WithTracerProvider specifies a tracer provider to use for creating a tracer.
 // If none is specified, the global provider is used.
 func WithTracerProvider(provider oteltrace.TracerProvider) Option {

instrumentation/github.com/gin-gonic/gin/otelgin/gin.go

@@ -31,6 +31,13 @@ const (
 // server handling the request.
 func Middleware(service string, opts ...Option) gin.HandlerFunc {
 	cfg := config{}
+
+	defaultOpts := []Option{
+		WithSpanOptions(oteltrace.WithSpanKind(oteltrace.SpanKindServer)),
+	}
+
+	opts = append(defaultOpts, opts...)
+
 	for _, opt := range opts {
 		opt.apply(&cfg)
 	}
@@ -92,9 +99,10 @@ func Middleware(service string, opts ...Option) gin.HandlerFunc {
 		opts := []oteltrace.SpanStartOption{
 			oteltrace.WithAttributes(sc.RequestTraceAttrs(service, c.Request, requestTraceAttrOpts)...),
 			oteltrace.WithAttributes(sc.Route(c.FullPath())),
-			oteltrace.WithSpanKind(oteltrace.SpanKindServer),
 		}
 
+		opts = append(opts, cfg.SpanStartOptions...)
+
 		spanName := cfg.SpanNameFormatter(c)
 		if spanName == "" {
 			spanName = fmt.Sprintf("HTTP %s route not found", c.Request.Method)

instrumentation/github.com/gin-gonic/gin/otelgin/test/gin_test.go

@@ -268,6 +268,51 @@ func TestSpanStatus(t *testing.T) {
 	})
 }
 
+func TestWithSpanOptions_AddsCustomAttributes(t *testing.T) {
+	sr := tracetest.NewSpanRecorder()
+	provider := sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr))
+
+	customAttr := attribute.String("custom.key", "custom.value")
+
+	router := gin.New()
+	router.Use(otelgin.Middleware("foobar",
+		otelgin.WithTracerProvider(provider),
+		otelgin.WithSpanOptions(trace.WithAttributes(customAttr)),
+	))
+	router.GET("/test", func(c *gin.Context) {})
+
+	r := httptest.NewRequest("GET", "/test", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, r)
+
+	spans := sr.Ended()
+	require.Len(t, spans, 1)
+
+	span := spans[0]
+	assert.Contains(t, span.Attributes(), customAttr)
+}
+
+func TestWithSpanOptions_PreservesDefaultSpanKind(t *testing.T) {
+	sr := tracetest.NewSpanRecorder()
+	provider := sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr))
+
+	router := gin.New()
+	router.Use(otelgin.Middleware("foobar",
+		otelgin.WithTracerProvider(provider),
+		otelgin.WithSpanOptions(), // no-op option, should still preserve SpanKindServer
+	))
+	router.GET("/test", func(c *gin.Context) {})
+
+	r := httptest.NewRequest("GET", "/test", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, r)
+
+	spans := sr.Ended()
+	require.Len(t, spans, 1)
+
+	assert.Equal(t, trace.SpanKindServer, spans[0].SpanKind())
+}
+
 func TestSpanName(t *testing.T) {
 	sr := tracetest.NewSpanRecorder()
 	provider := sdktrace.NewTracerProvider(