Skip to content

extract span preparation logic into helper function #3611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

extract span preparation logic into helper function #3611

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions ...telemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,26 +262,17 @@ def _patched_endpoint_prepare_request(

return wrapped(*args, **kwargs)

# pylint: disable=too-many-locals
# pylint: disable=too-many-branches
def _patched_api_call(self, original_func, instance, args, kwargs):
if not is_instrumentation_enabled():
return original_func(*args, **kwargs)

call_context = _determine_call_context(instance, args)
if call_context is None:
span_data = self._prepare_span_data(instance, args)
if span_data is None:
return original_func(*args, **kwargs)

extension = _find_extension(call_context)
if not extension.should_trace_service_call():
return original_func(*args, **kwargs)

attributes = {
SpanAttributes.RPC_SYSTEM: "aws-api",
SpanAttributes.RPC_SERVICE: call_context.service_id,
SpanAttributes.RPC_METHOD: call_context.operation,
CLOUD_REGION: call_context.region,
**get_server_attributes(call_context.endpoint_url),
}
call_context, extension, attributes = span_data

_safe_invoke(extension.extract_attributes, attributes)
end_span_on_exit = extension.should_end_span_on_exit()
Expand Down Expand Up @@ -346,6 +337,25 @@ def _call_response_hook(
span, call_context.service, call_context.operation, result
)

@staticmethod
def _prepare_span_data(instance, args):
call_context = _determine_call_context(instance, args)
if call_context is None:
return None

extension = _find_extension(call_context)
if not extension.should_trace_service_call():
return None

attributes = {
SpanAttributes.RPC_SYSTEM: "aws-api",
SpanAttributes.RPC_SERVICE: call_context.service_id,
SpanAttributes.RPC_METHOD: call_context.operation,
CLOUD_REGION: call_context.region,
**get_server_attributes(call_context.endpoint_url),
}

return call_context, extension, attributes

def _apply_response_attributes(span: Span, result):
if result is None or not span.is_recording():
Expand Down