Skip to content

Commit c6e7b2a

Browse files
ge0Ajage0Aja
authored
[AWSX] fix(logs forwarder): Bump datadog-lambda and ddtrace packages versions (#1038)
* [AWSX] fix(logs fowarder): Bump datadog-lambda and ddtrace packages versions * use lambda metric instead * black * update snapshots
1 parent 1c5995e commit c6e7b2a

11 files changed

Lines changed: 110 additions & 60 deletions

‎aws/logs_monitoring/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ bytecode
33
cattrs
44
certifi
55
charset-normalizer
6-
datadog-lambda==6.107.0
6+
datadog-lambda==8.120.0
77
datadog==0.52.0
88
ddsketch==3.0.1
9-
ddtrace==3.10.2
9+
ddtrace==3.16.2
1010
deprecated
1111
envier
1212
exceptiongroup

‎aws/logs_monitoring/telemetry.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Copyright 2021 Datadog, Inc.
55

66
try:
7-
from datadog_lambda.metric import lambda_stats
7+
from datadog_lambda.metric import lambda_metric
88

99
DD_SUBMIT_ENHANCED_METRICS = True
1010
except ImportError:
@@ -34,7 +34,7 @@ def send_forwarder_internal_metrics(name, additional_tags=[]):
3434
return
3535

3636
"""Send forwarder's internal metrics to DD"""
37-
lambda_stats.distribution(
37+
lambda_metric(
3838
"{}.{}".format(DD_FORWARDER_TELEMETRY_NAMESPACE_PREFIX, name),
3939
1,
4040
tags=DD_FORWARDER_TELEMETRY_TAGS + additional_tags,
@@ -45,7 +45,7 @@ def send_event_metric(metric_name, metric_value):
4545
if not DD_SUBMIT_ENHANCED_METRICS:
4646
return
4747

48-
lambda_stats.distribution(
48+
lambda_metric(
4949
"{}.{}".format(DD_FORWARDER_TELEMETRY_NAMESPACE_PREFIX, metric_name),
5050
metric_value,
5151
tags=DD_FORWARDER_TELEMETRY_TAGS,
@@ -56,6 +56,4 @@ def send_log_metric(metric):
5656
if not DD_SUBMIT_ENHANCED_METRICS:
5757
return
5858

59-
lambda_stats.distribution(
60-
metric["m"], metric["v"], timestamp=metric["e"], tags=metric["t"]
61-
)
59+
lambda_metric(metric["m"], metric["v"], timestamp=metric["e"], tags=metric["t"])

‎aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@
101101
"forwardername:test_function",
102102
"forwarder_memorysize:3008",
103103
"forwarder_version:<redacted from snapshot>",
104-
"event_type:awslogs"
104+
"event_type:awslogs",
105+
"dd_lambda_layer:datadog-python313_8.120.0"
105106
],
106107
"type": "distribution"
107108
},
@@ -115,7 +116,8 @@
115116
"forwardername:test_function",
116117
"forwarder_memorysize:3008",
117118
"forwarder_version:<redacted from snapshot>",
118-
"event_type:awslogs"
119+
"event_type:awslogs",
120+
"dd_lambda_layer:datadog-python313_8.120.0"
119121
],
120122
"type": "distribution"
121123
},
@@ -129,7 +131,8 @@
129131
"forwardername:test_function",
130132
"forwarder_memorysize:3008",
131133
"forwarder_version:<redacted from snapshot>",
132-
"event_type:awslogs"
134+
"event_type:awslogs",
135+
"dd_lambda_layer:datadog-python313_8.120.0"
133136
],
134137
"type": "distribution"
135138
},
@@ -143,7 +146,8 @@
143146
"forwardername:test_function",
144147
"forwarder_memorysize:3008",
145148
"forwarder_version:<redacted from snapshot>",
146-
"event_type:awslogs"
149+
"event_type:awslogs",
150+
"dd_lambda_layer:datadog-python313_8.120.0"
147151
],
148152
"type": "distribution"
149153
},
@@ -157,7 +161,8 @@
157161
"forwardername:test_function",
158162
"forwarder_memorysize:3008",
159163
"forwarder_version:<redacted from snapshot>",
160-
"event_type:awslogs"
164+
"event_type:awslogs",
165+
"dd_lambda_layer:datadog-python313_8.120.0"
161166
],
162167
"type": "distribution"
163168
},
@@ -171,7 +176,8 @@
171176
"forwardername:test_function",
172177
"forwarder_memorysize:3008",
173178
"forwarder_version:<redacted from snapshot>",
174-
"event_type:awslogs"
179+
"event_type:awslogs",
180+
"dd_lambda_layer:datadog-python313_8.120.0"
175181
],
176182
"type": "distribution"
177183
}

