Upgrade semconv to 1.32.0 in otelgrpc

CHANGELOG.md

@@ -8,6 +8,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+### Changed
+
+- The semantic conventions have been upgraded from `v1.30.0` to `v1.33.0` in `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc`. (#7361)
+
 <!-- Released section -->
 <!-- Don't change this section unless doing release -->
 

instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go

@@ -22,7 +22,7 @@ import (
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
-	semconv "go.opentelemetry.io/otel/semconv/v1.30.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.32.0"
 	"go.opentelemetry.io/otel/trace"
 )
 

instrumentation/google.golang.org/grpc/otelgrpc/internal/parse.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"go.opentelemetry.io/otel/attribute"
-	semconv "go.opentelemetry.io/otel/semconv/v1.30.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.32.0"
 )
 
 // ParseFullMethod returns a span name following the OpenTelemetry semantic

instrumentation/google.golang.org/grpc/otelgrpc/internal/parse_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"go.opentelemetry.io/otel/attribute"
-	semconv "go.opentelemetry.io/otel/semconv/v1.30.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.32.0"
 
 	"github.com/stretchr/testify/assert"
 )

instrumentation/google.golang.org/grpc/otelgrpc/stats_handler.go

@@ -17,8 +17,8 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/metric"
-	"go.opentelemetry.io/otel/metric/noop"
-	semconv "go.opentelemetry.io/otel/semconv/v1.30.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.32.0"
+	"go.opentelemetry.io/otel/semconv/v1.32.0/rpcconv"
 	"go.opentelemetry.io/otel/trace"
 
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal"
@@ -38,11 +38,11 @@ type serverHandler struct {
 
 	tracer trace.Tracer
 
-	duration metric.Float64Histogram
-	inSize   metric.Int64Histogram
-	outSize  metric.Int64Histogram
-	inMsg    metric.Int64Histogram
-	outMsg   metric.Int64Histogram
+	duration rpcconv.ServerDuration
+	inSize   rpcconv.ServerRequestSize
+	outSize  rpcconv.ServerResponseSize
+	inMsg    rpcconv.ServerRequestsPerRPC
+	outMsg   rpcconv.ServerResponsesPerRPC
 }
 
 // NewServerHandler creates a stats.Handler for a gRPC server.
@@ -62,64 +62,29 @@ func NewServerHandler(opts ...Option) stats.Handler {
 	)
 
 	var err error
-	h.duration, err = meter.Float64Histogram(
-		semconv.RPCServerDurationName,
-		metric.WithDescription(semconv.RPCServerDurationDescription),
-		metric.WithUnit(semconv.RPCServerDurationUnit),
-	)
+	h.duration, err = rpcconv.NewServerDuration(meter)
 	if err != nil {
 		otel.Handle(err)
-		if h.duration == nil {
-			h.duration = noop.Float64Histogram{}
-		}
 	}
 
-	h.inSize, err = meter.Int64Histogram(
-		semconv.RPCServerRequestSizeName,
-		metric.WithDescription(semconv.RPCServerRequestSizeDescription),
-		metric.WithUnit(semconv.RPCServerRequestSizeUnit),
-	)
+	h.inSize, err = rpcconv.NewServerRequestSize(meter)
 	if err != nil {
 		otel.Handle(err)
-		if h.inSize == nil {
-			h.inSize = noop.Int64Histogram{}
-		}
 	}
 
-	h.outSize, err = meter.Int64Histogram(
-		semconv.RPCServerResponseSizeName,
-		metric.WithDescription(semconv.RPCServerResponseSizeDescription),
-		metric.WithUnit(semconv.RPCServerResponseSizeUnit),
-	)
+	h.outSize, err = rpcconv.NewServerResponseSize(meter)
 	if err != nil {
 		otel.Handle(err)
-		if h.outSize == nil {
-			h.outSize = noop.Int64Histogram{}
-		}
 	}
 
-	h.inMsg, err = meter.Int64Histogram(
-		semconv.RPCServerRequestsPerRPCName,
-		metric.WithDescription(semconv.RPCServerRequestsPerRPCDescription),
-		metric.WithUnit(semconv.RPCServerRequestsPerRPCUnit),
-	)
+	h.inMsg, err = rpcconv.NewServerRequestsPerRPC(meter)
 	if err != nil {
 		otel.Handle(err)
-		if h.inMsg == nil {
-			h.inMsg = noop.Int64Histogram{}
-		}
 	}
 
-	h.outMsg, err = meter.Int64Histogram(
-		semconv.RPCServerResponsesPerRPCName,
-		metric.WithDescription(semconv.RPCServerResponsesPerRPCDescription),
-		metric.WithUnit(semconv.RPCServerResponsesPerRPCUnit),
-	)
+	h.outMsg, err = rpcconv.NewServerResponsesPerRPC(meter)
 	if err != nil {
 		otel.Handle(err)
-		if h.outMsg == nil {
-			h.outMsg = noop.Int64Histogram{}
-		}
 	}
 
 	return h
@@ -165,19 +130,28 @@ func (h *serverHandler) TagRPC(ctx context.Context, info *stats.RPCTagInfo) cont
 
 // HandleRPC processes the RPC stats.
 func (h *serverHandler) HandleRPC(ctx context.Context, rs stats.RPCStats) {
-	h.handleRPC(ctx, rs, h.duration, h.inSize, h.outSize, h.inMsg, h.outMsg, serverStatus)
+	h.handleRPC(
+		ctx,
+		rs,
+		h.duration.Inst(),
+		h.inSize,
+		h.outSize,
+		h.inMsg.Inst(),
+		h.outMsg.Inst(),
+		serverStatus,
+	)
 }
 
 type clientHandler struct {
 	*config
 
 	tracer trace.Tracer
 
-	duration metric.Float64Histogram
-	inSize   metric.Int64Histogram
-	outSize  metric.Int64Histogram
-	inMsg    metric.Int64Histogram
-	outMsg   metric.Int64Histogram
+	duration rpcconv.ClientDuration
+	inSize   rpcconv.ClientResponseSize
+	outSize  rpcconv.ClientRequestSize
+	inMsg    rpcconv.ClientResponsesPerRPC
+	outMsg   rpcconv.ClientRequestsPerRPC
 }
 
 // NewClientHandler creates a stats.Handler for a gRPC client.
