Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SEMANTIC CONVENTIONS] Upgrade to version 1.26.0 #1851

Merged
merged 3 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
CRATE_DIR="${SCRIPT_DIR}/../"

# freeze the spec version and generator version to make generation reproducible
SPEC_VERSION=1.25.0
SPEC_VERSION=1.26.0
SEMCOVGEN_VERSION=0.24.0

cd "$CRATE_DIR"
Expand Down Expand Up @@ -53,4 +53,14 @@ fi
# handle doc generation failures
"${SED[@]}" 's/\[2\]\.$//' src/resource.rs src/trace.rs # remove trailing [2] from few of the doc comments

# Remove the messaging.client_id definition along with its comments from the generated files
# - semconv "messaging.client_id" is deprecated
# - semconv "messaging.client.id" is to be used instead
# - Now because we use:
# pub const {{attribute.fqn | to_const_name}}: &str = "{{attribute.fqn}}";
# to generate the consts, where to_const_name replaces '.' with '_', we need to remove the old definition
# to avoid conflicts with the new one. Refer - https://github.com/open-telemetry/semantic-conventions/issues/1031
"${SED[@]}" '/\/\/\/ Deprecated, use `messaging.client.id` instead\./{N;N;N;N;d;}' src/trace.rs src/resource.rs
"${SED[@]}" '/pub const MESSAGING_CLIENT_ID: &str = "messaging.client_id";/{N;d;}' src/trace.rs src/resource.rs

cargo fmt
2 changes: 1 addition & 1 deletion opentelemetry-semantic-conventions/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ pub mod trace;

/// The schema URL that matches the version of the semantic conventions that
/// this crate defines.
pub const SCHEMA_URL: &str = "https://opentelemetry.io/schemas/1.25.0";
pub const SCHEMA_URL: &str = "https://opentelemetry.io/schemas/1.26.0";
Loading
Loading