up

Author: lmolkova

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/aws_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/aws_attributes.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
+from deprecated import deprecated
 from enum import Enum
 
 
@@ -54,7 +54,7 @@
 
 AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES = "aws.dynamodb.global_secondary_index_updates"
 """
-The JSON-serialized value of each item in the the `GlobalSecondaryIndexUpdates` request field.
+The JSON-serialized value of each item in the `GlobalSecondaryIndexUpdates` request field.
 """
 
 
@@ -132,7 +132,7 @@
 
 AWS_DYNAMODB_TABLE_COUNT = "aws.dynamodb.table_count"
 """
-The the number of items in the `TableNames` response parameter.
+The number of items in the `TableNames` response parameter.
 """
 
 
@@ -168,19 +168,25 @@
 
 AWS_ECS_TASK_ARN = "aws.ecs.task.arn"
 """
-The ARN of an [ECS task definition](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html).
+The ARN of a running [ECS task](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-account-settings.html#ecs-resource-ids).
 """
 
 
 AWS_ECS_TASK_FAMILY = "aws.ecs.task.family"
 """
-The task definition family this task definition is a member of.
+The family name of the [ECS task definition](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html) used to create the ECS task.
+"""
+
+
+AWS_ECS_TASK_ID = "aws.ecs.task.id"
+"""
+The ID of a running ECS task. The ID MUST be extracted from `task.arn`.
 """
 
 
 AWS_ECS_TASK_REVISION = "aws.ecs.task.revision"
 """
-The revision for this task definition.
+The revision for the task definition used to create the ECS task.
 """
 
 
