Skip to content

Commit 6d1c567

Browse files
authored
zipkin: Handle older semconv (#3794)
Fixes #3793 ## Changes Update OpenTelemetry to Zipkin Transformation to handle attributes from older semantic conventions in a backwards compatible way so that following attributes are (again) handled: - `net.peer.name` - `net.host.name` - `net.sock.peer.addr` & `net.sock.peer.port` - `server.socket.domain` - `server.socket.address` & `server.socket.port` The backwards compatibility of a stable OpenTelemetry to Zipkin Transformation was broken by: - #3402 - #3713
1 parent 5faaf6b commit 6d1c567

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

.markdown_link_check_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"replacement": "{{BASEURL}}/"
1111
},
1212
{
13-
"pattern": "^https://github.com/open-telemetry/opentelemetry-specification/(blob|tree)/[^/]+/(specification|supplementary-guidelines)/",
13+
"pattern": "^https://github.com/open-telemetry/opentelemetry-specification/(blob|tree)/main/(specification|supplementary-guidelines)/",
1414
"replacement": "LINK-CHECK-ERROR-USE-LOCAL-PATH-TO-DOC-PAGE-NOT-EXTERNAL-URL/"
1515
}
1616
],

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ release.
1414

1515
### Traces
1616

17+
- Update OpenTelemetry to Zipkin Transformation to handle attributes from older semantic conventions in a backwards compatible way.
18+
([#3794](https://github.com/open-telemetry/opentelemetry-specification/pull/3794))
19+
1720
### Metrics
1821

1922
- Add optional configuration for Prometheus exporters to optionally drop `otel_scope_info` metric.

specification/trace/sdk_exporters/zipkin.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,18 @@ always available. The following table lists the possible attributes for
9999
|---|---|---|
100100
|1|peer.service|[OpenTelemetry adopted attribute for remote service.](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/general/attributes.md#server-client-and-shared-network-attributes)|
101101
|2|server.address|[OpenTelemetry adopted attribute for remote hostname, or similar.](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/general/attributes.md#server-client-and-shared-network-attributes)|
102-
|3|network.peer.address & network.peer.port|[OpenTelemetry adopted attribute for remote socket address of the peer.](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/general/attributes.md#server-client-and-shared-network-attributes)|
103-
|4|peer.hostname|Remote hostname defined in OpenTracing specification.|
104-
|5|peer.address|Remote address defined in OpenTracing specification.|
105-
|6|db.name|Commonly used database name attribute for DB Spans.|
102+
|3|net.peer.name|[Legacy OpenTelemetry adopted attribute for remote hostname, or similar.](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.20.0/specification/trace/semantic_conventions/span-general.md#general-network-connection-attributes)|
103+
|4|network.peer.address & network.peer.port|[OpenTelemetry adopted attribute for remote socket address of the peer.](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/general/attributes.md#server-client-and-shared-network-attributes)|
104+
|5|server.socket.domain|[Legacy OpenTelemetry adopted attribute for remote socket hostname of the peer.](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/general/general-attributes.md#server-and-client-attributes)|
105+
|6|server.socket.address & server.socket.port|[Legacy OpenTelemetry adopted attribute for remote socket address of the peer.](https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/docs/general/general-attributes.md#server-and-client-attributes)|
106+
|7|net.sock.peer.name|[Legacy OpenTelemetry adopted attribute for remote socket hostname of the peer.](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.20.0/specification/trace/semantic_conventions/span-general.md#general-network-connection-attributes)|
107+
|8|net.sock.peer.addr & net.sock.peer.port|[Legacy OpenTelemetry adopted attribute for remote socket address of the peer.](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.20.0/specification/trace/semantic_conventions/span-general.md#general-network-connection-attributes)|
108+
|9|peer.hostname|Remote hostname defined in OpenTracing specification.|
109+
|10|peer.address|Remote address defined in OpenTracing specification.|
110+
|11|db.name|Commonly used database name attribute for DB Spans.|
106111

107112
* Ranking should control the selection order. For example, `server.address` (Rank
108-
2) should be selected before `peer.address` (Rank 5).
113+
2) should be selected before `peer.address` (Rank 11).
109114
* `network.peer.address` can be used by itself as `remoteEndpoint` but should be combined
110115
with `network.peer.port` if it is also present.
111116

0 commit comments

Comments
 (0)