Merge branch 'main' into fix_broken_test_and_shutdown_threads

Author: xrmx

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)
 

opentelemetry-api/src/opentelemetry/trace/span.py

@@ -592,7 +592,7 @@ def format_trace_id(trace_id: int) -> str:
         trace_id: Trace ID int
 
     Returns:
-        The trace ID as 32-byte hexadecimal string
+        The trace ID (16 bytes) cast to a 32-character hexadecimal string
     """
     return format(trace_id, "032x")
 
@@ -603,6 +603,6 @@ def format_span_id(span_id: int) -> str:
         span_id: Span ID int
 
     Returns:
-        The span ID as 16-byte hexadecimal string
+        The span ID (8 bytes) cast to a 16-character hexadecimal string
     """
     return format(span_id, "016x")

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"

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).
 """
 

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"

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"

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"

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"

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.
 """

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.