From 5e44e9cace55cc3609fac4cdee4bb7037add915f Mon Sep 17 00:00:00 2001 From: Sergio Prada Date: Wed, 28 Oct 2020 07:24:43 -0400 Subject: [PATCH 1/5] tag enhanced metrics witht he datadog_lambda:${version} string --- datadog_lambda/tags.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/datadog_lambda/tags.py b/datadog_lambda/tags.py index acef9691..c6b6e910 100644 --- a/datadog_lambda/tags.py +++ b/datadog_lambda/tags.py @@ -4,6 +4,7 @@ from datadog_lambda import __version__ from datadog_lambda.cold_start import get_cold_start_tag +from ddtrace import __version__ as ddtrace_version def _format_dd_lambda_layer_tag(): @@ -77,6 +78,11 @@ def get_runtime_tag(): major=major_version, minor=minor_version ) +def get_library_version_tag(): + """Get datadog lambda library tag + """ + return "datadog_lambda:{}".format(__version__) + def get_enhanced_metrics_tags(lambda_context): """Get the list of tags to apply to enhanced metrics @@ -85,6 +91,7 @@ def get_enhanced_metrics_tags(lambda_context): get_cold_start_tag(), "memorysize:{}".format(lambda_context.memory_limit_in_mb), get_runtime_tag(), + get_library_version_tag() ] From 7be8a6a9f2285c2d480815a65a3ae96d74a5b076 Mon Sep 17 00:00:00 2001 From: Sergio Prada Date: Wed, 28 Oct 2020 07:31:32 -0400 Subject: [PATCH 2/5] remove ddtrace --- datadog_lambda/tags.py | 1 - 1 file changed, 1 deletion(-) diff --git a/datadog_lambda/tags.py b/datadog_lambda/tags.py index c6b6e910..3d30b65c 100644 --- a/datadog_lambda/tags.py +++ b/datadog_lambda/tags.py @@ -4,7 +4,6 @@ from datadog_lambda import __version__ from datadog_lambda.cold_start import get_cold_start_tag -from ddtrace import __version__ as ddtrace_version def _format_dd_lambda_layer_tag(): From c16f7c4d0afcff094913f69b0871ad4cffedff0b Mon Sep 17 00:00:00 2001 From: Sergio Prada Date: Wed, 28 Oct 2020 07:33:13 -0400 Subject: [PATCH 3/5] format --- datadog_lambda/tags.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datadog_lambda/tags.py b/datadog_lambda/tags.py index 3d30b65c..5826f90d 100644 --- a/datadog_lambda/tags.py +++ b/datadog_lambda/tags.py @@ -77,6 +77,7 @@ def get_runtime_tag(): major=major_version, minor=minor_version ) + def get_library_version_tag(): """Get datadog lambda library tag """ @@ -90,7 +91,7 @@ def get_enhanced_metrics_tags(lambda_context): get_cold_start_tag(), "memorysize:{}".format(lambda_context.memory_limit_in_mb), get_runtime_tag(), - get_library_version_tag() + get_library_version_tag(), ] From ffd9c00ca1eee8d71051869540dad27bdb1bbc39 Mon Sep 17 00:00:00 2001 From: Sergio Prada Date: Wed, 28 Oct 2020 13:30:06 -0400 Subject: [PATCH 4/5] add datadog_lambda tag to enhanced metrics --- datadog_lambda/tags.py | 2 +- tests/test_wrapper.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/datadog_lambda/tags.py b/datadog_lambda/tags.py index 5826f90d..f21c8f92 100644 --- a/datadog_lambda/tags.py +++ b/datadog_lambda/tags.py @@ -81,7 +81,7 @@ def get_runtime_tag(): def get_library_version_tag(): """Get datadog lambda library tag """ - return "datadog_lambda:{}".format(__version__) + return "datadog_lambda:v{}".format(__version__) def get_enhanced_metrics_tags(lambda_context): diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py index a79297ce..68065a68 100644 --- a/tests/test_wrapper.py +++ b/tests/test_wrapper.py @@ -68,6 +68,13 @@ def setUp(self): self.mock_write_metric_point_to_stdout = patcher.start() self.addCleanup(patcher.stop) + patcher = patch("datadog_lambda.tags.get_library_version_tag") + self.mock_format_dd_lambda_layer_tag = patcher.start() + # Mock the layer version so we don't have to update tests on every version bump + self.mock_format_dd_lambda_layer_tag.return_value = ( + "datadog_lambda:v6.6.6" + ) + patcher = patch("datadog_lambda.tags._format_dd_lambda_layer_tag") self.mock_format_dd_lambda_layer_tag = patcher.start() # Mock the layer version so we don't have to update tests on every version bump @@ -146,6 +153,7 @@ def lambda_handler(event, context): "cold_start:true", "memorysize:256", "runtime:python2.7", + "datadog_lambda:v6.6.6", "dd_lambda_layer:datadog-python27_0.1.0", ], timestamp=None, @@ -176,6 +184,7 @@ def lambda_handler(event, context): "cold_start:true", "memorysize:256", "runtime:python2.7", + "datadog_lambda:v6.6.6", "dd_lambda_layer:datadog-python27_0.1.0", ], timestamp=None, @@ -191,6 +200,7 @@ def lambda_handler(event, context): "cold_start:true", "memorysize:256", "runtime:python2.7", + "datadog_lambda:v6.6.6", "dd_lambda_layer:datadog-python27_0.1.0", ], timestamp=None, @@ -226,6 +236,7 @@ def lambda_handler(event, context): "cold_start:true", "memorysize:256", "runtime:python2.7", + "datadog_lambda:v6.6.6", "dd_lambda_layer:datadog-python27_0.1.0", ], timestamp=None, @@ -241,6 +252,7 @@ def lambda_handler(event, context): "cold_start:false", "memorysize:256", "runtime:python2.7", + "datadog_lambda:v6.6.6", "dd_lambda_layer:datadog-python27_0.1.0", ], timestamp=None, @@ -274,6 +286,7 @@ def lambda_handler(event, context): "cold_start:true", "memorysize:256", "runtime:python2.7", + "datadog_lambda:v6.6.6", "dd_lambda_layer:datadog-python27_0.1.0", ], timestamp=None, @@ -307,6 +320,7 @@ def lambda_handler(event, context): "cold_start:true", "memorysize:256", "runtime:python2.7", + "datadog_lambda:v6.6.6", "dd_lambda_layer:datadog-python27_0.1.0", ], timestamp=None, From 576c6000527637c6998eac32db3c939603d9e54d Mon Sep 17 00:00:00 2001 From: Sergio Prada Date: Wed, 28 Oct 2020 14:17:30 -0400 Subject: [PATCH 5/5] black format --- tests/test_wrapper.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py index 68065a68..6cfce48a 100644 --- a/tests/test_wrapper.py +++ b/tests/test_wrapper.py @@ -71,9 +71,7 @@ def setUp(self): patcher = patch("datadog_lambda.tags.get_library_version_tag") self.mock_format_dd_lambda_layer_tag = patcher.start() # Mock the layer version so we don't have to update tests on every version bump - self.mock_format_dd_lambda_layer_tag.return_value = ( - "datadog_lambda:v6.6.6" - ) + self.mock_format_dd_lambda_layer_tag.return_value = "datadog_lambda:v6.6.6" patcher = patch("datadog_lambda.tags._format_dd_lambda_layer_tag") self.mock_format_dd_lambda_layer_tag = patcher.start()