Move net.protocol to net.app.protocol

semantic_conventions/trace/general.yaml

@@ -33,14 +33,14 @@ groups:
               brief: 'Something else (non IP-based).'
         brief: >
           Transport protocol used. See note below.
-      - id: protocol.name
+      - id: app.protocol.name
         type: string
         brief: 'Application layer protocol used. The value SHOULD be normalized to lowercase.'
-        examples: ['amqp', 'http', 'nntp']
-      - id: protocol.version
+        examples: ['amqp', 'http', 'mqtt']
+      - id: app.protocol.version
         type: string
         brief: 'Version of the application layer protocol used.'
-        examples: '0.9.1'
+        examples: '3.1.1'
       - id: peer.ip
         type: string
         brief: >

specification/trace/semantic_conventions/span-general.md

@@ -35,8 +35,8 @@ the `net.peer.*` properties of a client are equal to the `net.host.*` properties
 | Attribute  | Type | Description  | Examples  | Required |
 |---|---|---|---|---|
 | `net.transport` | string | Transport protocol used. See note below. | `ip_tcp` | No |
-| `net.protocol.name` | string | Application layer protocol used. The value SHOULD be normalized to lowercase. | `amqp`; `http`; `nntp` | No |
-| `net.protocol.version` | string | Version of the application layer protocol used. | `0.9.1` | No |
+| `net.app.protocol.name` | string | Application layer protocol used. The value SHOULD be normalized to lowercase. | `amqp`; `http`; `mqtt` | No |
+| `net.app.protocol.version` | string | Version of the application layer protocol used. | `3.1.1` | No |
 | `net.peer.ip` | string | Remote address of the peer (dotted decimal for IPv4 or [RFC5952](https://tools.ietf.org/html/rfc5952) for IPv6) | `127.0.0.1` | No |
 | `net.peer.port` | int | Remote port number. | `80`; `8080`; `443` | No |
 | `net.peer.name` | string | Remote hostname or similar, see note below. [1] | `example.com` | No |