cleanups

Author: ericapisani

sentry_sdk/integrations/strawberry.py

@@ -228,7 +228,7 @@ def on_operation(self) -> "Generator[None, None, None]":
         if type(graphql_span) is StreamedSpan:
             if execution_context.operation_name:
                 segment = graphql_span._segment
-                segment.set_attribute("sentry.source", TransactionSource.COMPONENT)
+                segment.set_attribute("sentry.span.source", TransactionSource.COMPONENT)
                 segment.set_attribute("sentry.op", op)
                 segment.name = execution_context.operation_name
         elif type(graphql_span) is Span:
@@ -327,7 +327,6 @@ async def resolve(
 
         field_path = "{}.{}".format(info.parent_type, info.field_name)
 
-<<<<<<< HEAD
         client = sentry_sdk.get_client()
         is_span_streaming_enabled = has_span_streaming_enabled(client.options)
         if is_span_streaming_enabled:
@@ -340,8 +339,6 @@ async def resolve(
             ):
                 return await self._resolve(_next, root, info, *args, **kwargs)
 
-=======
->>>>>>> master
         with sentry_sdk.start_span(
             op=OP.GRAPHQL_RESOLVE,
             name="resolving {}".format(field_path),
@@ -369,7 +366,6 @@ def resolve(
 
         field_path = "{}.{}".format(info.parent_type, info.field_name)
 
-<<<<<<< HEAD
         client = sentry_sdk.get_client()
         is_span_streaming_enabled = has_span_streaming_enabled(client.options)
         if is_span_streaming_enabled:
@@ -382,8 +378,6 @@ def resolve(
             ):
                 return _next(root, info, *args, **kwargs)
 
-=======
->>>>>>> master
         with sentry_sdk.start_span(
             op=OP.GRAPHQL_RESOLVE,
             name="resolving {}".format(field_path),