Merge branch 'main' into retry2

Author: DylanRussell

CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4553](https://github.com/open-telemetry/opentelemetry-python/pull/4553))
 - docs: updated and added to the metrics and log examples
   ([#4559](https://github.com/open-telemetry/opentelemetry-python/pull/4559))
+- Bump semantic conventions to 1.33.0
+  ([#4567](https://github.com/open-telemetry/opentelemetry-python/pull/4567))
 
 ## Version 1.32.0/0.53b0 (2025-04-10)
 

opentelemetry-api/src/opentelemetry/_logs/_internal/__init__.py

@@ -162,29 +162,30 @@ def get_logger(
     ) -> Logger:
         """Returns a `Logger` for use by the given instrumentation library.
 
-        For any two calls it is undefined whether the same or different
-        `Logger` instances are returned, even for different library names.
+        For any two calls with identical parameters, it is undefined whether the same
+        or different `Logger` instances are returned.
 
         This function may return different `Logger` types (e.g. a no-op logger
         vs. a functional logger).
 
         Args:
-            name: The name of the instrumenting module.
-                ``__name__`` may not be used as this can result in
-                different logger names if the loggers are in different files.
-                It is better to use a fixed string that can be imported where
-                needed and used consistently as the name of the logger.
-
-                This should *not* be the name of the module that is
-                instrumented but the name of the module doing the instrumentation.
+            name: The name of the instrumenting module, package or class.
+                This should *not* be the name of the module, package or class that is
+                instrumented but the name of the code doing the instrumentation.
                 E.g., instead of ``"requests"``, use
                 ``"opentelemetry.instrumentation.requests"``.
 
+                For log sources which define a logger name (e.g. logging.Logger.name)
+                the Logger Name should be recorded as the instrumentation scope name.
+
             version: Optional. The version string of the
                 instrumenting library.  Usually this should be the same as
                 ``importlib.metadata.version(instrumenting_library_name)``.
 
             schema_url: Optional. Specifies the Schema URL of the emitted telemetry.
+
+            attributes: Optional. Specifies the instrumentation scope attributes to
+                associate with emitted telemetry.
         """
 
 

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

@@ -35,3 +35,25 @@
 
 More information about Android identifier best practices can be found [here](https://developer.android.com/training/articles/user-data-ids).
 """
+
+APP_SCREEN_COORDINATE_X: Final = "app.screen.coordinate.x"
+"""
+The x (horizontal) coordinate of a screen coordinate, in screen pixels.
+"""
+
+APP_SCREEN_COORDINATE_Y: Final = "app.screen.coordinate.y"
+"""
+The y (vertical) component of a screen coordinate, in screen pixels.
+"""
+
+APP_WIDGET_ID: Final = "app.widget.id"
+"""
+An identifier that uniquely differentiates this widget from other widgets in the same application.
+Note: A widget is an application component, typically an on-screen visual GUI element.
+"""
+
+APP_WIDGET_NAME: Final = "app.widget.name"
+"""
+The name of an application widget.
+Note: A widget is an application component, typically an on-screen visual GUI element.
+"""

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

@@ -15,6 +15,11 @@
 from enum import Enum
 from typing import Final
 
+CICD_PIPELINE_ACTION_NAME: Final = "cicd.pipeline.action.name"
+"""
+The kind of action a pipeline run is performing.
+"""
+
 CICD_PIPELINE_NAME: Final = "cicd.pipeline.name"
 """
 The human readable name of the pipeline within a CI/CD system.
@@ -50,6 +55,11 @@
 The unique identifier of a task run within a pipeline.
 """
 
+CICD_PIPELINE_TASK_RUN_RESULT: Final = "cicd.pipeline.task.run.result"
+"""
+The result of a task run.
+"""
+
 CICD_PIPELINE_TASK_RUN_URL_FULL: Final = "cicd.pipeline.task.run.url.full"
 """
 The [URL](https://wikipedia.org/wiki/URL) of the pipeline task run, providing the complete address in order to locate and identify the pipeline task run.
@@ -65,11 +75,35 @@
 The name of a component of the CICD system.
 """
 
+CICD_WORKER_ID: Final = "cicd.worker.id"
+"""
+The unique identifier of a worker within a CICD system.
+"""
+
+CICD_WORKER_NAME: Final = "cicd.worker.name"
+"""
+The name of a worker within a CICD system.
+"""
+
 CICD_WORKER_STATE: Final = "cicd.worker.state"
 """
 The state of a CICD worker / agent.
 """
 
+CICD_WORKER_URL_FULL: Final = "cicd.worker.url.full"
+"""
+The [URL](https://wikipedia.org/wiki/URL) of the worker, providing the complete address in order to locate and identify the worker.
+"""
+
+
+class CicdPipelineActionNameValues(Enum):
+    BUILD = "BUILD"
+    """The pipeline run is executing a build."""
+    RUN = "RUN"
+    """The pipeline run is executing."""
+    SYNC = "SYNC"
+    """The pipeline run is executing a sync."""
+
 
 class CicdPipelineResultValues(Enum):
     SUCCESS = "success"
@@ -95,6 +129,21 @@ class CicdPipelineRunStateValues(Enum):
     """The finalizing state spans from when the run has finished executing (eg. cleanup of run resources)."""
 
 
+class CicdPipelineTaskRunResultValues(Enum):
+    SUCCESS = "success"
+    """The task run finished successfully."""
+    FAILURE = "failure"
+    """The task run did not finish successfully, eg. due to a compile error or a failing test. Such failures are usually detected by non-zero exit codes of the tools executed in the task run."""
+    ERROR = "error"
+    """The task run failed due to an error in the CICD system, eg. due to the worker being killed."""
+    TIMEOUT = "timeout"
+    """A timeout caused the task run to be interrupted."""
+    CANCELLATION = "cancellation"
+    """The task run was cancelled, eg. by a user manually cancelling the task run."""
+    SKIP = "skip"
+    """The task run was skipped, eg. due to a precondition not being met."""
+
+
 class CicdPipelineTaskTypeValues(Enum):
     BUILD = "build"
     """build."""

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

@@ -21,12 +21,12 @@
 
 CODE_COLUMN_NUMBER: Final = "code.column.number"
 """
-The column number in `code.file.path` best representing the operation. It SHOULD point within the code unit named in `code.function.name`.
+Deprecated in favor of stable :py:const:`opentelemetry.semconv.attributes.code_attributes.CODE_COLUMN_NUMBER`.
 """
 
 CODE_FILE_PATH: Final = "code.file.path"
 """
-The source code file name that identifies the code unit as uniquely as possible (preferably an absolute file path).
+Deprecated in favor of stable :py:const:`opentelemetry.semconv.attributes.code_attributes.CODE_FILE_PATH`.
 """
 
 CODE_FILEPATH: Final = "code.filepath"
@@ -41,27 +41,12 @@
 
 CODE_FUNCTION_NAME: Final = "code.function.name"
 """
-The method or function fully-qualified name without arguments. The value should fit the natural representation of the language runtime, which is also likely the same used within `code.stacktrace` attribute value.
-Note: Values and format depends on each language runtime, thus it is impossible to provide an exhaustive list of examples.
-The values are usually the same (or prefixes of) the ones found in native stack trace representation stored in
-`code.stacktrace` without information on arguments.
-
-Examples:
-
-* Java method: `com.example.MyHttpService.serveRequest`
-* Java anonymous class method: `com.mycompany.Main$1.myMethod`
-* Java lambda method: `com.mycompany.Main$$Lambda/0x0000748ae4149c00.myMethod`
-* PHP function: `GuzzleHttp\\Client::transfer`
-* Go function: `github.com/my/repo/pkg.foo.func5`
-* Elixir: `OpenTelemetry.Ctx.new`
-* Erlang: `opentelemetry_ctx:new`
-* Rust: `playground::my_module::my_cool_func`
-* C function: `fopen`.
+Deprecated in favor of stable :py:const:`opentelemetry.semconv.attributes.code_attributes.CODE_FUNCTION_NAME`.
 """
 
 CODE_LINE_NUMBER: Final = "code.line.number"
 """
-The line number in `code.file.path` best representing the operation. It SHOULD point within the code unit named in `code.function.name`.
+Deprecated in favor of stable :py:const:`opentelemetry.semconv.attributes.code_attributes.CODE_LINE_NUMBER`.
 """
 
 CODE_LINENO: Final = "code.lineno"
@@ -76,5 +61,5 @@
 
 CODE_STACKTRACE: Final = "code.stacktrace"
 """
-A stacktrace as a string in the natural representation for the language runtime. The representation is identical to [`exception.stacktrace`](/docs/exceptions/exceptions-spans.md#stacktrace-representation).
+Deprecated in favor of stable :py:const:`opentelemetry.semconv.attributes.code_attributes.CODE_STACKTRACE`.
 """

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

@@ -82,6 +82,7 @@
 CONTAINER_LABEL_TEMPLATE: Final = "container.label"
 """
 Container labels, `<key>` being the label name, the value being the label value.
+Note: For example, a docker container label `app` with value `nginx` SHOULD be recorded as the `container.label.app` attribute with value `"nginx"`.
 """
 
 CONTAINER_LABELS_TEMPLATE: Final = "container.labels"