Skip to content

chore(strawberry): Remove transaction-based tracing #7166

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

Draft
sentrivana wants to merge 2 commits into
base: major/3.0
Choose a base branch
from
+233 −672
Draft

chore(strawberry): Remove transaction-based tracing #7166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3da50f0
chore(strawberry): Remove transaction-based tracing
sentrivana Aug 11, 2026
4445c6e
Merge branch 'major/3.0' into ivana/major/remove-transactions-strawberry
sentrivana Aug 11, 2026
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
231 changes: 71 additions & 160 deletions sentry_sdk/integrations/strawberry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
from sentry_sdk.integrations.logging import ignore_logger
from sentry_sdk.scope import should_send_default_pii
from sentry_sdk.traces import SegmentNameSource
from sentry_sdk.tracing import Span, TransactionSource
from sentry_sdk.tracing_utils import StreamedSpan, has_span_streaming_enabled
from sentry_sdk.utils import (
capture_internal_exceptions,
ensure_integration_enabled,
Expand Down Expand Up @@ -178,138 +176,81 @@ def on_operation(self) -> "Generator[None, None, None]":
scope.add_event_processor(event_processor)

client = sentry_sdk.get_client()
is_span_streaming_enabled = has_span_streaming_enabled(client.options)
if is_span_streaming_enabled:
if sentry_sdk.traces.get_current_span() is None:
yield
return

additional_attributes: "dict[str, Any]" = {}
if has_data_collection_enabled(client.options):
if client.options["data_collection"]["graphql"]["document"]:
additional_attributes["graphql.document"] = (
self.execution_context.query
)

elif should_send_default_pii():
additional_attributes["graphql.document"] = self.execution_context.query
if sentry_sdk.traces.get_current_span() is None:

@cursor cursor Bot Aug 11, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dead resource name helpers remain

Low Severity

_resource_name and hash_query are unused after the static tracing path was removed. Their only call site set graphql.resource_name on legacy spans, so these helpers (and the hashlib import they need) are now dead code.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 4445c6e. Configure here.

yield
return

if operation_name:
additional_attributes["graphql.operation.name"] = operation_name

graphql_span = sentry_sdk.traces.start_span(
name=description,
attributes={
"sentry.origin": StrawberryIntegration.origin,
"sentry.op": op,
"graphql.operation.type": operation_type,
**additional_attributes,
},
)
else:
graphql_span = sentry_sdk.start_span(
op=op,
name=description,
origin=StrawberryIntegration.origin,
)
graphql_span.__enter__()
additional_attributes: "dict[str, Any]" = {}
if has_data_collection_enabled(client.options):
if client.options["data_collection"]["graphql"]["document"]:
additional_attributes["graphql.document"] = self.execution_context.query

if type(graphql_span) is Span:
if has_data_collection_enabled(client.options):
if client.options["data_collection"]["graphql"]["document"]:
graphql_span.set_data(
"graphql.document", self.execution_context.query
)
elif should_send_default_pii():
graphql_span.set_data("graphql.document", self.execution_context.query)
elif should_send_default_pii():
additional_attributes["graphql.document"] = self.execution_context.query

graphql_span.set_data("graphql.operation.type", operation_type)
graphql_span.set_data("graphql.operation.name", operation_name)
# This attribute is being removed in streamed spans
graphql_span.set_data("graphql.resource_name", self._resource_name)
if operation_name:
additional_attributes["graphql.operation.name"] = operation_name

graphql_span = sentry_sdk.traces.start_span(
name=description,
attributes={
"sentry.origin": StrawberryIntegration.origin,
"sentry.op": op,
"graphql.operation.type": operation_type,
**additional_attributes,
},
)

yield

if type(graphql_span) is StreamedSpan:
if self.execution_context.operation_name:
segment = graphql_span._segment
segment.set_attribute(
"sentry.segment.name.source", SegmentNameSource.COMPONENT
)
segment.set_attribute("sentry.op", op)
segment.name = self.execution_context.operation_name
elif isinstance(graphql_span, Span):
transaction = graphql_span.containing_transaction
if transaction and self.execution_context.operation_name:
transaction.name = self.execution_context.operation_name
transaction.source = TransactionSource.COMPONENT
transaction.op = op
if self.execution_context.operation_name:
segment = graphql_span._segment
segment.set_attribute(
"sentry.segment.name.source", SegmentNameSource.COMPONENT
)
segment.set_attribute("sentry.op", op)
segment.name = self.execution_context.operation_name

graphql_span.__exit__(None, None, None)
graphql_span.end()

def on_validate(self) -> "Generator[None, None, None]":
client = sentry_sdk.get_client()
is_span_streaming_enabled = has_span_streaming_enabled(client.options)

if is_span_streaming_enabled:
if sentry_sdk.traces.get_current_span() is None:
yield
return

validation_span = sentry_sdk.traces.start_span(
name="validation",
attributes={
"sentry.op": OP.GRAPHQL_VALIDATE,
"sentry.origin": StrawberryIntegration.origin,
},
)
else:
validation_span = sentry_sdk.start_span(
op=OP.GRAPHQL_VALIDATE,
name="validation",
origin=StrawberryIntegration.origin,
)
if sentry_sdk.traces.get_current_span() is None:
yield
return

validation_span = sentry_sdk.traces.start_span(
name="validation",
attributes={
"sentry.op": OP.GRAPHQL_VALIDATE,
"sentry.origin": StrawberryIntegration.origin,
},
)

# If an exception is raised during validation, we still need to close the span
try:
yield
finally:
if isinstance(validation_span, StreamedSpan):
validation_span.end()
else:
validation_span.finish()
validation_span.end()

def on_parse(self) -> "Generator[None, None, None]":
client = sentry_sdk.get_client()
is_span_streaming_enabled = has_span_streaming_enabled(client.options)

if is_span_streaming_enabled:
if sentry_sdk.traces.get_current_span() is None:
yield
return

parsing_span = sentry_sdk.traces.start_span(
name="parsing",
attributes={
"sentry.op": OP.GRAPHQL_PARSE,
"sentry.origin": StrawberryIntegration.origin,
},
)
else:
parsing_span = sentry_sdk.start_span(
op=OP.GRAPHQL_PARSE,
name="parsing",
origin=StrawberryIntegration.origin,
)
if sentry_sdk.traces.get_current_span() is None:
yield
return

parsing_span = sentry_sdk.traces.start_span(
name="parsing",
attributes={
"sentry.op": OP.GRAPHQL_PARSE,
"sentry.origin": StrawberryIntegration.origin,
},
)

# If an exception is raised during parsing, we still need to close the span
try:
yield
finally:
if isinstance(parsing_span, StreamedSpan):
parsing_span.end()
else:
parsing_span.finish()
parsing_span.end()

def should_skip_tracing(
self,
Expand Down Expand Up @@ -346,31 +287,16 @@ async def resolve(

field_path = "{}.{}".format(info.parent_type, info.field_name)

client = sentry_sdk.get_client()
is_span_streaming_enabled = has_span_streaming_enabled(client.options)
if is_span_streaming_enabled:
if sentry_sdk.traces.get_current_span() is None:
return await self._resolve(_next, root, info, *args, **kwargs)

with sentry_sdk.traces.start_span(
name=f"resolving {field_path}",
attributes={
"sentry.origin": StrawberryIntegration.origin,
"sentry.op": OP.GRAPHQL_RESOLVE,
},
):
return await self._resolve(_next, root, info, *args, **kwargs)

with sentry_sdk.start_span(
op=OP.GRAPHQL_RESOLVE,
name="resolving {}".format(field_path),
origin=StrawberryIntegration.origin,
) as span:
span.set_data("graphql.field_name", info.field_name)
span.set_data("graphql.parent_type", info.parent_type.name)
span.set_data("graphql.field_path", field_path)
span.set_data("graphql.path", ".".join(map(str, info.path.as_list())))
if sentry_sdk.traces.get_current_span() is None:
return await self._resolve(_next, root, info, *args, **kwargs)

with sentry_sdk.traces.start_span(
name=f"resolving {field_path}",
attributes={
"sentry.origin": StrawberryIntegration.origin,
"sentry.op": OP.GRAPHQL_RESOLVE,
},
):
return await self._resolve(_next, root, info, *args, **kwargs)


Expand All @@ -388,31 +314,16 @@ def resolve(

field_path = "{}.{}".format(info.parent_type, info.field_name)

client = sentry_sdk.get_client()
is_span_streaming_enabled = has_span_streaming_enabled(client.options)
if is_span_streaming_enabled:
if sentry_sdk.traces.get_current_span() is None:
return _next(root, info, *args, **kwargs)

with sentry_sdk.traces.start_span(
name=f"resolving {field_path}",
attributes={
"sentry.origin": StrawberryIntegration.origin,
"sentry.op": OP.GRAPHQL_RESOLVE,
},
):
return _next(root, info, *args, **kwargs)

with sentry_sdk.start_span(
op=OP.GRAPHQL_RESOLVE,
name="resolving {}".format(field_path),
origin=StrawberryIntegration.origin,
) as span:
span.set_data("graphql.field_name", info.field_name)
span.set_data("graphql.parent_type", info.parent_type.name)
span.set_data("graphql.field_path", field_path)
span.set_data("graphql.path", ".".join(map(str, info.path.as_list())))
if sentry_sdk.traces.get_current_span() is None:
return _next(root, info, *args, **kwargs)

with sentry_sdk.traces.start_span(
name=f"resolving {field_path}",
attributes={
"sentry.origin": StrawberryIntegration.origin,
"sentry.op": OP.GRAPHQL_RESOLVE,
},
):
return _next(root, info, *args, **kwargs)


Expand Down
Loading
Loading