Skip to content

Commit 6901afa

Browse files
author
chris.agocs
committed
Update inferred span keys
1 parent 308aa48 commit 6901afa

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎datadog_lambda/tracing.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -453,9 +453,9 @@ def create_inferred_span_from_api_gateway_websocket_event(event, context):
453453
"connection_id": event["requestContext"]["connectionId"],
454454
}
455455
if is_api_gateway_invocation_async(event):
456-
InferredSpanInfo.set_tags(tags, tag_origin="self", synchronicity="async")
456+
InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="async")
457457
else:
458-
InferredSpanInfo.set_tags(tags, tag_origin="self", synchronicity="sync")
458+
InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="sync")
459459
request_time_epoch = event["requestContext"]["requestTimeEpoch"]
460460
args = {
461461
"service": domain,
@@ -482,9 +482,9 @@ def create_inferred_span_from_api_gateway_event(event, context):
482482
"request_id": context.aws_request_id,
483483
}
484484
if is_api_gateway_invocation_async(event):
485-
InferredSpanInfo.set_tags(tags, tag_origin="self", synchronicity="async")
485+
InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="async")
486486
else:
487-
InferredSpanInfo.set_tags(tags, tag_origin="self", synchronicity="sync")
487+
InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="sync")
488488
request_time_epoch = event["requestContext"]["requestTimeEpoch"]
489489
args = {
490490
"service": domain,
@@ -511,9 +511,9 @@ def create_inferred_span_from_http_api_event(event, context):
511511
"request_id": context.aws_request_id,
512512
}
513513
if is_api_gateway_invocation_async(event):
514-
InferredSpanInfo.set_tags(tags, tag_origin="self", synchronicity="async")
514+
InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="async")
515515
else:
516-
InferredSpanInfo.set_tags(tags, tag_origin="self", synchronicity="sync")
516+
InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="sync")
517517
request_time_epoch = event["requestContext"]["timeEpoch"]
518518
args = {
519519
"service": domain,
@@ -535,7 +535,7 @@ def create_inferred_span_from_sqs_event(event, context):
535535
"operation_name": "aws.sqs",
536536
"resource_names": queue_name,
537537
}
538-
InferredSpanInfo.set_tags(tags, tag_origin="self", synchronicity="async")
538+
InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="async")
539539
request_time_epoch = event_record["attributes"]["SentTimestamp"]
540540
args = {
541541
"service": "sqs",
@@ -557,7 +557,7 @@ def create_inferred_span_from_sns_event(event, context):
557557
"operation_name": "aws.sns",
558558
"resource_names": topic_name,
559559
}
560-
InferredSpanInfo.set_tags(tags, tag_origin="self", synchronicity="async")
560+
InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="async")
561561
sns_dt_format = "%Y-%m-%dT%H:%M:%S.%fZ"
562562
timestamp = event_record["Sns"]["Timestamp"]
563563
dt = datetime.strptime(timestamp, sns_dt_format)
@@ -582,7 +582,7 @@ def create_inferred_span_from_kinesis_event(event, context):
582582
"operation_name": "aws.kinesis",
583583
"resource_names": stream_name,
584584
}
585-
InferredSpanInfo.set_tags(tags, tag_origin="self", synchronicity="async")
585+
InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="async")
586586
request_time_epoch = event_record["kinesis"]["approximateArrivalTimestamp"]
587587

588588
args = {
@@ -605,7 +605,7 @@ def create_inferred_span_from_dynamodb_event(event, context):
605605
"operation_name": "aws.dynamodb",
606606
"resource_names": table_name,
607607
}
608-
InferredSpanInfo.set_tags(tags, synchronicity="async", tag_origin="self")
608+
InferredSpanInfo.set_tags(tags, synchronicity="async", tag_source="self")
609609
request_time_epoch = event_record["dynamodb"]["ApproximateCreationDateTime"]
610610

