Merge branch 'main' into jacksonweber/populate-synthetic-attributes

Author: JacksonWeber

.github/component_owners.yml

@@ -48,3 +48,6 @@ components:
   instrumentation-genai/opentelemetry-instrumentation-langchain:
     - zhirafovod
     - wrisa
+
+  instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2:
+    - nagkumar91

instrumentation-genai/README.md

@@ -3,7 +3,7 @@
 | --------------- | ------------------ | --------------- | -------------- |
 | [opentelemetry-instrumentation-google-genai](./opentelemetry-instrumentation-google-genai) | google-genai >= 1.0.0 | No | development
 | [opentelemetry-instrumentation-langchain](./opentelemetry-instrumentation-langchain) | langchain >= 0.3.21 | No | development
-| [opentelemetry-instrumentation-openai-agents](./opentelemetry-instrumentation-openai-agents) | openai-agents >= 0.3.3 | No | development
+| [opentelemetry-instrumentation-openai-agents-v2](./opentelemetry-instrumentation-openai-agents-v2) | openai-agents >= 0.3.3 | No | development
 | [opentelemetry-instrumentation-openai-v2](./opentelemetry-instrumentation-openai-v2) | openai >= 1.26.0 | Yes | development
 | [opentelemetry-instrumentation-vertexai](./opentelemetry-instrumentation-vertexai) | google-cloud-aiplatform >= 1.64 | No | development
 | [opentelemetry-instrumentation-weaviate](./opentelemetry-instrumentation-weaviate) | weaviate-client >= 3.0.0,<5.0.0 | No | development

instrumentation-genai/opentelemetry-instrumentation-google-genai/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Implement the new semantic convention changes made in https://github.com/open-telemetry/semantic-conventions/pull/2179.
+A single event (`gen_ai.client.inference.operation.details`) is used to capture Chat History. This is opt-in,
+an environment variable OTEL_SEMCONV_STABILITY_OPT_IN needs to be set to `gen_ai_latest_experimental` to see them ([#3386](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3386))
+- Support CompletionHook for upload to cloud storage. 
+
 ## Version 0.3b0 (2025-07-08)
 
 - Add automatic instrumentation to tool call functions ([#3446](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3446))

instrumentation-genai/opentelemetry-instrumentation-google-genai/pyproject.toml

@@ -38,13 +38,15 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~=1.37",
-  "opentelemetry-instrumentation >=0.52b1, <2",
-  "opentelemetry-semantic-conventions >=0.52b1, <2"
-]
+  "opentelemetry-instrumentation >=0.58b0, <2",
+  "opentelemetry-semantic-conventions >=0.58b0, <2",
+  # TODO https://github.com/open-telemetry/opentelemetry-python-contrib/issues/3786: restrict
+  # version after the first release
+  "opentelemetry-util-genai",]
 
 [project.optional-dependencies]
 instruments = [
-    "google-genai >= 1.0.0"
+    "google-genai >= 1.32.0"
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/flags.py

@@ -12,12 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
+from os import environ
+from typing import Union
 
-_CONTENT_RECORDING_ENV_VAR = (
-    "OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"
+from opentelemetry.instrumentation._semconv import _StabilityMode
+from opentelemetry.util.genai.environment_variables import (
+    OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT,
 )
+from opentelemetry.util.genai.types import ContentCapturingMode
+from opentelemetry.util.genai.utils import get_content_capturing_mode
 
 
-def is_content_recording_enabled():
-    return os.getenv(_CONTENT_RECORDING_ENV_VAR, "false").lower() == "true"
+def is_content_recording_enabled(
+    mode: _StabilityMode,
+) -> Union[bool, ContentCapturingMode]:
+    if mode == _StabilityMode.DEFAULT:
+        capture_content = environ.get(
+            OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT, "false"
+        )
+        return capture_content.lower() == "true"
+    if mode == _StabilityMode.GEN_AI_LATEST_EXPERIMENTAL:
+        return get_content_capturing_mode()
+    raise RuntimeError(f"{mode} mode not supported")