fix(http): append path to the url

Author: florentinl

datadog_lambda/trigger.py

@@ -315,8 +315,8 @@ def extract_http_tags(event):
             path = apigateway_v2_http.get("path")
             method = apigateway_v2_http.get("method")
 
-    if path:
-        http_tags["http.url_details.path"] = path
+    if path and http_tags.get("http.url"):
+        http_tags["http.url"] += path
     if method:
         http_tags["http.method"] = method
 

tests/test_trigger.py

@@ -301,8 +301,7 @@ def test_extract_trigger_tags_api_gateway(self):
             {
                 "function_trigger.event_source": "api-gateway",
                 "function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/1234567890/stages/prod",
-                "http.url": "https://70ixmpl4fl.execute-api.us-east-2.amazonaws.com",
-                "http.url_details.path": "/prod/path/to/resource",
+                "http.url": "https://70ixmpl4fl.execute-api.us-east-2.amazonaws.com/prod/path/to/resource",
                 "http.method": "POST",
                 "http.route": "/{proxy+}",
             },
@@ -320,8 +319,7 @@ def test_extract_trigger_tags_api_gateway_non_proxy(self):
             {
                 "function_trigger.event_source": "api-gateway",
                 "function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/lgxbo6a518/stages/dev",
-                "http.url": "https://lgxbo6a518.execute-api.eu-west-1.amazonaws.com",
-                "http.url_details.path": "/dev/http/get",
+                "http.url": "https://lgxbo6a518.execute-api.eu-west-1.amazonaws.com/dev/http/get",
                 "http.method": "GET",
                 "http.route": "/http/get",
             },
@@ -387,8 +385,7 @@ def test_extract_trigger_tags_api_gateway_http_api(self):
             {
                 "function_trigger.event_source": "api-gateway",
                 "function_trigger.event_source_arn": "arn:aws:apigateway:us-west-1::/restapis/x02yirxc7a/stages/$default",
-                "http.url": "https://x02yirxc7a.execute-api.eu-west-1.amazonaws.com",
-                "http.url_details.path": "/httpapi/get",
+                "http.url": "https://x02yirxc7a.execute-api.eu-west-1.amazonaws.com/httpapi/get",
                 "http.method": "GET",
                 "http.route": "/httpapi/get",
             },
@@ -406,7 +403,6 @@ def test_extract_trigger_tags_application_load_balancer(self):
             {
                 "function_trigger.event_source": "application-load-balancer",
                 "function_trigger.event_source_arn": "arn:aws:elasticloadbalancing:us-east-2:123456789012:targetgroup/lambda-xyz/123abc",
-                "http.url_details.path": "/lambda",
                 "http.method": "GET",
             },
         )
@@ -568,9 +564,7 @@ def test_extract_http_tags_with_invalid_request_context(self):
         event = {"requestContext": "not_a_dict", "path": "/test", "httpMethod": "GET"}
         http_tags = extract_http_tags(event)
         # Should still extract valid tags from the event
-        self.assertEqual(
-            http_tags, {"http.url_details.path": "/test", "http.method": "GET"}
-        )
+        self.assertEqual(http_tags, {"http.method": "GET"})
 
     def test_extract_http_tags_with_invalid_apigateway_http(self):
         from datadog_lambda.trigger import extract_http_tags