611611
args = {
@@ -628,7 +628,7 @@ def create_inferred_span_from_s3_event(event, context):
628628
"operation_name": "aws.s3",
629629
"resource_names": bucket_name,
630630
}
631-
InferredSpanInfo.set_tags(tags, synchronicity="async", tag_origin="self")
631+
InferredSpanInfo.set_tags(tags, synchronicity="async", tag_source="self")
632632
dt_format = "%Y-%m-%dT%H:%M:%S.%fZ"
633633
timestamp = event_record["eventTime"]
634634
dt = datetime.strptime(timestamp, dt_format)
@@ -655,7 +655,7 @@ def create_inferred_span_from_eventbridge_event(event, context):
655655
InferredSpanInfo.set_tags(
656656
tags,
657657
synchronicity="async",
658-
tag_origin="self",
658+
tag_source="self",
659659
)
660660
dt_format = "%Y-%m-%dT%H:%M:%SZ"
661661
timestamp = event["time"]
@@ -722,16 +722,16 @@ def create_function_execution_span(
722722
class InferredSpanInfo(object):
723723
BASE_NAME = "inferred_span"
724724
SYNCHRONICITY = f"{BASE_NAME}.synchronicity"
725-
TAG_ORIGIN = f"{BASE_NAME}.tag_origin"
725+
TAG_SOURCE = f"{BASE_NAME}.tag_source"
726726

727727
@classmethod
728728
def set_tags(
729729
cls,
730730
tags: Dict[str, str],
731731
synchronicity: Optional[Literal["sync", "async"]] = None,
732-
tag_origin: Optional[Literal["labmda", "self"]] = None,
732+
tag_source: Optional[Literal["labmda", "self"]] = None,
733733
):
734734
if synchronicity is not None:
735735
tags[cls.SYNCHRONICITY] = str(synchronicity)
736-
if tag_origin is not None:
737-
tags[cls.TAG_ORIGIN] = str(tag_origin)
736+
if tag_source is not None:
737+
tags[cls.TAG_SOURCE] = str(tag_source)

‎tests/test_tracing.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ def test_create_inferred_span_from_api_gateway_event(self):
577577
"70ixmpl4fl.execute-api.us-east-2.amazonaws.com/path/to/resource",
578578
)
579579
self.assertEqual(span.get_tag("request_id"), "123")
580-
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_ORIGIN), "self")
580+
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self")
581581
self.assertEqual(span.start, 1428582896.0)
582582
self.assertEqual(span.span_type, "http")
583583
self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync")
@@ -606,7 +606,7 @@ def test_create_inferred_span_from_api_gateway_non_proxy_event_async(self):
606606
"lgxbo6a518.execute-api.sa-east-1.amazonaws.com/http/get",
607607
)
608608
self.assertEqual(span.get_tag("request_id"), "123")
609-
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_ORIGIN), "self")
609+
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self")
610610
self.assertEqual(span.start, 1631210915.2509997)
611611
self.assertEqual(span.span_type, "http")
612612
self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async")
@@ -635,7 +635,7 @@ def test_create_inferred_span_from_api_gateway_non_proxy_event_sync(self):
635635
"lgxbo6a518.execute-api.sa-east-1.amazonaws.com/http/get",
636636
)
637637
self.assertEqual(span.get_tag("request_id"), "123")
638-
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_ORIGIN), "self")
638+
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self")
639639
self.assertEqual(span.start, 1631210915.2509997)
640640
self.assertEqual(span.span_type, "http")
641641
self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync")
@@ -664,7 +664,7 @@ def test_create_inferred_span_from_http_api_event(self):
664664
"x02yirxc7a.execute-api.sa-east-1.amazonaws.com/httpapi/get",
665665
)
666666
self.assertEqual(span.get_tag("request_id"), "123")
667-
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_ORIGIN), "self")
667+
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self")
668668
self.assertEqual(span.start, 1631212283.738)
669669
self.assertEqual(span.span_type, "http")
670670
self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync")
@@ -693,7 +693,7 @@ def test_create_inferred_span_from_api_gateway_websocket_default_event(self):
693693
"p62c47itsb.execute-api.sa-east-1.amazonaws.com$default",
694694
)
695695
self.assertEqual(span.get_tag("request_id"), "123")
696-
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_ORIGIN), "self")
696+
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self")
697697
self.assertEqual(span.start, 1631285061.365)
698698
self.assertEqual(span.span_type, "web")
699699
self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync")
@@ -722,7 +722,7 @@ def test_create_inferred_span_from_api_gateway_websocket_connect_event(self):
722722
"p62c47itsb.execute-api.sa-east-1.amazonaws.com$connect",
723723
)
724724
self.assertEqual(span.get_tag("request_id"), "123")
725-
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_ORIGIN), "self")
725+
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self")
726726
self.assertEqual(span.start, 1631284003.071)
727727
self.assertEqual(span.span_type, "web")
728728
self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync")
@@ -751,7 +751,7 @@ def test_create_inferred_span_from_api_gateway_websocket_disconnect_event(self):
751751
"p62c47itsb.execute-api.sa-east-1.amazonaws.com$disconnect",
752752
)
753753
self.assertEqual(span.get_tag("request_id"), "123")
754-
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_ORIGIN), "self")
754+
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self")
755755
self.assertEqual(span.start, 1631284034.737)
756756
self.assertEqual(span.span_type, "web")
757757
self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync")
@@ -780,7 +780,7 @@ def test_create_inferred_span_from_sqs_event(self):
780780
"MyQueue",
781781
)
782782
self.assertEqual(span.get_tag("request_id"), None)
783-
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_ORIGIN), "self")
783+
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self")
784784
self.assertEqual(span.start, 1523232000.0)
785785
self.assertEqual(span.span_type, "web")
786786
self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async")
@@ -809,7 +809,7 @@ def test_create_inferred_span_from_sns_event(self):
809809
"ExampleTopic",
810810
)
811811
self.assertEqual(span.get_tag("request_id"), None)
812-
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_ORIGIN), "self")
812+
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self")
813813
self.assertEqual(span.start, 0.0)
814814
self.assertEqual(span.span_type, "web")
815815
self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async")
@@ -838,7 +838,7 @@ def test_create_inferred_span_from_kinesis_event(self):
838838
"EXAMPLE",
839839
)
840840
self.assertEqual(span.get_tag("request_id"), None)
841-
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_ORIGIN), "self")
841+
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self")
842842
self.assertEqual(span.start, 1428537600.0)
843843
self.assertEqual(span.span_type, "web")
844844
self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async")
@@ -867,7 +867,7 @@ def test_create_inferred_span_from_dynamodb_event(self):
867867
"ExampleTableWithStream",
868868
)
869869
self.assertEqual(span.get_tag("request_id"), None)
870-
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_ORIGIN), "self")
870+
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self")
871871
self.assertEqual(span.start, 1428537600.0)
872872
self.assertEqual(span.span_type, "web")
873873
self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async")
@@ -896,7 +896,7 @@ def test_create_inferred_span_from_s3_event(self):
896896
"example-bucket",
897897
)
898898
self.assertEqual(span.get_tag("request_id"), None)
899-
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_ORIGIN), "self")
899+
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self")
900900
self.assertEqual(span.start, 0.0)
901901
self.assertEqual(span.span_type, "web")
902902
self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async")
@@ -925,7 +925,7 @@ def test_create_inferred_span_from_eventbridge_event(self):
925925
"eventbridge.custom.event.sender",
926926
)
927927
self.assertEqual(span.get_tag("request_id"), None)
928-
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_ORIGIN), "self")
928+
self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self")
929929
self.assertEqual(span.start, 1635989865.0)
930930
self.assertEqual(span.span_type, "web")
931931
self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async")

0 commit comments

Comments
 (0)