otelgrpc: add server.address and server.port (#8723)

Signed-off-by: David Ashpole <dashpole@google.com>

Author: dashpole

CHANGELOG.md

@@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Added support for `service` resource detector in `go.opentelemetry.io/contrib/otelconf`. (#8674)
 - Added support for `attribute_count_limit` and `attribute_value_length_limit` in tracer provider configuration in `go.opentelemetry.io/contrib/otelconf`. (#8687)
 - Added support for `attribute_count_limit` and `attribute_value_length_limit` in logger provider configuration in `go.opentelemetry.io/contrib/otelconf`. (#8686)
+- Added support for `server.address` and `server.port` attributes in `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc`. (#8723)
 
 ### Changed
 
@@ -22,6 +23,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Fixed
 
 - Limit the request body size at 1MB in `go.opentelemetry.io/contrib/zpages`. (#8656)
+- Fix server spans using the client's address and port for `server.address` and `server.port` attributes in `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc`. (#8723)
 
 ### Removed
 

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

@@ -106,11 +106,11 @@ func TestStatsHandler(t *testing.T) {
 				})
 
 				t.Run("ClientMetrics", func(t *testing.T) {
-					checkClientMetrics(t, clientMetricReader)
+					checkClientMetrics(t, clientMetricReader, listener.Addr().String())
 				})
 
 				t.Run("ServerSpans", func(t *testing.T) {
-					checkServerSpans(t, serverSR)
+					checkServerSpans(t, serverSR, listener.Addr().String())
 				})
 
 				t.Run("ServerMetrics", func(t *testing.T) {
@@ -217,7 +217,12 @@ func checkClientSpans(t *testing.T, spans []trace.ReadOnlySpan, addr string) {
 	}, pingPong.Attributes())
 }
 
-func checkServerSpans(t *testing.T, sr *tracetest.SpanRecorder) {
+func checkServerSpans(t *testing.T, sr *tracetest.SpanRecorder, addr string) {
+	host, p, err := net.SplitHostPort(addr)
+	require.NoError(t, err)
+	port, err := strconv.Atoi(p)
+	require.NoError(t, err)
+
 	var spans []trace.ReadOnlySpan
 	require.Eventually(t, func() bool {
 		spans = sr.Ended()
@@ -245,25 +250,28 @@ func checkServerSpans(t *testing.T, sr *tracetest.SpanRecorder) {
 		assert.False(t, s.EndTime().IsZero())
 		assert.Equal(t, tc.name, s.Name())
 		assert.Empty(t, s.Events())
-		port, ok := findAttribute(s.Attributes(), semconv.ServerPortKey)
-		assert.True(t, ok)
 		assert.ElementsMatch(t, []attribute.KeyValue{
 			semconv.RPCMethodKey.String(tc.name),
 			semconv.RPCSystemNameGRPC,
 			semconv.RPCResponseStatusCode(codes.OK.String()),
-			semconv.ServerAddress("127.0.0.1"),
-			port,
+			semconv.ServerAddress(host),
+			semconv.ServerPort(port),
 			testSpanAttr,
 		}, s.Attributes())
 	}
 }
 
-func checkClientMetrics(t *testing.T, reader metric.Reader) {
+func checkClientMetrics(t *testing.T, reader metric.Reader, addr string) {
 	rm := metricdata.ResourceMetrics{}
 	err := reader.Collect(t.Context(), &rm)
 	assert.NoError(t, err)
 	require.Len(t, rm.ScopeMetrics, 1)
 	require.Len(t, rm.ScopeMetrics[0].Metrics, 1)
+
+	host, p, err := net.SplitHostPort(addr)
+	require.NoError(t, err)
+	port, err := strconv.Atoi(p)
+	require.NoError(t, err)
 	expectedScopeMetric := metricdata.ScopeMetrics{
 		Scope: instrumentation.Scope{
 			Name:      "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc",
@@ -283,34 +291,44 @@ func checkClientMetrics(t *testing.T, reader metric.Reader) {
 								semconv.RPCResponseStatusCode(codes.OK.String()),
 								semconv.RPCMethod("grpc.testing.TestService/EmptyCall"),
 								semconv.RPCSystemNameGRPC,
+								semconv.ServerAddress(host),
+								semconv.ServerPort(port),
 								testMetricAttr),
 						},
 						{
 							Attributes: attribute.NewSet(
 								semconv.RPCResponseStatusCode(codes.OK.String()),
 								semconv.RPCMethod("grpc.testing.TestService/UnaryCall"),
 								semconv.RPCSystemNameGRPC,
+								semconv.ServerAddress(host),
+								semconv.ServerPort(port),
 								testMetricAttr),
 						},
 						{
 							Attributes: attribute.NewSet(
 								semconv.RPCResponseStatusCode(codes.OK.String()),
 								semconv.RPCMethod("grpc.testing.TestService/StreamingInputCall"),
 								semconv.RPCSystemNameGRPC,
+								semconv.ServerAddress(host),
+								semconv.ServerPort(port),
 								testMetricAttr),
 						},
 						{
 							Attributes: attribute.NewSet(
 								semconv.RPCResponseStatusCode(codes.OK.String()),
 								semconv.RPCMethod("grpc.testing.TestService/StreamingOutputCall"),
 								semconv.RPCSystemNameGRPC,
+								semconv.ServerAddress(host),
+								semconv.ServerPort(port),
 								testMetricAttr),
 						},
 						{
 							Attributes: attribute.NewSet(
 								semconv.RPCResponseStatusCode(codes.OK.String()),
 								semconv.RPCMethod("grpc.testing.TestService/FullDuplexCall"),
 								semconv.RPCSystemNameGRPC,
+								semconv.ServerAddress(host),
+								semconv.ServerPort(port),
 								testMetricAttr),
 						},
 					},

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

@@ -10,7 +10,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/sdk/instrumentation"
 	semconv "go.opentelemetry.io/otel/semconv/v1.40.0"
 	"google.golang.org/grpc"
@@ -69,12 +68,3 @@ func doCalls(ctx context.Context, client pb.TestServiceClient) {
 	test.DoServerStreaming(ctx, client)
 	test.DoPingPong(ctx, client)
 }
-
-func findAttribute(kvs []attribute.KeyValue, key attribute.Key) (attribute.KeyValue, bool) {
-	for _, kv := range kvs {
-		if kv.Key == key {
-			return kv, true
-		}
-	}
-	return attribute.KeyValue{}, false
-}

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

@@ -16,7 +16,6 @@ import (
 	"go.opentelemetry.io/otel/semconv/v1.40.0/rpcconv"
 	"go.opentelemetry.io/otel/trace"
 	grpc_codes "google.golang.org/grpc/codes"
-	"google.golang.org/grpc/peer"
 	"google.golang.org/grpc/stats"
 	"google.golang.org/grpc/status"
 
@@ -255,12 +254,23 @@ func (*config) handleRPC(
 	switch rs := rs.(type) {
 	case *stats.Begin:
 	case *stats.InPayload:
+	case *stats.InHeader:
+		if !rs.Client && rs.LocalAddr != nil {
+			if span.IsRecording() {
+				span.SetAttributes(serverAddrAttrs(rs.LocalAddr.String())...)
+			}
+			// TODO: add server.address and server.port to metrics once the API supports opt-in attributes.
+		}
 	case *stats.OutPayload:
 	case *stats.OutTrailer:
 	case *stats.OutHeader:
-		if span.IsRecording() {
-			if p, ok := peer.FromContext(ctx); ok {
-				span.SetAttributes(serverAddrAttrs(p.Addr.String())...)
+		if rs.Client && rs.RemoteAddr != nil && (span.IsRecording() || gctx != nil) {
+			attrs := serverAddrAttrs(rs.RemoteAddr.String())
+			if span.IsRecording() {
+				span.SetAttributes(attrs...)
+			}
+			if gctx != nil {
+				gctx.metricAttrs = append(gctx.metricAttrs, attrs...)
 			}
 		}
 	case *stats.End: