Skip to content

Commit b7e8b54

Browse files
authored
BREAKING rename net.app.protocol.(name|version) to net.protocol.(name|version) and replace http.flavor with net.protocol.(name|version) (open-telemetry#3272)
1 parent ade0ab6 commit b7e8b54

File tree

9 files changed

+148
-128
lines changed

9 files changed

+148
-128
lines changed

schemas/1.20.0

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
file_format: 1.1.0
2+
schema_url: https://opentelemetry.io/schemas/1.20.0
3+
versions:
4+
1.20.0:
5+
spans:
6+
changes:
7+
# https://github.com/open-telemetry/opentelemetry-specification/pull/3272
8+
- rename_attributes:
9+
attribute_map:
10+
net.app.protocol.name: net.protocol.name
11+
net.app.protocol.version: net.protocol.version
12+
1.19.0:
13+
spans:
14+
changes:
15+
# https://github.com/open-telemetry/opentelemetry-specification/pull/3209
16+
- rename_attributes:
17+
attribute_map:
18+
faas.execution: faas.invocation_id
19+
# https://github.com/open-telemetry/opentelemetry-specification/pull/3188
20+
- rename_attributes:
21+
attribute_map:
22+
faas.id: cloud.resource_id
23+
# https://github.com/open-telemetry/opentelemetry-specification/pull/3190
24+
- rename_attributes:
25+
attribute_map:
26+
http.user_agent: user_agent.original
27+
resources:
28+
changes:
29+
# https://github.com/open-telemetry/opentelemetry-specification/pull/3190
30+
- rename_attributes:
31+
attribute_map:
32+
browser.user_agent: user_agent.original
33+
1.18.0:
34+
1.17.0:
35+
spans:
36+
changes:
37+
# https://github.com/open-telemetry/opentelemetry-specification/pull/2957
38+
- rename_attributes:
39+
attribute_map:
40+
messaging.consumer_id: messaging.consumer.id
41+
messaging.protocol: net.app.protocol.name
42+
messaging.protocol_version: net.app.protocol.version
43+
messaging.destination: messaging.destination.name
44+
messaging.temp_destination: messaging.destination.temporary
45+
messaging.destination_kind: messaging.destination.kind
46+
messaging.message_id: messaging.message.id
47+
messaging.conversation_id: messaging.message.conversation_id
48+
messaging.message_payload_size_bytes: messaging.message.payload_size_bytes
49+
messaging.message_payload_compressed_size_bytes: messaging.message.payload_compressed_size_bytes
50+
messaging.rabbitmq.routing_key: messaging.rabbitmq.destination.routing_key
51+
messaging.kafka.message_key: messaging.kafka.message.key
52+
messaging.kafka.partition: messaging.kafka.destination.partition
53+
messaging.kafka.tombstone: messaging.kafka.message.tombstone
54+
messaging.rocketmq.message_type: messaging.rocketmq.message.type
55+
messaging.rocketmq.message_tag: messaging.rocketmq.message.tag
56+
messaging.rocketmq.message_keys: messaging.rocketmq.message.keys
57+
messaging.kafka.consumer_group: messaging.kafka.consumer.group
58+
1.16.0:
59+
1.15.0:
60+
spans:
61+
changes:
62+
# https://github.com/open-telemetry/opentelemetry-specification/pull/2743
63+
- rename_attributes:
64+
attribute_map:
65+
http.retry_count: http.resend_count
66+
1.14.0:
67+
1.13.0:
68+
spans:
69+
changes:
70+
# https://github.com/open-telemetry/opentelemetry-specification/pull/2614
71+
- rename_attributes:
72+
attribute_map:
73+
net.peer.ip: net.sock.peer.addr
74+
net.host.ip: net.sock.host.addr
75+
1.12.0:
76+
1.11.0:
77+
1.10.0:
78+
1.9.0:
79+
1.8.0:
80+
spans:
81+
changes:
82+
- rename_attributes:
83+
attribute_map:
84+
db.cassandra.keyspace: db.name
85+
db.hbase.namespace: db.name
86+
1.7.0:
87+
1.6.1:
88+
1.5.0:
89+
1.4.0:

semantic_conventions/http-common.yaml

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,12 @@ groups:
1515
conditionally_required: If and only if one was received/sent.
1616
brief: '[HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6).'
1717
examples: [200]
18-
- id: flavor
19-
type:
20-
# Default value: `true`. If false, it helps the code gen tool to
21-
# encode checks that only accept the listed values.
22-
allow_custom_values: true
23-
members:
24-
- id: http_1_0
25-
value: '1.0'
26-
brief: 'HTTP/1.0'
27-
- id: http_1_1
28-
value: '1.1'
29-
brief: 'HTTP/1.1'
30-
- id: http_2_0
31-
value: '2.0'
32-
brief: 'HTTP/2'
33-
- id: http_3_0
34-
value: '3.0'
35-
brief: 'HTTP/3'
36-
- id: spdy
37-
value: 'SPDY'
38-
brief: 'SPDY protocol.'
39-
- id: quic
40-
value: 'QUIC'
41-
brief: 'QUIC protocol.'
42-
brief: 'Kind of HTTP protocol used.'
18+
- ref: net.protocol.name
19+
examples: ['http', 'spdy']
20+
requirement_level:
21+
recommended: if not default (`http`).
22+
- ref: net.protocol.version
23+
examples: ['1.0', '1.1', '2.0']
4324

4425
- id: attributes.http.client
4526
prefix: http

semantic_conventions/metrics/http.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ groups:
1010
# todo (lmolkova) build tools don't populate grandparent attributes
1111
- ref: http.method
1212
- ref: http.status_code
13-
- ref: http.flavor
13+
- ref: net.protocol.name
14+
- ref: net.protocol.version
1415

1516
- id: metric.http.server.active_requests
1617
type: metric
@@ -62,7 +63,8 @@ groups:
6263
# todo (lmolkova) build tools don't populate grandparent attributes
6364
- ref: http.method
6465
- ref: http.status_code
65-
- ref: http.flavor
66+
- ref: net.protocol.name
67+
- ref: net.protocol.version
6668

6769
- id: metric.http.server.response.size
6870
type: metric
@@ -75,7 +77,8 @@ groups:
7577
attributes:
7678
- ref: http.method
7779
- ref: http.status_code
78-
- ref: http.flavor
80+
- ref: net.protocol.name
81+
- ref: net.protocol.version
7982

8083
- id: metric.http.client.duration
8184
type: metric
@@ -87,7 +90,8 @@ groups:
8790
attributes:
8891
- ref: http.method
8992
- ref: http.status_code
90-
- ref: http.flavor
93+
- ref: net.protocol.name
94+
- ref: net.protocol.version
9195
- ref: net.sock.peer.addr
9296

9397
- id: metric.http.client.request.size
@@ -101,7 +105,8 @@ groups:
101105
attributes:
102106
- ref: http.method
103107
- ref: http.status_code
104-
- ref: http.flavor
108+
- ref: net.protocol.name
109+
- ref: net.protocol.version
105110
- ref: net.sock.peer.addr
106111

107112
- id: metric.http.client.response.size
@@ -115,5 +120,6 @@ groups:
115120
attributes:
116121
- ref: http.method
117122
- ref: http.status_code
118-
- ref: http.flavor
123+
- ref: net.protocol.name
124+
- ref: net.protocol.version
119125
- ref: net.sock.peer.addr

semantic_conventions/trace/general.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ groups:
2828
brief: 'Something else (non IP-based).'
2929
brief: >
3030
Transport protocol used. See note below.
31-
- id: app.protocol.name
31+
- id: protocol.name
3232
type: string
3333
brief: 'Application layer protocol used. The value SHOULD be normalized to lowercase.'
3434
examples: ['amqp', 'http', 'mqtt']
35-
- id: app.protocol.version
35+
- id: protocol.version
3636
type: string
3737
brief: 'Version of the application layer protocol used. See note below.'
3838
examples: '3.1.1'
3939
note: >
40-
`net.app.protocol.version` refers to the version of the protocol used and might be
40+
`net.protocol.version` refers to the version of the protocol used and might be
4141
different from the protocol client's version. If the HTTP client used has a version
4242
of `0.27.2`, but sends HTTP version `1.1`, this attribute should be set to `1.1`.
4343
- id: sock.peer.name

semantic_conventions/trace/messaging.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ groups:
171171
tag: connection-level
172172
requirement_level:
173173
recommended: If different than `net.peer.name` and if `net.sock.peer.addr` is set.
174-
- ref: net.app.protocol.name
174+
- ref: net.protocol.name
175175
examples: ['amqp', 'mqtt']
176-
- ref: net.app.protocol.version
176+
- ref: net.protocol.version
177177
constraints:
178178
- include: network
179179

0 commit comments

Comments
 (0)