Add more span attributes (URL, network)

Sources/AsyncHTTPClient/AsyncAwait/HTTPClient+tracing.swift

@@ -29,11 +29,22 @@ 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
+
+            // set url attributes
+            if let deconstructedURL = try? DeconstructedURL(url: request.url) {
+                span.attributes[keys.urlScheme] = deconstructedURL.scheme.rawValue
+                span.attributes[keys.urlPath] = deconstructedURL.uri
+                span.attributes[keys.serverHostname] = deconstructedURL.connectionTarget.host
+                span.attributes[keys.serverPort] = deconstructedURL.connectionTarget.port
+            }
+
             let response = try await body()
 
             // set response span attributes
             TracingSupport.handleResponseStatusCode(span, response.status, keys: tracing.attributeKeys)
+
+            // set network protocol version
+            span.attributes[keys.networkProtocolVersion] = "\(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

@@ -1111,7 +1111,15 @@ public final class HTTPClient: Sendable {
             @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 responseStatusCode: String = "http.response.status_code"
+
+            @usableFromInline package var networkProtocolVersion: String = "network.protocol.version"
+
+            @usableFromInline package var urlPath: String = "url.path"
+            @usableFromInline package var urlScheme: String = "url.scheme"
+
+            @usableFromInline package var serverHostname: String = "server.hostname"
+            @usableFromInline package var serverPort: String = "server.port"
 
             @usableFromInline package var httpFlavor: String = "http.flavor"
 

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