Skip to content
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

Fix strawberry tests #3647

Closed
wants to merge 6 commits into from
Closed

Fix strawberry tests #3647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ab4432c
.
sentrivana Oct 11, 2024
ad24b0c
Merge branch 'potel-base' into ivana/potel/fix-strawberry
sentrivana Oct 11, 2024
6dafe07
transaction -> root span
sentrivana Oct 11, 2024
aaf3982
fix
sentrivana Oct 11, 2024
786b4fc
Merge branch 'potel-base' into ivana/potel/fix-strawberry
sentrivana Oct 18, 2024
962178a
.
sentrivana Oct 18, 2024
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
70 changes: 34 additions & 36 deletions sentry_sdk/integrations/strawberry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,38 +170,36 @@ def on_operation(self):
},
)

span = sentry_sdk.get_current_span()
if span:
self.graphql_span = span.start_child(
op=op,
name=description,
origin=StrawberryIntegration.origin,
)
else:
self.graphql_span = sentry_sdk.start_span(
op=op,
name=description,
origin=StrawberryIntegration.origin,
)
self.graphql_span = sentry_sdk.start_span(
op=op,
name=description,
origin=StrawberryIntegration.origin,
)

self.graphql_span.set_data("graphql.operation.type", operation_type)
self.graphql_span.set_data("graphql.operation.name", self._operation_name)
self.graphql_span.set_data("graphql.document", self.execution_context.query)
self.graphql_span.set_data("graphql.resource_name", self._resource_name)
self.graphql_span.set_attribute("graphql.operation.type", operation_type)
if self._operation_name is not None:
self.graphql_span.set_attribute(
"graphql.operation.name", self._operation_name
)
self.graphql_span.set_attribute(
"graphql.document", self.execution_context.query
)
self.graphql_span.set_attribute("graphql.resource_name", self._resource_name)

yield

transaction = self.graphql_span.containing_transaction
if transaction and self.execution_context.operation_name:
transaction.name = self.execution_context.operation_name
transaction.source = TRANSACTION_SOURCE_COMPONENT
transaction.op = op
if self.execution_context.operation_name:
isolation_scope = sentry_sdk.get_isolation_scope()
isolation_scope.set_transaction_name(
self.execution_context.operation_name,
source=TRANSACTION_SOURCE_COMPONENT,
)

self.graphql_span.finish()

