Skip to content

Commit 0f16ebb

Browse files
purple4reinapurple4reina
committed
Revert v1 to original.
1 parent e8d3b62 commit 0f16ebb

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎datadog_lambda/tracing.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -885,17 +885,16 @@ def create_inferred_span_from_api_gateway_websocket_event(
885885
def create_inferred_span_from_api_gateway_event(
886886
event, context, decode_authorizer_context: bool = True
887887
):
888-
request_context = event.get("requestContext") or {}
889-
domain = request_context.get("domainName") or ""
888+
request_context = event.get("requestContext")
889+
domain = request_context.get("domainName", "")
890890
api_id = request_context.get("apiId")
891891
service_name = determine_service_name(
892892
service_mapping, api_id, "lambda_api_gateway", domain
893893
)
894-
method = request_context.get("httpMethod") or request_context.get("http", {}).get("method")
895-
path = event.get("rawPath") or request_context.get("path") or request_context.get("routeKey", "")
894+
method = event.get("httpMethod")
895+
path = event.get("path")
896896
resource_path = _get_resource_path(event, request_context)
897-
898-
resource = "{} {}".format(method, resource_path)
897+
resource = "{0} {1}".format(method, resource_path)
899898
tags = {
900899
"operation_name": "aws.apigateway.rest",
901900
"http.url": domain + path,
@@ -959,7 +958,8 @@ def create_inferred_span_from_http_api_event(
959958
)
960959
method = request_context.get("http", {}).get("method")
961960
path = event.get("rawPath")
962-
resource = "{0} {1}".format(method, path)
961+
resource_path = _get_resource_path(event, request_context)
962+
resource = "{0} {1}".format(method, resource_path)
963963
tags = {
964964
"operation_name": "aws.httpapi",
965965
"endpoint": path,

‎tests/test_tracing.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,9 +1373,9 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
13731373
"_inferred_span.tag_source": "self",
13741374
"apiid": "1234567890",
13751375
"apiname": "1234567890",
1376-
"endpoint": "/prod/path/to/resource",
1376+
"endpoint": "/path/to/resource",
13771377
"http.method": "POST",
1378-
"http.url": "70ixmpl4fl.execute-api.us-east-2.amazonaws.com/prod/path/to/resource",
1378+
"http.url": "70ixmpl4fl.execute-api.us-east-2.amazonaws.com/path/to/resource",
13791379
"operation_name": "aws.apigateway.rest",
13801380
"request_id": "123",
13811381
"resource_names": "POST /{proxy+}",
@@ -1395,9 +1395,9 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
13951395
"_inferred_span.tag_source": "self",
13961396
"apiid": "lgxbo6a518",
13971397
"apiname": "lgxbo6a518",
1398-
"endpoint": "/dev/http/get",
1398+
"endpoint": "/http/get",
13991399
"http.method": "GET",
1400-
"http.url": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com/dev/http/get",
1400+
"http.url": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com/http/get",
14011401
"operation_name": "aws.apigateway.rest",
14021402
"request_id": "123",
14031403
"resource_names": "GET /http/get",
@@ -1417,9 +1417,9 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
14171417
"_inferred_span.tag_source": "self",
14181418
"apiid": "lgxbo6a518",
14191419
"apiname": "lgxbo6a518",
1420-
"endpoint": "/dev/http/get",
1420+
"endpoint": "/http/get",
14211421
"http.method": "GET",
1422-
"http.url": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com/dev/http/get",
1422+
"http.url": "lgxbo6a518.execute-api.eu-west-1.amazonaws.com/http/get",
14231423
"operation_name": "aws.apigateway.rest",
14241424
"request_id": "123",
14251425
"resource_names": "GET /http/get",
@@ -1464,9 +1464,9 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
14641464
"_inferred_span.tag_source": "self",
14651465
"apiid": "mcwkra0ya4",
14661466
"apiname": "mcwkra0ya4",
1467-
"endpoint": "/dev/user/42",
1467+
"endpoint": "/user/42",
14681468
"http.method": "GET",
1469-
"http.url": "mcwkra0ya4.execute-api.sa-east-1.amazonaws.com/dev/user/42",
1469+
"http.url": "mcwkra0ya4.execute-api.sa-east-1.amazonaws.com/user/42",
14701470
"operation_name": "aws.apigateway.rest",
14711471
"request_id": "123",
14721472
"resource_names": "GET /user/{id}",
@@ -1755,9 +1755,9 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
17551755
"_inferred_span.tag_source": "self",
17561756
"apiid": "None",
17571757
"apiname": "None",
1758-
"endpoint": "/prod/path/to/resource",
1758+
"endpoint": "/path/to/resource",
17591759
"http.method": "POST",
1760-
"http.url": "70ixmpl4fl.execute-api.us-east-2.amazonaws.com/prod/path/to/resource",
1760+
"http.url": "70ixmpl4fl.execute-api.us-east-2.amazonaws.com/path/to/resource",
17611761
"operation_name": "aws.apigateway.rest",
17621762
"request_id": "123",
17631763
"resource_names": "POST /{proxy+}",
@@ -1778,9 +1778,9 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
17781778
"_inferred_span.tag_source": "self",
17791779
"apiid": "amddr1rix9",
17801780
"apiname": "amddr1rix9",
1781-
"endpoint": "/dev/hello",
1781+
"endpoint": "/hello",
17821782
"http.method": "GET",
1783-
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/dev/hello",
1783+
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
17841784
"operation_name": "aws.apigateway.rest",
17851785
"request_id": "123",
17861786
"resource_names": "GET /hello",
@@ -1800,9 +1800,9 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
18001800
"_inferred_span.tag_source": "self",
18011801
"apiid": "amddr1rix9",
18021802
"apiname": "amddr1rix9",
1803-
"endpoint": "/dev/hello",
1803+
"endpoint": "/hello",
18041804
"http.method": "GET",
1805-
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/dev/hello",
1805+
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
18061806
"operation_name": "aws.apigateway.rest",
18071807
"request_id": "123",
18081808
"resource_names": "GET /hello",
@@ -1823,9 +1823,9 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
18231823
"_inferred_span.tag_source": "self",
18241824
"apiid": "amddr1rix9",
18251825
"apiname": "amddr1rix9",
1826-
"endpoint": "/dev/hello",
1826+
"endpoint": "/hello",
18271827
"http.method": "GET",
1828-
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/dev/hello",
1828+
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
18291829
"operation_name": "aws.apigateway.rest",
18301830
"request_id": "123",
18311831
"resource_names": "GET /hello",
@@ -1845,9 +1845,9 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
18451845
"_inferred_span.tag_source": "self",
18461846
"apiid": "amddr1rix9",
18471847
"apiname": "amddr1rix9",
1848-
"endpoint": "/dev/hello",
1848+
"endpoint": "/hello",
18491849
"http.method": "GET",
1850-
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/dev/hello",
1850+
"http.url": "amddr1rix9.execute-api.eu-west-1.amazonaws.com/hello",
18511851
"operation_name": "aws.apigateway.rest",
18521852
"request_id": "123",
18531853
"resource_names": "GET /hello",

0 commit comments

Comments
 (0)