Skip to content

Commit d1aaee5

Browse files
zarirhamzazarirhamza
committed
test(integration): regenerate snapshots for DD_SERVICE inferred spans
Inferred (synthetic) spans now use DD_SERVICE (integration-tests-python) as their service instead of the AWS service representation, so the redundant _dd.base_service tag is dropped on those spans. Regenerated via UPDATE_SNAPSHOTS for all Python versions.
1 parent e2cdc94 commit d1aaee5

14 files changed

Lines changed: 126 additions & 594 deletions

‎tests/integration/snapshots/logs/async-metrics_python310.log‎

Lines changed: 9 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
4545
"duration": "XXXX",
4646
"error": 0,
4747
"meta": {
48-
"_dd.base_service": "integration-tests-python",
4948
"_dd.origin": "lambda",
5049
"_dd.p.dm": "-0",
5150
"_dd.p.tid": "XXXX",
@@ -80,7 +79,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
8079
"name": "aws.apigateway",
8180
"parent_id": "XXXX",
8281
"resource": "GET /",
83-
"service": "XXXX.execute-api.us-east-2.amazonaws.com",
82+
"service": "integration-tests-python",
8483
"span_id": "XXXX",
8584
"start": "XXXX",
8685
"trace_id": "XXXX",
@@ -109,9 +108,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
109108
"span.kind": "server",
110109
"span.name": "aws.lambda"
111110
},
112-
"metrics": {
113-
"_dd.top_level": 1
114-
},
115111
"name": "aws.lambda",
116112
"parent_id": "XXXX",
117113
"resource": "integration-tests-python-XXXX-async-metrics_python310",
@@ -375,7 +371,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
375371
"duration": "XXXX",
376372
"error": 0,
377373
"meta": {
378-
"_dd.base_service": "integration-tests-python",
379374
"_dd.origin": "lambda",
380375
"_dd.p.dm": "-0",
381376
"_dd.p.tid": "XXXX",
@@ -408,7 +403,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
408403
"name": "aws.dynamodb",
409404
"parent_id": "XXXX",
410405
"resource": "ExampleTableWithStream",
411-
"service": "ExampleTableWithStream",
406+
"service": "integration-tests-python",
412407
"span_id": "XXXX",
413408
"span_links": [
414409
{
@@ -465,9 +460,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
465460
"span.kind": "server",
466461
"span.name": "aws.lambda"
467462
},
468-
"metrics": {
469-
"_dd.top_level": 1
470-
},
471463
"name": "aws.lambda",
472464
"parent_id": "XXXX",
473465
"resource": "integration-tests-python-XXXX-async-metrics_python310",
@@ -585,7 +577,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
585577
"duration": "XXXX",
586578
"error": 0,
587579
"meta": {
588-
"_dd.base_service": "integration-tests-python",
589580
"_dd.origin": "lambda",
590581
"_dd.p.dm": "-0",
591582
"_dd.p.tid": "XXXX",
@@ -611,7 +602,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
611602
"name": "aws.eventbridge",
612603
"parent_id": "XXXX",
613604
"resource": "eventbridge.custom.event.sender",
614-
"service": "eventbridge.custom.event.sender",
605+
"service": "integration-tests-python",
615606
"span_id": "XXXX",
616607
"start": "XXXX",
617608
"trace_id": "XXXX",
@@ -635,9 +626,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
635626
"span.kind": "server",
636627
"span.name": "aws.lambda"
637628
},
638-
"metrics": {
639-
"_dd.top_level": 1
640-
},
641629
"name": "aws.lambda",
642630
"parent_id": "XXXX",
643631
"resource": "integration-tests-python-XXXX-async-metrics_python310",
@@ -755,7 +743,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
755743
"duration": "XXXX",
756744
"error": 0,
757745
"meta": {
758-
"_dd.base_service": "integration-tests-python",
759746
"_dd.origin": "lambda",
760747
"_dd.p.dm": "-0",
761748
"_dd.p.tid": "XXXX",
@@ -791,7 +778,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
791778
"name": "aws.httpapi",
792779
"parent_id": "XXXX",
793780
"resource": "GET /httpapi/get",
794-
"service": "XXXX.execute-api.eu-west-1.amazonaws.com",
781+
"service": "integration-tests-python",
795782
"span_id": "XXXX",
796783
"start": "XXXX",
797784
"trace_id": "XXXX",
@@ -820,9 +807,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
820807
"span.kind": "server",
821808
"span.name": "aws.lambda"
822809
},
823-
"metrics": {
824-
"_dd.top_level": 1
825-
},
826810
"name": "aws.lambda",
827811
"parent_id": "XXXX",
828812
"resource": "integration-tests-python-XXXX-async-metrics_python310",
@@ -940,7 +924,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
940924
"duration": "XXXX",
941925
"error": 0,
942926
"meta": {
943-
"_dd.base_service": "integration-tests-python",
944927
"_dd.origin": "lambda",
945928
"_dd.p.dm": "-0",
946929
"_dd.p.tid": "XXXX",
@@ -973,7 +956,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
973956
"name": "aws.kinesis",
974957
"parent_id": "XXXX",
975958
"resource": "EXAMPLE",
976-
"service": "EXAMPLE",
959+
"service": "integration-tests-python",
977960
"span_id": "XXXX",
978961
"start": "XXXX",
979962
"trace_id": "XXXX",
@@ -998,9 +981,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
998981
"span.kind": "server",
999982
"span.name": "aws.lambda"
1000983
},
1001-
"metrics": {
1002-
"_dd.top_level": 1
1003-
},
1004984
"name": "aws.lambda",
1005985
"parent_id": "XXXX",
1006986
"resource": "integration-tests-python-XXXX-async-metrics_python310",
@@ -1117,7 +1097,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
11171097
{
11181098
"error": 0,
11191099
"meta": {
1120-
"_dd.base_service": "integration-tests-python",
11211100
"_dd.origin": "lambda",
11221101
"_dd.p.dm": "-0",
11231102
"_dd.p.tid": "XXXX",
@@ -1149,7 +1128,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
11491128
"name": "aws.s3",
11501129
"parent_id": "XXXX",
11511130
"resource": "example-bucket",
1152-
"service": "example-bucket",
1131+
"service": "integration-tests-python",
11531132
"span_id": "XXXX",
11541133
"span_links": [
11551134
{
@@ -1185,9 +1164,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
11851164
"span.kind": "server",
11861165
"span.name": "aws.lambda"
11871166
},
1188-
"metrics": {
1189-
"_dd.top_level": 1
1190-
},
11911167
"name": "aws.lambda",
11921168
"parent_id": "XXXX",
11931169
"resource": "integration-tests-python-XXXX-async-metrics_python310",
@@ -1305,7 +1281,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
13051281
"duration": "XXXX",
13061282
"error": 0,
13071283
"meta": {
1308-
"_dd.base_service": "integration-tests-python",
13091284
"_dd.origin": "lambda",
13101285
"_dd.p.dm": "-0",
13111286
"_dd.p.tid": "XXXX",
@@ -1336,7 +1311,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
13361311
"name": "aws.sns",
13371312
"parent_id": "XXXX",
13381313
"resource": "sns-lambda",
1339-
"service": "sns-lambda",
1314+
"service": "integration-tests-python",
13401315
"span_id": "XXXX",
13411316
"start": "XXXX",
13421317
"trace_id": "XXXX",
@@ -1361,9 +1336,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
13611336
"span.kind": "server",
13621337
"span.name": "aws.lambda"
13631338
},
1364-
"metrics": {
1365-
"_dd.top_level": 1
1366-
},
13671339
"name": "aws.lambda",
13681340
"parent_id": "XXXX",
13691341
"resource": "integration-tests-python-XXXX-async-metrics_python310",
@@ -1481,7 +1453,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
14811453
"duration": "XXXX",
14821454
"error": 0,
14831455
"meta": {
1484-
"_dd.base_service": "integration-tests-python",
14851456
"_dd.origin": "lambda",
14861457
"_dd.p.dm": "-0",
14871458
"_dd.p.tid": "XXXX",
@@ -1511,7 +1482,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
15111482
"name": "aws.sqs",
15121483
"parent_id": "XXXX",
15131484
"resource": "my-queue",
1514-
"service": "my-queue",
1485+
"service": "integration-tests-python",
15151486
"span_id": "XXXX",
15161487
"start": "XXXX",
15171488
"trace_id": "XXXX",
@@ -1536,9 +1507,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
15361507
"span.kind": "server",
15371508
"span.name": "aws.lambda"
15381509
},
1539-
"metrics": {
1540-
"_dd.top_level": 1
1541-
},
15421510
"name": "aws.lambda",
15431511
"parent_id": "XXXX",
15441512
"resource": "integration-tests-python-XXXX-async-metrics_python310",
@@ -1656,7 +1624,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
16561624
"duration": "XXXX",
16571625
"error": 0,
16581626
"meta": {
1659-
"_dd.base_service": "integration-tests-python",
16601627
"_dd.origin": "lambda",
16611628
"_dd.p.dm": "-0",
16621629
"_dd.p.tid": "XXXX",
@@ -1692,7 +1659,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
16921659
"name": "aws.apigateway.websocket",
16931660
"parent_id": "XXXX",
16941661
"resource": "$default",
1695-
"service": "XXXX.execute-api.eu-west-1.amazonaws.com",
1662+
"service": "integration-tests-python",
16961663
"span_id": "XXXX",
16971664
"start": "XXXX",
16981665
"trace_id": "XXXX",
@@ -1719,9 +1686,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
17191686
"span.kind": "server",
17201687
"span.name": "aws.lambda"
17211688
},
1722-
"metrics": {
1723-
"_dd.top_level": 1
1724-
},
17251689
"name": "aws.lambda",
17261690
"parent_id": "XXXX",
17271691
"resource": "integration-tests-python-XXXX-async-metrics_python310",

0 commit comments

Comments
 (0)