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.

Sign up for GitHub

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

chore: bump semconv 1.31.0 #2845

Merged
merged 6 commits into from
Mar 21, 2025
Merged

chore: bump semconv 1.31.0 #2845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5e7e949
bump semconv
lalitb Mar 21, 2025
7217551
update changelog
lalitb Mar 21, 2025
d539bb8
Merge branch 'main' into semconv_1.31_0
lalitb Mar 21, 2025
57689ec
build error
lalitb Mar 21, 2025
6796fa6
Merge branch 'semconv_1.31_0' of github.com:lalitb/opentelemetry-rust…
lalitb Mar 21, 2025
ccc1fe2
build error
lalitb Mar 21, 2025
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
6 changes: 6 additions & 0 deletions opentelemetry-semantic-conventions/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## vNext

## 0.29.0

Released 2025-Mar-21

- Update to [v1.31.0](https://github.com/open-telemetry/semantic-conventions/releases/tag/v1.31.0) of the semantic conventions.

## 0.28.0

Released 2025-Feb-10
Expand Down
10 changes: 2 additions & 8 deletions opentelemetry-semantic-conventions/scripts/generate-consts-from-spec.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ 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.30.0
WEAVER_VERSION=v0.12.0
SPEC_VERSION=1.31.0
WEAVER_VERSION=v0.13.0

cd "$CRATE_DIR"

Expand Down Expand Up @@ -49,13 +49,7 @@ expression='
s/\\\[([^\]]+)\]\(([^)]+)\)/[\1](\2)/g
'

# TODO - remove this with semconv 1.31.0. Refer: https://github.com/open-telemetry/semantic-conventions/pull/1827
# Fix broken and malformed K8s JobSpec link
link_fix_expression='s/\\\[K8s JobSpec\\\]\(https:\/\/kubernetes\.io\/docs\/reference\/generated\/kubernetes-api\/v1\.30\/#jobspec-v1-batch\./[K8s JobSpec](https:\/\/kubernetes\.io\/docs\/reference\/generated\/kubernetes-api\/v1\.30\/#jobspec-v1-batch)./g'

"${SED[@]}" -E "${expression}" src/metric.rs
"${SED[@]}" -E "${expression}" src/attribute.rs
"${SED[@]}" -E "${link_fix_expression}" src/metric.rs


cargo fmt
2 changes: 1 addition & 1 deletion opentelemetry-semantic-conventions/scripts/templates/registry/rust/resource.rs.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
//!
//! ```rust
//! use opentelemetry::KeyValue;
//! use opentelemetry_sdk::{trace::{config, SdkTracerProvider}, Resource};
//! use opentelemetry_sdk::{trace::SdkTracerProvider, Resource};
//! use opentelemetry_semantic_conventions as semconv;
//!
//! let _tracer = SdkTracerProvider::builder()
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-semantic-conventions/scripts/templates/registry/rust/weaver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ comment_formats:
default_comment_format: rust

params:
schema_url: "https://opentelemetry.io/schemas/1.30.0"
schema_url: "https://opentelemetry.io/schemas/1.31.0"
exclude_root_namespace: []
excluded_attributes: ["messaging.client_id"]

Expand Down
480 changes: 327 additions & 153 deletions opentelemetry-semantic-conventions/src/attribute.rs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion opentelemetry-semantic-conventions/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,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.30.0";
pub const SCHEMA_URL: &str = "https://opentelemetry.io/schemas/1.31.0";
424 changes: 371 additions & 53 deletions opentelemetry-semantic-conventions/src/metric.rs
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions opentelemetry-semantic-conventions/src/resource.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,12 @@ pub use crate::attribute::K8S_DEPLOYMENT_NAME;
#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::K8S_DEPLOYMENT_UID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::K8S_HPA_NAME;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::K8S_HPA_UID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::K8S_JOB_NAME;

Expand Down Expand Up @@ -314,6 +320,18 @@ pub use crate::attribute::K8S_REPLICASET_NAME;
#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::K8S_REPLICASET_UID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::K8S_REPLICATIONCONTROLLER_NAME;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::K8S_REPLICATIONCONTROLLER_UID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::K8S_RESOURCEQUOTA_NAME;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::K8S_RESOURCEQUOTA_UID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::K8S_STATEFULSET_NAME;

