Add more span attributes (URL, network)

Package.swift

@@ -44,6 +44,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.2"),
         .package(url: "https://github.com/apple/swift-algorithms.git", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-distributed-tracing.git", from: "1.3.0"),
+        .package(url: "https://github.com/swift-otel/swift-otel-semantic-conventions.git", from: "1.39.0"),
     ],
     targets: [
         .target(
@@ -72,6 +73,7 @@ let package = Package(
                 // Observability support
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "Tracing", package: "swift-distributed-tracing"),
+                .product(name: "OTelSemanticConventions", package: "swift-otel-semantic-conventions"),
             ],
             swiftSettings: strictConcurrencySettings
         ),
@@ -94,6 +96,7 @@ let package = Package(
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "InMemoryLogging", package: "swift-log"),
                 .product(name: "Tracing", package: "swift-distributed-tracing"),
+                .product(name: "OTelSemanticConventions", package: "swift-otel-semantic-conventions"),
                 .product(name: "InMemoryTracing", package: "swift-distributed-tracing"),
             ],
             resources: [

Sources/AsyncHTTPClient/AsyncAwait/HTTPClient+tracing.swift

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import NIOHTTP1
+import OTelSemanticConventions
 import Tracing
 
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
@@ -27,13 +28,32 @@ extension HTTPClient {
         }
 
         return try await tracer.withSpan(request.method.rawValue, ofKind: .client) { span in
-            let keys = self.configuration.tracing.attributeKeys
-            span.attributes[keys.requestMethod] = request.method.rawValue
-            // TODO: set more attributes on the span
+            span.attributes.http.request.method = .init(rawValue: request.method.rawValue)
+
+            // set request headers
+            for header in request.headers {
+                span.attributes.http.request.header.set(header.name, to: [header.value])
+            }
+
+            // set url attributes
+            if let deconstructedURL = try? DeconstructedURL(url: request.url) {
+                span.attributes.url.path = deconstructedURL.uri
+                span.attributes.url.scheme = deconstructedURL.scheme.rawValue
+                span.attributes.server.address = deconstructedURL.connectionTarget.host
+                span.attributes.server.port = deconstructedURL.connectionTarget.port
+            }
+
             let response = try await body()
 
             // set response span attributes
-            TracingSupport.handleResponseStatusCode(span, response.status, keys: tracing.attributeKeys)
+            TracingSupport.handleResponseStatusCode(span, response.status)
+
+            for header in response.headers {
+                span.attributes.http.response.header.set(header.name, to: [header.value])
+            }
+
+            // set network protocol version
+            span.attributes.network.protocol.version = "\(response.version.major).\(response.version.minor)"
 
             return response
         }

Sources/AsyncHTTPClient/ConnectionTarget.swift

@@ -14,7 +14,8 @@
 
 import enum NIOCore.SocketAddress
 
-enum ConnectionTarget: Equatable, Hashable {
+@usableFromInline
+enum ConnectionTarget: Equatable, Hashable, Sendable {
     // We keep the IP address serialization precisely as it is in the URL.
     // Some platforms have quirks in their implementations of 'ntop', for example
     // writing IPv6 addresses as having embedded IPv4 sections (e.g. [::192.168.0.1] vs [::c0a8:1]).
@@ -44,6 +45,7 @@ enum ConnectionTarget: Equatable, Hashable {
 extension ConnectionTarget {
     /// The host name which will be send as an HTTP `Host` header.
     /// Only returns nil if the `self` is a `unixSocket`.
+    @usableFromInline
     var host: String? {
         switch self {
         case .ipAddress(let serialization, _): return serialization
@@ -54,6 +56,7 @@ extension ConnectionTarget {
 
     /// The host name which will be send as an HTTP host header.
     /// Only returns nil if the `self` is a `unixSocket`.
+    @usableFromInline
     var port: Int? {
         switch self {
         case .ipAddress(_, let address): return address.port!

Sources/AsyncHTTPClient/DeconstructedURL.swift

@@ -14,11 +14,16 @@
 
 import struct Foundation.URL
 
-struct DeconstructedURL {
+@usableFromInline
+struct DeconstructedURL: Sendable {
+    @usableFromInline
     var scheme: Scheme
+    @usableFromInline
     var connectionTarget: ConnectionTarget
+    @usableFromInline
     var uri: String
 
+    @usableFromInline
     init(
         scheme: Scheme,
         connectionTarget: ConnectionTarget,
@@ -31,6 +36,7 @@ struct DeconstructedURL {
 }
 
 extension DeconstructedURL {
+    @usableFromInline
     init(url: String) throws {
         guard let url = URL(string: url) else {
             throw HTTPClientError.invalidURL

Sources/AsyncHTTPClient/HTTPClient.swift

@@ -1089,33 +1089,12 @@ public final class HTTPClient: Sendable {
             }
         }
 
-        // TODO: Open up customization of keys we use?
-        /// Configuration for tracing attributes set by the HTTPClient.
-        @usableFromInline
-        package var attributeKeys: AttributeKeys
-
         public init() {
             if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
                 self._tracer = InstrumentationSystem.tracer
             } else {
                 self._tracer = nil
             }
-            self.attributeKeys = .init()
-        }
-
-        /// Span attribute keys that the HTTPClient should set automatically.
-        /// This struct allows the configuration of the attribute names (keys) which will be used for the apropriate values.
-        @usableFromInline
-        package struct AttributeKeys: Sendable {
-            @usableFromInline package var requestMethod: String = "http.request.method"
-            @usableFromInline package var requestBodySize: String = "http.request.body.size"
-
-            @usableFromInline package var responseBodySize: String = "http.response.body.size"
-            @usableFromInline package var responseStatusCode: String = "http.status_code"
-
-            @usableFromInline package var httpFlavor: String = "http.flavor"
-
-            @usableFromInline package init() {}
         }
     }
 

Sources/AsyncHTTPClient/RequestBag+Tracing.swift

@@ -65,7 +65,7 @@ extension RequestBag.LoopBoundState {
             return
         }
 
-        TracingSupport.handleResponseStatusCode(span, response.status, keys: tracing.attributeKeys)
+        TracingSupport.handleResponseStatusCode(span, response.status)
 
         span.end()
         self.activeSpan = nil

Sources/AsyncHTTPClient/Scheme.swift

@@ -13,7 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 /// List of schemes `HTTPClient` currently supports
-enum Scheme: String {
+@usableFromInline
+enum Scheme: String, Sendable {
     case http
     case https
     case unix

Sources/AsyncHTTPClient/TracingSupport.swift

@@ -17,6 +17,7 @@ import NIOConcurrencyHelpers
 import NIOCore
 import NIOHTTP1
 import NIOSSL
+import OTelSemanticConventions
 import Tracing
 
 // MARK: - Centralized span attribute handling
@@ -26,13 +27,13 @@ struct TracingSupport {
     @inlinable
     static func handleResponseStatusCode(
         _ span: Span,
-        _ status: HTTPResponseStatus,
-        keys: HTTPClient.TracingConfiguration.AttributeKeys
+        _ status: HTTPResponseStatus
     ) {
         if status.code >= 400 {
             span.setStatus(.init(code: .error))
         }
-        span.attributes[keys.responseStatusCode] = SpanAttribute.int64(Int64(status.code))
+
+        span.attributes.http.response.statusCode = Int(status.code)
     }
 }
 

Tests/AsyncHTTPClientTests/HTTPClientTracingTests.swift

@@ -26,6 +26,7 @@ import NIOPosix
 import NIOSSL
 import NIOTestUtils
 import NIOTransportServices
+import OTelSemanticConventions
 import Tracing
 import XCTest
 
@@ -109,7 +110,7 @@ final class HTTPClientTracingTests: XCTestCaseHTTPClientTestsBaseClass {
 
         XCTAssertEqual(span.operationName, "POST")
         XCTAssertTrue(span.errors.isEmpty, "Should have recorded error")
-        XCTAssertEqual(span.attributes.get(client.tracing.attributeKeys.responseStatusCode), 404)
+        XCTAssertEqual(span.attributes.get(OTelAttribute.http.response.statusCode), 404)
     }
 
     func testTrace_execute_async() async throws {
@@ -145,6 +146,6 @@ final class HTTPClientTracingTests: XCTestCaseHTTPClientTestsBaseClass {
 
         XCTAssertEqual(span.operationName, "GET")
         XCTAssertTrue(span.errors.isEmpty, "Should have recorded error")
-        XCTAssertEqual(span.attributes.get(client.tracing.attributeKeys.responseStatusCode), 404)
+        XCTAssertEqual(span.attributes.get(OTelAttribute.http.response.statusCode), 404)
     }
 }