Skip to content

fix: http.url tag to include protocol #603

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

Merged
merged 4 commits into from
May 23, 2025
Merged

fix: http.url tag to include protocol #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8acff0
update `http.url` in inferred spans
duncanista May 23, 2025
30716c2
update `http.url` in trigger tags
duncanista May 23, 2025
5d62df6
fix `resource_names` update
duncanista May 23, 2025
675dea2
update integration test
duncanista May 23, 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
14 changes: 9 additions & 5 deletions datadog_lambda/tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,13 +850,14 @@ def create_inferred_span_from_lambda_function_url_event(event, context):
http = request_context.get("http")
method = http.get("method") if http else None
path = http.get("path") if http else None
http_url = f"https://{domain}{path}"
resource = f"{method} {path}"
tags = {
"operation_name": "aws.lambda.url",
"http.url": domain + path,
"http.url": http_url,
"endpoint": path,
"http.method": method,
"resource_names": domain + path,
"resource_names": resource,
"request_id": context.aws_request_id,
}
request_time_epoch = request_context.get("timeEpoch")
Expand Down Expand Up @@ -948,14 +949,15 @@ def create_inferred_span_from_api_gateway_websocket_event(
request_context = event.get("requestContext")
domain = request_context.get("domainName")
endpoint = request_context.get("routeKey")
http_url = f"https://{domain}{endpoint}"
api_id = request_context.get("apiId")

service_name = determine_service_name(
service_mapping, api_id, "lambda_api_gateway", domain
)
tags = {
"operation_name": "aws.apigateway.websocket",
"http.url": domain + endpoint,
"http.url": http_url,
"endpoint": endpoint,
"resource_names": endpoint,
"apiid": api_id,
Expand Down Expand Up @@ -1007,11 +1009,12 @@ def create_inferred_span_from_api_gateway_event(
)
method = event.get("httpMethod")
path = event.get("path")
http_url = f"https://{domain}{path}"
resource_path = _get_resource_path(event, request_context)
resource = f"{method} {resource_path}"
tags = {
"operation_name": "aws.apigateway.rest",
"http.url": domain + path,
"http.url": http_url,
"endpoint": path,
"http.method": method,
"resource_names": resource,
Expand Down Expand Up @@ -1073,12 +1076,13 @@ def create_inferred_span_from_http_api_event(
http = request_context.get("http") or {}
method = http.get("method")
path = event.get("rawPath")
http_url = f"https://{domain}{path}"
resource_path = _get_resource_path(event, request_context)
resource = f"{method} {resource_path}"
tags = {
"operation_name": "aws.httpapi",
"endpoint": path,
"http.url": domain + path,
"http.url": http_url,
"http.method": http.get("method"),
"http.protocol": http.get("protocol"),
"http.source_ip": http.get("sourceIp"),
Expand Down
2 changes: 1 addition & 1 deletion datadog_lambda/trigger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ def extract_http_tags(event):
if request_context and request_context.get("stage"):
domain_name = request_context.get("domainName")
if domain_name:
http_tags["http.url"] = domain_name
http_tags["http.url"] = f"https://{domain_name}"

path = request_context.get("path")
method = request_context.get("httpMethod")
Expand Down
12 changes: 6 additions & 6 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 @@ -55,7 +55,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
"http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
Expand Down Expand Up @@ -103,7 +103,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX",
"http.url": "XXXX.execute-api.us-east-2.amazonaws.com",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com",
"http.url_details.path": "/Prod/",
"http.method": "GET",
"http.route": "/",
Expand Down Expand Up @@ -594,7 +594,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/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",
Expand Down Expand Up @@ -644,7 +644,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX$default",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url_details.path": "/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
Expand Down Expand Up @@ -1436,7 +1436,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default",
"endpoint": "$default",
"resource_names": "$default",
"apiid": "XXXX",
Expand Down Expand Up @@ -1486,7 +1486,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
"http.status_code": "200",
"_dd.base_service": "integration-tests-python"
},
Expand Down
12 changes: 6 additions & 6 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 @@ -55,7 +55,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
"http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
Expand Down Expand Up @@ -103,7 +103,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX",
"http.url": "XXXX.execute-api.us-east-2.amazonaws.com",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com",
"http.url_details.path": "/Prod/",
"http.method": "GET",
"http.route": "/",
Expand Down Expand Up @@ -594,7 +594,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/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",
Expand Down Expand Up @@ -644,7 +644,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX$default",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url_details.path": "/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
Expand Down Expand Up @@ -1436,7 +1436,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default",
"endpoint": "$default",
"resource_names": "$default",
"apiid": "XXXX",
Expand Down Expand Up @@ -1486,7 +1486,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
"http.status_code": "200",
"_dd.base_service": "integration-tests-python"
},
Expand Down
12 changes: 6 additions & 6 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 @@ -55,7 +55,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
"http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
Expand Down Expand Up @@ -103,7 +103,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX",
"http.url": "XXXX.execute-api.us-east-2.amazonaws.com",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com",
"http.url_details.path": "/Prod/",
"http.method": "GET",
"http.route": "/",
Expand Down Expand Up @@ -594,7 +594,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/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",
Expand Down Expand Up @@ -644,7 +644,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX$default",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url_details.path": "/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
Expand Down Expand Up @@ -1436,7 +1436,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default",
"endpoint": "$default",
"resource_names": "$default",
"apiid": "XXXX",
Expand Down Expand Up @@ -1486,7 +1486,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
"http.status_code": "200",
"_dd.base_service": "integration-tests-python"
},
Expand Down
12 changes: 6 additions & 6 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 @@ -55,7 +55,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
"http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
Expand Down Expand Up @@ -103,7 +103,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX",
"http.url": "XXXX.execute-api.us-east-2.amazonaws.com",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com",
"http.url_details.path": "/Prod/",
"http.method": "GET",
"http.route": "/",
Expand Down Expand Up @@ -594,7 +594,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/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",
Expand Down Expand Up @@ -644,7 +644,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX$default",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url_details.path": "/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
Expand Down Expand Up @@ -1436,7 +1436,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default",
"endpoint": "$default",
"resource_names": "$default",
"apiid": "XXXX",
Expand Down Expand Up @@ -1486,7 +1486,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
"http.status_code": "200",
"_dd.base_service": "integration-tests-python"
},
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/snapshots/logs/async-metrics_python38.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.rest",
"http.url": "XXXX.execute-api.us-east-2.amazonaws.com/",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/",
"endpoint": "/",
"http.method": "GET",
"resource_names": "GET /",
Expand Down Expand Up @@ -103,7 +103,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX",
"http.url": "XXXX.execute-api.us-east-2.amazonaws.com",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com",
"http.url_details.path": "/Prod/",
"http.method": "GET",
"http.route": "/",
Expand Down Expand Up @@ -594,7 +594,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"_dd.origin": "lambda",
"operation_name": "aws.httpapi",
"endpoint": "/httpapi/get",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com/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",
Expand Down Expand Up @@ -644,7 +644,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX$default",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url_details.path": "/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
Expand Down Expand Up @@ -1436,7 +1436,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"operation_name": "aws.apigateway.websocket",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com$default",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default",
"endpoint": "$default",
"resource_names": "$default",
"apiid": "XXXX",
Expand Down Expand Up @@ -1486,7 +1486,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX",
"http.url": "XXXX.execute-api.eu-west-1.amazonaws.com",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
"http.status_code": "200",
"_dd.base_service": "integration-tests-python"
},
Expand Down
Loading
Loading