@@ -296,6 +302,7 @@
 """
 
 
+
 class AwsEcsLaunchtypeValues(Enum):
     EC2 = "ec2"
     """ec2."""

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/browser_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/browser_attributes.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+
 BROWSER_BRANDS = "browser.brands"
 """
 Array of brand name and version separated by a space.Note: This value is intended to be taken from the [UA client hints API](https://wicg.github.io/ua-client-hints/#interface) (`navigator.userAgentData.brands`).

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/user_agent_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/client_attributes.py

@@ -12,10 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-USER_AGENT_ORIGINAL = "user_agent.original"
+
+
+CLIENT_ADDRESS = "client.address"
+"""
+
+Deprecated: The attribute is stable now, use :py:const:`opentelemetry.semconv.attributes.client_attributes.CLIENT_ADDRESS` instead.
 """
-Value of the [HTTP User-Agent](https://www.rfc-editor.org/rfc/rfc9110.html#field.user-agent) header sent by the client.
-See Also: the attribute is stable now, use :py:const:`opentelemetry.semconv.user_agent_attributes.USER_AGENT_ORIGINAL` instead.
+
+
+CLIENT_PORT = "client.port"
+"""
+
+Deprecated: The attribute is stable now, use :py:const:`opentelemetry.semconv.attributes.client_attributes.CLIENT_PORT` instead.
 """
 
 

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/cloud_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/cloud_attributes.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
+from deprecated import deprecated
 from enum import Enum
 
 
@@ -68,6 +68,7 @@
 """
 
 
+
 class CloudPlatformValues(Enum):
     ALIBABA_CLOUD_ECS = "alibaba_cloud_ecs"
     """Alibaba Cloud Elastic Compute Service."""
@@ -102,6 +103,9 @@ class CloudPlatformValues(Enum):
     AZURE_VM = "azure_vm"
     """Azure Virtual Machines."""
 
+    AZURE_CONTAINER_APPS = "azure_container_apps"
+    """Azure Container Apps."""
+
     AZURE_CONTAINER_INSTANCES = "azure_container_instances"
     """Azure Container Instances."""
 
@@ -151,6 +155,7 @@ class CloudPlatformValues(Enum):
     """Tencent Cloud Serverless Cloud Function (SCF)."""
 
 
+
 class CloudProviderValues(Enum):
     ALIBABA_CLOUD = "alibaba_cloud"
     """Alibaba Cloud."""

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/cloudevents_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/cloudevents_attributes.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+
 CLOUDEVENTS_EVENT_ID = "cloudevents.event_id"
 """
 The [event_id](https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#id) uniquely identifies the event.

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/code_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/code_attributes.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+
 CODE_COLUMN = "code.column"
 """
 The column number in `code.filepath` best representing the operation. It SHOULD point within the code unit named in `code.function`.

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/container_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/container_attributes.py

@@ -12,6 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from deprecated import deprecated
+from enum import Enum
+
+
 CONTAINER_COMMAND = "container.command"
 """
 The command used to run the container (i.e. the command name).Note: If using embedded credentials or sensitive data, it is recommended to remove them to prevent potential leakage.
@@ -30,6 +34,12 @@
 """
 
 
+CONTAINER_CPU_STATE = "container.cpu.state"
+"""
+The CPU state for this data point.
+"""
+
+
 CONTAINER_ID = "container.id"
 """
 Container ID. Usually a UUID, as for example used to [identify Docker containers](https://docs.docker.com/engine/reference/run/#container-identification). The UUID might be abbreviated.
@@ -62,12 +72,18 @@
 """
 
 
-CONTAINER_LABELS_TEMPLATE = "container.labels"
+CONTAINER_LABEL_TEMPLATE = "container.label"
 """
 Container labels, `<key>` being the label name, the value being the label value.
 """
 
 
+CONTAINER_LABELS_TEMPLATE = "container.labels"
+"""
+Deprecated: Replaced by `container.label`.
+"""
+
+
 CONTAINER_NAME = "container.name"
 """
 Container name used by container runtime.
@@ -80,3 +96,15 @@
 """
 
 
+
+class ContainerCpuStateValues(Enum):
+    USER = "user"
+    """When tasks of the cgroup are in user mode (Linux). When all container processes are in user mode (Windows)."""
+
+    SYSTEM = "system"
+    """When CPU is used by the system (host OS)."""
+
+    KERNEL = "kernel"
+    """When tasks of the cgroup are in kernel mode (Linux). When all container processes are in kernel mode (Windows)."""
+
+

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/db_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/db_attributes.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
+from deprecated import deprecated
 from enum import Enum
 
 
@@ -60,7 +60,7 @@
 
 DB_CONNECTION_STRING = "db.connection_string"
 """
-The connection string used to connect to the database. It is recommended to remove embedded credentials.
+Deprecated: "Replaced by `server.address` and `server.port`.".
 """
 
 
@@ -120,7 +120,7 @@
 
 DB_ELASTICSEARCH_NODE_NAME = "db.elasticsearch.node.name"
 """
-Represents the human-readable identifier of the node/instance to which a request was routed.
+Deprecated: Replaced by `db.instance.id`.
 """
 
 
@@ -138,7 +138,7 @@
 
 DB_JDBC_DRIVER_CLASSNAME = "db.jdbc.driver_classname"
 """
-The fully-qualified class name of the [Java Database Connectivity (JDBC)](https://docs.oracle.com/javase/8/docs/technotes/guides/jdbc/) driver used to connect.
+Deprecated: Removed as not used.
 """
 
 
@@ -196,6 +196,7 @@
 """
 
 
+
 class DbCassandraConsistencyLevelValues(Enum):
     ALL = "all"
     """all."""
@@ -231,6 +232,7 @@ class DbCassandraConsistencyLevelValues(Enum):
     """local_serial."""
 
 
+
 class DbCosmosdbConnectionModeValues(Enum):
     GATEWAY = "gateway"
     """Gateway (HTTP) connections mode."""
@@ -239,6 +241,7 @@ class DbCosmosdbConnectionModeValues(Enum):
     """Direct connection."""
 
 
+
 class DbCosmosdbOperationTypeValues(Enum):
     INVALID = "Invalid"
     """invalid."""
@@ -286,6 +289,7 @@ class DbCosmosdbOperationTypeValues(Enum):
     """execute_javascript."""
 
 
+
 class DbSystemValues(Enum):
     OTHER_SQL = "other_sql"
     """Some other SQL database. Fallback only. See notes."""

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/deployment_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/deployment_attributes.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+
 DEPLOYMENT_ENVIRONMENT = "deployment.environment"
 """
 Name of the [deployment environment](https://wikipedia.org/wiki/Deployment_environment) (aka deployment tier).Note: `deployment.environment` does not affect the uniqueness constraints defined through

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/destination_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/destination_attributes.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+
 DESTINATION_ADDRESS = "destination.address"
 """
 Destination address - domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain socket name.Note: When observed from the source side, and when communicating through an intermediary, `destination.address` SHOULD represent the destination address behind any intermediaries, for example proxies, if it's available.

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/device_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/device_attributes.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+
 DEVICE_ID = "device.id"
 """
 A unique identifier representing the device.Note: The device identifier MUST only be defined using the values outlined below. This value is not an advertising identifier and MUST NOT be used as such. On iOS (Swift or Objective-C), this value MUST be equal to the [vendor identifier](https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor). On Android (Java or Kotlin), this value MUST be equal to the Firebase Installation ID or a globally unique UUID which is persisted across sessions in your application. More information can be found [here](https://developer.android.com/training/articles/user-data-ids) on best practices and exact implementation details. Caution should be taken when storing personal data or anything which can identify a user. GDPR and data protection laws may apply, ensure you do your own due diligence.

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/disk_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/disk_attributes.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
+from deprecated import deprecated
 from enum import Enum
 
 
@@ -22,6 +22,7 @@
 """
 
 
+
 class DiskIoDirectionValues(Enum):
     READ = "read"
     """read."""

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/dns_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/dns_attributes.py

@@ -12,10 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+
 DNS_QUESTION_NAME = "dns.question.name"
 """
-The name being queried.Note: The name being queried.
-    If the name field contains non-printable characters (below 32 or above 126), those characters should be represented as escaped base 10 integers (\DDD). Back slashes and quotes should be escaped. Tabs, carriage returns, and line feeds should be converted to \t, \r, and \n respectively.
+The name being queried.Note: If the name field contains non-printable characters (below 32 or above 126), those characters should be represented as escaped base 10 integers (\DDD). Back slashes and quotes should be escaped. Tabs, carriage returns, and line feeds should be converted to \t, \r, and \n respectively.
 """
 
 

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/enduser_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/enduser_attributes.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+
 ENDUSER_ID = "enduser.id"
 """
 Username or client_id extracted from the access token or [Authorization](https://tools.ietf.org/html/rfc7235#section-4.2) header in the inbound request from outside the system.

opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/error_attributes.py

@@ -0,0 +1,32 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from deprecated import deprecated
+from enum import Enum
+
+
+ERROR_TYPE = "error.type"
+"""
+
+Deprecated: The attribute is stable now, use :py:const:`opentelemetry.semconv.attributes.error_attributes.ERROR_TYPE` instead.
+"""
+
+
+
+@deprecated(reason="The attribute is stable now, use :py:const:`opentelemetry.semconv.attributes.error_attributes.ErrorTypeValues` instead.")
+class ErrorTypeValues(Enum):
+    OTHER = "_OTHER"
+    """A fallback error value to be used when the instrumentation doesn't define a custom value."""
+
+

opentelemetry-semantic-conventions/src/opentelemetry/semconv/incubating/event_attributes.py renamed to opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/event_attributes.py

@@ -12,9 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+
 EVENT_NAME = "event.name"
 """
-Identifies the class / type of event.Note: Event names are subject to the same rules as [attribute names](https://github.com/open-telemetry/opentelemetry-specification/tree/v1.26.0/specification/common/attribute-naming.md). Notably, event names are namespaced to avoid collisions and provide a clean separation of semantics for events in separate domains like browser, mobile, and kubernetes.
+Identifies the class / type of event.Note: Event names are subject to the same rules as [attribute names](https://github.com/open-telemetry/opentelemetry-specification/tree/v1.31.0/specification/common/attribute-naming.md). Notably, event names are namespaced to avoid collisions and provide a clean separation of semantics for events in separate domains like browser, mobile, and kubernetes.
 """