Skip to content

Tag enhanced metrics with datadog lambda library version #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 5, 2020
Merged

Tag enhanced metrics with datadog lambda library version #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e44e9c
tag enhanced metrics witht he datadog_lambda:${version} string
Czechh Oct 28, 2020
7be8a6a
remove ddtrace
Czechh Oct 28, 2020
c16f7c4
format
Czechh Oct 28, 2020
ffd9c00
add datadog_lambda tag to enhanced metrics
Czechh Oct 28, 2020
576c600
black format
Czechh Oct 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions datadog_lambda/tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,20 @@ def get_runtime_tag():
)


def get_library_version_tag():
"""Get datadog lambda library tag
"""
return "datadog_lambda:v{}".format(__version__)


def get_enhanced_metrics_tags(lambda_context):
"""Get the list of tags to apply to enhanced metrics
"""
return parse_lambda_tags_from_arn(lambda_context) + [
get_cold_start_tag(),
"memorysize:{}".format(lambda_context.memory_limit_in_mb),
get_runtime_tag(),
get_library_version_tag(),
]


Expand Down
12 changes: 12 additions & 0 deletions tests/test_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ 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
Expand Down Expand Up @@ -146,6 +151,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,
Expand Down Expand Up @@ -176,6 +182,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,
Expand All @@ -191,6 +198,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,
Expand Down Expand Up @@ -226,6 +234,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,
Expand All @@ -241,6 +250,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,
Expand Down Expand Up @@ -274,6 +284,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,
Expand Down Expand Up @@ -307,6 +318,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,
Expand Down