Namespace (g)RPC SpanAttributeNames

Author: slashmo

Sources/OpenTelemetryInstrumentationSupport/SpanAttribute+GRPCSemantics.swift

@@ -15,13 +15,16 @@ import TracingInstrumentation
 
 extension SpanAttributeName {
     /// - See: GRPCAttributes
-    public static let gRPCMessageType = "message.type"
-    /// - See: GRPCAttributes
-    public static let gRPCMessageID = "message.id"
-    /// - See: GRPCAttributes
-    public static let gRPCMessageCompressedSize = "message.compressed_size"
-    /// - See: GRPCAttributes
-    public static let gRPCMessageUncompressedSize = "message.uncompressed_size"
+    public enum GRPC {
+        /// - See: GRPCAttributes
+        public static let messageType = "message.type"
+        /// - See: GRPCAttributes
+        public static let messageID = "message.id"
+        /// - See: GRPCAttributes
+        public static let messageCompressedSize = "message.compressed_size"
+        /// - See: GRPCAttributes
+        public static let messageUncompressedSize = "message.uncompressed_size"
+    }
 }
 
 #if swift(>=5.2)
@@ -52,19 +55,19 @@ public struct GRPCAttributes: SpanAttributeNamespace {
         public init() {}
 
         /// The type of message, e.g. "SENT" or "RECEIVED".
-        public var messageType: SpanAttributeKey<String> { .init(name: SpanAttributeName.gRPCMessageType) }
+        public var messageType: SpanAttributeKey<String> { .init(name: SpanAttributeName.GRPC.messageType) }
 
         /// The message id calculated as two different counters starting from 1, one for sent messages and one for received messages.
-        public var messageID: SpanAttributeKey<Int> { .init(name: SpanAttributeName.gRPCMessageID) }
+        public var messageID: SpanAttributeKey<Int> { .init(name: SpanAttributeName.GRPC.messageID) }
 
         /// The compressed message size in bytes.
         public var messageCompressedSize: SpanAttributeKey<Int> {
-            .init(name: SpanAttributeName.gRPCMessageCompressedSize)
+            .init(name: SpanAttributeName.GRPC.messageCompressedSize)
         }
 
         /// The uncompressed message size in bytes.
         public var messageUncompressedSize: SpanAttributeKey<Int> {
-            .init(name: SpanAttributeName.gRPCMessageUncompressedSize)
+            .init(name: SpanAttributeName.GRPC.messageUncompressedSize)
         }
     }
 }

Sources/OpenTelemetryInstrumentationSupport/SpanAttribute+RPCSemantics.swift

@@ -15,11 +15,14 @@ import TracingInstrumentation
 
 extension SpanAttributeName {
     /// - See: RPCAttributes
-    public static let rpcSystem = "rpc.system"
-    /// - See: RPCAttributes
-    public static let rpcService = "rpc.service"
-    /// - See: RPCAttributes
-    public static let rpcMethod = "rpc.method"
+    public enum RPC {
+        /// - See: RPCAttributes
+        public static let system = "rpc.system"
+        /// - See: RPCAttributes
+        public static let service = "rpc.service"
+        /// - See: RPCAttributes
+        public static let method = "rpc.method"
+    }
 }
 
 #if swift(>=5.2)
@@ -50,13 +53,13 @@ public struct RPCAttributes: SpanAttributeNamespace {
         public init() {}
 
         /// A string identifying the remoting system, e.g., "grpc", "java_rmi" or "wcf".
-        public var system: SpanAttributeKey<String> { .init(name: SpanAttributeName.rpcSystem) }
+        public var system: SpanAttributeKey<String> { .init(name: SpanAttributeName.RPC.system) }
 
         /// The full name of the service being called, including its package name, if applicable.
-        public var service: SpanAttributeKey<String> { .init(name: SpanAttributeName.rpcService) }
+        public var service: SpanAttributeKey<String> { .init(name: SpanAttributeName.RPC.service) }
 
         /// The name of the method being called, must be equal to the $method part in the span name.
-        public var method: SpanAttributeKey<String> { .init(name: SpanAttributeName.rpcMethod) }
+        public var method: SpanAttributeKey<String> { .init(name: SpanAttributeName.RPC.method) }
     }
 }
 #endif