Skip to content

Commit d8acff0

Browse files
duncanistaduncanista
committed
update http.url in inferred spans
1 parent 676446c commit d8acff0

File tree

2 files changed

+29
-25
lines changed

2 files changed

+29
-25
lines changed

‎datadog_lambda/tracing.py‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -850,13 +850,14 @@ def create_inferred_span_from_lambda_function_url_event(event, context):
850850
http = request_context.get("http")
851851
method = http.get("method") if http else None
852852
path = http.get("path") if http else None
853+
http_url = f"https://{domain}{path}"
853854
resource = f"{method} {path}"
854855
tags = {
855856
"operation_name": "aws.lambda.url",
856-
"http.url": domain + path,
857+
"http.url": http_url,
857858
"endpoint": path,
858859
"http.method": method,
859-
"resource_names": domain + path,
860+
"resource_names": http_url,
860861
"request_id": context.aws_request_id,
861862
}
862863
request_time_epoch = request_context.get("timeEpoch")
@@ -948,16 +949,17 @@ def create_inferred_span_from_api_gateway_websocket_event(
948949
request_context = event.get("requestContext")
949950
domain = request_context.get("domainName")
950951
endpoint = request_context.get("routeKey")
952+
http_url = f"https://{domain}{endpoint}"
951953
api_id = request_context.get("apiId")
952954

953955
service_name = determine_service_name(
954956
service_mapping, api_id, "lambda_api_gateway", domain
955957
)
956958
tags = {
957959
"operation_name": "aws.apigateway.websocket",
958-
"http.url": domain + endpoint,
960+
"http.url": http_url,
959961
"endpoint": endpoint,
960-
"resource_names": endpoint,
962+
"resource_names": http_url,
961963
"apiid": api_id,
962964
"apiname": api_id,
963965
"stage": request_context.get("stage"),
@@ -1007,14 +1009,15 @@ def create_inferred_span_from_api_gateway_event(
10071009
)
10081010
method = event.get("httpMethod")
10091011
path = event.get("path")
1012+
http_url = f"https://{domain}{path}"
10101013
resource_path = _get_resource_path(event, request_context)
10111014
resource = f"{method} {resource_path}"
10121015
tags = {
10131016
"operation_name": "aws.apigateway.rest",
1014-
"http.url": domain + path,
1017+
"http.url": http_url,
10151018
"endpoint": path,
10161019
"http.method": method,
1017-
"resource_names": resource,
1020+
"resource_names": http_url,
10181021
"apiid": api_id,
10191022
"apiname": api_id,
10201023
"stage": request_context.get("stage"),
@@ -1073,12 +1076,13 @@ def create_inferred_span_from_http_api_event(
10731076
http = request_context.get("http") or {}
10741077
method = http.get("method")
10751078
path = event.get("rawPath")
1079+
http_url = f"https://{domain}{path}"
10761080
resource_path = _get_resource_path(event, request_context)
10771081
resource = f"{method} {resource_path}"
10781082
tags = {
10791083
"operation_name": "aws.httpapi",
10801084
"endpoint": path,
1081-
"http.url": domain + path,
1085+
"http.url": http_url,
10821086
"http.method": http.get("method"),
10831087
"http.protocol": http.get("protocol"),
10841088
"http.source_ip": http.get("sourceIp"),

‎tests/test_tracing.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1730,7 +1730,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
17301730
"apiname": "1234567890",
17311731
"endpoint": "/path/to/resource",
17321732
"http.method": "POST",
1733-
"http.url": "70ixmpl4fl.execute-api.us-east-2.amazonaws.com/path/to/resource",
1733+
"http.url": "https://70ixmpl4fl.execute-api.us-east-2.amazonaws.com/path/to/resource",
17341734
"operation_name": "aws.apigateway.rest",
17351735
"request_id": "123",
17361736
"resource_names": "POST /{proxy+}",
@@ -1752,7 +1752,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
17521752
"apiname": "lgxbo6a518",
17531753
"endpoint": "/http/get",
17541754
"http.method": "GET",
1755-
"http.url": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com/http/get",
1755+
"http.url": "https://lgxbo6a518.execute-api.eu-west-1.amazonaws.com/http/get",
17561756
"operation_name": "aws.apigateway.rest",
17571757
"request_id": "123",
17581758
"resource_names": "GET /http/get",
@@ -1774,7 +1774,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
17741774
"apiname": "lgxbo6a518",
17751775
"endpoint": "/http/get",
17761776
"http.method": "GET",
1777-
"http.url": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com/http/get",
1777+
"http.url": "https://lgxbo6a518.execute-api.eu-west-1.amazonaws.com/http/get",
17781778
"operation_name": "aws.apigateway.rest",
17791779
"request_id": "123",
17801780
"resource_names": "GET /http/get",
@@ -1798,7 +1798,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
17981798
"http.method": "GET",
17991799
"http.protocol": "HTTP/1.1",
18001800
"http.source_ip": "38.122.226.210",
1801-
"http.url": "x02yirxc7a.execute-api.eu-west-1.amazonaws.com/httpapi/get",
1801+
"http.url": "https://x02yirxc7a.execute-api.eu-west-1.amazonaws.com/httpapi/get",
18021802
"http.user_agent": "curl/7.64.1",
18031803
"operation_name": "aws.httpapi",
18041804
"request_id": "123",
@@ -1821,7 +1821,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
18211821
"apiname": "mcwkra0ya4",
18221822
"endpoint": "/user/42",
18231823
"http.method": "GET",
1824-
"http.url": "mcwkra0ya4.execute-api.sa-east-1.amazonaws.com/user/42",
1824+
"http.url": "https://mcwkra0ya4.execute-api.sa-east-1.amazonaws.com/user/42",
18251825
"operation_name": "aws.apigateway.rest",
18261826
"request_id": "123",
18271827
"resource_names": "GET /user/{id}",
@@ -1843,7 +1843,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
18431843
"apiname": "9vj54we5ih",
18441844
"endpoint": "/user/42",
18451845
"http.method": "GET",
1846-
"http.url": "9vj54we5ih.execute-api.sa-east-1.amazonaws.com/user/42",
1846+
"http.url": "https://9vj54we5ih.execute-api.sa-east-1.amazonaws.com/user/42",
18471847
"operation_name": "aws.httpapi",
18481848
"request_id": "123",
18491849
"resource_names": "GET /user/{id}",
@@ -1866,7 +1866,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
18661866
"connection_id": "Fc5SzcoYGjQCJlg=",
18671867
"endpoint": "$default",
18681868
"event_type": "MESSAGE",
1869-
"http.url": "p62c47itsb.execute-api.eu-west-1.amazonaws.com$default",
1869+
"http.url": "https://p62c47itsb.execute-api.eu-west-1.amazonaws.com$default",
18701870
"message_direction": "IN",
18711871
"operation_name": "aws.apigateway.websocket",
18721872
"request_id": "123",
@@ -1890,7 +1890,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
18901890
"connection_id": "Fc2tgfl3mjQCJfA=",
18911891
"endpoint": "$connect",
18921892
"event_type": "CONNECT",
1893-
"http.url": "p62c47itsb.execute-api.eu-west-1.amazonaws.com$connect",
1893+
"http.url": "https://p62c47itsb.execute-api.eu-west-1.amazonaws.com$connect",
18941894
"message_direction": "IN",
18951895
"operation_name": "aws.apigateway.websocket",
18961896
"request_id": "123",
@@ -1914,7 +1914,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
19141914
"connection_id": "Fc2tgfl3mjQCJfA=",
19151915
"endpoint": "$disconnect",
19161916
"event_type": "DISCONNECT",
1917-
"http.url": "p62c47itsb.execute-api.eu-west-1.amazonaws.com$disconnect",
1917+
"http.url": "https://p62c47itsb.execute-api.eu-west-1.amazonaws.com$disconnect",
19181918
"message_direction": "IN",
19191919
"operation_name": "aws.apigateway.websocket",
19201920
"request_id": "123",
@@ -2112,7 +2112,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
21122112
"apiname": "None",
21132113
"endpoint": "/path/to/resource",
21142114
"http.method": "POST",
2115-
"http.url": "70ixmpl4fl.execute-api.us-east-2.amazonaws.com/path/to/resource",
2115+
"http.url": "https://70ixmpl4fl.execute-api.us-east-2.amazonaws.com/path/to/resource",
21162116
"operation_name": "aws.apigateway.rest",
21172117
"request_id": "123",
21182118
"resource_names": "POST /{proxy+}",
@@ -2135,7 +2135,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
21352135
"apiname": "amddr1rix9",
21362136
"endpoint": "/hello",
21372137
"http.method": "GET",
2138-
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
2138+
"http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
21392139
"operation_name": "aws.apigateway.rest",
21402140
"request_id": "123",
21412141
"resource_names": "GET /hello",
@@ -2157,7 +2157,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
21572157
"apiname": "amddr1rix9",
21582158
"endpoint": "/hello",
21592159
"http.method": "GET",
2160-
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
2160+
"http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
21612161
"operation_name": "aws.apigateway.rest",
21622162
"request_id": "123",
21632163
"resource_names": "GET /hello",
@@ -2180,7 +2180,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
21802180
"apiname": "amddr1rix9",
21812181
"endpoint": "/hello",
21822182
"http.method": "GET",
2183-
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
2183+
"http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
21842184
"operation_name": "aws.apigateway.rest",
21852185
"request_id": "123",
21862186
"resource_names": "GET /hello",
@@ -2202,7 +2202,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
22022202
"apiname": "amddr1rix9",
22032203
"endpoint": "/hello",
22042204
"http.method": "GET",
2205-
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
2205+
"http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
22062206
"operation_name": "aws.apigateway.rest",
22072207
"request_id": "123",
22082208
"resource_names": "GET /hello",
@@ -2224,7 +2224,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
22242224
"apiname": "amddr1rix9",
22252225
"endpoint": "/hello",
22262226
"http.method": "GET",
2227-
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
2227+
"http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
22282228
"operation_name": "aws.httpapi",
22292229
"request_id": "123",
22302230
"resource_names": "GET /hello",
@@ -2246,7 +2246,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
22462246
"apiname": "amddr1rix9",
22472247
"endpoint": "/hello",
22482248
"http.method": "GET",
2249-
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
2249+
"http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
22502250
"operation_name": "aws.httpapi",
22512251
"request_id": "123",
22522252
"resource_names": "GET /hello",
@@ -2270,7 +2270,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
22702270
"connection_id": "ZLr9QeNLmjQCIZA=",
22712271
"endpoint": "$connect",
22722272
"event_type": "CONNECT",
2273-
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com$connect",
2273+
"http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.com$connect",
22742274
"message_direction": "IN",
22752275
"operation_name": "aws.apigateway.websocket",
22762276
"request_id": "123",
@@ -2294,7 +2294,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
22942294
"connection_id": "ZLwtceO1mjQCI8Q=",
22952295
"endpoint": "main",
22962296
"event_type": "MESSAGE",
2297-
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.commain",
2297+
"http.url": "https://amddr1rix9.execute-api.eu-west-1.amazonaws.commain",
22982298
"message_direction": "IN",
22992299
"operation_name": "aws.apigateway.websocket",
23002300
"request_id": "123",

0 commit comments

Comments
 (0)