‎aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
"forwardername:test_function",
7575
"forwarder_memorysize:3008",
7676
"forwarder_version:<redacted from snapshot>",
77-
"event_type:awslogs"
77+
"event_type:awslogs",
78+
"dd_lambda_layer:datadog-python313_8.120.0"
7879
],
7980
"type": "distribution"
8081
},
@@ -88,7 +89,8 @@
8889
"forwardername:test_function",
8990
"forwarder_memorysize:3008",
9091
"forwarder_version:<redacted from snapshot>",
91-
"event_type:awslogs"
92+
"event_type:awslogs",
93+
"dd_lambda_layer:datadog-python313_8.120.0"
9294
],
9395
"type": "distribution"
9496
},
@@ -102,7 +104,8 @@
102104
"forwardername:test_function",
103105
"forwarder_memorysize:3008",
104106
"forwarder_version:<redacted from snapshot>",
105-
"event_type:awslogs"
107+
"event_type:awslogs",
108+
"dd_lambda_layer:datadog-python313_8.120.0"
106109
],
107110
"type": "distribution"
108111
},
@@ -116,7 +119,8 @@
116119
"forwardername:test_function",
117120
"forwarder_memorysize:3008",
118121
"forwarder_version:<redacted from snapshot>",
119-
"event_type:awslogs"
122+
"event_type:awslogs",
123+
"dd_lambda_layer:datadog-python313_8.120.0"
120124
],
121125
"type": "distribution"
122126
},
@@ -130,7 +134,8 @@
130134
"forwardername:test_function",
131135
"forwarder_memorysize:3008",
132136
"forwarder_version:<redacted from snapshot>",
133-
"event_type:awslogs"
137+
"event_type:awslogs",
138+
"dd_lambda_layer:datadog-python313_8.120.0"
134139
],
135140
"type": "distribution"
136141
},
@@ -144,7 +149,8 @@
144149
"forwardername:test_function",
145150
"forwarder_memorysize:3008",
146151
"forwarder_version:<redacted from snapshot>",
147-
"event_type:awslogs"
152+
"event_type:awslogs",
153+
"dd_lambda_layer:datadog-python313_8.120.0"
148154
],
149155
"type": "distribution"
150156
}

‎aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_cloudtrail.json~snapshot‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@
110110
"forwardername:test_function",
111111
"forwarder_memorysize:3008",
112112
"forwarder_version:<redacted from snapshot>",
113-
"event_type:awslogs"
113+
"event_type:awslogs",
114+
"dd_lambda_layer:datadog-python313_8.120.0"
114115
],
115116
"type": "distribution"
116117
},
@@ -124,7 +125,8 @@
124125
"forwardername:test_function",
125126
"forwarder_memorysize:3008",
126127
"forwarder_version:<redacted from snapshot>",
127-
"event_type:awslogs"
128+
"event_type:awslogs",
129+
"dd_lambda_layer:datadog-python313_8.120.0"
128130
],
129131
"type": "distribution"
130132
},
@@ -138,7 +140,8 @@
138140
"forwardername:test_function",
139141
"forwarder_memorysize:3008",
140142
"forwarder_version:<redacted from snapshot>",
141-
"event_type:awslogs"
143+
"event_type:awslogs",
144+
"dd_lambda_layer:datadog-python313_8.120.0"
142145
],
143146
"type": "distribution"
144147
},
@@ -152,7 +155,8 @@
152155
"forwardername:test_function",
153156
"forwarder_memorysize:3008",
154157
"forwarder_version:<redacted from snapshot>",
155-
"event_type:awslogs"
158+
"event_type:awslogs",
159+
"dd_lambda_layer:datadog-python313_8.120.0"
156160
],
157161
"type": "distribution"
158162
},
@@ -166,7 +170,8 @@
166170
"forwardername:test_function",
167171
"forwarder_memorysize:3008",
168172
"forwarder_version:<redacted from snapshot>",
169-
"event_type:awslogs"
173+
"event_type:awslogs",
174+
"dd_lambda_layer:datadog-python313_8.120.0"
170175
],
171176
"type": "distribution"
172177
},
@@ -180,7 +185,8 @@
180185
"forwardername:test_function",
181186
"forwarder_memorysize:3008",
182187
"forwarder_version:<redacted from snapshot>",
183-
"event_type:awslogs"
188+
"event_type:awslogs",
189+
"dd_lambda_layer:datadog-python313_8.120.0"
184190
],
185191
"type": "distribution"
186192
}

