Skip to content

Fix CI #2735

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
xrmx merged 2 commits into from
Sep 11, 2026
+9 −7
Merged

Fix CI #2735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab879c7
tests: bump mongodb newest server to 8.0
xrmx Sep 11, 2026
517e94b
test: stabilize nonexisting instrumentation assertion
Copilot Sep 11, 2026
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
8 changes: 4 additions & 4 deletions tests/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ services:
volumes:
- pymongodata36:/data/db

mongodb42:
image: mongo:4.2
mongodb80:
image: mongo:8.0
ports:
- "27017:27017"
volumes:
- pymongodata42:/data/db
- pymongodata80:/data/db

memcached:
image: memcached
Expand Down Expand Up @@ -176,7 +176,7 @@ volumes:
driver: local
pymongodata36:
driver: local
pymongodata42:
pymongodata80:
driver: local
pyesdata7:
driver: local
Expand Down
4 changes: 3 additions & 1 deletion tests/instrumentation/base_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ def test_instrument_nonexisting_method_on_module():
def test_instrument_nonexisting_method(caplog):
with caplog.at_level(logging.DEBUG, "elasticapm.instrument"):
_TestInstrumentNonExistingMethod().instrument()
assert_any_record_contains(caplog.records, "has no attribute", "elasticapm.instrument")
assert_any_record_contains(
caplog.records, "Skipping instrumentation of logging.Logger.non_existing_method:", "elasticapm.instrument"
)


def test_instrument_broken_module(caplog):
Expand Down
4 changes: 2 additions & 2 deletions tests/scripts/envs/pymongo-newest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export PYTEST_MARKER="-m mongodb"
export DOCKER_DEPS="mongodb42"
export MONGODB_HOST="mongodb42"
export DOCKER_DEPS="mongodb80"
export MONGODB_HOST="mongodb80"
Loading