From 872708dadbb911abfa5ecd72550c1f15600b8a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Paj=C4=85k?= Date: Fri, 15 Dec 2023 09:09:22 +0100 Subject: [PATCH 1/3] zipkin: Handle older semconv --- CHANGELOG.md | 3 +++ specification/trace/sdk_exporters/zipkin.md | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index daba7b5387e..b3c1d1d5278 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ release. ### Traces +- Update OpenTelemetry to Zipkin Transformation to handle attributes from older semantic conventions in a backwards compatible way. + ([#3794](https://github.com/open-telemetry/opentelemetry-specification/pull/3794)) + ### Metrics ### Logs diff --git a/specification/trace/sdk_exporters/zipkin.md b/specification/trace/sdk_exporters/zipkin.md index 013dec94510..9a902619cc5 100644 --- a/specification/trace/sdk_exporters/zipkin.md +++ b/specification/trace/sdk_exporters/zipkin.md @@ -99,13 +99,18 @@ always available. The following table lists the possible attributes for |---|---|---| |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)| |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)| -|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)| -|4|peer.hostname|Remote hostname defined in OpenTracing specification.| -|5|peer.address|Remote address defined in OpenTracing specification.| -|6|db.name|Commonly used database name attribute for DB Spans.| +|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)| +|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)| +|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)| +|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)| +|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)| +|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)| +|9|peer.hostname|Remote hostname defined in OpenTracing specification.| +|10|peer.address|Remote address defined in OpenTracing specification.| +|11|db.name|Commonly used database name attribute for DB Spans.| * Ranking should control the selection order. For example, `server.address` (Rank - 2) should be selected before `peer.address` (Rank 5). + 2) should be selected before `peer.address` (Rank 11). * `network.peer.address` can be used by itself as `remoteEndpoint` but should be combined with `network.peer.port` if it is also present. From 8542a6d58b472d3ee092f99a91ff2685501307c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Paj=C4=85k?= Date: Fri, 15 Dec 2023 09:26:12 +0100 Subject: [PATCH 2/3] Fix markdown-link-check to handle references to previous versions --- .markdown_link_check_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.markdown_link_check_config.json b/.markdown_link_check_config.json index 7e1a026d261..ef12a7f2baf 100644 --- a/.markdown_link_check_config.json +++ b/.markdown_link_check_config.json @@ -10,7 +10,7 @@ "replacement": "{{BASEURL}}/" }, { - "pattern": "^https://github.com/open-telemetry/opentelemetry-specification/(blob|tree)/[^/]+/(specification|supplementary-guidelines)/", + "pattern": "^https://github.com/open-telemetry/opentelemetry-specification/tree/[^/]+/(specification|supplementary-guidelines)/", "replacement": "LINK-CHECK-ERROR-USE-LOCAL-PATH-TO-DOC-PAGE-NOT-EXTERNAL-URL/" } ], From c9f66bbea25afff4e1e5a42b2dd9c4aa05d2b149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Paj=C4=85k?= Date: Tue, 9 Jan 2024 16:52:32 +0100 Subject: [PATCH 3/3] Update .markdown_link_check_config.json Co-authored-by: Patrice Chalin --- .markdown_link_check_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.markdown_link_check_config.json b/.markdown_link_check_config.json index ef12a7f2baf..d24172ea15c 100644 --- a/.markdown_link_check_config.json +++ b/.markdown_link_check_config.json @@ -10,7 +10,7 @@ "replacement": "{{BASEURL}}/" }, { - "pattern": "^https://github.com/open-telemetry/opentelemetry-specification/tree/[^/]+/(specification|supplementary-guidelines)/", + "pattern": "^https://github.com/open-telemetry/opentelemetry-specification/(blob|tree)/main/(specification|supplementary-guidelines)/", "replacement": "LINK-CHECK-ERROR-USE-LOCAL-PATH-TO-DOC-PAGE-NOT-EXTERNAL-URL/" } ],