Skip to content

Commit c4aa843

Browse files
authored
Tag enhanced metrics with datadog lambda library version (#94)
* tag enhanced metrics witht he datadog_lambda:${version} string * remove ddtrace * format * add datadog_lambda tag to enhanced metrics * black format
1 parent 947e4b2 commit c4aa843

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

datadog_lambda/tags.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,20 @@ def get_runtime_tag():
7878
)
7979

8080

81+
def get_library_version_tag():
82+
"""Get datadog lambda library tag
83+
"""
84+
return "datadog_lambda:v{}".format(__version__)
85+
86+
8187
def get_enhanced_metrics_tags(lambda_context):
8288
"""Get the list of tags to apply to enhanced metrics
8389
"""
8490
return parse_lambda_tags_from_arn(lambda_context) + [
8591
get_cold_start_tag(),
8692
"memorysize:{}".format(lambda_context.memory_limit_in_mb),
8793
get_runtime_tag(),
94+
get_library_version_tag(),
8895
]
8996

9097

tests/test_wrapper.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ def setUp(self):
6868
self.mock_write_metric_point_to_stdout = patcher.start()
6969
self.addCleanup(patcher.stop)
7070

71+
patcher = patch("datadog_lambda.tags.get_library_version_tag")
72+
self.mock_format_dd_lambda_layer_tag = patcher.start()
73+
# Mock the layer version so we don't have to update tests on every version bump
74+
self.mock_format_dd_lambda_layer_tag.return_value = "datadog_lambda:v6.6.6"
75+
7176
patcher = patch("datadog_lambda.tags._format_dd_lambda_layer_tag")
7277
self.mock_format_dd_lambda_layer_tag = patcher.start()
7378
# Mock the layer version so we don't have to update tests on every version bump
@@ -146,6 +151,7 @@ def lambda_handler(event, context):
146151
"cold_start:true",
147152
"memorysize:256",
148153
"runtime:python2.7",
154+
"datadog_lambda:v6.6.6",
149155
"dd_lambda_layer:datadog-python27_0.1.0",
150156
],
151157
timestamp=None,
@@ -176,6 +182,7 @@ def lambda_handler(event, context):
176182
"cold_start:true",
177183
"memorysize:256",
178184
"runtime:python2.7",
185+
"datadog_lambda:v6.6.6",
179186
"dd_lambda_layer:datadog-python27_0.1.0",
180187
],
181188
timestamp=None,
@@ -191,6 +198,7 @@ def lambda_handler(event, context):
191198
"cold_start:true",
192199
"memorysize:256",
193200
"runtime:python2.7",
201+
"datadog_lambda:v6.6.6",
194202
"dd_lambda_layer:datadog-python27_0.1.0",
195203
],
196204
timestamp=None,
@@ -226,6 +234,7 @@ def lambda_handler(event, context):
226234
"cold_start:true",
227235
"memorysize:256",
228236
"runtime:python2.7",
237+
"datadog_lambda:v6.6.6",
229238
"dd_lambda_layer:datadog-python27_0.1.0",
230239
],
231240
timestamp=None,
@@ -241,6 +250,7 @@ def lambda_handler(event, context):
241250
"cold_start:false",
242251
"memorysize:256",
243252
"runtime:python2.7",
253+
"datadog_lambda:v6.6.6",
244254
"dd_lambda_layer:datadog-python27_0.1.0",
245255
],
246256
timestamp=None,
@@ -274,6 +284,7 @@ def lambda_handler(event, context):
274284
"cold_start:true",
275285
"memorysize:256",
276286
"runtime:python2.7",
287+
"datadog_lambda:v6.6.6",
277288
"dd_lambda_layer:datadog-python27_0.1.0",
278289
],
279290
timestamp=None,
@@ -307,6 +318,7 @@ def lambda_handler(event, context):
307318
"cold_start:true",
308319
"memorysize:256",
309320
"runtime:python2.7",
321+
"datadog_lambda:v6.6.6",
310322
"dd_lambda_layer:datadog-python27_0.1.0",
311323
],
312324
timestamp=None,

0 commit comments

Comments
 (0)