Skip to content

Commit cb64278

Browse files
joeyzhao2018joeyzhao2018
authored
update integration test log snapshot files (#252)
1 parent 17cd4b6 commit cb64278

File tree

7 files changed

+272
-135
lines changed

7 files changed

+272
-135
lines changed

‎scripts/run_integration_tests.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,13 @@ for handler_name in "${LAMBDA_HANDLERS[@]}"; do
194194
# Normalize package version so that these snapshots aren't broken on version bumps
195195
sed -E "s/(dd_lambda_layer:datadog-python[0-9]+_)[0-9]+\.[0-9]+\.[0-9]+/\1X\.X\.X/g" |
196196
sed -E "s/(datadog_lambda:v)([0-9]+\.[0-9]+\.[0-9])/\1XX/g" |
197+
sed -E "s/(datadogpy\/)([0-9]+\.[0-9]+\.[0-9])/\1XX/g" |
197198
sed -E "s/(python )([0-9]\.[0-9]+\.[0-9]+)/\1XX/g" |
198199
# Strip out run ID (from function name, resource, etc.)
199200
sed -E "s/${!run_id}/XXXX/g" |
200201
# Normalize python-requests version
201202
sed -E "s/(User-Agent:python-requests\/)[0-9]+\.[0-9]+\.[0-9]+/\1X\.X\.X/g" |
203+
sed -E "s/(\"http.useragent\"\: \"python-requests\/)[0-9]+\.[0-9]+\.[0-9]+/\1X\.X\.X/g" |
202204
# Strip out trace/span/parent/timestamps
203205
sed -E "s/(\"trace_id\"\: \")[A-Z0-9\.\-]+/\1XXXX/g" |
204206
sed -E "s/(\"span_id\"\: \")[A-Z0-9\.\-]+/\1XXXX/g" |

‎tests/integration/snapshots/logs/async-metrics_python37.log

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
122122
"_dd.origin": "lambda",
123123
"http.method": "GET",
124124
"http.url": "https://datadoghq.com/",
125-
"http.status_code": "200"
125+
"http.status_code": "200",
126+
"http.useragent": "python-requests/X.X.X"
126127
},
127128
"metrics": {
128129
"_dd.measured": 1
@@ -143,7 +144,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
143144
"_dd.origin": "lambda",
144145
"http.method": "GET",
145146
"http.url": "https://www.datadoghq.com/",
146-
"http.status_code": "200"
147+
"http.status_code": "200",
148+
"http.useragent": "python-requests/X.X.X"
147149
},
148150
"metrics": {
149151
"_dd.measured": 1
@@ -273,7 +275,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
273275
"_dd.origin": "lambda",
274276
"http.method": "GET",
275277
"http.url": "https://datadoghq.com/",
276-
"http.status_code": "200"
278+
"http.status_code": "200",
279+
"http.useragent": "python-requests/X.X.X"
277280
},
278281
"metrics": {
279282
"_dd.measured": 1
@@ -294,7 +297,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
294297
"_dd.origin": "lambda",
295298
"http.method": "GET",
296299
"http.url": "https://www.datadoghq.com/",
297-
"http.status_code": "200"
300+
"http.status_code": "200",
301+
"http.useragent": "python-requests/X.X.X"
298302
},
299303
"metrics": {
300304
"_dd.measured": 1
@@ -417,7 +421,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
417421
"_dd.origin": "lambda",
418422
"http.method": "GET",
419423
"http.url": "https://datadoghq.com/",
420-
"http.status_code": "200"
424+
"http.status_code": "200",
425+
"http.useragent": "python-requests/X.X.X"
421426
},
422427
"metrics": {
423428
"_dd.measured": 1
@@ -438,7 +443,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
438443
"_dd.origin": "lambda",
439444
"http.method": "GET",
440445
"http.url": "https://www.datadoghq.com/",
441-
"http.status_code": "200"
446+
"http.status_code": "200",
447+
"http.useragent": "python-requests/X.X.X"
442448
},
443449
"metrics": {
444450
"_dd.measured": 1
@@ -576,7 +582,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
576582
"_dd.origin": "lambda",
577583
"http.method": "GET",
578584
"http.url": "https://datadoghq.com/",
579-
"http.status_code": "200"
585+
"http.status_code": "200",
586+
"http.useragent": "python-requests/X.X.X"
580587
},
581588
"metrics": {
582589
"_dd.measured": 1
@@ -597,7 +604,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
597604
"_dd.origin": "lambda",
598605
"http.method": "GET",
599606
"http.url": "https://www.datadoghq.com/",
600-
"http.status_code": "200"
607+
"http.status_code": "200",
608+
"http.useragent": "python-requests/X.X.X"
601609
},
602610
"metrics": {
603611
"_dd.measured": 1
@@ -727,7 +735,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
727735
"_dd.origin": "lambda",
728736
"http.method": "GET",
729737
"http.url": "https://datadoghq.com/",
730-
"http.status_code": "200"
738+
"http.status_code": "200",
739+
"http.useragent": "python-requests/X.X.X"
731740
},
732741
"metrics": {
733742
"_dd.measured": 1
@@ -748,7 +757,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
748757
"_dd.origin": "lambda",
749758
"http.method": "GET",
750759
"http.url": "https://www.datadoghq.com/",
751-
"http.status_code": "200"
760+
"http.status_code": "200",
761+
"http.useragent": "python-requests/X.X.X"
752762
},
753763
"metrics": {
754764
"_dd.measured": 1
@@ -875,7 +885,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
875885
"_dd.origin": "lambda",
876886
"http.method": "GET",
877887
"http.url": "https://datadoghq.com/",
878-
"http.status_code": "200"
888+
"http.status_code": "200",
889+
"http.useragent": "python-requests/X.X.X"
879890
},
880891
"metrics": {
881892
"_dd.measured": 1
@@ -896,7 +907,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
896907
"_dd.origin": "lambda",
897908
"http.method": "GET",
898909
"http.url": "https://www.datadoghq.com/",
899-
"http.status_code": "200"
910+
"http.status_code": "200",
911+
"http.useragent": "python-requests/X.X.X"
900912
},
901913
"metrics": {
902914
"_dd.measured": 1
@@ -1024,7 +1036,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
10241036
"_dd.origin": "lambda",
10251037
"http.method": "GET",
10261038
"http.url": "https://datadoghq.com/",
1027-
"http.status_code": "200"
1039+
"http.status_code": "200",
1040+
"http.useragent": "python-requests/X.X.X"
10281041
},
10291042
"metrics": {
10301043
"_dd.measured": 1
@@ -1045,7 +1058,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
10451058
"_dd.origin": "lambda",
10461059
"http.method": "GET",
10471060
"http.url": "https://www.datadoghq.com/",
1048-
"http.status_code": "200"
1061+
"http.status_code": "200",
1062+
"http.useragent": "python-requests/X.X.X"
10491063
},
10501064
"metrics": {
10511065
"_dd.measured": 1
@@ -1172,7 +1186,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
11721186
"_dd.origin": "lambda",
11731187
"http.method": "GET",
11741188
"http.url": "https://datadoghq.com/",
1175-
"http.status_code": "200"
1189+
"http.status_code": "200",
1190+
"http.useragent": "python-requests/X.X.X"
11761191
},
11771192
"metrics": {
11781193
"_dd.measured": 1
@@ -1193,7 +1208,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
11931208
"_dd.origin": "lambda",
11941209
"http.method": "GET",
11951210
"http.url": "https://www.datadoghq.com/",
1196-
"http.status_code": "200"
1211+
"http.status_code": "200",
1212+
"http.useragent": "python-requests/X.X.X"
11971213
},
11981214
"metrics": {
11991215
"_dd.measured": 1
@@ -1328,7 +1344,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
13281344
"_dd.origin": "lambda",
13291345
"http.method": "GET",
13301346
"http.url": "https://datadoghq.com/",
1331-
"http.status_code": "200"
1347+
"http.status_code": "200",
1348+
"http.useragent": "python-requests/X.X.X"
13321349
},
13331350
"metrics": {
13341351
"_dd.measured": 1
@@ -1349,7 +1366,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
13491366
"_dd.origin": "lambda",
13501367
"http.method": "GET",
13511368
"http.url": "https://www.datadoghq.com/",
1352-
"http.status_code": "200"
1369+
"http.status_code": "200",
1370+
"http.useragent": "python-requests/X.X.X"
13531371
},
13541372
"metrics": {
13551373
"_dd.measured": 1

‎tests/integration/snapshots/logs/async-metrics_python38.log

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
122122
"_dd.origin": "lambda",
123123
"http.method": "GET",
124124
"http.url": "https://datadoghq.com/",
125-
"http.status_code": "200"
125+
"http.status_code": "200",
126+
"http.useragent": "python-requests/X.X.X"
126127
},
127128
"metrics": {
128129
"_dd.measured": 1
@@ -143,7 +144,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
143144
"_dd.origin": "lambda",
144145
"http.method": "GET",
145146
"http.url": "https://www.datadoghq.com/",
146-
"http.status_code": "200"
147+
"http.status_code": "200",
148+
"http.useragent": "python-requests/X.X.X"
147149
},
148150
"metrics": {
149151
"_dd.measured": 1
@@ -273,7 +275,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
273275
"_dd.origin": "lambda",
274276
"http.method": "GET",
275277
"http.url": "https://datadoghq.com/",
276-
"http.status_code": "200"
278+
"http.status_code": "200",
279+
"http.useragent": "python-requests/X.X.X"
277280
},
278281
"metrics": {
279282
"_dd.measured": 1
@@ -294,7 +297,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
294297
"_dd.origin": "lambda",
295298
"http.method": "GET",
296299
"http.url": "https://www.datadoghq.com/",
297-
"http.status_code": "200"
300+
"http.status_code": "200",
301+
"http.useragent": "python-requests/X.X.X"
298302
},
299303
"metrics": {
300304
"_dd.measured": 1
@@ -417,7 +421,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
417421
"_dd.origin": "lambda",
418422
"http.method": "GET",
419423
"http.url": "https://datadoghq.com/",
420-
"http.status_code": "200"
424+
"http.status_code": "200",
425+
"http.useragent": "python-requests/X.X.X"
421426
},
422427
"metrics": {
423428
"_dd.measured": 1
@@ -438,7 +443,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
438443
"_dd.origin": "lambda",
439444
"http.method": "GET",
440445
"http.url": "https://www.datadoghq.com/",
441-
"http.status_code": "200"
446+
"http.status_code": "200",
447+
"http.useragent": "python-requests/X.X.X"
442448
},
443449
"metrics": {
444450
"_dd.measured": 1
@@ -576,7 +582,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
576582
"_dd.origin": "lambda",
577583
"http.method": "GET",
578584
"http.url": "https://datadoghq.com/",
579-
"http.status_code": "200"
585+
"http.status_code": "200",
586+
"http.useragent": "python-requests/X.X.X"
580587
},
581588
"metrics": {
582589
"_dd.measured": 1
@@ -597,7 +604,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
597604
"_dd.origin": "lambda",
598605
"http.method": "GET",
599606
"http.url": "https://www.datadoghq.com/",
600-
"http.status_code": "200"
607+
"http.status_code": "200",
608+
"http.useragent": "python-requests/X.X.X"
601609
},
602610
"metrics": {
603611
"_dd.measured": 1
@@ -727,7 +735,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
727735
"_dd.origin": "lambda",
728736
"http.method": "GET",
729737
"http.url": "https://datadoghq.com/",
730-
"http.status_code": "200"
738+
"http.status_code": "200",
739+
"http.useragent": "python-requests/X.X.X"
731740
},
732741
"metrics": {
733742
"_dd.measured": 1
@@ -748,7 +757,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
748757
"_dd.origin": "lambda",
749758
"http.method": "GET",
750759
"http.url": "https://www.datadoghq.com/",
751-
"http.status_code": "200"
760+
"http.status_code": "200",
761+
"http.useragent": "python-requests/X.X.X"
752762
},
753763
"metrics": {
754764
"_dd.measured": 1
@@ -875,7 +885,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
875885
"_dd.origin": "lambda",
876886
"http.method": "GET",
877887
"http.url": "https://datadoghq.com/",
878-
"http.status_code": "200"
888+
"http.status_code": "200",
889+
"http.useragent": "python-requests/X.X.X"
879890
},
880891
"metrics": {
881892
"_dd.measured": 1
@@ -896,7 +907,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
896907
"_dd.origin": "lambda",
897908
"http.method": "GET",
898909
"http.url": "https://www.datadoghq.com/",
899-
"http.status_code": "200"
910+
"http.status_code": "200",
911+
"http.useragent": "python-requests/X.X.X"
900912
},
901913
"metrics": {
902914
"_dd.measured": 1
@@ -1024,7 +1036,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
10241036
"_dd.origin": "lambda",
10251037
"http.method": "GET",
10261038
"http.url": "https://datadoghq.com/",
1027-
"http.status_code": "200"
1039+
"http.status_code": "200",
1040+
"http.useragent": "python-requests/X.X.X"
10281041
},
10291042
"metrics": {
10301043
"_dd.measured": 1
@@ -1045,7 +1058,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
10451058
"_dd.origin": "lambda",
10461059
"http.method": "GET",
10471060
"http.url": "https://www.datadoghq.com/",
1048-
"http.status_code": "200"
1061+
"http.status_code": "200",
1062+
"http.useragent": "python-requests/X.X.X"
10491063
},
10501064
"metrics": {
10511065
"_dd.measured": 1
@@ -1172,7 +1186,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
11721186
"_dd.origin": "lambda",
11731187
"http.method": "GET",
11741188
"http.url": "https://datadoghq.com/",
1175-
"http.status_code": "200"
1189+
"http.status_code": "200",
1190+
"http.useragent": "python-requests/X.X.X"
11761191
},
11771192
"metrics": {
11781193
"_dd.measured": 1
@@ -1193,7 +1208,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
11931208
"_dd.origin": "lambda",
11941209
"http.method": "GET",
11951210
"http.url": "https://www.datadoghq.com/",
1196-
"http.status_code": "200"
1211+
"http.status_code": "200",
1212+
"http.useragent": "python-requests/X.X.X"
11971213
},
11981214
"metrics": {
11991215
"_dd.measured": 1
@@ -1328,7 +1344,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
13281344
"_dd.origin": "lambda",
13291345
"http.method": "GET",
13301346
"http.url": "https://datadoghq.com/",
1331-
"http.status_code": "200"
1347+
"http.status_code": "200",
1348+
"http.useragent": "python-requests/X.X.X"
13321349
},
13331350
"metrics": {
13341351
"_dd.measured": 1
@@ -1349,7 +1366,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
13491366
"_dd.origin": "lambda",
13501367
"http.method": "GET",
13511368
"http.url": "https://www.datadoghq.com/",
1352-
"http.status_code": "200"
1369+
"http.status_code": "200",
1370+
"http.useragent": "python-requests/X.X.X"
13531371
},
13541372
"metrics": {
13551373
"_dd.measured": 1

0 commit comments

Comments
 (0)