Skip to content

feat: Remove urllib3 pin #510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
astuyve merged 7 commits into from
Aug 8, 2024
Merged

feat: Remove urllib3 pin #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5cc7618
feat: Remove urllib3 pin
astuyve Aug 8, 2024
bd7fb23
fix: increase size limit
astuyve Aug 8, 2024
fcafb25
feat: Split into dev dependencies. Update boto3
astuyve Aug 8, 2024
841ae86
fix: resolve conflicts. bump ddtrace
astuyve Aug 8, 2024
8edf5d0
Merge branch 'main' into aj/remove-urllib3-dep
astuyve Aug 8, 2024
ebe27c4
go back to optional dep instead of dev dep because poetry and pip don…
astuyve Aug 8, 2024
77005f6
feat: ints
astuyve Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
229 changes: 115 additions & 114 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 2 additions & 7 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,14 @@ classifiers = [
python = ">=3.8.0,<4"
datadog = ">=0.41.0,<1.0.0"
wrapt = "^1.11.2"
ddtrace = ">=2.9.2"
ddtrace = ">=2.10.0"
ujson = ">=5.9.0"
urllib3 = [
{version = "<2.0.0", python = "<3.11", optional = true},
{version = "<2.1.0", python = ">=3.11", optional = true},
]
boto3 = { version = "^1.28.0", optional = true }
boto3 = { version = "^1.34.0", optional = true }
requests = { version ="^2.22.0", optional = true }
pytest = { version= "^8.0.0", optional = true }
pytest-benchmark = { version = "^4.0", optional = true }
flake8 = { version = "^5.0.4", optional = true }


[tool.poetry.extras]
dev = [
"boto3",
Expand Down
2 changes: 1 addition & 1 deletion scripts/check_layer_size.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

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


LAYER_FILES_PREFIX="datadog_lambda_py"
Expand Down
68 changes: 34 additions & 34 deletions tests/integration/snapshots/logs/async-metrics_python310.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ START
"account_id:XXXX",
"functionname:integration-tests-python-XXXX-async-metrics_python310",
"resource:integration-tests-python-XXXX-async-metrics_python310",
"cold_start:true",
"memorysize:1024",
"cold_start:true",
"runtime:python3.10",
"datadog_lambda:vXX",
"dd_lambda_layer:datadog-python310_X.X.X"
Expand All @@ -36,8 +36,8 @@ START
"dd_lambda_layer:datadog-python310_X.X.X"
]
}
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
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
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
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
{
"traces": [
[
Expand Down Expand Up @@ -180,8 +180,8 @@ START
"account_id:XXXX",
"functionname:integration-tests-python-XXXX-async-metrics_python310",
"resource:integration-tests-python-XXXX-async-metrics_python310",
"cold_start:false",
"memorysize:1024",
"cold_start:false",
"runtime:python3.10",
"datadog_lambda:vXX",
"dd_lambda_layer:datadog-python310_X.X.X"
Expand All @@ -207,8 +207,8 @@ START
"dd_lambda_layer:datadog-python310_X.X.X"
]
}
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
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
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
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
{
"traces": [
[
Expand Down Expand Up @@ -246,7 +246,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
"metrics": {
"process_id": XXXX,
"_dd.top_level": 1,
"_sampling_priority_v1": -1
"_sampling_priority_v1": 1
},
"type": "web"
},
Expand Down Expand Up @@ -346,8 +346,8 @@ START
"account_id:XXXX",
"functionname:integration-tests-python-XXXX-async-metrics_python310",
"resource:integration-tests-python-XXXX-async-metrics_python310",
"cold_start:false",
"memorysize:1024",
"cold_start:false",
"runtime:python3.10",
"datadog_lambda:vXX",
"dd_lambda_layer:datadog-python310_X.X.X"
Expand All @@ -373,8 +373,8 @@ START
"dd_lambda_layer:datadog-python310_X.X.X"
]
}
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
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
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
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
{
"traces": [
[
Expand Down Expand Up @@ -505,8 +505,8 @@ START
"account_id:XXXX",
"functionname:integration-tests-python-XXXX-async-metrics_python310",
"resource:integration-tests-python-XXXX-async-metrics_python310",
"cold_start:false",
"memorysize:1024",
"cold_start:false",
"runtime:python3.10",
"datadog_lambda:vXX",
"dd_lambda_layer:datadog-python310_X.X.X"
Expand All @@ -532,8 +532,8 @@ START
"dd_lambda_layer:datadog-python310_X.X.X"
]
}
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
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
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
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
{
"traces": [
[
Expand Down Expand Up @@ -575,7 +575,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
"metrics": {
"process_id": XXXX,
"_dd.top_level": 1,
"_sampling_priority_v1": -1
"_sampling_priority_v1": 1
},
"type": "http"
},
Expand Down Expand Up @@ -679,8 +679,8 @@ START
"account_id:XXXX",
"functionname:integration-tests-python-XXXX-async-metrics_python310",
"resource:integration-tests-python-XXXX-async-metrics_python310",
"cold_start:false",
"memorysize:1024",
"cold_start:false",
"runtime:python3.10",
"datadog_lambda:vXX",
"dd_lambda_layer:datadog-python310_X.X.X"
Expand All @@ -706,8 +706,8 @@ START
"dd_lambda_layer:datadog-python310_X.X.X"
]
}
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
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
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
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
{
"traces": [
[
Expand Down Expand Up @@ -745,7 +745,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
"metrics": {
"process_id": XXXX,
"_dd.top_level": 1,
"_sampling_priority_v1": -1
"_sampling_priority_v1": 1
},
"type": "web"
},
Expand Down Expand Up @@ -845,8 +845,8 @@ START
"account_id:XXXX",
"functionname:integration-tests-python-XXXX-async-metrics_python310",
"resource:integration-tests-python-XXXX-async-metrics_python310",
"cold_start:false",
"memorysize:1024",
"cold_start:false",
"runtime:python3.10",
"datadog_lambda:vXX",
"dd_lambda_layer:datadog-python310_X.X.X"
Expand All @@ -872,8 +872,8 @@ START
"dd_lambda_layer:datadog-python310_X.X.X"
]
}
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
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
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
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
{
"traces": [
[
Expand Down Expand Up @@ -908,7 +908,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
"metrics": {
"process_id": XXXX,
"_dd.top_level": 1,
"_sampling_priority_v1": -1
"_sampling_priority_v1": 1
},
"type": "web"
},
Expand Down Expand Up @@ -1008,8 +1008,8 @@ START
"account_id:XXXX",
"functionname:integration-tests-python-XXXX-async-metrics_python310",
"resource:integration-tests-python-XXXX-async-metrics_python310",
"cold_start:false",
"memorysize:1024",
"cold_start:false",
"runtime:python3.10",
"datadog_lambda:vXX",
"dd_lambda_layer:datadog-python310_X.X.X"
Expand All @@ -1035,8 +1035,8 @@ START
"dd_lambda_layer:datadog-python310_X.X.X"
]
}
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
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
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
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
{
"traces": [
[
Expand Down Expand Up @@ -1072,7 +1072,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
"metrics": {
"process_id": XXXX,
"_dd.top_level": 1,
"_sampling_priority_v1": -1
"_sampling_priority_v1": 1
},
"type": "web"
},
Expand Down Expand Up @@ -1172,8 +1172,8 @@ START
"account_id:XXXX",
"functionname:integration-tests-python-XXXX-async-metrics_python310",
"resource:integration-tests-python-XXXX-async-metrics_python310",
"cold_start:false",
"memorysize:1024",
"cold_start:false",
"runtime:python3.10",
"datadog_lambda:vXX",
"dd_lambda_layer:datadog-python310_X.X.X"
Expand All @@ -1199,8 +1199,8 @@ START
"dd_lambda_layer:datadog-python310_X.X.X"
]
}
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
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
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
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
{
"traces": [
[
Expand Down Expand Up @@ -1235,7 +1235,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
"metrics": {
"process_id": XXXX,
"_dd.top_level": 1,
"_sampling_priority_v1": -1
"_sampling_priority_v1": 1
},
"type": "web"
},
Expand Down Expand Up @@ -1335,8 +1335,8 @@ START
"account_id:XXXX",
"functionname:integration-tests-python-XXXX-async-metrics_python310",
"resource:integration-tests-python-XXXX-async-metrics_python310",
"cold_start:false",
"memorysize:1024",
"cold_start:false",
"runtime:python3.10",
"datadog_lambda:vXX",
"dd_lambda_layer:datadog-python310_X.X.X"
Expand All @@ -1362,8 +1362,8 @@ START
"dd_lambda_layer:datadog-python310_X.X.X"
]
}
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
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
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
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
{
"traces": [
[
Expand Down Expand Up @@ -1404,7 +1404,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", "
"metrics": {
"process_id": XXXX,
"_dd.top_level": 1,
"_sampling_priority_v1": -1
"_sampling_priority_v1": 1
},
"type": "web"
},
Expand Down
Loading