Add HTTP attributes on server span

Author: slashmo

Sources/GRPC/GRPCServerRequestRoutingHandler.swift

@@ -131,7 +131,7 @@ extension GRPCServerRequestRoutingHandler: ChannelInboundHandler, RemovableChann
     var span: Span
 
     let requestPart = self.unwrapInboundIn(data)
-    switch self.unwrapInboundIn(data) {
+    switch requestPart {
     case let .head(requestHead):
       precondition(self.state == .notConfigured)
 
@@ -141,6 +141,12 @@ extension GRPCServerRequestRoutingHandler: ChannelInboundHandler, RemovableChann
         ofKind: .server
       )
 
+      if let userAgent = requestHead.headers.first(name: "User-Agent") {
+        span.attributes[SpanAttributeName.HTTP.userAgent] = .string(userAgent)
+      }
+      span.attributes[SpanAttributeName.HTTP.method] = .string(requestHead.method.rawValue)
+      span.attributes[SpanAttributeName.HTTP.flavor] = "\(requestHead.version.major).\(requestHead.version.minor)"
+      span.attributes[SpanAttributeName.HTTP.target] = .string(requestHead.uri)
       span.attributes[SpanAttributeName.RPC.system] = "grpc"
 
       InstrumentationSystem.instrument.extract(
@@ -245,11 +251,6 @@ extension GRPCServerRequestRoutingHandler: ChannelInboundHandler, RemovableChann
   }
 
   private func makeCallHandler(channel: Channel, requestInfo: GRPCRequestInfo) -> GRPCCallHandler? {
-    // URI format: "/package.Servicename/MethodName", resulting in the following components separated by a slash:
-    // - uriComponents[0]: empty
-    // - uriComponents[1]: service name (including the package name);
-    //     `CallHandlerProvider`s should provide the service name including the package name.
-    // - uriComponents[2]: method name.
     self.logger.debug("making call handler", metadata: ["path": "\(requestInfo.uri)"])
 
     let context = CallHandlerContext(

Sources/GRPC/HTTP1ToGRPCServerCodec.swift

@@ -20,6 +20,7 @@ import NIOFoundationCompat
 import NIOHTTP1
 import SwiftProtobuf
 import TracingInstrumentation
+import OpenTelemetryInstrumentationSupport
 
 /// Incoming gRPC package with a fixed message type.
 ///
@@ -350,15 +351,18 @@ extension HTTP1ToGRPCServerCodec: ChannelOutboundHandler {
         headers.add(name: GRPCHeaderName.acceptEncoding, value: acceptEncoding)
       }
 
+      let responseStatus = HTTPResponseStatus.ok
       context.write(
         self
           .wrapOutboundOut(.head(HTTPResponseHead(
             version: version,
-            status: .ok,
+            status: responseStatus,
             headers: headers
           ))),
         promise: promise
       )
+      self.span.attributes[SpanAttributeName.HTTP.statusCode] = .int(Int(responseStatus.code))
+      self.span.attributes[SpanAttributeName.HTTP.statusText] = .string(responseStatus.reasonPhrase)
       self.outboundState = .expectingBodyOrStatus
 
     case let .message(messageContext):
@@ -392,6 +396,7 @@ extension HTTP1ToGRPCServerCodec: ChannelOutboundHandler {
             compressed: messageContext.compressed
           )
           context.write(self.wrapOutboundOut(.body(.byteBuffer(messageBuffer))), promise: promise)
+          self.span.attributes[SpanAttributeName.HTTP.responseContentLength] = .int(messageBuffer.readableBytes)
         }
       } catch {
         let error = GRPCError.SerializationFailure().captureContext()
@@ -462,6 +467,7 @@ extension HTTP1ToGRPCServerCodec: ChannelOutboundHandler {
         responseTextBuffer.clear(minimumCapacity: UInt32(encodedData.utf8.count))
         responseTextBuffer.writeString(encodedData)
 
+        self.span.attributes[SpanAttributeName.HTTP.responseContentLength] = .int(encodedData.utf8.count)
         // After collecting all response for gRPC Web connections, send one final aggregated
         // response.
         context.write(