Skip to content

Commit 87631e9

Browse files
duncanistaduncanista
committed
lint fix with black again
1 parent 39d0d98 commit 87631e9

File tree

2 files changed

+27
-95
lines changed

2 files changed

+27
-95
lines changed

‎aws/logs_monitoring/enhanced_lambda_metrics.py‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,13 @@
3434
r"REPORT\s+"
3535
+ r"RequestId:\s+(?P<{}>[\w-]+)\s+".format(REQUEST_ID_FIELD_NAME)
3636
+ r"Duration:\s+(?P<{}>[\d\.]+)\s+ms\s+".format(DURATION_METRIC_NAME)
37-
+ r"Billed\s+Duration:\s+(?P<{}>[\d\.]+)\s+ms\s+".format(
38-
BILLED_DURATION_METRIC_NAME
39-
)
37+
+ r"Billed\s+Duration:\s+(?P<{}>[\d\.]+)\s+ms\s+".format(BILLED_DURATION_METRIC_NAME)
4038
+ r"Memory\s+Size:\s+(?P<{}>\d+)\s+MB\s+".format(MEMORY_ALLOCATED_FIELD_NAME)
4139
+ r"Max\s+Memory\s+Used:\s+(?P<{}>\d+)\s+MB".format(MAX_MEMORY_USED_METRIC_NAME)
4240
+ r"(\s+Init\s+Duration:\s+(?P<{}>[\d\.]+)\s+ms)?".format(INIT_DURATION_METRIC_NAME)
4341
)
4442

45-
TIMED_OUT_REGEX = re.compile(
46-
r"Task\stimed\sout\safter\s+(?P<{}>[\d\.]+)\s+seconds".format(TIMEOUTS_METRIC_NAME)
47-
)
43+
TIMED_OUT_REGEX = re.compile(r"Task\stimed\sout\safter\s+(?P<{}>[\d\.]+)\s+seconds".format(TIMEOUTS_METRIC_NAME))
4844

