Skip to content

Commit d4b411e

Browse files
astuyveastuyve
authored
feat: Remove urllib3 pin (#510)
* feat: Remove urllib3 pin * fix: increase size limit * feat: Split into dev dependencies. Update boto3 * fix: resolve conflicts. bump ddtrace * go back to optional dep instead of dev dep because poetry and pip dont play nice * feat: ints
1 parent 7b5abe4 commit d4b411e

13 files changed

+511
-515
lines changed

‎poetry.lock‎

Lines changed: 115 additions & 114 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,14 @@ classifiers = [
2727
python = ">=3.8.0,<4"
2828
datadog = ">=0.41.0,<1.0.0"
2929
wrapt = "^1.11.2"
30-
ddtrace = ">=2.9.2"
30+
ddtrace = ">=2.10.0"
3131
ujson = ">=5.9.0"
32-
urllib3 = [
33-
{version = "<2.0.0", python = "<3.11", optional = true},
34-
{version = "<2.1.0", python = ">=3.11", optional = true},
35-
]
36-
boto3 = { version = "^1.28.0", optional = true }
32+
boto3 = { version = "^1.34.0", optional = true }
3733
requests = { version ="^2.22.0", optional = true }
3834
pytest = { version= "^8.0.0", optional = true }
3935
pytest-benchmark = { version = "^4.0", optional = true }
4036
flake8 = { version = "^5.0.4", optional = true }
4137

42-
4338
[tool.poetry.extras]
4439
dev = [
4540
"boto3",

‎scripts/check_layer_size.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
set -e
1111
MAX_LAYER_COMPRESSED_SIZE_KB=$(expr 5 \* 1024)
12-
MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 12 \* 1024)
12+
MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 13 \* 1024)
1313

1414

1515
LAYER_FILES_PREFIX="datadog_lambda_py"

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

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ START
99
"account_id:XXXX",
1010
"functionname:integration-tests-python-XXXX-async-metrics_python310",
1111
"resource:integration-tests-python-XXXX-async-metrics_python310",
12-
"cold_start:true",
1312
"memorysize:1024",
13+
"cold_start:true",
1414
"runtime:python3.10",
1515
"datadog_lambda:vXX",
1616
"dd_lambda_layer:datadog-python310_X.X.X"
@@ -36,8 +36,8 @@ START
3636
"dd_lambda_layer:datadog-python310_X.X.X"
3737
]
3838
}
39-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
40-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
39+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
40+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
4141
{
4242
"traces": [
4343
[
@@ -180,8 +180,8 @@ START
180180
"account_id:XXXX",
181181
"functionname:integration-tests-python-XXXX-async-metrics_python310",
182182
"resource:integration-tests-python-XXXX-async-metrics_python310",
183-
"cold_start:false",
184183
"memorysize:1024",
184+
"cold_start:false",
185185
"runtime:python3.10",
186186
"datadog_lambda:vXX",
187187
"dd_lambda_layer:datadog-python310_X.X.X"
@@ -207,8 +207,8 @@ START
207207
"dd_lambda_layer:datadog-python310_X.X.X"
208208
]
209209
}
210-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
211-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
210+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
211+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
212212
{
213213
"traces": [
214214
[
@@ -246,7 +246,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
246246
"metrics": {
247247
"process_id": XXXX,
248248
"_dd.top_level": 1,
249-
"_sampling_priority_v1": -1
249+
"_sampling_priority_v1": 1
250250
},
251251
"type": "web"
252252
},
@@ -346,8 +346,8 @@ START
346346
"account_id:XXXX",
347347
"functionname:integration-tests-python-XXXX-async-metrics_python310",
348348
"resource:integration-tests-python-XXXX-async-metrics_python310",
349-
"cold_start:false",
350349
"memorysize:1024",
350+
"cold_start:false",
351351
"runtime:python3.10",
352352
"datadog_lambda:vXX",
353353
"dd_lambda_layer:datadog-python310_X.X.X"
@@ -373,8 +373,8 @@ START
373373
"dd_lambda_layer:datadog-python310_X.X.X"
374374
]
375375
}
376-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
377-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
376+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
377+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
378378
{
379379
"traces": [
380380
[
@@ -505,8 +505,8 @@ START
505505
"account_id:XXXX",
506506
"functionname:integration-tests-python-XXXX-async-metrics_python310",
507507
"resource:integration-tests-python-XXXX-async-metrics_python310",
508-
"cold_start:false",
509508
"memorysize:1024",
509+
"cold_start:false",
510510
"runtime:python3.10",
511511
"datadog_lambda:vXX",
512512
"dd_lambda_layer:datadog-python310_X.X.X"
@@ -532,8 +532,8 @@ START
532532
"dd_lambda_layer:datadog-python310_X.X.X"
533533
]
534534
}
535-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
536-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
535+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
536+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
537537
{
538538
"traces": [
539539
[
@@ -575,7 +575,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
575575
"metrics": {
576576
"process_id": XXXX,
577577
"_dd.top_level": 1,
578-
"_sampling_priority_v1": -1
578+
"_sampling_priority_v1": 1
579579
},
580580
"type": "http"
581581
},
@@ -679,8 +679,8 @@ START
679679
"account_id:XXXX",
680680
"functionname:integration-tests-python-XXXX-async-metrics_python310",
681681
"resource:integration-tests-python-XXXX-async-metrics_python310",
682-
"cold_start:false",
683682
"memorysize:1024",
683+
"cold_start:false",
684684
"runtime:python3.10",
685685
"datadog_lambda:vXX",
686686
"dd_lambda_layer:datadog-python310_X.X.X"
@@ -706,8 +706,8 @@ START
706706
"dd_lambda_layer:datadog-python310_X.X.X"
707707
]
708708
}
709-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
710-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
709+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
710+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
711711
{
712712
"traces": [
713713
[
@@ -745,7 +745,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
745745
"metrics": {
746746
"process_id": XXXX,
747747
"_dd.top_level": 1,
748-
"_sampling_priority_v1": -1
748+
"_sampling_priority_v1": 1
749749
},
750750
"type": "web"
751751
},
@@ -845,8 +845,8 @@ START
845845
"account_id:XXXX",
846846
"functionname:integration-tests-python-XXXX-async-metrics_python310",
847847
"resource:integration-tests-python-XXXX-async-metrics_python310",
848-
"cold_start:false",
849848
"memorysize:1024",
849+
"cold_start:false",
850850
"runtime:python3.10",
851851
"datadog_lambda:vXX",
852852
"dd_lambda_layer:datadog-python310_X.X.X"
@@ -872,8 +872,8 @@ START
872872
"dd_lambda_layer:datadog-python310_X.X.X"
873873
]
874874
}
875-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
876-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
875+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
876+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
877877
{
878878
"traces": [
879879
[
@@ -908,7 +908,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
908908
"metrics": {
909909
"process_id": XXXX,
910910
"_dd.top_level": 1,
911-
"_sampling_priority_v1": -1
911+
"_sampling_priority_v1": 1
912912
},
913913
"type": "web"
914914
},
@@ -1008,8 +1008,8 @@ START
10081008
"account_id:XXXX",
10091009
"functionname:integration-tests-python-XXXX-async-metrics_python310",
10101010
"resource:integration-tests-python-XXXX-async-metrics_python310",
1011-
"cold_start:false",
10121011
"memorysize:1024",
1012+
"cold_start:false",
10131013
"runtime:python3.10",
10141014
"datadog_lambda:vXX",
10151015
"dd_lambda_layer:datadog-python310_X.X.X"
@@ -1035,8 +1035,8 @@ START
10351035
"dd_lambda_layer:datadog-python310_X.X.X"
10361036
]
10371037
}
1038-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
1039-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
1038+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
1039+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
10401040
{
10411041
"traces": [
10421042
[
@@ -1072,7 +1072,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
10721072
"metrics": {
10731073
"process_id": XXXX,
10741074
"_dd.top_level": 1,
1075-
"_sampling_priority_v1": -1
1075+
"_sampling_priority_v1": 1
10761076
},
10771077
"type": "web"
10781078
},
@@ -1172,8 +1172,8 @@ START
11721172
"account_id:XXXX",
11731173
"functionname:integration-tests-python-XXXX-async-metrics_python310",
11741174
"resource:integration-tests-python-XXXX-async-metrics_python310",
1175-
"cold_start:false",
11761175
"memorysize:1024",
1176+
"cold_start:false",
11771177
"runtime:python3.10",
11781178
"datadog_lambda:vXX",
11791179
"dd_lambda_layer:datadog-python310_X.X.X"
@@ -1199,8 +1199,8 @@ START
11991199
"dd_lambda_layer:datadog-python310_X.X.X"
12001200
]
12011201
}
1202-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
1203-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
1202+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
1203+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
12041204
{
12051205
"traces": [
12061206
[
@@ -1235,7 +1235,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
12351235
"metrics": {
12361236
"process_id": XXXX,
12371237
"_dd.top_level": 1,
1238-
"_sampling_priority_v1": -1
1238+
"_sampling_priority_v1": 1
12391239
},
12401240
"type": "web"
12411241
},
@@ -1335,8 +1335,8 @@ START
13351335
"account_id:XXXX",
13361336
"functionname:integration-tests-python-XXXX-async-metrics_python310",
13371337
"resource:integration-tests-python-XXXX-async-metrics_python310",
1338-
"cold_start:false",
13391338
"memorysize:1024",
1339+
"cold_start:false",
13401340
"runtime:python3.10",
13411341
"datadog_lambda:vXX",
13421342
"dd_lambda_layer:datadog-python310_X.X.X"
@@ -1362,8 +1362,8 @@ START
13621362
"dd_lambda_layer:datadog-python310_X.X.X"
13631363
]
13641364
}
1365-
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
1366-
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "User-Agent:python-requests/X.X.X", "traceparent:XXX", "tracestate:XXX
1365+
HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
1366+
HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX
13671367
{
13681368
"traces": [
13691369
[
@@ -1404,7 +1404,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
14041404
"metrics": {
14051405
"process_id": XXXX,
14061406
"_dd.top_level": 1,
1407-
"_sampling_priority_v1": -1
1407+
"_sampling_priority_v1": 1
14081408
},
14091409
"type": "web"
14101410
},

0 commit comments

Comments
 (0)