Skip to content

Commit 530b3dc

Browse files
github-actions[bot]emmettbutlermabdinur
authored
fix(pymongo): update pymongo integration for compatibility with 4.5.x [backport 1.18] (#6775)
Backport 1a3c424 from #6736 to 1.18. Pymongo 4.5.0 [changed the name](mongodb/mongo-python-driver#1329) of the `get_socket` function on which our integration is based. This pull request adapts the integration to work with version 4.5.0 by changing the expected function name based on the version. Fixes #6723 ## Checklist - [x] Change(s) are motivated and described in the PR description. - [x] Testing strategy is described if automated tests are not included in the PR. - [x] Risk is outlined (performance impact, potential for breakage, maintainability, etc). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) are followed. If no release note is required, add label `changelog/no-changelog`. - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)). - [x] Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Title is accurate. - [x] No unnecessary changes are introduced. - [x] Description motivates each change. - [x] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary. - [x] Testing strategy adequately addresses listed risk(s). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] Release note makes sense to a user of the library. - [x] Reviewer has explicitly acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment. - [x] Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) --------- Co-authored-by: Emmett Butler <[email protected]> Co-authored-by: Munir Abdinur <[email protected]>
1 parent 619c4bf commit 530b3dc

File tree

15 files changed

+145
-127
lines changed

15 files changed

+145
-127
lines changed

.riot/requirements/1854ba5.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1854ba5.in
5+
# pip-compile --no-annotate .riot/requirements/1854ba5.in
66
#
7-
attrs==22.2.0
8-
coverage[toml]==7.2.2
9-
dnspython==2.3.0
7+
attrs==23.1.0
8+
coverage[toml]==7.3.0
9+
dnspython==2.4.2
1010
hypothesis==6.45.0
1111
iniconfig==2.0.0
12-
mock==5.0.1
12+
mock==5.1.0
1313
mongoengine==0.27.0
1414
opentracing==2.4.0
15-
packaging==23.0
16-
pluggy==1.0.0
17-
pymongo==4.3.3
18-
pytest==7.2.2
19-
pytest-cov==4.0.0
20-
pytest-mock==3.10.0
15+
packaging==23.1
16+
pluggy==1.2.0
17+
pymongo==4.5.0
18+
pytest==7.4.0
19+
pytest-cov==4.1.0
20+
pytest-mock==3.11.1
2121
sortedcontainers==2.4.0

.riot/requirements/1922cee.txt

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.10
2+
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
55
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1922cee.in
66
#
7-
attrs==22.2.0
8-
click==8.1.3
9-
coverage[toml]==7.2.2
10-
exceptiongroup==1.1.1
7+
attrs==23.1.0
8+
click==8.1.7
9+
coverage[toml]==7.3.0
1110
hypothesis==6.45.0
1211
iniconfig==2.0.0
13-
mock==5.0.1
12+
mock==5.1.0
1413
opentracing==2.4.0
15-
packaging==23.0
16-
pluggy==1.0.0
17-
pytest==7.2.2
18-
pytest-cov==4.0.0
19-
pytest-mock==3.10.0
20-
slotscheck==0.16.5
14+
packaging==23.1
15+
pluggy==1.3.0
16+
pytest==7.4.0
17+
pytest-cov==4.1.0
18+
pytest-mock==3.11.1
19+
slotscheck==0.17.0
2120
sortedcontainers==2.4.0
22-
tomli==2.0.1

.riot/requirements/1b81325.txt

Lines changed: 0 additions & 26 deletions
This file was deleted.

.riot/requirements/1fd1158.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1fd1158.in
5+
# pip-compile --no-annotate .riot/requirements/1fd1158.in
66
#
7-
attrs==22.2.0
8-
coverage[toml]==7.2.2
9-
dnspython==2.3.0
10-
exceptiongroup==1.1.1
7+
attrs==23.1.0
8+
coverage[toml]==7.3.0
9+
dnspython==2.4.2
10+
exceptiongroup==1.1.3
1111
hypothesis==6.45.0
1212
iniconfig==2.0.0
13-
mock==5.0.1
13+
mock==5.1.0
1414
mongoengine==0.27.0
1515
opentracing==2.4.0
16-
packaging==23.0
17-
pluggy==1.0.0
18-
pymongo==4.3.3
19-
pytest==7.2.2
20-
pytest-cov==4.0.0
21-
pytest-mock==3.10.0
16+
packaging==23.1
17+
pluggy==1.2.0
18+
pymongo==4.5.0
19+
pytest==7.4.0
20+
pytest-cov==4.1.0
21+
pytest-mock==3.11.1
2222
sortedcontainers==2.4.0
2323
tomli==2.0.1

.riot/requirements/41bf6ef.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.9
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate .riot/requirements/41bf6ef.in
6+
#
7+
attrs==23.1.0
8+
coverage[toml]==7.3.0
9+
dnspython==2.4.2
10+
exceptiongroup==1.1.3
11+
hypothesis==6.45.0
12+
iniconfig==2.0.0
13+
mock==5.1.0
14+
mongoengine==0.27.0
15+
opentracing==2.4.0
16+
packaging==23.1
17+
pluggy==1.2.0
18+
pymongo==4.5.0
19+
pytest==7.4.0
20+
pytest-cov==4.1.0
21+
pytest-mock==3.11.1
22+
sortedcontainers==2.4.0
23+
tomli==2.0.1

.riot/requirements/4bf8418.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.7
3+
# by the following command:
4+
#
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/4bf8418.in
6+
#
7+
attrs==23.1.0
8+
coverage[toml]==7.2.7
9+
dnspython==2.3.0
10+
exceptiongroup==1.1.3
11+
hypothesis==6.45.0
12+
importlib-metadata==6.7.0
13+
iniconfig==2.0.0
14+
mock==5.1.0
15+
mongoengine==0.27.0
16+
opentracing==2.4.0
17+
packaging==23.1
18+
pluggy==1.2.0
19+
pymongo==4.5.0
20+
pytest==7.4.0
21+
pytest-cov==4.1.0
22+
pytest-mock==3.11.1
23+
sortedcontainers==2.4.0
24+
tomli==2.0.1
25+
typing-extensions==4.7.1
26+
zipp==3.15.0

.riot/requirements/a1e6119.txt

Lines changed: 0 additions & 23 deletions
This file was deleted.

.riot/requirements/bddee76.txt

Lines changed: 0 additions & 23 deletions
This file was deleted.

.riot/requirements/c01e3b4.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/c01e3b4.in
5+
# pip-compile --no-annotate .riot/requirements/c01e3b4.in
66
#
77
attrs==22.2.0
88
coverage[toml]==7.2.2

.riot/requirements/f92d9dc.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.8
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate .riot/requirements/f92d9dc.in
6+
#
7+
attrs==23.1.0
8+
coverage[toml]==7.3.0
9+
dnspython==2.4.2
10+
exceptiongroup==1.1.3
11+
hypothesis==6.45.0
12+
iniconfig==2.0.0
13+
mock==5.1.0
14+
mongoengine==0.27.0
15+
opentracing==2.4.0
16+
packaging==23.1
17+
pluggy==1.2.0
18+
pymongo==4.5.0
19+
pytest==7.4.0
20+
pytest-cov==4.1.0
21+
pytest-mock==3.11.1
22+
sortedcontainers==2.4.0
23+
tomli==2.0.1

0 commit comments

Comments
 (0)