Skip to content

Commit fbb4eab

Browse files
joeyzhao2018joeyzhao2018
authored
Joey/update snapshots (#297)
* update snapshots * update snapshots * only update snapshots when diff shows mismatch * fix the unittest broken due to authorizer header injection
1 parent b76ef05 commit fbb4eab

10 files changed

+248
-236
lines changed

‎datadog_lambda/constants.py

-3
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,3 @@ class Headers(object):
5151
# invocation and the main function invocation are IDENTICAL. Therefore we can use it to tell
5252
# whether current invocation is the actual original authorizing request or a cached request.
5353
Authorizing_Request_Id = "x-datadog-authorizing-requestid"
54-
55-
# injected by the HTTPPropagator.inject but no use
56-
TAGS_HEADER_TO_DELETE = "x-datadog-tags"

‎datadog_lambda/tracing.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ def extract_context_from_http_event_or_context(
191191
# fail fast on any KeyError here
192192
trace_id = injected_authorizer_data[TraceHeader.TRACE_ID]
193193
parent_id = injected_authorizer_data[TraceHeader.PARENT_ID]
194-
sampling_priority = injected_authorizer_data[
194+
sampling_priority = injected_authorizer_data.get(
195195
TraceHeader.SAMPLING_PRIORITY
196-
]
196+
)
197197
return trace_id, parent_id, sampling_priority
198198
except Exception as e:
199199
logger.debug(

‎datadog_lambda/wrapper.py

+9-4
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
from importlib import import_module
1111
import json
1212
from time import time_ns
13-
from ddtrace.propagation.http import HTTPPropagator
1413

1514
from datadog_lambda.extension import should_use_extension, flush_extension
1615
from datadog_lambda.cold_start import set_cold_start, is_cold_start
1716
from datadog_lambda.constants import (
1817
TraceContextSource,
1918
XraySubsegment,
2019
Headers,
20+
TraceHeader,
2121
)
2222
from datadog_lambda.metric import (
2323
flush_stats,
@@ -185,9 +185,14 @@ def _inject_authorizer_span_headers(self, request_id):
185185
)
186186
injected_headers = {}
187187
source_span = self.inferred_span if self.inferred_span else self.span
188-
HTTPPropagator.inject(source_span.context, injected_headers)
189-
# remove unused header
190-
injected_headers.pop(Headers.TAGS_HEADER_TO_DELETE, None)
188+
span_context = source_span.context
189+
injected_headers[TraceHeader.TRACE_ID] = str(span_context.trace_id)
190+
injected_headers[TraceHeader.PARENT_ID] = str(span_context.span_id)
191+
sampling_priority = span_context.sampling_priority
192+
if sampling_priority is not None:
193+
injected_headers[TraceHeader.SAMPLING_PRIORITY] = str(
194+
span_context.sampling_priority
195+
)
191196
injected_headers[Headers.Parent_Span_Finish_Time] = finish_time_ns
192197
if request_id is not None:
193198
injected_headers[Headers.Authorizing_Request_Id] = request_id

‎scripts/run_integration_tests.sh

+12-8
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ for handler_name in "${LAMBDA_HANDLERS[@]}"; do
216216
sed -E "s/(\"duration\"\: )[0-9\.\-]+/\1\"XXXX\"/g" |
217217
sed -E "s/(\"start\"\: )[0-9\.\-]+/\1\"XXXX\"/g" |
218218
sed -E "s/(\"system\.pid\"\: )[0-9\.\-]+/\1\"XXXX\"/g" |
219+
sed -E "s/(\"process_id\"\: )[0-9\.\-]+/\1XXXX/g" |
219220
sed -E "s/(\"runtime-id\"\: \")[a-z0-9\.\-]+/\1XXXX/g" |
220221
sed -E "s/([a-zA-Z0-9]+)(\.execute-api\.[a-z0-9\-]+\.amazonaws\.com)/XXXX\2/g" |
221222
sed -E "s/(\"apiid\"\: \")[a-z0-9\.\-]+/\1XXXX/g" |
@@ -231,6 +232,7 @@ for handler_name in "${LAMBDA_HANDLERS[@]}"; do
231232
sed -E "s/(\"partition_key\"\:\ \")[a-zA-Z0-9\-]+/\1XXXX/g" |
232233
sed -E "s/(\"object_etag\"\:\ \")[a-zA-Z0-9\-]+/\1XXXX/g" |
233234
sed -E "s/(\"dd_trace\"\: \")([0-9]+\.[0-9]+\.[0-9])/\1X.X.X/g" |
235+
sed -E "s/(traceparent\:)([A-Za-z0-9\-]+)/\1XXX/g" |
234236
# Parse out account ID in ARN
235237
sed -E "s/([a-zA-Z0-9]+):([a-zA-Z0-9]+):([a-zA-Z0-9]+):([a-zA-Z0-9\-]+):([a-zA-Z0-9\-\:]+)/\1:\2:\3:\4:XXXX:\4/g" |
236238
sed -E "/init complete at epoch/d" |
@@ -241,17 +243,19 @@ for handler_name in "${LAMBDA_HANDLERS[@]}"; do
241243
# If no snapshot file exists yet, we create one
242244
echo "Writing logs to $function_snapshot_path because no snapshot exists yet"
243245
echo "$logs" >$function_snapshot_path
244-
elif [ -n "$UPDATE_SNAPSHOTS" ]; then
245-
# If $UPDATE_SNAPSHOTS is set to true write the new logs over the current snapshot
246-
echo "Overwriting log snapshot for $function_snapshot_path"
247-
echo "$logs" >$function_snapshot_path
248246
else
249247
# Compare new logs to snapshots
250-
diff_output=$(echo "$logs" | diff - $function_snapshot_path)
248+
diff_output=$(echo "$logs" | sort | diff -w - <(sort $function_snapshot_path))
251249
if [ $? -eq 1 ]; then
252-
echo "Failed: Mismatch found between new $function_name logs (first) and snapshot (second):"
253-
echo "$diff_output"
254-
mismatch_found=true
250+
if [ -n "$UPDATE_SNAPSHOTS" ]; then
251+
# If $UPDATE_SNAPSHOTS is set to true write the new logs over the current snapshot
252+
echo "Overwriting log snapshot for $function_snapshot_path"
253+
echo "$logs" >$function_snapshot_path
254+
else
255+
echo "Failed: Mismatch found between new $function_name logs (first) and snapshot (second):"
256+
echo "$diff_output"
257+
mismatch_found=true
258+
fi
255259
else
256260
echo "Ok: New logs for $function_name match snapshot"
257261
fi

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

+28-27
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
INIT_START Runtime Version: python:3.7.v22 Runtime Version ARN: arn:aws:lambda:eu-west-1:XXXX:eu-west-1
12
START
23
{
34
"m": "aws.lambda.enhanced.invocations",
@@ -35,8 +36,8 @@ START
3536
"dd_lambda_layer:datadog-python37_X.X.X"
3637
]
3738
}
38-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
39-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
39+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
40+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
4041
{
4142
"traces": [
4243
[
@@ -69,7 +70,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
6970
},
7071
"metrics": {
7172
"_dd.agent_psr": 1,
72-
"system.pid": "XXXX",
73+
"process_id": XXXX,
7374
"_dd.top_level": 1,
7475
"_sampling_priority_v1": 1
7576
},
@@ -193,8 +194,8 @@ START
193194
"dd_lambda_layer:datadog-python37_X.X.X"
194195
]
195196
}
196-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
197-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
197+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
198+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
198199
{
199200
"traces": [
200201
[
@@ -226,7 +227,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
226227
},
227228
"metrics": {
228229
"_dd.agent_psr": 1,
229-
"system.pid": "XXXX",
230+
"process_id": XXXX,
230231
"_dd.top_level": 1,
231232
"_sampling_priority_v1": 1
232233
},
@@ -346,8 +347,8 @@ START
346347
"dd_lambda_layer:datadog-python37_X.X.X"
347348
]
348349
}
349-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
350-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
350+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
351+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
351352
{
352353
"traces": [
353354
[
@@ -373,7 +374,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
373374
},
374375
"metrics": {
375376
"_dd.agent_psr": 1,
376-
"system.pid": "XXXX",
377+
"process_id": XXXX,
377378
"_dd.top_level": 1,
378379
"_sampling_priority_v1": 1
379380
},
@@ -492,8 +493,8 @@ START
492493
"dd_lambda_layer:datadog-python37_X.X.X"
493494
]
494495
}
495-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
496-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
496+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
497+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
497498
{
498499
"traces": [
499500
[
@@ -529,7 +530,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
529530
},
530531
"metrics": {
531532
"_dd.agent_psr": 1,
532-
"system.pid": "XXXX",
533+
"process_id": XXXX,
533534
"_dd.top_level": 1,
534535
"_sampling_priority_v1": 1
535536
},
@@ -653,8 +654,8 @@ START
653654
"dd_lambda_layer:datadog-python37_X.X.X"
654655
]
655656
}
656-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
657-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
657+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
658+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
658659
{
659660
"traces": [
660661
[
@@ -686,7 +687,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
686687
},
687688
"metrics": {
688689
"_dd.agent_psr": 1,
689-
"system.pid": "XXXX",
690+
"process_id": XXXX,
690691
"_dd.top_level": 1,
691692
"_sampling_priority_v1": 1
692693
},
@@ -806,8 +807,8 @@ START
806807
"dd_lambda_layer:datadog-python37_X.X.X"
807808
]
808809
}
809-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
810-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
810+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
811+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
811812
{
812813
"traces": [
813814
[
@@ -836,7 +837,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
836837
},
837838
"metrics": {
838839
"_dd.agent_psr": 1,
839-
"system.pid": "XXXX",
840+
"process_id": XXXX,
840841
"_dd.top_level": 1,
841842
"_sampling_priority_v1": 1
842843
},
@@ -956,8 +957,8 @@ START
956957
"dd_lambda_layer:datadog-python37_X.X.X"
957958
]
958959
}
959-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
960-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
960+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
961+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
961962
{
962963
"traces": [
963964
[
@@ -987,7 +988,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
987988
},
988989
"metrics": {
989990
"_dd.agent_psr": 1,
990-
"system.pid": "XXXX",
991+
"process_id": XXXX,
991992
"_dd.top_level": 1,
992993
"_sampling_priority_v1": 1
993994
},
@@ -1107,8 +1108,8 @@ START
11071108
"dd_lambda_layer:datadog-python37_X.X.X"
11081109
]
11091110
}
1110-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
1111-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
1111+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
1112+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
11121113
{
11131114
"traces": [
11141115
[
@@ -1137,7 +1138,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
11371138
},
11381139
"metrics": {
11391140
"_dd.agent_psr": 1,
1140-
"system.pid": "XXXX",
1141+
"process_id": XXXX,
11411142
"_dd.top_level": 1,
11421143
"_sampling_priority_v1": 1
11431144
},
@@ -1257,8 +1258,8 @@ START
12571258
"dd_lambda_layer:datadog-python37_X.X.X"
12581259
]
12591260
}
1260-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
1261-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
1261+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
1262+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {}
12621263
{
12631264
"traces": [
12641265
[
@@ -1293,7 +1294,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
12931294
},
12941295
"metrics": {
12951296
"_dd.agent_psr": 1,
1296-
"system.pid": "XXXX",
1297+
"process_id": XXXX,
12971298
"_dd.top_level": 1,
12981299
"_sampling_priority_v1": 1
12991300
},

0 commit comments

Comments
 (0)