4945
OUT_OF_MEMORY_ERROR_STRINGS = [
5046
"fatal error: runtime: out of memory", # Go
@@ -133,19 +129,13 @@ def submit_to_dd(self):
133129
if not timestamp:
134130
timestamp = time()
135131

136-
logger.debug(
137-
"Submitting metric {} {} {}".format(self.name, self.value, self.tags)
138-
)
139-
lambda_stats.distribution(
140-
self.name, self.value, timestamp=timestamp, tags=self.tags
141-
)
132+
logger.debug("Submitting metric {} {} {}".format(self.name, self.value, self.tags))
133+
lambda_stats.distribution(self.name, self.value, timestamp=timestamp, tags=self.tags)
142134

143135

144136
def get_last_modified_time(s3_file):
145137
last_modified_str = s3_file["ResponseMetadata"]["HTTPHeaders"]["last-modified"]
146-
last_modified_date = datetime.datetime.strptime(
147-
last_modified_str, "%a, %d %b %Y %H:%M:%S %Z"
148-
)
138+
last_modified_date = datetime.datetime.strptime(last_modified_str, "%a, %d %b %Y %H:%M:%S %Z")
149139
last_modified_unix_time = int(last_modified_date.strftime("%s"))
150140
return last_modified_unix_time
151141

@@ -163,9 +153,7 @@ def parse_and_submit_enhanced_metrics(logs, cache_layer):
163153

164154
for log in logs:
165155
try:
166-
enhanced_metrics = generate_enhanced_lambda_metrics(
167-
log, cache_layer.get_lambda_tags_cache()
168-
)
156+
enhanced_metrics = generate_enhanced_lambda_metrics(log, cache_layer.get_lambda_tags_cache())
169157
for enhanced_metric in enhanced_metrics:
170158
enhanced_metric.submit_to_dd()
171159
except Exception as e:
@@ -456,9 +444,7 @@ def create_out_of_memory_enhanced_metric(log_line):
456444
DatadogMetricPoint[]
457445
"""
458446

459-
contains_out_of_memory_error = any(
460-
s in log_line for s in OUT_OF_MEMORY_ERROR_STRINGS
461-
)
447+
contains_out_of_memory_error = any(s in log_line for s in OUT_OF_MEMORY_ERROR_STRINGS)
462448

463449
if not contains_out_of_memory_error:
464450
return []

‎aws/logs_monitoring/tests/test_enhanced_lambda_metrics.py‎

Lines changed: 20 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,7 @@ class TestEnhancedLambdaMetrics(unittest.TestCase):
105105
)
106106

107107
def test_parse_lambda_tags_from_arn(self):
108-
verify_as_json(
109-
parse_lambda_tags_from_arn(
110-
"arn:aws:lambda:us-east-1:1234597598159:function:swf-hello-test"
111-
)
112-
)
108+
verify_as_json(parse_lambda_tags_from_arn("arn:aws:lambda:us-east-1:1234597598159:function:swf-hello-test"))
113109

114110
def test_parse_metrics_from_report_log(self):
115111
parsed_metrics = parse_metrics_from_report_log(self.malformed_report)
@@ -161,31 +157,19 @@ def test_parse_metrics_from_partial_metrics_json_report_log(self):
161157

162158
def test_create_out_of_memory_enhanced_metric(self):
163159
go_out_of_memory_error = "fatal error: runtime: out of memory"
164-
self.assertEqual(
165-
len(create_out_of_memory_enhanced_metric(go_out_of_memory_error)), 1
166-
)
160+
self.assertEqual(len(create_out_of_memory_enhanced_metric(go_out_of_memory_error)), 1)
167161

168-
java_out_of_memory_error = (
169-
"Requested array size exceeds VM limit: java.lang.OutOfMemoryError"
170-
)
171-
self.assertEqual(
172-
len(create_out_of_memory_enhanced_metric(java_out_of_memory_error)), 1
173-
)
162+
java_out_of_memory_error = "Requested array size exceeds VM limit: java.lang.OutOfMemoryError"
163+
self.assertEqual(len(create_out_of_memory_enhanced_metric(java_out_of_memory_error)), 1)
174164

175165
node_out_of_memory_error = "FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
176-
self.assertEqual(
177-
len(create_out_of_memory_enhanced_metric(node_out_of_memory_error)), 1
178-
)
166+
self.assertEqual(len(create_out_of_memory_enhanced_metric(node_out_of_memory_error)), 1)
179167

180168
python_out_of_memory_error = "fatal error: runtime: out of memory"
181-
self.assertEqual(
182-
len(create_out_of_memory_enhanced_metric(python_out_of_memory_error)), 1
183-
)
169+
self.assertEqual(len(create_out_of_memory_enhanced_metric(python_out_of_memory_error)), 1)
184170

185171
ruby_out_of_memory_error = "failed to allocate memory (NoMemoryError)"
186-
self.assertEqual(
187-
len(create_out_of_memory_enhanced_metric(ruby_out_of_memory_error)), 1
188-
)
172+
self.assertEqual(len(create_out_of_memory_enhanced_metric(ruby_out_of_memory_error)), 1)
189173

190174
success_message = "Success!"
191175
self.assertEqual(len(create_out_of_memory_enhanced_metric(success_message)), 0)
@@ -220,15 +204,9 @@ def test_generate_enhanced_lambda_metrics_json(
220204
"owner": "172597598159",
221205
},
222206
"function_version": "$LATEST",
223-
"invoked_function_arn": (
224-
"arn:aws:lambda:us-east-1:172597598159:function:collect_logs_datadog_demo"
225-
),
226-
},
227-
"lambda": {
228-
"arn": (
229-
"arn:aws:lambda:us-east-1:172597598159:function:post-coupon-prod-us"
230-
)
207+
"invoked_function_arn": ("arn:aws:lambda:us-east-1:172597598159:function:collect_logs_datadog_demo"),
231208
},
209+
"lambda": {"arn": ("arn:aws:lambda:us-east-1:172597598159:function:post-coupon-prod-us")},
232210
"timestamp": 10000,
233211
}
234212

@@ -250,15 +228,9 @@ def test_generate_enhanced_lambda_metrics(self):
250228
"owner": "172597598159",
251229
},
252230
"function_version": "$LATEST",
253-
"invoked_function_arn": (
254-
"arn:aws:lambda:us-east-1:172597598159:function:collect_logs_datadog_demo"
255-
),
256-
},
257-
"lambda": {
258-
"arn": (
259-
"arn:aws:lambda:us-east-1:172597598159:function:post-coupon-prod-us"
260-
)
231+
"invoked_function_arn": ("arn:aws:lambda:us-east-1:172597598159:function:collect_logs_datadog_demo"),
261232
},
233+
"lambda": {"arn": ("arn:aws:lambda:us-east-1:172597598159:function:post-coupon-prod-us")},
262234
"timestamp": 10000,
263235
}
264236

@@ -269,9 +241,7 @@ def test_generate_enhanced_lambda_metrics_with_tags(
269241
self,
270242
):
271243
tags_cache = LambdaTagsCache("")
272-
tags_cache.get = MagicMock(
273-
return_value=["team:metrics", "monitor:datadog", "env:prod", "creator:swf"]
274-
)
244+
tags_cache.get = MagicMock(return_value=["team:metrics", "monitor:datadog", "env:prod", "creator:swf"])
275245

276246
logs_input = {
277247
"message": (
@@ -284,15 +254,9 @@ def test_generate_enhanced_lambda_metrics_with_tags(
284254
"owner": "172597598159",
285255
},
286256
"function_version": "$LATEST",
287-
"invoked_function_arn": (
288-
"arn:aws:lambda:us-east-1:172597598159:function:collect_logs_datadog_demo"
289-
),
290-
},
291-
"lambda": {
292-
"arn": (
293-
"arn:aws:lambda:us-east-1:172597598159:function:post-coupon-prod-us"
294-
)
257+
"invoked_function_arn": ("arn:aws:lambda:us-east-1:172597598159:function:collect_logs_datadog_demo"),
295258
},
259+
"lambda": {"arn": ("arn:aws:lambda:us-east-1:172597598159:function:post-coupon-prod-us")},
296260
"timestamp": 10000,
297261
}
298262

@@ -314,15 +278,9 @@ def test_generate_enhanced_lambda_metrics_once_with_missing_arn(self):
314278
"owner": "172597598159",
315279
},
316280
"function_version": "$LATEST",
317-
"invoked_function_arn": (
318-
"arn:aws:lambda:us-east-1:172597598159:function:collect_logs_datadog_demo"
319-
),
320-
},
321-
"lambda": {
322-
"arn": (
323-
"arn:aws:lambda:us-east-1:172597598159:function:post-coupon-prod-us"
324-
)
281+
"invoked_function_arn": ("arn:aws:lambda:us-east-1:172597598159:function:collect_logs_datadog_demo"),
325282
},
283+
"lambda": {"arn": ("arn:aws:lambda:us-east-1:172597598159:function:post-coupon-prod-us")},
326284
"timestamp": 10000,
327285
}
328286

@@ -357,15 +315,9 @@ def test_generate_enhanced_lambda_metrics_refresh_s3_cache(self, mock1, mock2):
357315
"owner": "172597598159",
358316
},
359317
"function_version": "$LATEST",
360-
"invoked_function_arn": (
361-
"arn:aws:lambda:us-east-1:172597598159:function:collect_logs_datadog_demo"
362-
),
363-
},
364-
"lambda": {
365-
"arn": (
366-
"arn:aws:lambda:us-east-1:172597598159:function:post-coupon-prod-us"
367-
)
318+
"invoked_function_arn": ("arn:aws:lambda:us-east-1:172597598159:function:collect_logs_datadog_demo"),
368319
},
320+
"lambda": {"arn": ("arn:aws:lambda:us-east-1:172597598159:function:post-coupon-prod-us")},
369321
"timestamp": 10000,
370322
}
371323

@@ -415,15 +367,9 @@ def test_generate_enhanced_lambda_metrics_client_error(
415367
"owner": "172597598159",
416368
},
417369
"function_version": "$LATEST",
418-
"invoked_function_arn": (
419-
"arn:aws:lambda:us-east-1:172597598159:function:collect_logs_datadog_demo"
420-
),
421-
},
422-
"lambda": {
423-
"arn": (
424-
"arn:aws:lambda:us-east-1:172597598159:function:post-coupon-prod-us"
425-
)
370+
"invoked_function_arn": ("arn:aws:lambda:us-east-1:172597598159:function:collect_logs_datadog_demo"),
426371
},
372+
"lambda": {"arn": ("arn:aws:lambda:us-east-1:172597598159:function:post-coupon-prod-us")},
427373
"timestamp": 10000,
428374
}
429375

0 commit comments

Comments
 (0)