From 1e03adf0ea8803bb6b4f6384c034f9a41c142f1c Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Fri, 23 May 2025 15:51:50 +0200 Subject: [PATCH] Bump semantic conventions to 1.34.0 --- CHANGELOG.md | 2 + .../_incubating/attributes/aws_attributes.py | 47 +++++++++++++++++++ .../attributes/cloud_attributes.py | 2 +- .../_incubating/attributes/code_attributes.py | 2 +- .../_incubating/attributes/db_attributes.py | 12 ++--- .../attributes/deployment_attributes.py | 2 +- .../attributes/device_attributes.py | 2 +- .../attributes/enduser_attributes.py | 4 +- .../attributes/feature_flag_attributes.py | 10 ++++ .../attributes/gen_ai_attributes.py | 17 +++++-- .../_incubating/attributes/http_attributes.py | 10 ++-- .../attributes/messaging_attributes.py | 4 +- .../_incubating/attributes/net_attributes.py | 2 +- .../attributes/network_attributes.py | 2 +- .../_incubating/attributes/otel_attributes.py | 4 +- .../attributes/process_attributes.py | 4 +- .../attributes/system_attributes.py | 4 +- .../_incubating/attributes/vcs_attributes.py | 12 ++--- .../semconv/_incubating/metrics/db_metrics.py | 6 +-- .../_incubating/metrics/messaging_metrics.py | 6 +-- .../_incubating/metrics/otel_metrics.py | 10 ++-- .../src/opentelemetry/semconv/schemas.py | 5 ++ scripts/semconv/generate.sh | 2 +- 23 files changed, 123 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 001fbf28a58..7d74a1ca79f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#4593](https://github.com/open-telemetry/opentelemetry-python/pull/4593)) - opentelemetry-test-utils: assert explicit bucket boundaries in histogram metrics ([#4595](https://github.com/open-telemetry/opentelemetry-python/pull/4595)) +- Bump semantic conventions to 1.34.0 + ([#4599](https://github.com/open-telemetry/opentelemetry-python/pull/4599)) ## Version 1.33.0/0.54b0 (2025-05-09) diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/aws_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/aws_attributes.py index 70a991ccae3..b4a969fbbd8 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/aws_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/aws_attributes.py @@ -15,6 +15,16 @@ from enum import Enum from typing import Final +AWS_BEDROCK_GUARDRAIL_ID: Final = "aws.bedrock.guardrail.id" +""" +The unique identifier of the AWS Bedrock Guardrail. A [guardrail](https://docs.aws.amazon.com/bedrock/latest/userguide/guardrails.html) helps safeguard and prevent unwanted behavior from model responses or user messages. +""" + +AWS_BEDROCK_KNOWLEDGE_BASE_ID: Final = "aws.bedrock.knowledge_base.id" +""" +The unique identifier of the AWS Bedrock Knowledge base. A [knowledge base](https://docs.aws.amazon.com/bedrock/latest/userguide/knowledge-base.html) is a bank of information that can be queried by models to generate more relevant responses and augment prompts. +""" + AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS: Final = ( "aws.dynamodb.attribute_definitions" ) @@ -186,12 +196,22 @@ The AWS extended request ID as returned in the response header `x-amz-id-2`. """ +AWS_KINESIS_STREAM_NAME: Final = "aws.kinesis.stream_name" +""" +The name of the AWS Kinesis [stream](https://docs.aws.amazon.com/streams/latest/dev/introduction.html) the request refers to. Corresponds to the `--stream-name` parameter of the Kinesis [describe-stream](https://docs.aws.amazon.com/cli/latest/reference/kinesis/describe-stream.html) operation. +""" + AWS_LAMBDA_INVOKED_ARN: Final = "aws.lambda.invoked_arn" """ The full invoked ARN as provided on the `Context` passed to the function (`Lambda-Runtime-Invoked-Function-Arn` header on the `/runtime/invocation/next` applicable). Note: This may be different from `cloud.resource_id` if an alias is involved. """ +AWS_LAMBDA_RESOURCE_MAPPING_ID: Final = "aws.lambda.resource_mapping.id" +""" +The UUID of the [AWS Lambda EvenSource Mapping](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html). An event source is mapped to a lambda function. It's contents are read by Lambda and used to trigger a function. This isn't available in the lambda execution context or the lambda runtime environtment. This is going to be populated by the AWS SDK for each language when that UUID is present. Some of these operations are Create/Delete/Get/List/Update EventSourceMapping. +""" + AWS_LOG_GROUP_ARNS: Final = "aws.log.group.arns" """ The Amazon Resource Name(s) (ARN) of the AWS log group(s). @@ -290,6 +310,33 @@ - [upload-part-copy](https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html). """ +AWS_SECRETSMANAGER_SECRET_ARN: Final = "aws.secretsmanager.secret.arn" +""" +The ARN of the Secret stored in the Secrets Mangger. +""" + +AWS_SNS_TOPIC_ARN: Final = "aws.sns.topic.arn" +""" +The ARN of the AWS SNS Topic. An Amazon SNS [topic](https://docs.aws.amazon.com/sns/latest/dg/sns-create-topic.html) is a logical access point that acts as a communication channel. +""" + +AWS_SQS_QUEUE_URL: Final = "aws.sqs.queue.url" +""" +The URL of the AWS SQS Queue. It's a unique identifier for a queue in Amazon Simple Queue Service (SQS) and is used to access the queue and perform actions on it. +""" + +AWS_STEP_FUNCTIONS_ACTIVITY_ARN: Final = "aws.step_functions.activity.arn" +""" +The ARN of the AWS Step Functions Activity. +""" + +AWS_STEP_FUNCTIONS_STATE_MACHINE_ARN: Final = ( + "aws.step_functions.state_machine.arn" +) +""" +The ARN of the AWS Step Functions State Machine. +""" + class AwsEcsLaunchtypeValues(Enum): EC2 = "ec2" diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/cloud_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/cloud_attributes.py index e32cf8d7d18..faed11b093e 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/cloud_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/cloud_attributes.py @@ -39,7 +39,7 @@ CLOUD_REGION: Final = "cloud.region" """ -The geographical region the resource is running. +The geographical region within a cloud provider. When associated with a resource, this attribute specifies the region where the resource operates. When calling services or APIs deployed on a cloud, this attribute identifies the region where the called destination is deployed. Note: Refer to your provider's docs to see the available regions, for example [Alibaba Cloud regions](https://www.alibabacloud.com/help/doc-detail/40654.htm), [AWS regions](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/), [Azure regions](https://azure.microsoft.com/global-infrastructure/geographies/), [Google Cloud regions](https://cloud.google.com/about/locations), or [Tencent Cloud regions](https://www.tencentcloud.com/document/product/213/6091). """ diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/code_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/code_attributes.py index a25e7f64afa..e033b1f965b 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/code_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/code_attributes.py @@ -36,7 +36,7 @@ CODE_FUNCTION: Final = "code.function" """ -Deprecated: Replaced by `code.function.name`. +Deprecated: Value should be included in `code.function.name` which is expected to be a fully-qualified name. """ CODE_FUNCTION_NAME: Final = "code.function.name" diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/db_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/db_attributes.py index 7f58cb2da02..61ef5ff256b 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/db_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/db_attributes.py @@ -106,7 +106,7 @@ DB_COSMOSDB_OPERATION_TYPE: Final = "db.cosmosdb.operation_type" """ -Deprecated: No replacement at this time. +Deprecated: Removed, no replacement at this time. """ DB_COSMOSDB_REGIONS_CONTACTED: Final = "db.cosmosdb.regions_contacted" @@ -153,12 +153,12 @@ DB_INSTANCE_ID: Final = "db.instance.id" """ -Deprecated: Deprecated, no general replacement at this time. For Elasticsearch, use `db.elasticsearch.node.name` instead. +Deprecated: Removed, no general replacement at this time. For Elasticsearch, use `db.elasticsearch.node.name` instead. """ DB_JDBC_DRIVER_CLASSNAME: Final = "db.jdbc.driver_classname" """ -Deprecated: Removed as not used. +Deprecated: Removed, no replacement at this time. """ DB_MONGODB_COLLECTION: Final = "db.mongodb.collection" @@ -168,7 +168,7 @@ DB_MSSQL_INSTANCE_NAME: Final = "db.mssql.instance_name" """ -Deprecated: Deprecated, no replacement at this time. +Deprecated: Removed, no replacement at this time. """ DB_NAME: Final = "db.name" @@ -278,7 +278,7 @@ DB_USER: Final = "db.user" """ -Deprecated: No replacement at this time. +Deprecated: Removed, no replacement at this time. """ @@ -354,7 +354,7 @@ class DbCosmosdbConsistencyLevelValues(Enum): @deprecated( - "The attribute db.cosmosdb.operation_type is deprecated - No replacement at this time" + "The attribute db.cosmosdb.operation_type is deprecated - Removed, no replacement at this time" ) class DbCosmosdbOperationTypeValues(Enum): BATCH = "batch" diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/deployment_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/deployment_attributes.py index a37626c2a6f..1461a891cc6 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/deployment_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/deployment_attributes.py @@ -17,7 +17,7 @@ DEPLOYMENT_ENVIRONMENT: Final = "deployment.environment" """ -Deprecated: Deprecated, use `deployment.environment.name` instead. +Deprecated: Replaced by `deployment.environment.name`. """ DEPLOYMENT_ENVIRONMENT_NAME: Final = "deployment.environment.name" diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/device_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/device_attributes.py index 015b3bafe88..b79d5ab0f30 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/device_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/device_attributes.py @@ -32,7 +32,7 @@ > However, it may be appropriate for specific enterprise scenarios, such as kiosk devices or enterprise-managed devices, with appropriate compliance clearance. > Any instrumentation providing this identifier MUST implement it as an opt-in feature. > -> See [`app.installation.id`](/docs/attributes-registry/app.md#app-installation-id) for a more privacy-preserving alternative. +> See [`app.installation.id`](/docs/registry/attributes/app.md#app-installation-id) for a more privacy-preserving alternative. """ DEVICE_MANUFACTURER: Final = "device.manufacturer" diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/enduser_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/enduser_attributes.py index 809404407bb..d07132941f6 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/enduser_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/enduser_attributes.py @@ -34,10 +34,10 @@ ENDUSER_ROLE: Final = "enduser.role" """ -Deprecated: Replaced by `user.roles` attribute. +Deprecated: Use `user.roles` attribute instead. """ ENDUSER_SCOPE: Final = "enduser.scope" """ -Deprecated: Removed. +Deprecated: Removed, no replacement at this time. """ diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/feature_flag_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/feature_flag_attributes.py index ca92a9a6d44..83284422771 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/feature_flag_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/feature_flag_attributes.py @@ -49,6 +49,16 @@ The reason code which shows how a feature flag value was determined. """ +FEATURE_FLAG_RESULT_VALUE: Final = "feature_flag.result.value" +""" +The evaluated value of the feature flag. +Note: With some feature flag providers, feature flag results can be quite large or contain private or sensitive details. +Because of this, `feature_flag.result.variant` is often the preferred attribute if it is available. + +It may be desirable to redact or otherwise limit the size and scope of `feature_flag.result.value` if possible. +Because the evaluated flag value is unstructured and may be any type, it is left to the instrumentation author to determine how best to achieve this. +""" + FEATURE_FLAG_RESULT_VARIANT: Final = "feature_flag.result.variant" """ A semantic identifier for an evaluated flag value. diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/gen_ai_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/gen_ai_attributes.py index eea9f6fa8f5..7a4c95dc5f2 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/gen_ai_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/gen_ai_attributes.py @@ -37,6 +37,17 @@ Deprecated: Removed, no replacement at this time. """ +GEN_AI_CONVERSATION_ID: Final = "gen_ai.conversation.id" +""" +The unique identifier for a conversation (session, thread), used to store and correlate messages within this conversation. +""" + +GEN_AI_DATA_SOURCE_ID: Final = "gen_ai.data_source.id" +""" +The data source identifier. +Note: Data sources are used by AI agents and RAG applications to store grounding data. A data source may be an external database, object store, document collection, website, or any other storage system used by the GenAI agent or application. The `gen_ai.data_source.id` SHOULD match the identifier used by the GenAI system rather than a name specific to the external storage, such as a database or object store. Semantic conventions referencing `gen_ai.data_source.id` MAY also leverage additional attributes, such as `db.*`, to further identify and describe the data source. +""" + GEN_AI_OPENAI_REQUEST_RESPONSE_FORMAT: Final = ( "gen_ai.openai.request.response_format" ) @@ -46,7 +57,7 @@ GEN_AI_OPENAI_REQUEST_SEED: Final = "gen_ai.openai.request.seed" """ -Deprecated: Replaced by `gen_ai.request.seed` attribute. +Deprecated: Replaced by `gen_ai.request.seed`. """ GEN_AI_OPENAI_REQUEST_SERVICE_TIER: Final = ( @@ -208,7 +219,7 @@ GEN_AI_USAGE_COMPLETION_TOKENS: Final = "gen_ai.usage.completion_tokens" """ -Deprecated: Replaced by `gen_ai.usage.output_tokens` attribute. +Deprecated: Replaced by `gen_ai.usage.output_tokens`. """ GEN_AI_USAGE_INPUT_TOKENS: Final = "gen_ai.usage.input_tokens" @@ -223,7 +234,7 @@ GEN_AI_USAGE_PROMPT_TOKENS: Final = "gen_ai.usage.prompt_tokens" """ -Deprecated: Replaced by `gen_ai.usage.input_tokens` attribute. +Deprecated: Replaced by `gen_ai.usage.input_tokens`. """ diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/http_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/http_attributes.py index 56dca7a28ec..e31e5c227c3 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/http_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/http_attributes.py @@ -74,7 +74,7 @@ HTTP_REQUEST_CONTENT_LENGTH: Final = "http.request_content_length" """ -Deprecated: Replaced by `http.request.header.`. +Deprecated: Replaced by `http.request.header.content-length`. """ HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED: Final = ( @@ -106,14 +106,14 @@ HTTP_RESPONSE_CONTENT_LENGTH: Final = "http.response_content_length" """ -Deprecated: Replaced by `http.response.header.`. +Deprecated: hp.response.header.content-length. """ HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED: Final = ( "http.response_content_length_uncompressed" ) """ -Deprecated: Replace by `http.response.body.size`. +Deprecated: Replaced by `http.response.body.size`. """ HTTP_ROUTE: Final = "http.route" @@ -123,7 +123,7 @@ HTTP_SCHEME: Final = "http.scheme" """ -Deprecated: Replaced by `url.scheme` instead. +Deprecated: Replaced by `url.scheme`. """ HTTP_SERVER_NAME: Final = "http.server_name" @@ -138,7 +138,7 @@ HTTP_TARGET: Final = "http.target" """ -Deprecated: Split to `url.path` and `url.query. +Deprecated: Split to `url.path` and `url.query`. """ HTTP_URL: Final = "http.url" diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/messaging_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/messaging_attributes.py index 1046f7a120a..7756a0aba13 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/messaging_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/messaging_attributes.py @@ -74,14 +74,14 @@ "messaging.destination_publish.anonymous" ) """ -Deprecated: No replacement at this time. +Deprecated: Removed. No replacement at this time. """ MESSAGING_DESTINATION_PUBLISH_NAME: Final = ( "messaging.destination_publish.name" ) """ -Deprecated: No replacement at this time. +Deprecated: Removed. No replacement at this time. """ MESSAGING_EVENTHUBS_CONSUMER_GROUP: Final = ( diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/net_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/net_attributes.py index 019c1ff647e..3488d0ea802 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/net_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/net_attributes.py @@ -79,7 +79,7 @@ NET_SOCK_PEER_NAME: Final = "net.sock.peer.name" """ -Deprecated: Removed. +Deprecated: Removed. No replacement at this time. """ NET_SOCK_PEER_PORT: Final = "net.sock.peer.port" diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/network_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/network_attributes.py index daa971dbfbc..f9bf30bca77 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/network_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/network_attributes.py @@ -207,7 +207,7 @@ class NetworkTransportValues(Enum): UNIX = "unix" """Deprecated in favor of stable :py:const:`opentelemetry.semconv.attributes.network_attributes.NetworkTransportValues.UNIX`.""" QUIC = "quic" - """QUIC.""" + """Deprecated in favor of stable :py:const:`opentelemetry.semconv.attributes.network_attributes.NetworkTransportValues.QUIC`.""" @deprecated( diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/otel_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/otel_attributes.py index 9acca955f3d..eebacacb998 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/otel_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/otel_attributes.py @@ -44,12 +44,12 @@ OTEL_LIBRARY_NAME: Final = "otel.library.name" """ -Deprecated: Use the `otel.scope.name` attribute. +Deprecated: Replaced by `otel.scope.name`. """ OTEL_LIBRARY_VERSION: Final = "otel.library.version" """ -Deprecated: Use the `otel.scope.version` attribute. +Deprecated: Replaced by `otel.scope.version`. """ OTEL_SCOPE_NAME: Final = "otel.scope.name" diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/process_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/process_attributes.py index 8030e71989a..2391cbffb37 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/process_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/process_attributes.py @@ -30,12 +30,12 @@ PROCESS_COMMAND_ARGS: Final = "process.command_args" """ -All the command arguments (including the command/executable itself) as received by the process. On Linux-based systems (and some other Unixoid systems supporting procfs), can be set according to the list of null-delimited strings extracted from `proc/[pid]/cmdline`. For libc-based executables, this would be the full argv vector passed to `main`. +All the command arguments (including the command/executable itself) as received by the process. On Linux-based systems (and some other Unixoid systems supporting procfs), can be set according to the list of null-delimited strings extracted from `proc/[pid]/cmdline`. For libc-based executables, this would be the full argv vector passed to `main`. SHOULD NOT be collected by default unless there is sanitization that excludes sensitive data. """ PROCESS_COMMAND_LINE: Final = "process.command_line" """ -The full command used to launch the process as a single string representing the full command. On Windows, can be set to the result of `GetCommandLineW`. Do not set this if you have to assemble it just for monitoring; use `process.command_args` instead. +The full command used to launch the process as a single string representing the full command. On Windows, can be set to the result of `GetCommandLineW`. Do not set this if you have to assemble it just for monitoring; use `process.command_args` instead. SHOULD NOT be collected by default unless there is sanitization that excludes sensitive data. """ PROCESS_CONTEXT_SWITCH_TYPE: Final = "process.context_switch_type" diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/system_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/system_attributes.py index 63df13efa8a..57a48b06dd3 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/system_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/system_attributes.py @@ -59,7 +59,7 @@ SYSTEM_NETWORK_STATE: Final = "system.network.state" """ -Deprecated: Removed, report network connection state with `network.connection.state` attribute. +Deprecated: Replaced by `network.connection.state`. """ SYSTEM_PAGING_DIRECTION: Final = "system.paging.direction" @@ -146,7 +146,7 @@ class SystemMemoryStateValues(Enum): @deprecated( - "The attribute system.network.state is deprecated - Removed, report network connection state with `network.connection.state` attribute" + "The attribute system.network.state is deprecated - Replaced by `network.connection.state`" ) class SystemNetworkStateValues(Enum): CLOSE = "close" diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/vcs_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/vcs_attributes.py index cc654abcfeb..52edebe2869 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/vcs_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/vcs_attributes.py @@ -118,12 +118,12 @@ VCS_REPOSITORY_CHANGE_ID: Final = "vcs.repository.change.id" """ -Deprecated: Deprecated, use `vcs.change.id` instead. +Deprecated: Replaced by `vcs.change.id`. """ VCS_REPOSITORY_CHANGE_TITLE: Final = "vcs.repository.change.title" """ -Deprecated: Deprecated, use `vcs.change.title` instead. +Deprecated: Replaced by `vcs.change.title`. """ VCS_REPOSITORY_NAME: Final = "vcs.repository.name" @@ -136,17 +136,17 @@ VCS_REPOSITORY_REF_NAME: Final = "vcs.repository.ref.name" """ -Deprecated: Deprecated, use `vcs.ref.head.name` instead. +Deprecated: Replaced by `vcs.ref.head.name`. """ VCS_REPOSITORY_REF_REVISION: Final = "vcs.repository.ref.revision" """ -Deprecated: Deprecated, use `vcs.ref.head.revision` instead. +Deprecated: Replaced by `vcs.ref.head.revision`. """ VCS_REPOSITORY_REF_TYPE: Final = "vcs.repository.ref.type" """ -Deprecated: Deprecated, use `vcs.ref.head.type` instead. +Deprecated: Replaced by `vcs.ref.head.type`. """ VCS_REPOSITORY_URL_FULL: Final = "vcs.repository.url.full" @@ -215,7 +215,7 @@ class VcsRefTypeValues(Enum): @deprecated( - "The attribute vcs.repository.ref.type is deprecated - Deprecated, use `vcs.ref.head.type` instead" + "The attribute vcs.repository.ref.type is deprecated - Replaced by `vcs.ref.head.type`" ) class VcsRepositoryRefTypeValues(Enum): BRANCH = "branch" diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/db_metrics.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/db_metrics.py index bbbfca46ab8..e78dc6b246c 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/db_metrics.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/db_metrics.py @@ -176,7 +176,7 @@ def create_db_client_connection_wait_time(meter: Meter) -> Histogram: DB_CLIENT_CONNECTIONS_CREATE_TIME: Final = "db.client.connections.create_time" """ -Deprecated: Replaced by `db.client.connection.create_time`. Note: the unit also changed from `ms` to `s`. +Deprecated: Replaced by `db.client.connection.create_time` with unit `s`. """ @@ -285,7 +285,7 @@ def create_db_client_connections_usage(meter: Meter) -> UpDownCounter: DB_CLIENT_CONNECTIONS_USE_TIME: Final = "db.client.connections.use_time" """ -Deprecated: Replaced by `db.client.connection.use_time`. Note: the unit also changed from `ms` to `s`. +Deprecated: Replaced by `db.client.connection.use_time` with unit `s`. """ @@ -300,7 +300,7 @@ def create_db_client_connections_use_time(meter: Meter) -> Histogram: DB_CLIENT_CONNECTIONS_WAIT_TIME: Final = "db.client.connections.wait_time" """ -Deprecated: Replaced by `db.client.connection.wait_time`. Note: the unit also changed from `ms` to `s`. +Deprecated: Replaced by `db.client.connection.wait_time` with unit `s`. """ diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/messaging_metrics.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/messaging_metrics.py index 0418743f4aa..32023a78044 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/messaging_metrics.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/messaging_metrics.py @@ -143,15 +143,15 @@ def create_messaging_publish_duration(meter: Meter) -> Histogram: MESSAGING_PUBLISH_MESSAGES: Final = "messaging.publish.messages" """ -Deprecated: Replaced by `messaging.client.produced.messages`. +Deprecated: Replaced by `messaging.client.sent.messages`. """ def create_messaging_publish_messages(meter: Meter) -> Counter: - """Deprecated. Use `messaging.client.produced.messages` instead""" + """Deprecated. Use `messaging.client.sent.messages` instead""" return meter.create_counter( name=MESSAGING_PUBLISH_MESSAGES, - description="Deprecated. Use `messaging.client.produced.messages` instead.", + description="Deprecated. Use `messaging.client.sent.messages` instead.", unit="{message}", ) diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/otel_metrics.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/otel_metrics.py index 2647d60ea72..045f63b32e0 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/otel_metrics.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/otel_metrics.py @@ -147,7 +147,7 @@ def create_otel_sdk_exporter_span_exported(meter: Meter) -> Counter: "otel.sdk.exporter.span.exported.count" ) """ -Deprecated: Renamed to `otel.sdk.exporter.span.exported`. +Deprecated: Replaced by `otel.sdk.exporter.span.exported`. """ @@ -184,7 +184,7 @@ def create_otel_sdk_exporter_span_inflight(meter: Meter) -> UpDownCounter: "otel.sdk.exporter.span.inflight.count" ) """ -Deprecated: Renamed to `otel.sdk.exporter.span.inflight`. +Deprecated: Replaced by `otel.sdk.exporter.span.inflight`. """ @@ -322,7 +322,7 @@ def create_otel_sdk_processor_span_processed(meter: Meter) -> Counter: "otel.sdk.processor.span.processed.count" ) """ -Deprecated: Renamed to `otel.sdk.processor.span.processed`. +Deprecated: Replaced by `otel.sdk.processor.span.processed`. """ @@ -400,7 +400,7 @@ def create_otel_sdk_span_ended(meter: Meter) -> Counter: OTEL_SDK_SPAN_ENDED_COUNT: Final = "otel.sdk.span.ended.count" """ -Deprecated: Renamed to `otel.sdk.span.ended`. +Deprecated: Replaced by `otel.sdk.span.ended`. """ @@ -434,7 +434,7 @@ def create_otel_sdk_span_live(meter: Meter) -> UpDownCounter: OTEL_SDK_SPAN_LIVE_COUNT: Final = "otel.sdk.span.live.count" """ -Deprecated: Renamed to `otel.sdk.span.live`. +Deprecated: Replaced by `otel.sdk.span.live`. """ diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/schemas.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/schemas.py index 77a40bea768..373bd143f27 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/schemas.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/schemas.py @@ -65,5 +65,10 @@ class Schemas(Enum): """ The URL of the OpenTelemetry schema version 1.33.0. """ + + V1_34_0 = "https://opentelemetry.io/schemas/1.34.0" + """ + The URL of the OpenTelemetry schema version 1.34.0. + """ # when generating new semantic conventions, # make sure to add new versions version here. diff --git a/scripts/semconv/generate.sh b/scripts/semconv/generate.sh index df58a966f08..323c0474b65 100755 --- a/scripts/semconv/generate.sh +++ b/scripts/semconv/generate.sh @@ -5,7 +5,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ROOT_DIR="${SCRIPT_DIR}/../.." # freeze the spec version to make SemanticAttributes generation reproducible -SEMCONV_VERSION=1.33.0 +SEMCONV_VERSION=1.34.0 SEMCONV_VERSION_TAG=v$SEMCONV_VERSION OTEL_WEAVER_IMG_VERSION=v0.15.0 INCUBATING_DIR=_incubating