Expand Down
110 changes: 29 additions & 81 deletions opentelemetry-semantic-conventions/src/trace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
//! .start(&tracer);
//! ```

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::ANDROID_APP_STATE;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS;

Expand Down Expand Up @@ -208,7 +211,6 @@ pub use crate::attribute::ELASTICSEARCH_NODE_NAME;

pub use crate::attribute::ERROR_TYPE;

#[allow(deprecated)]
pub use crate::attribute::EXCEPTION_ESCAPED;

pub use crate::attribute::EXCEPTION_MESSAGE;
Expand All @@ -235,9 +237,6 @@ pub use crate::attribute::FAAS_DOCUMENT_OPERATION;
#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::FAAS_DOCUMENT_TIME;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::FAAS_INVOCATION_ID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::FAAS_INVOKED_NAME;

Expand Down Expand Up @@ -278,7 +277,13 @@ pub use crate::attribute::FEATURE_FLAG_VARIANT;
pub use crate::attribute::FEATURE_FLAG_VERSION;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::GEN_AI_OPENAI_REQUEST_RESPONSE_FORMAT;
pub use crate::attribute::GEN_AI_AGENT_DESCRIPTION;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::GEN_AI_AGENT_ID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::GEN_AI_AGENT_NAME;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::GEN_AI_OPENAI_REQUEST_SERVICE_TIER;
Expand All @@ -292,6 +297,12 @@ pub use crate::attribute::GEN_AI_OPENAI_RESPONSE_SYSTEM_FINGERPRINT;
#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::GEN_AI_OPERATION_NAME;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::GEN_AI_OUTPUT_TYPE;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::GEN_AI_REQUEST_CHOICE_COUNT;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::GEN_AI_REQUEST_ENCODING_FORMATS;

Expand Down Expand Up @@ -334,6 +345,12 @@ pub use crate::attribute::GEN_AI_RESPONSE_MODEL;
#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::GEN_AI_SYSTEM;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::GEN_AI_TOOL_CALL_ID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::GEN_AI_TOOL_NAME;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::GEN_AI_USAGE_INPUT_TOKENS;

Expand Down Expand Up @@ -376,52 +393,7 @@ pub use crate::attribute::HTTP_RESPONSE_STATUS_CODE;
pub use crate::attribute::HTTP_ROUTE;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_BATCH_MESSAGE_COUNT;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_CLIENT_ID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_CONSUMER_GROUP_NAME;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_DESTINATION_ANONYMOUS;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_DESTINATION_NAME;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_DESTINATION_PARTITION_ID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_DESTINATION_SUBSCRIPTION_NAME;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_DESTINATION_TEMPLATE;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_DESTINATION_TEMPORARY;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_MESSAGE_BODY_SIZE;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_MESSAGE_CONVERSATION_ID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_MESSAGE_ENVELOPE_SIZE;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_MESSAGE_ID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_OPERATION_NAME;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_OPERATION_TYPE;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::MESSAGING_SYSTEM;
pub use crate::attribute::IOS_APP_STATE;

pub use crate::attribute::NETWORK_LOCAL_ADDRESS;

Expand Down Expand Up @@ -454,36 +426,6 @@ pub use crate::attribute::PROCESS_EXIT_CODE;
#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::PROCESS_PID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::RPC_CONNECT_RPC_ERROR_CODE;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::RPC_CONNECT_RPC_REQUEST_METADATA;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::RPC_CONNECT_RPC_RESPONSE_METADATA;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::RPC_GRPC_REQUEST_METADATA;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::RPC_GRPC_RESPONSE_METADATA;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::RPC_GRPC_STATUS_CODE;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::RPC_JSONRPC_ERROR_CODE;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::RPC_JSONRPC_ERROR_MESSAGE;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::RPC_JSONRPC_REQUEST_ID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::RPC_JSONRPC_VERSION;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::RPC_MESSAGE_COMPRESSED_SIZE;

Expand All @@ -509,6 +451,12 @@ pub use crate::attribute::SERVER_ADDRESS;

pub use crate::attribute::SERVER_PORT;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::SESSION_ID;

#[cfg(feature = "semconv_experimental")]
pub use crate::attribute::SESSION_PREVIOUS_ID;

pub use crate::attribute::URL_FULL;

pub use crate::attribute::URL_PATH;
Expand Down