add new func to avoid breaking changes

Author: tranngoclam

CHANGELOG.md

@@ -15,7 +15,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Changed
 
 - Jaeger remote sampler's probabilistic strategy now uses the same sampling algorithm as `trace.TraceIDRatioBased` in `go.opentelemetry.io/contrib/samplers/jaegerremote`. (#6892)
-- otelgin: use gin.Context in MetricAttributeFn (#6932)
+- otelgin: add GinMetricAttributeFn (#6932)
 
 ### Removed
 

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

@@ -17,13 +17,14 @@ import (
 )
 
 type config struct {
-	TracerProvider    oteltrace.TracerProvider
-	Propagators       propagation.TextMapPropagator
-	Filters           []Filter
-	GinFilters        []GinFilter
-	SpanNameFormatter SpanNameFormatter
-	MeterProvider     metric.MeterProvider
-	MetricAttributeFn MetricAttributeFn
+	TracerProvider       oteltrace.TracerProvider
+	Propagators          propagation.TextMapPropagator
+	Filters              []Filter
+	GinFilters           []GinFilter
+	SpanNameFormatter    SpanNameFormatter
+	MeterProvider        metric.MeterProvider
+	MetricAttributeFn    MetricAttributeFn
+	GinMetricAttributeFn GinMetricAttributeFn
 }
 
 // Filter is a predicate used to determine whether a given http.request should
@@ -37,9 +38,13 @@ type GinFilter func(*gin.Context) bool
 // SpanNameFormatter is used to set span name by http.request.
 type SpanNameFormatter func(r *http.Request) string
 
-// MetricAttributeFn is used to extract additional attributes from the gin.Context
+// MetricAttributeFn is used to extract additional attributes from the http.Request
 // and return them as a slice of attribute.KeyValue.
-type MetricAttributeFn func(c *gin.Context) []attribute.KeyValue
+type MetricAttributeFn func(*http.Request) []attribute.KeyValue
+
+// GinMetricAttributeFn is used to extract additional attributes from the gin.Context
+// and return them as a slice of attribute.KeyValue.
+type GinMetricAttributeFn func(*gin.Context) []attribute.KeyValue
 
 // Option specifies instrumentation configuration options.
 type Option interface {
@@ -115,3 +120,11 @@ func WithMetricAttributeFn(f MetricAttributeFn) Option {
 		c.MetricAttributeFn = f
 	})
 }
+
+// WithGinMetricAttributeFn specifies a function that extracts additional attributes from the gin.Context
+// and returns them as a slice of attribute.KeyValue.
+func WithGinMetricAttributeFn(f GinMetricAttributeFn) Option {
+	return optionFunc(func(c *config) {
+		c.GinMetricAttributeFn = f
+	})
+}

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

@@ -118,7 +118,10 @@ func Middleware(service string, opts ...Option) gin.HandlerFunc {
 		// Record the server-side attributes.
 		var additionalAttributes []attribute.KeyValue
 		if cfg.MetricAttributeFn != nil {
-			additionalAttributes = cfg.MetricAttributeFn(c)
+			additionalAttributes = append(additionalAttributes, cfg.MetricAttributeFn(c.Request)...)
+		}
+		if cfg.GinMetricAttributeFn != nil {
+			additionalAttributes = append(additionalAttributes, cfg.GinMetricAttributeFn(c)...)
 		}
 
 		sc.RecordMetrics(ctx, semconv.ServerMetricData{

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

@@ -439,17 +439,30 @@ func TestWithGinFilter(t *testing.T) {
 
 func TestMetrics(t *testing.T) {
 	tests := []struct {
-		name                     string
-		metricAttributeExtractor func(*gin.Context) []attribute.KeyValue
+		name                        string
+		metricAttributeExtractor    func(*http.Request) []attribute.KeyValue
+		ginMetricAttributeExtractor func(*gin.Context) []attribute.KeyValue
 	}{
-		{"default", nil},
-		{"with metric attributes callback", func(c *gin.Context) []attribute.KeyValue {
-			return []attribute.KeyValue{
-				attribute.String("key1", "value1"),
-				attribute.String("key2", "value"),
-				attribute.String("method", strings.ToUpper(c.Request.Method)),
-			}
-		}},
+		{
+			name:                        "default",
+			metricAttributeExtractor:    nil,
+			ginMetricAttributeExtractor: nil,
+		},
+		{
+			name: "with metric attributes callback",
+			metricAttributeExtractor: func(r *http.Request) []attribute.KeyValue {
+				return []attribute.KeyValue{
+					attribute.String("key1", "value1"),
+					attribute.String("key2", "value"),
+					attribute.String("method", strings.ToUpper(r.Method)),
+				}
+			},
+			ginMetricAttributeExtractor: func(c *gin.Context) []attribute.KeyValue {
+				return []attribute.KeyValue{
+					attribute.String("key3", "value3"),
+				}
+			},
+		},
 	}
 
 	for _, tt := range tests {
@@ -461,6 +474,7 @@ func TestMetrics(t *testing.T) {
 			router.Use(otelgin.Middleware("foobar",
 				otelgin.WithMeterProvider(meterProvider),
 				otelgin.WithMetricAttributeFn(tt.metricAttributeExtractor),
+				otelgin.WithGinMetricAttributeFn(tt.ginMetricAttributeExtractor),
 			))
 			router.GET("/user/:id", func(c *gin.Context) {
 				id := c.Param("id")
@@ -493,7 +507,10 @@ func TestMetrics(t *testing.T) {
 			}
 
 			if tt.metricAttributeExtractor != nil {
-				attrs = append(attrs, tt.metricAttributeExtractor(c)...)
+				attrs = append(attrs, tt.metricAttributeExtractor(c.Request)...)
+			}
+			if tt.ginMetricAttributeExtractor != nil {
+				attrs = append(attrs, tt.ginMetricAttributeExtractor(c)...)
 			}
 
 			metricdatatest.AssertEqual(t, metricdata.Metrics{