From 9846ea3605fa96a9b0bb9c125b62c1a320687607 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 21 May 2025 16:07:08 -0700 Subject: [PATCH 1/3] Update OpenAi instrumentor for Logs/Events API args change --- .../src/opentelemetry/instrumentation/openai_v2/patch.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/patch.py b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/patch.py index 072365abb7..cc8d890cb7 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/patch.py +++ b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/patch.py @@ -26,6 +26,7 @@ server_attributes as ServerAttributes, ) from opentelemetry.trace import Span, SpanKind, Tracer +from opentelemetry.trace.span import SpanContext from .instruments import Instruments from .utils import ( @@ -404,9 +405,7 @@ def cleanup(self): name="gen_ai.choice", attributes=event_attributes, body=body, - trace_id=span_ctx.trace_id, - span_id=span_ctx.span_id, - trace_flags=span_ctx.trace_flags, + span_context=span_ctx, ) ) From 3de428b659a19ed447d06098f8af54ff9ee67fbf Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 21 May 2025 16:08:01 -0700 Subject: [PATCH 2/3] Update Botocore instrumentor for Logs/Events API args change --- .../instrumentation/botocore/extensions/bedrock.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/bedrock.py b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/bedrock.py index 6a6c009ee2..740fbbd4a0 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/bedrock.py +++ b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/bedrock.py @@ -506,9 +506,7 @@ def _converse_on_success( span_ctx = span.get_span_context() event_logger.emit( choice.to_choice_event( - trace_id=span_ctx.trace_id, - span_id=span_ctx.span_id, - trace_flags=span_ctx.trace_flags, + span_context=span_ctx, ) ) From ee908dcc1c1b1ff8252766ad9c2f29cf5adafb8c Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 21 May 2025 16:12:41 -0700 Subject: [PATCH 3/3] Changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ecdc6d396..45ba1d44e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#3474](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3474)) - `opentelemetry-instrumentation-fastapi`: Drop support for FastAPI versions earlier than `0.92` ([#3012](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3012)) +- `opentelemetry-instrumentation-botocore`, `opentelemetry-instrumentation-openai-v2`: Update Events API usage + ([#3528](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3528)) ## Version 1.33.0/0.54b0 (2025-05-09)