up

CHANGELOG.md

@@ -47,6 +47,15 @@ release.
   ([#3390](https://github.com/open-telemetry/opentelemetry-specification/pull/3390))
 - BREAKING: Remove `messaging.consumer.id`, make `messaging.client_id` generic
   ([#3336](https://github.com/open-telemetry/opentelemetry-specification/pull/3336))
+- Rename `net.peer.*`, `net.host.*`, and `net.sock.*` attributes to align with ECS
+  ([#TODO](https://github.com/open-telemetry/opentelemetry-specification/pull/TODO))
+    BREAKING: rename `net.peer.name` and `net.host.name` to `server.address`,
+     `net.peer.port` and `net.host.port` to `server.port`,
+     `net.sock.peer.addr` to `server.socket.address` on client side and to `client.socket.address` on server side,
+     `net.sock.peer.port` to `server.socket.port` on client side and to `client.socket.port` on server side,
+     `net.sock.peer.name` to `server.socket.domain`,
+     `net.sock.host.addr` to `server.socket.address`,
+     `net.sock.host.port` to `server.socket.port`
 
 ### Compatibility
 

semantic_conventions/http-common.yaml

@@ -15,11 +15,11 @@ groups:
           conditionally_required: If and only if one was received/sent.
         brief: '[HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6).'
         examples: [200]
-      - ref: network.protocol.name
+      - ref: net.protocol.name
         examples: ['http', 'spdy']
         requirement_level:
           recommended: if not default (`http`).
-      - ref: network.protocol.version
+      - ref: net.protocol.version
         examples: ['1.0', '1.1', '2.0']
 
   - id: attributes.http.client

semantic_conventions/metrics/http.yaml

@@ -10,8 +10,8 @@ groups:
       # todo (lmolkova) build tools don't populate grandparent attributes
       - ref: http.method
       - ref: http.status_code
-      - ref: network.protocol.name
-      - ref: network.protocol.version
+      - ref: net.protocol.name
+      - ref: net.protocol.version
 
   - id: metric.http.server.active_requests
     type: metric
@@ -62,8 +62,8 @@ groups:
       # todo (lmolkova) build tools don't populate grandparent attributes
       - ref: http.method
       - ref: http.status_code
-      - ref: network.protocol.name
-      - ref: network.protocol.version
+      - ref: net.protocol.name
+      - ref: net.protocol.version
 
   - id: metric.http.server.response.size
     type: metric
@@ -76,8 +76,8 @@ groups:
     attributes:
       - ref: http.method
       - ref: http.status_code
-      - ref: network.protocol.name
-      - ref: network.protocol.version
+      - ref: net.protocol.name
+      - ref: net.protocol.version
 
   - id: metric.http.client.duration
     type: metric
@@ -89,8 +89,8 @@ groups:
     attributes:
       - ref: http.method
       - ref: http.status_code
-      - ref: network.protocol.name
-      - ref: network.protocol.version
+      - ref: net.protocol.name
+      - ref: net.protocol.version
       - ref: server.socket.address
 
   - id: metric.http.client.request.size
@@ -104,8 +104,8 @@ groups:
     attributes:
       - ref: http.method
       - ref: http.status_code
-      - ref: network.protocol.name
-      - ref: network.protocol.version
+      - ref: net.protocol.name
+      - ref: net.protocol.version
       - ref: server.socket.address
 
   - id: metric.http.client.response.size
@@ -119,6 +119,6 @@ groups:
     attributes:
       - ref: http.method
       - ref: http.status_code
-      - ref: network.protocol.name
-      - ref: network.protocol.version
+      - ref: net.protocol.name
+      - ref: net.protocol.version
       - ref: server.socket.address

semantic_conventions/trace/database.yaml

@@ -242,12 +242,12 @@ groups:
         tag: connection-level
       - ref: server.socket.port
         tag: connection-level
-      - ref: network.type
+      - ref: net.sock.family
         tag: connection-level
       - ref: server.socket.domain
         requirement_level:
           recommended: If different than `server.address` and if `server.socket.address` is set.
-      - ref: network.transport
+      - ref: net.transport
         tag: connection-level
         requirement_level:
           conditionally_required: If database type is in-process (`"inproc"`), recommended for other database types.

semantic_conventions/trace/general.yaml

@@ -5,21 +5,6 @@ groups:
     brief: >
         These attributes may be used for any network related operation.
     attributes:
-      - id: transport
-        type: string
-        stability: deprecated
-        brief: Deprecated, use `network.transport`.
-        examples: ['ip_tcp']
-      - id: protocol.name
-        type: string
-        stability: deprecated
-        brief: Deprecated, use `network.protocol.name`.
-        examples: ['amqp']
-      - id: protocol.version
-        type: string
-        stability: deprecated
-        brief: Deprecated, use `network.protocol.version`.
-        examples: ['1.0']
       - id: sock.peer.name
         type: string
         stability: deprecated
@@ -36,11 +21,6 @@ groups:
         stability: deprecated
         examples: [65531]
         brief: Deprecated, use `server.socket.port` on client spans and `client.socket.port` on server spans.
-      - id: sock.family
-        type: string
-        stability: deprecated
-        brief: Deprecated, use `network.type`.
-        examples: ['inet6']
       - id: peer.name
         type: string
         stability: deprecated
@@ -73,7 +53,7 @@ groups:
         examples: [8080]
 
   - id: network-core
-    prefix: network
+    prefix: net
     type: attribute_group
     brief: >
         These attributes may be used for any network related operation.
@@ -110,10 +90,10 @@ groups:
         brief: 'Version of the application layer protocol used. See note below.'
         examples: '3.1.1'
         note: >
-          `network.protocol.version` refers to the version of the protocol used and might be
+          `net.protocol.version` refers to the version of the protocol used and might be
           different from the protocol client's version. If the HTTP client used has a version
           of `0.27.2`, but sends HTTP version `1.1`, this attribute should be set to `1.1`.
-      - id: type
+      - id: sock.family
         type:
           allow_custom_values: true
           members:
@@ -130,7 +110,7 @@ groups:
           conditionally_required: >
             If different than `inet` and if any of `server.nat.address` or `client.address` are set.
             Consumers of telemetry SHOULD accept both IPv4 and IPv6 formats for the address in `server.nat.address` and `client.address`
-            if `network.type` is not set. This is to support instrumentations that follow previous versions
+            if `net.sock.family` is not set. This is to support instrumentations that follow previous versions
             of this document.
         brief: >
           Protocol [address family](https://man7.org/linux/man-pages/man7/address_families.7.html) which is used for communication.

semantic_conventions/trace/http.yaml

@@ -27,7 +27,7 @@ groups:
       - ref: server.socket.address
       - ref: server.socket.port
       - ref: server.socket.domain
-      - ref: network.type
+      - ref: net.sock.family
         examples: ['inet', 'inet6']
       - ref: user_agent.original
 

semantic_conventions/trace/messaging.yaml

@@ -150,15 +150,15 @@ groups:
         tag: connection-level
       - ref: server.socket.port
         tag: connection-level
-      - ref: network.type
+      - ref: net.sock.family
         tag: connection-level
       - ref: server.socket.domain
         tag: connection-level
         requirement_level:
           recommended: If different than `server.address` and if `server.socket.address` is set.
-      - ref: network.protocol.name
+      - ref: net.protocol.name
         examples: ['amqp', 'mqtt']
-      - ref: network.protocol.version
+      - ref: net.protocol.version
 
   - id: messaging.producer
     prefix: messaging

semantic_conventions/trace/rpc.yaml

@@ -53,7 +53,7 @@ groups:
       - ref: server.socket.port
         requirement_level:
           recommended: If different than `server.port` and if `server.socket.address` is set.
-      - ref: network.type
+      - ref: net.sock.family
         requirement_level:
           conditionally_required: If and only if `server.socket.address` is set.
       - ref: server.socket.domain
@@ -70,7 +70,7 @@ groups:
       - ref: server.port
         requirement_level:
           conditionally_required: See below
-      - ref: network.transport
+      - ref: net.transport
         requirement_level:
           conditionally_required: See below
     constraints:
@@ -88,7 +88,7 @@ groups:
       - ref: server.address
       - ref: server.socket.address
       - ref: server.socket.port
-      - ref: network.type
+      - ref: net.sock.family
 
   - id: rpc.grpc
     prefix: rpc.grpc

specification/common/attribute-requirement-level.md

@@ -34,7 +34,7 @@ For example, Metric attributes that may have high cardinality can only be define
 
 A semantic convention that refers to an attribute from another semantic convention MAY modify the requirement level within its own scope. Otherwise, requirement level from the referred semantic convention applies.
 
-For example, [Database semantic convention](../trace/semantic_conventions/database.md) references `network.transport` attribute defined in [General attributes](../trace/semantic_conventions/span-general.md) with `Conditionally Required` level on it.
+For example, [Database semantic convention](../trace/semantic_conventions/database.md) references `net.transport` attribute defined in [General attributes](../trace/semantic_conventions/span-general.md) with `Conditionally Required` level on it.
 
 ## Required