Skip to content

feat(aap): update tags on inferred spans for API Gateway #697

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

Open
florentinl wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(aap): update tags on inferred spans for API Gateway #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6d346a
feat(aap): update api gateway inferred span tags for better correlation
florentinl Dec 5, 2025
e7adc97
update snapshots
florentinl Dec 8, 2025
cde7774
update snapshots
florentinl Dec 9, 2025
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
16 changes: 10 additions & 6 deletions datadog_lambda/tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,6 +1061,8 @@ def create_inferred_span_from_api_gateway_event(
event, context, decode_authorizer_context: bool = True
):
request_context = event.get("requestContext")
identity = request_context.get("identity")

domain = request_context.get("domainName", "")
api_id = request_context.get("apiId")
service_name = determine_service_name(
Expand All @@ -1072,11 +1074,11 @@ def create_inferred_span_from_api_gateway_event(
resource_path = _get_resource_path(event, request_context)
resource = f"{method} {resource_path}"
tags = {
"operation_name": "aws.apigateway.rest",
"http.url": http_url,
"endpoint": path,
"http.method": method,
"resource_names": resource,
"http.useragent": identity.get("userAgent"),
"span.kind": "server",
"apiid": api_id,
"apiname": api_id,
Expand All @@ -1091,7 +1093,7 @@ def create_inferred_span_from_api_gateway_event(
args = {
"service": service_name,
"resource": resource,
"span_type": "http",
"span_type": "web",
}
tracer.set_tags(_dd_origin)
upstream_authorizer_span = None
Expand All @@ -1103,6 +1105,7 @@ def create_inferred_span_from_api_gateway_event(
span = tracer.trace("aws.apigateway", **args)
if span:
span.set_tags(tags)
span.set_metric(InferredSpanInfo.METRIC, 1.0)
# start time pushed by the inserted authorizer span
span.start_ns = int(
finish_time_ns
Expand Down Expand Up @@ -1140,13 +1143,12 @@ def create_inferred_span_from_http_api_event(
resource_path = _get_resource_path(event, request_context)
resource = f"{method} {resource_path}"
tags = {
"operation_name": "aws.httpapi",
"endpoint": path,
"http.url": http_url,
"http.method": http.get("method"),
"http.protocol": http.get("protocol"),
"http.source_ip": http.get("sourceIp"),
"http.user_agent": http.get("userAgent"),
"http.useragent": http.get("userAgent"),
"resource_names": resource,
"request_id": context.aws_request_id,
"apiid": api_id,
Expand All @@ -1167,10 +1169,11 @@ def create_inferred_span_from_http_api_event(
Headers.Parent_Span_Finish_Time
)
span = tracer.trace(
"aws.httpapi", service=service_name, resource=resource, span_type="http"
"aws.httpapi", service=service_name, resource=resource, span_type="web"
)
if span:
span.set_tags(tags)
span.set_metric(InferredSpanInfo.METRIC, 1.0)
span.start_ns = int(inferred_span_start_ns)
return span

Expand Down Expand Up @@ -1424,7 +1427,7 @@ def create_inferred_span_from_eventbridge_event(event, context):
span.start = dt.replace(tzinfo=timezone.utc).timestamp()

# Since inferred span will later parent Lambda, preserve Lambda's current parent
if dd_trace_context.span_id:
if dd_trace_context and getattr(dd_trace_context, "span_id", None):
span.parent_id = dd_trace_context.span_id

return span
Expand Down Expand Up @@ -1512,6 +1515,7 @@ class InferredSpanInfo(object):
BASE_NAME = "_inferred_span"
SYNCHRONICITY = f"{BASE_NAME}.synchronicity"
TAG_SOURCE = f"{BASE_NAME}.tag_source"
METRIC = f"_dd.{BASE_NAME}"

@staticmethod
def set_tags(
Expand Down
11 changes: 6 additions & 5 deletions tests/integration/snapshots/logs/async-metrics_python310.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"meta": {
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
"http.useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36",
"span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
Expand All @@ -76,10 +76,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
},
"metrics": {
"process_id": XXXX,
"_dd._inferred_span": 1,
"_dd.top_level": 1,
"_sampling_priority_v1": 1
},
"type": "http"
"type": "web"
},
{
"trace_id": "XXXX",
Expand Down Expand Up @@ -718,13 +719,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"meta": {
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
"http.user_agent": "XXXX/7.64.1",
"http.useragent": "curl/7.64.1",
"resource_names": "GET /httpapi/get",
"request_id": "XXXX",
"apiid": "XXXX",
Expand All @@ -742,10 +742,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
},
"metrics": {
"process_id": XXXX,
"_dd._inferred_span": 1,
"_dd.top_level": 1,
"_sampling_priority_v1": 1
},
"type": "http"
"type": "web"
},
{
"trace_id": "XXXX",
Expand Down
11 changes: 6 additions & 5 deletions tests/integration/snapshots/logs/async-metrics_python311.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"meta": {
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
"http.useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36",
"span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
Expand All @@ -76,10 +76,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
},
"metrics": {
"process_id": XXXX,
"_dd._inferred_span": 1,
"_dd.top_level": 1,
"_sampling_priority_v1": 1
},
"type": "http"
"type": "web"
},
{
"trace_id": "XXXX",
Expand Down Expand Up @@ -718,13 +719,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"meta": {
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
"http.user_agent": "XXXX/7.64.1",
"http.useragent": "curl/7.64.1",
"resource_names": "GET /httpapi/get",
"request_id": "XXXX",
"apiid": "XXXX",
Expand All @@ -742,10 +742,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
},
"metrics": {
"process_id": XXXX,
"_dd._inferred_span": 1,
"_dd.top_level": 1,
"_sampling_priority_v1": 1
},
"type": "http"
"type": "web"
},
{
"trace_id": "XXXX",
Expand Down
11 changes: 6 additions & 5 deletions tests/integration/snapshots/logs/async-metrics_python312.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"meta": {
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
"http.useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36",
"span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
Expand All @@ -76,10 +76,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
},
"metrics": {
"process_id": XXXX,
"_dd._inferred_span": 1,
"_dd.top_level": 1,
"_sampling_priority_v1": 1
},
"type": "http"
"type": "web"
},
{
"trace_id": "XXXX",
Expand Down Expand Up @@ -718,13 +719,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"meta": {
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
"http.user_agent": "XXXX/7.64.1",
"http.useragent": "curl/7.64.1",
"resource_names": "GET /httpapi/get",
"request_id": "XXXX",
"apiid": "XXXX",
Expand All @@ -742,10 +742,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
},
"metrics": {
"process_id": XXXX,
"_dd._inferred_span": 1,
"_dd.top_level": 1,
"_sampling_priority_v1": 1
},
"type": "http"
"type": "web"
},
{
"trace_id": "XXXX",
Expand Down
11 changes: 6 additions & 5 deletions tests/integration/snapshots/logs/async-metrics_python313.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"meta": {
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
"http.useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36",
"span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
Expand All @@ -76,10 +76,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
},
"metrics": {
"process_id": XXXX,
"_dd._inferred_span": 1,
"_dd.top_level": 1,
"_sampling_priority_v1": 1
},
"type": "http"
"type": "web"
},
{
"trace_id": "XXXX",
Expand Down Expand Up @@ -718,13 +719,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"meta": {
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
"http.user_agent": "XXXX/7.64.1",
"http.useragent": "curl/7.64.1",
"resource_names": "GET /httpapi/get",
"request_id": "XXXX",
"apiid": "XXXX",
Expand All @@ -742,10 +742,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
},
"metrics": {
"process_id": XXXX,
"_dd._inferred_span": 1,
"_dd.top_level": 1,
"_sampling_priority_v1": 1
},
"type": "http"
"type": "web"
},
{
"trace_id": "XXXX",
Expand Down
11 changes: 6 additions & 5 deletions tests/integration/snapshots/logs/async-metrics_python314.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"meta": {
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
"http.useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36",
"span.kind": "server",
"apiid": "XXXX",
"apiname": "XXXX",
Expand All @@ -76,10 +76,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
},
"metrics": {
"process_id": XXXX,
"_dd._inferred_span": 1,
"_dd.top_level": 1,
"_sampling_priority_v1": 1
},
"type": "http"
"type": "web"
},
{
"trace_id": "XXXX",
Expand Down Expand Up @@ -718,13 +719,12 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"meta": {
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.protocol": "HTTP/1.1",
"http.source_ip": "XXXX",
"http.user_agent": "XXXX/7.64.1",
"http.useragent": "curl/7.64.1",
"resource_names": "GET /httpapi/get",
"request_id": "XXXX",
"apiid": "XXXX",
Expand All @@ -742,10 +742,11 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
},
"metrics": {
"process_id": XXXX,
"_dd._inferred_span": 1,
"_dd.top_level": 1,
"_sampling_priority_v1": 1
},
"type": "http"
"type": "web"
},
{
"trace_id": "XXXX",
Expand Down
Loading
Loading