Update the botocore instrumentation to emit events via the logs API instead of the deprecated events API
#3624
Conversation
instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_bedrock.py
Outdated
Show resolved
Hide resolved
...pentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py
Outdated
Show resolved
Hide resolved
|
Updated dependencies to require opentelemetry-api >= 1.35, I think this can be merged now. |
|
ACtually before this goes in I think we need to update the SDK Logger to attach the resource to the LogRecord like the SDK EventLogger does: https://github.com/open-telemetry/opentelemetry-python/blob/main/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py#L654-L764 |
Trying to follow. Is this related to Logging SDK vs Events SDK |
|
Yes. Event SDK emit adds resource, logging SDK does not. Logging SDK should do it, and there should be no SDK Log record (that's sort of tangentially related, the SDK logger expects an SDK log record when it should expect an API log record which has no resource on it) |
|
@DylanRussell is this blocked on releasing open-telemetry/opentelemetry-python#4737? Please resolve the merge conflict when you have a chance |
| attributes=attributes, | ||
| body=self._to_body_dict(), | ||
| **event_kwargs, | ||
| context=get_current(), |
There was a problem hiding this comment.
I think instead we should set the span in context in the callers that needs it with:
from opentelemetry.trace.propagation import set_span_in_context
ctx = set_span_in_context(span, context.get_current())
and pass the context instead of trace_id, span_id, trace_flags.
There was a problem hiding this comment.
When I do that I run into an error along this code path:
AttributeError: 'SpanContext' object has no attribute 'get'
What am I doing wrong ?
There was a problem hiding this comment.
@DylanRussell the span_ctx = span.get_span_context() returns SpanContext object: tests pass with
+ from opentelemetry.trace.propagation import set_span_in_context
+ from opentelemetry.context import get_current
# this path is used by streaming apis, in that case we are already out of the span
# context so need to add the span context manually
- span_ctx = span.get_span_context()
- logger.emit(choice.to_choice_event(context=span_ctx))
+ ctx = set_span_in_context(span, get_current())
+ logger.emit(choice.to_choice_event(context=ctx))
| span_ctx = span.get_span_context() | ||
| event_logger.emit( | ||
| logger.emit( | ||
| choice.to_choice_event( |
There was a problem hiding this comment.
Here I think we should put the span in context and pass the context instead of the 3 deprecated params.
…python-contrib into fix_botocore
| ] | ||
| dependencies = [ | ||
| "opentelemetry-api ~= 1.30", | ||
| "opentelemetry-api >= 1.37", |
There was a problem hiding this comment.
| "opentelemetry-api >= 1.37", | |
| "opentelemetry-api ~= 1.37", |
Description
Move
botocorefrom the deprecated events API to the logs API.Type of change
Please delete options that are not relevant.
How Has This Been Tested?
I've updated the existing unit tests to all pass.
Does This PR Require a Core Repo Change?
Checklist:
See contributing.md for styleguide, changelog guidelines, and more.