add resource and excutedversion tags and tests

Author: jcstorms1

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "/usr/local/bin/python3"
+}

datadog_lambda/tags.py

@@ -35,16 +35,27 @@ def parse_lambda_tags_from_arn(arn):
     split_arn = arn.split(":")
 
     # If ARN includes version / alias at the end, drop it
-    if len(split_arn) > 7:
-        split_arn = split_arn[:7]
+    if len(split_arn) <= 7:
 
-    _, _, _, region, account_id, _, function_name = split_arn
+        _, _, _, region, account_id, _, function_name = split_arn
 
-    return [
-        "region:{}".format(region),
-        "account_id:{}".format(account_id),
-        "functionname:{}".format(function_name),
-    ]
+        return [
+            "region:{}".format(region),
+            "account_id:{}".format(account_id),
+            "functionname:{}".format(function_name),
+        ]
+
+    else:
+        _, _, _, region, account_id, _, function_name, alias = split_arn
+
+        resource = function_name + ":" + alias
+
+        return [
+            "region:{}".format(region),
+            "account_id:{}".format(account_id),
+            "functionname:{}".format(function_name),
+            "resource:{}".format(resource),
+        ]
 
 
 def get_runtime_tag():
@@ -63,6 +74,7 @@ def get_enhanced_metrics_tags(lambda_context):
     return parse_lambda_tags_from_arn(lambda_context.invoked_function_arn) + [
         get_cold_start_tag(),
         "memorysize:{}".format(lambda_context.memory_limit_in_mb),
+        "executedversion:{}".format(lambda_context.function_version),
         get_runtime_tag(),
         _format_dd_lambda_layer_tag(),
     ]

tests/test_tags.py

@@ -34,6 +34,7 @@ def test_parse_lambda_tags_from_arn(self):
                 "region:us-west-1",
                 "account_id:1234597598159",
                 "functionname:other-function",
+                "resource:other-function:function-alias",
             ],
         )
 

tests/test_wrapper.py

@@ -14,11 +14,13 @@ def get_mock_context(
     aws_request_id="request-id-1",
     memory_limit_in_mb="256",
     invoked_function_arn="arn:aws:lambda:us-west-1:123457598159:function:python-layer-test",
+    function_version="1",
 ):
     lambda_context = MagicMock()
     lambda_context.aws_request_id = aws_request_id
     lambda_context.memory_limit_in_mb = memory_limit_in_mb
     lambda_context.invoked_function_arn = invoked_function_arn
+    lambda_context.function_version = function_version
     return lambda_context
 
 
@@ -146,6 +148,7 @@ def lambda_handler(event, context):
                         "functionname:python-layer-test",
                         "cold_start:true",
                         "memorysize:256",
+                        "executedversion:1",
                         "runtime:python2.7",
                         "dd_lambda_layer:datadog-python27_0.1.0",
                     ],
@@ -174,6 +177,7 @@ def lambda_handler(event, context):
                         "functionname:python-layer-test",
                         "cold_start:true",
                         "memorysize:256",
+                        "executedversion:1",
                         "runtime:python2.7",
                         "dd_lambda_layer:datadog-python27_0.1.0",
                     ],
@@ -187,13 +191,49 @@ def lambda_handler(event, context):
                         "functionname:python-layer-test",
                         "cold_start:true",
                         "memorysize:256",
+                        "executedversion:1",
                         "runtime:python2.7",
                         "dd_lambda_layer:datadog-python27_0.1.0",
                     ],
                 ),
             ]
         )
 
+    def test_metric_with_function_alias(self):
+        @datadog_lambda_wrapper
+        def lambda_handler(event, context):
+            lambda_metric("test.meetric", 100)
+
+        invoked_function_with_alias = (
+            "arn:aws:lambda:us-west-1:123457598159:function:python-layer-test:foobar"
+        )
+
+        lambda_event = {}
+        lambda_context = get_mock_context()
+        lambda_context.invoked_function_arn = invoked_function_with_alias
+
+        lambda_handler(lambda_event, lambda_context)
+
+        self.mock_write_metric_point_to_stdout.assert_has_calls(
+            [
+                call(
+                    "aws.lambda.enhanced.invocations",
+                    1,
+                    tags=[
+                        "region:us-west-1",
+                        "account_id:123457598159",
+                        "functionname:python-layer-test",
+                        "resource:python-layer-test:foobar",
+                        "cold_start:true",
+                        "memorysize:256",
+                        "executedversion:1",
+                        "runtime:python2.7",
+                        "dd_lambda_layer:datadog-python27_0.1.0",
+                    ],
+                )
+            ]
+        )
+
     def test_enhanced_metrics_cold_start_tag(self):
         @datadog_lambda_wrapper
         def lambda_handler(event, context):
@@ -220,6 +260,7 @@ def lambda_handler(event, context):
                         "functionname:python-layer-test",
                         "cold_start:true",
                         "memorysize:256",
+                        "executedversion:1",
                         "runtime:python2.7",
                         "dd_lambda_layer:datadog-python27_0.1.0",
                     ],
@@ -233,6 +274,7 @@ def lambda_handler(event, context):
                         "functionname:python-layer-test",
                         "cold_start:false",
                         "memorysize:256",
+                        "executedversion:1",
                         "runtime:python2.7",
                         "dd_lambda_layer:datadog-python27_0.1.0",
                     ],