@@ -197,64 +171,29 @@ func NewClientHandler(opts ...Option) stats.Handler {
 	)
 
 	var err error
-	h.duration, err = meter.Float64Histogram(
-		semconv.RPCClientDurationName,
-		metric.WithDescription(semconv.RPCClientDurationDescription),
-		metric.WithUnit(semconv.RPCClientDurationUnit),
-	)
+	h.duration, err = rpcconv.NewClientDuration(meter)
 	if err != nil {
 		otel.Handle(err)
-		if h.duration == nil {
-			h.duration = noop.Float64Histogram{}
-		}
 	}
 
-	h.outSize, err = meter.Int64Histogram(
-		semconv.RPCClientRequestSizeName,
-		metric.WithDescription(semconv.RPCClientRequestSizeDescription),
-		metric.WithUnit(semconv.RPCClientRequestSizeUnit),
-	)
+	h.inSize, err = rpcconv.NewClientResponseSize(meter)
 	if err != nil {
 		otel.Handle(err)
-		if h.outSize == nil {
-			h.outSize = noop.Int64Histogram{}
-		}
 	}
 
-	h.inSize, err = meter.Int64Histogram(
-		semconv.RPCClientResponseSizeName,
-		metric.WithDescription(semconv.RPCClientResponseSizeDescription),
-		metric.WithUnit(semconv.RPCClientResponseSizeUnit),
-	)
+	h.outSize, err = rpcconv.NewClientRequestSize(meter)
 	if err != nil {
 		otel.Handle(err)
-		if h.inSize == nil {
-			h.inSize = noop.Int64Histogram{}
-		}
 	}
 
-	h.outMsg, err = meter.Int64Histogram(
-		semconv.RPCClientRequestsPerRPCName,
-		metric.WithDescription(semconv.RPCClientRequestsPerRPCDescription),
-		metric.WithUnit(semconv.RPCClientRequestsPerRPCUnit),
-	)
+	h.inMsg, err = rpcconv.NewClientResponsesPerRPC(meter)
 	if err != nil {
 		otel.Handle(err)
-		if h.outMsg == nil {
-			h.outMsg = noop.Int64Histogram{}
-		}
 	}
 
-	h.inMsg, err = meter.Int64Histogram(
-		semconv.RPCClientResponsesPerRPCName,
-		metric.WithDescription(semconv.RPCClientResponsesPerRPCDescription),
-		metric.WithUnit(semconv.RPCClientResponsesPerRPCUnit),
-	)
+	h.outMsg, err = rpcconv.NewClientRequestsPerRPC(meter)
 	if err != nil {
 		otel.Handle(err)
-		if h.inMsg == nil {
-			h.inMsg = noop.Int64Histogram{}
-		}
 	}
 
 	return h
@@ -290,7 +229,13 @@ func (h *clientHandler) TagRPC(ctx context.Context, info *stats.RPCTagInfo) cont
 // HandleRPC processes the RPC stats.
 func (h *clientHandler) HandleRPC(ctx context.Context, rs stats.RPCStats) {
 	h.handleRPC(
-		ctx, rs, h.duration, h.inSize, h.outSize, h.inMsg, h.outMsg,
+		ctx,
+		rs,
+		h.duration.Inst(),
+		h.inSize,
+		h.outSize,
+		h.inMsg.Inst(),
+		h.outMsg.Inst(),
 		func(s *status.Status) (codes.Code, string) {
 			return codes.Error, s.Message()
 		},
@@ -307,11 +252,16 @@ func (h *clientHandler) HandleConn(context.Context, stats.ConnStats) {
 	// no-op
 }
 
+type int64Hist interface {
+	Record(context.Context, int64, ...attribute.KeyValue)
+}
+
 func (c *config) handleRPC(
 	ctx context.Context,
 	rs stats.RPCStats,
 	duration metric.Float64Histogram,
-	inSize, outSize, inMsg, outMsg metric.Int64Histogram,
+	inSize, outSize int64Hist,
+	inMsg, outMsg metric.Int64Histogram,
 	recordStatus func(*status.Status) (codes.Code, string),
 ) {
 	gctx, _ := ctx.Value(gRPCContextKey{}).(*gRPCContext)
@@ -327,7 +277,7 @@ func (c *config) handleRPC(
 	case *stats.InPayload:
 		if gctx != nil {
 			messageId = atomic.AddInt64(&gctx.inMessages, 1)
-			inSize.Record(ctx, int64(rs.Length), metric.WithAttributes(gctx.metricAttrs...))
+			inSize.Record(ctx, int64(rs.Length), gctx.metricAttrs...)
 		}
 
 		if c.ReceivedEvent && span.IsRecording() {
@@ -343,7 +293,7 @@ func (c *config) handleRPC(
 	case *stats.OutPayload:
 		if gctx != nil {
 			messageId = atomic.AddInt64(&gctx.outMessages, 1)
-			outSize.Record(ctx, int64(rs.Length), metric.WithAttributes(gctx.metricAttrs...))
+			outSize.Record(ctx, int64(rs.Length), gctx.metricAttrs...)
 		}
 
 		if c.SentEvent && span.IsRecording() {