From 728c3ca60db2fcd6e53767b859695b04e9714eff Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 14 Aug 2023 13:58:21 -0700 Subject: [PATCH] `http/dup` has higher precedence than `http` in `OTEL_SEMCONV_STABILITY_OPT_IN` (#249) --- CHANGELOG.md | 3 +++ docs/database/database-spans.md | 1 + docs/http/README.md | 1 + docs/http/http-metrics.md | 1 + docs/http/http-spans.md | 1 + docs/messaging/messaging-spans.md | 1 + docs/rpc/rpc-metrics.md | 1 + docs/rpc/rpc-spans.md | 1 + 8 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d22fd89a75..c8c5f52301 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,9 @@ release. - `jvm.buffer.usage` - `jvm.buffer.limit` - `jvm.buffer.count` +- Clarify that `http/dup` has higher precedence than `http` in case both values are present + in `OTEL_SEMCONV_STABILITY_OPT_IN` + ([#249](https://github.com/open-telemetry/semantic-conventions/pull/249)) ## v1.21.0 (2023-07-13) diff --git a/docs/database/database-spans.md b/docs/database/database-spans.md index 2de954defa..15174ac9f6 100644 --- a/docs/database/database-spans.md +++ b/docs/database/database-spans.md @@ -37,6 +37,7 @@ linkTitle: Client Calls > * The default behavior (in the absence of one of these values) is to continue > emitting whatever version of the old experimental networking attributes > the instrumentation was emitting previously. +> * Note: `http/dup` has higher precedence than `http` in case both values are present > * SHOULD maintain (security patching at a minimum) the existing major version > for at least six months after it starts emitting both sets of attributes. > * SHOULD drop the environment variable in the next major version (stable diff --git a/docs/http/README.md b/docs/http/README.md index c12ecc2998..e3bc209b16 100644 --- a/docs/http/README.md +++ b/docs/http/README.md @@ -33,6 +33,7 @@ and various HTTP versions like 1.1, 2 and SPDY. > * The default behavior (in the absence of one of these values) is to continue > emitting whatever version of the old experimental HTTP and networking attributes > the instrumentation was emitting previously. +> * Note: `http/dup` has higher precedence than `http` in case both values are present > * SHOULD maintain (security patching at a minimum) the existing major version > for at least six months after it starts emitting both sets of attributes. > * SHOULD drop the environment variable in the next major version (stable diff --git a/docs/http/http-metrics.md b/docs/http/http-metrics.md index c70d6fdfde..5f8c192706 100644 --- a/docs/http/http-metrics.md +++ b/docs/http/http-metrics.md @@ -46,6 +46,7 @@ operations. By adding HTTP attributes to metric events it allows for finely tune > * The default behavior (in the absence of one of these values) is to continue > emitting whatever version of the old experimental HTTP and networking attributes > the instrumentation was emitting previously. +> * Note: `http/dup` has higher precedence than `http` in case both values are present > * SHOULD maintain (security patching at a minimum) the existing major version > for at least six months after it starts emitting both sets of attributes. > * SHOULD drop the environment variable in the next major version (stable diff --git a/docs/http/http-spans.md b/docs/http/http-spans.md index eb058e928e..871dc221b9 100644 --- a/docs/http/http-spans.md +++ b/docs/http/http-spans.md @@ -52,6 +52,7 @@ and various HTTP versions like 1.1, 2 and SPDY. > * The default behavior (in the absence of one of these values) is to continue > emitting whatever version of the old experimental HTTP and networking attributes > the instrumentation was emitting previously. +> * Note: `http/dup` has higher precedence than `http` in case both values are present > * SHOULD maintain (security patching at a minimum) the existing major version > for at least six months after it starts emitting both sets of attributes. > * SHOULD drop the environment variable in the next major version (stable diff --git a/docs/messaging/messaging-spans.md b/docs/messaging/messaging-spans.md index 72179fd6ce..d25a0c57b0 100644 --- a/docs/messaging/messaging-spans.md +++ b/docs/messaging/messaging-spans.md @@ -53,6 +53,7 @@ > * The default behavior (in the absence of one of these values) is to continue > emitting whatever version of the old experimental networking attributes > the instrumentation was emitting previously. +> * Note: `http/dup` has higher precedence than `http` in case both values are present > * SHOULD maintain (security patching at a minimum) the existing major version > for at least six months after it starts emitting both sets of attributes. > * SHOULD drop the environment variable in the next major version (stable diff --git a/docs/rpc/rpc-metrics.md b/docs/rpc/rpc-metrics.md index 6cb5768f3d..d80d0c5df4 100644 --- a/docs/rpc/rpc-metrics.md +++ b/docs/rpc/rpc-metrics.md @@ -55,6 +55,7 @@ metrics can be filtered for finer grain analysis. > * The default behavior (in the absence of one of these values) is to continue > emitting whatever version of the old experimental networking attributes > the instrumentation was emitting previously. +> * Note: `http/dup` has higher precedence than `http` in case both values are present > * SHOULD maintain (security patching at a minimum) the existing major version > for at least six months after it starts emitting both sets of attributes. > * SHOULD drop the environment variable in the next major version (stable diff --git a/docs/rpc/rpc-spans.md b/docs/rpc/rpc-spans.md index c82bfa02f4..cf6a054ccc 100644 --- a/docs/rpc/rpc-spans.md +++ b/docs/rpc/rpc-spans.md @@ -45,6 +45,7 @@ This document defines how to describe remote procedure calls > * The default behavior (in the absence of one of these values) is to continue > emitting whatever version of the old experimental networking attributes > the instrumentation was emitting previously. +> * Note: `http/dup` has higher precedence than `http` in case both values are present > * SHOULD maintain (security patching at a minimum) the existing major version > for at least six months after it starts emitting both sets of attributes. > * SHOULD drop the environment variable in the next major version (stable