def on_validate(self):
# type: () -> Generator[None, None, None]
self.validation_span = self.graphql_span.start_child(
self.validation_span = sentry_sdk.start_span(
op=OP.GRAPHQL_VALIDATE,
name="validation",
origin=StrawberryIntegration.origin,
Expand All @@ -213,7 +211,7 @@ def on_validate(self):

def on_parse(self):
# type: () -> Generator[None, None, None]
self.parsing_span = self.graphql_span.start_child(
self.parsing_span = sentry_sdk.start_span(
op=OP.GRAPHQL_PARSE,
name="parsing",
origin=StrawberryIntegration.origin,
Expand Down Expand Up @@ -243,15 +241,15 @@ async def resolve(self, _next, root, info, *args, **kwargs):

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

with self.graphql_span.start_child(
with sentry_sdk.start_span(
op=OP.GRAPHQL_RESOLVE,
name="resolving {}".format(field_path),
name=f"resolving {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())))
span.set_attribute("graphql.field_name", info.field_name)
span.set_attribute("graphql.parent_type", info.parent_type.name)
span.set_attribute("graphql.field_path", field_path)
span.set_attribute("graphql.path", ".".join(map(str, info.path.as_list())))

return await self._resolve(_next, root, info, *args, **kwargs)

Expand All @@ -264,15 +262,15 @@ def resolve(self, _next, root, info, *args, **kwargs):

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

with self.graphql_span.start_child(
with sentry_sdk.start_span(
op=OP.GRAPHQL_RESOLVE,
name="resolving {}".format(field_path),
name=f"resolving {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())))
span.set_attribute("graphql.field_name", info.field_name)
span.set_attribute("graphql.parent_type", info.parent_type.name)
span.set_attribute("graphql.field_path", field_path)
span.set_attribute("graphql.path", ".".join(map(str, info.path.as_list())))

return _next(root, info, *args, **kwargs)

Expand Down
72 changes: 36 additions & 36 deletions tests/integrations/strawberry/test_strawberry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ def test_breadcrumb_no_operation_name(


@parameterize_strawberry_test
def test_capture_transaction_on_error(
def test_capture_root_span_on_error(
request,
sentry_init,
capture_events,
Expand All @@ -300,14 +300,14 @@ def test_capture_transaction_on_error(
client.post("/graphql", json={"query": query, "operationName": "ErrorQuery"})

assert len(events) == 2
(_, transaction_event) = events
(_, root_span_event) = events

assert transaction_event["transaction"] == "ErrorQuery"
assert transaction_event["contexts"]["trace"]["op"] == OP.GRAPHQL_QUERY
assert transaction_event["spans"]
assert root_span_event["transaction"] == "ErrorQuery"
assert root_span_event["contexts"]["trace"]["op"] == OP.GRAPHQL_QUERY
assert root_span_event["spans"]

query_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_QUERY
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_QUERY
]
assert len(query_spans) == 1, "exactly one query span expected"
query_span = query_spans[0]
Expand All @@ -318,23 +318,23 @@ def test_capture_transaction_on_error(
assert query_span["data"]["graphql.resource_name"]

parse_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_PARSE
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_PARSE
]
assert len(parse_spans) == 1, "exactly one parse span expected"
parse_span = parse_spans[0]
assert parse_span["parent_span_id"] == query_span["span_id"]
assert parse_span["description"] == "parsing"

validate_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_VALIDATE
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_VALIDATE
]
assert len(validate_spans) == 1, "exactly one validate span expected"
validate_span = validate_spans[0]
assert validate_span["parent_span_id"] == query_span["span_id"]
assert validate_span["description"] == "validation"

resolve_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_RESOLVE
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_RESOLVE
]
assert len(resolve_spans) == 1, "exactly one resolve span expected"
resolve_span = resolve_spans[0]
Expand All @@ -351,7 +351,7 @@ def test_capture_transaction_on_error(


@parameterize_strawberry_test
def test_capture_transaction_on_success(
def test_capture_root_span_on_success(
request,
sentry_init,
capture_events,
Expand All @@ -377,14 +377,14 @@ def test_capture_transaction_on_success(
client.post("/graphql", json={"query": query, "operationName": "GreetingQuery"})

assert len(events) == 1
(transaction_event,) = events
(root_span_event,) = events

assert transaction_event["transaction"] == "GreetingQuery"
assert transaction_event["contexts"]["trace"]["op"] == OP.GRAPHQL_QUERY
assert transaction_event["spans"]
assert root_span_event["transaction"] == "GreetingQuery"
assert root_span_event["contexts"]["trace"]["op"] == OP.GRAPHQL_QUERY
assert root_span_event["spans"]

query_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_QUERY
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_QUERY
]
assert len(query_spans) == 1, "exactly one query span expected"
query_span = query_spans[0]
Expand All @@ -395,23 +395,23 @@ def test_capture_transaction_on_success(
assert query_span["data"]["graphql.resource_name"]

parse_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_PARSE
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_PARSE
]
assert len(parse_spans) == 1, "exactly one parse span expected"
parse_span = parse_spans[0]
assert parse_span["parent_span_id"] == query_span["span_id"]
assert parse_span["description"] == "parsing"

validate_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_VALIDATE
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_VALIDATE
]
assert len(validate_spans) == 1, "exactly one validate span expected"
validate_span = validate_spans[0]
assert validate_span["parent_span_id"] == query_span["span_id"]
assert validate_span["description"] == "validation"

resolve_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_RESOLVE
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_RESOLVE
]
assert len(resolve_spans) == 1, "exactly one resolve span expected"
resolve_span = resolve_spans[0]
Expand All @@ -428,7 +428,7 @@ def test_capture_transaction_on_success(


@parameterize_strawberry_test
def test_transaction_no_operation_name(
def test_root_span_no_operation_name(
request,
sentry_init,
capture_events,
Expand All @@ -454,17 +454,17 @@ def test_transaction_no_operation_name(
client.post("/graphql", json={"query": query})

assert len(events) == 1
(transaction_event,) = events
(root_span_event,) = events

if async_execution:
assert transaction_event["transaction"] == "/graphql"
assert root_span_event["transaction"] == "/graphql"
else:
assert transaction_event["transaction"] == "graphql_view"
assert root_span_event["transaction"] == "graphql_view"

assert transaction_event["spans"]
assert root_span_event["spans"]

query_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_QUERY
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_QUERY
]
assert len(query_spans) == 1, "exactly one query span expected"
query_span = query_spans[0]
Expand All @@ -475,23 +475,23 @@ def test_transaction_no_operation_name(
assert query_span["data"]["graphql.resource_name"]

parse_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_PARSE
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_PARSE
]
assert len(parse_spans) == 1, "exactly one parse span expected"
parse_span = parse_spans[0]
assert parse_span["parent_span_id"] == query_span["span_id"]
assert parse_span["description"] == "parsing"

validate_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_VALIDATE
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_VALIDATE
]
assert len(validate_spans) == 1, "exactly one validate span expected"
validate_span = validate_spans[0]
assert validate_span["parent_span_id"] == query_span["span_id"]
assert validate_span["description"] == "validation"

resolve_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_RESOLVE
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_RESOLVE
]
assert len(resolve_spans) == 1, "exactly one resolve span expected"
resolve_span = resolve_spans[0]
Expand All @@ -508,7 +508,7 @@ def test_transaction_no_operation_name(


@parameterize_strawberry_test
def test_transaction_mutation(
def test_root_span_mutation(
request,
sentry_init,
capture_events,
Expand All @@ -534,14 +534,14 @@ def test_transaction_mutation(
client.post("/graphql", json={"query": query})

assert len(events) == 1
(transaction_event,) = events
(root_span_event,) = events

assert transaction_event["transaction"] == "Change"
assert transaction_event["contexts"]["trace"]["op"] == OP.GRAPHQL_MUTATION
assert transaction_event["spans"]
assert root_span_event["transaction"] == "Change"
assert root_span_event["contexts"]["trace"]["op"] == OP.GRAPHQL_MUTATION
assert root_span_event["spans"]

query_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_MUTATION
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_MUTATION
]
assert len(query_spans) == 1, "exactly one mutation span expected"
query_span = query_spans[0]
Expand All @@ -552,23 +552,23 @@ def test_transaction_mutation(
assert query_span["data"]["graphql.resource_name"]

parse_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_PARSE
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_PARSE
]
assert len(parse_spans) == 1, "exactly one parse span expected"
parse_span = parse_spans[0]
assert parse_span["parent_span_id"] == query_span["span_id"]
assert parse_span["description"] == "parsing"

validate_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_VALIDATE
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_VALIDATE
]
assert len(validate_spans) == 1, "exactly one validate span expected"
validate_span = validate_spans[0]
assert validate_span["parent_span_id"] == query_span["span_id"]
assert validate_span["description"] == "validation"

resolve_spans = [
span for span in transaction_event["spans"] if span["op"] == OP.GRAPHQL_RESOLVE
span for span in root_span_event["spans"] if span["op"] == OP.GRAPHQL_RESOLVE
]
assert len(resolve_spans) == 1, "exactly one resolve span expected"
resolve_span = resolve_spans[0]
Expand Down
Loading