fix: http uri parsing (#161)

Author: GuyMoses

src/lumigo_tracer/lumigo_utils.py

@@ -544,3 +544,7 @@ def get_size_upper_bound() -> int:
 
 def is_error_code(status_code: int) -> bool:
     return status_code >= 400
+
+
+def is_aws_arn(string_to_validate: Optional[str]) -> bool:
+    return bool(string_to_validate and string_to_validate.startswith("arn:aws:"))

src/lumigo_tracer/parsing_utils.py

@@ -187,3 +187,7 @@ def recursive_get_key(d: Union[List, Dict[str, Union[Dict, str]]], key, depth=No
                 if recursive_result:
                     return recursive_result
     return default
+
+
+def extract_function_name_from_arn(arn: str) -> str:
+    return safe_split_get(arn, ":", 6)

src/lumigo_tracer/wrappers/http/http_parser.py

@@ -1,6 +1,7 @@
 import json
 import uuid
 from typing import Type, Optional
+from urllib.parse import unquote
 
 from lumigo_tracer.parsing_utils import (
     safe_split_get,
@@ -10,6 +11,7 @@
     recursive_json_join,
     safe_get,
     should_scrub_domain,
+    extract_function_name_from_arn,
 )
 from lumigo_tracer.lumigo_utils import (
     Configuration,
@@ -18,6 +20,7 @@
     get_logger,
     get_current_ms_time,
     is_error_code,
+    is_aws_arn,
 )
 from lumigo_tracer.wrappers.http.http_data_classes import HttpRequest
 
@@ -170,9 +173,14 @@ def parse_response(self, url: str, status_code: int, headers, body: bytes) -> di
 
 class LambdaParser(ServerlessAWSParser):
     def parse_request(self, parse_params: HttpRequest) -> dict:
+        decoded_uri = safe_split_get(unquote(parse_params.uri), "/", 3)
         return recursive_json_join(
             {
-                "info": {"resourceName": safe_split_get(parse_params.uri, "/", 3)},
+                "info": {
+                    "resourceName": extract_function_name_from_arn(decoded_uri)
+                    if is_aws_arn(decoded_uri)
+                    else decoded_uri
+                },
                 "invocationType": parse_params.headers.get("x-amz-invocation-type"),
             },
             super().parse_request(parse_params),

src/test/unit/test_lumigo_utils.py

@@ -33,6 +33,7 @@
     KILL_SWITCH,
     is_error_code,
     get_size_upper_bound,
+    is_aws_arn,
 )
 import json
 
@@ -409,3 +410,15 @@ def test_get_size_upper_bound():
 )
 def test_is_error_code(status_code, is_error):
     assert is_error_code(status_code) is is_error
+
+
+@pytest.mark.parametrize(
+    ("arn", "is_arn_result"),
+    [
+        ("not-arn", False),
+        (None, False),
+        ("arn:aws:lambda:region:876841109798:function:function-name", True),
+    ],
+)
+def test_is_aws_arn(arn, is_arn_result):
+    assert is_aws_arn(arn) is is_arn_result

src/test/unit/test_parsing_utils.py

@@ -14,6 +14,7 @@
     safe_key_from_query,
     safe_key_from_xml,
     safe_get_list,
+    extract_function_name_from_arn,
 )
 from lumigo_tracer.lumigo_utils import config, Configuration
 
@@ -169,3 +170,11 @@ def test_str_to_tuple():
 
 def test_str_to_tuple_exception():
     assert str_to_tuple([1]) is None
+
+
+def test_extract_name_from_arn():
+    name = "function-name"
+    assert (
+        extract_function_name_from_arn(f"arn:aws:lambda:region:123847209798:function:{name}")
+        == name  # noqa
+    )

src/test/unit/wrappers/http/test_http_parser.py

@@ -11,6 +11,7 @@
     ApiGatewayV2Parser,
     DynamoParser,
     EventBridgeParser,
+    LambdaParser,
 )
 
 
@@ -76,6 +77,28 @@ def test_apigw_parse_response_with_aws_request_id():
     }
 
 
+@pytest.mark.parametrize(
+    "uri, resource_name",
+    [
+        (
+            "lambda.us-west-2.amazonaws.com/2015-03-31/functions/my-function/invocations?Qualifier=1",
+            "my-function",
+        ),
+        (
+            "lambda.eu-central-1.amazonaws.com/2015-03-31/functions/arn%3Aaws%3Alambda%3Aeu-central-1%3A123847209798%3Afunction%3Aservice-prod-accessRedis/invocations",
+            "service-prod-accessRedis",
+        ),
+    ],
+)
+def test_lambda_parser_resource_name(uri, resource_name):
+    parser = LambdaParser()
+    params = HttpRequest(
+        host="", method="POST", uri=uri, headers={}, body=json.dumps({"hello": "world"})
+    )
+    response = parser.parse_request(params)
+    assert response["info"]["resourceName"] == resource_name
+
+
 @pytest.mark.parametrize(
     "method, body, message_id",
     [