‎aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_coldstart.json~snapshot‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"forwardername:test_function",
1414
"forwarder_memorysize:3008",
1515
"forwarder_version:<redacted from snapshot>",
16-
"event_type:awslogs"
16+
"event_type:awslogs",
17+
"dd_lambda_layer:datadog-python313_8.120.0"
1718
],
1819
"type": "distribution"
1920
},
@@ -27,7 +28,8 @@
2728
"forwardername:test_function",
2829
"forwarder_memorysize:3008",
2930
"forwarder_version:<redacted from snapshot>",
30-
"event_type:awslogs"
31+
"event_type:awslogs",
32+
"dd_lambda_layer:datadog-python313_8.120.0"
3133
],
3234
"type": "distribution"
3335
},
@@ -41,7 +43,8 @@
4143
"forwardername:test_function",
4244
"forwarder_memorysize:3008",
4345
"forwarder_version:<redacted from snapshot>",
44-
"event_type:awslogs"
46+
"event_type:awslogs",
47+
"dd_lambda_layer:datadog-python313_8.120.0"
4548
],
4649
"type": "distribution"
4750
},
@@ -55,7 +58,8 @@
5558
"forwardername:test_function",
5659
"forwarder_memorysize:3008",
5760
"forwarder_version:<redacted from snapshot>",
58-
"event_type:awslogs"
61+
"event_type:awslogs",
62+
"dd_lambda_layer:datadog-python313_8.120.0"
5963
],
6064
"type": "distribution"
6165
},
@@ -69,7 +73,8 @@
6973
"forwardername:test_function",
7074
"forwarder_memorysize:3008",
7175
"forwarder_version:<redacted from snapshot>",
72-
"event_type:awslogs"
76+
"event_type:awslogs",
77+
"dd_lambda_layer:datadog-python313_8.120.0"
7378
],
7479
"type": "distribution"
7580
},
@@ -83,7 +88,8 @@
8388
"forwardername:test_function",
8489
"forwarder_memorysize:3008",
8590
"forwarder_version:<redacted from snapshot>",
86-
"event_type:awslogs"
91+
"event_type:awslogs",
92+
"dd_lambda_layer:datadog-python313_8.120.0"
8793
],
8894
"type": "distribution"
8995
},
@@ -97,7 +103,8 @@
97103
"forwardername:test_function",
98104
"forwarder_memorysize:3008",
99105
"forwarder_version:<redacted from snapshot>",
100-
"event_type:awslogs"
106+
"event_type:awslogs",
107+
"dd_lambda_layer:datadog-python313_8.120.0"
101108
],
102109
"type": "distribution"
103110
}

‎aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
"forwardername:test_function",
5757
"forwarder_memorysize:3008",
5858
"forwarder_version:<redacted from snapshot>",
59-
"event_type:awslogs"
59+
"event_type:awslogs",
60+
"dd_lambda_layer:datadog-python313_8.120.0"
6061
],
6162
"type": "distribution"
6263
},
@@ -70,7 +71,8 @@
7071
"forwardername:test_function",
7172
"forwarder_memorysize:3008",
7273
"forwarder_version:<redacted from snapshot>",
73-
"event_type:awslogs"
74+
"event_type:awslogs",
75+
"dd_lambda_layer:datadog-python313_8.120.0"
7476
],
7577
"type": "distribution"
7678
},
@@ -84,7 +86,8 @@
8486
"forwardername:test_function",
8587
"forwarder_memorysize:3008",
8688
"forwarder_version:<redacted from snapshot>",
87-
"event_type:awslogs"
89+
"event_type:awslogs",
90+
"dd_lambda_layer:datadog-python313_8.120.0"
8891
],
8992
"type": "distribution"
9093
},
@@ -98,7 +101,8 @@
98101
"forwardername:test_function",
99102
"forwarder_memorysize:3008",
100103
"forwarder_version:<redacted from snapshot>",
101-
"event_type:awslogs"
104+
"event_type:awslogs",
105+
"dd_lambda_layer:datadog-python313_8.120.0"
102106
],
103107
"type": "distribution"
104108
}

0 commit comments

Comments
 (0)