Merge branch 'main' into feat/lambda-sns-tracing

xrmx · web-flow · commit b5e3850cc8b5 · 2025-07-30T18:02:09.000+02:00
diff --git a/Dockerfile.wolfi b/Dockerfile.wolfi
@@ -1,3 +1,3 @@
-FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:2a601e3db11b58d6d5bfedb651c513e46556e231a56f437990ec4f0248f2207b
+FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:9ded4d2364e7f263cada56b0b9ca3ef643e8dac958a79df3d18c2a9f0a33fbc7
 ARG AGENT_DIR
 COPY ${AGENT_DIR} /opt/python
diff --git a/setup.cfg b/setup.cfg
@@ -107,6 +107,7 @@ markers =
     aiobotocore
     kafka
     grpc
+    azurestorage
 addopts=--random-order
 
 [isort]
diff --git a/tests/client/client_tests.py b/tests/client/client_tests.py
@@ -39,8 +39,8 @@
 import time
 import warnings
 from collections import defaultdict
+from unittest import mock
 
-import mock
 import pytest
 from pytest_localserver.http import ContentServer
 from pytest_localserver.https import DEFAULT_CERTIFICATE
diff --git a/tests/client/exception_tests.py b/tests/client/exception_tests.py
@@ -29,8 +29,8 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import os
+from unittest import mock
 
-import mock
 import pytest
 
 import elasticapm
diff --git a/tests/client/py3_exception_tests.py b/tests/client/py3_exception_tests.py
@@ -38,7 +38,7 @@
 #
 #
 
-import mock
+from unittest import mock
 
 from elasticapm.conf.constants import ERROR
 
diff --git a/tests/config/central_config_tests.py b/tests/config/central_config_tests.py
@@ -28,7 +28,8 @@
 #  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import mock
+from unittest import mock
+
 import pytest
 
 
diff --git a/tests/config/tests.py b/tests/config/tests.py
@@ -35,8 +35,8 @@
 import platform
 import stat
 from datetime import timedelta
+from unittest import mock
 
-import mock
 import pytest
 
 import elasticapm.conf
diff --git a/tests/contrib/asyncio/aiohttp_web_tests.py b/tests/contrib/asyncio/aiohttp_web_tests.py
@@ -32,7 +32,8 @@
 
 aiohttp = pytest.importorskip("aiohttp")  # isort:skip
 
-import mock
+from unittest import mock
+
 from multidict import MultiDict
 
 import elasticapm
diff --git a/tests/contrib/asyncio/starlette_tests.py b/tests/contrib/asyncio/starlette_tests.py
@@ -38,8 +38,8 @@
 starlette = pytest.importorskip("starlette")  # isort:skip
 
 import os
+from unittest import mock
 
-import mock
 import urllib3
 import wrapt
 from starlette.applications import Starlette
diff --git a/tests/contrib/asyncio/tornado/tornado_tests.py b/tests/contrib/asyncio/tornado/tornado_tests.py
@@ -33,8 +33,8 @@
 tornado = pytest.importorskip("tornado")  # isort:skip
 
 import os
+from unittest import mock
 
-import mock
 from wrapt import BoundFunctionWrapper
 
 import elasticapm
diff --git a/tests/contrib/celery/flask_tests.py b/tests/contrib/celery/flask_tests.py
@@ -33,7 +33,7 @@
 flask = pytest.importorskip("flask")  # isort:skip
 celery = pytest.importorskip("celery")  # isort:skip
 
-import mock
+from unittest import mock
 
 from elasticapm.conf.constants import ERROR, TRANSACTION
 
diff --git a/tests/contrib/django/django_tests.py b/tests/contrib/django/django_tests.py
@@ -41,8 +41,8 @@
 import logging
 import os
 from copy import deepcopy
+from unittest import mock
 
-import mock
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.redirects.models import Redirect
diff --git a/tests/contrib/django/wrapper_tests.py b/tests/contrib/django/wrapper_tests.py
@@ -32,7 +32,7 @@
 # Installing an app is not reversible, so using this instrumentation "for real" would
 # pollute the Django instance used by pytest.
 
-import mock
+from unittest import mock
 
 from elasticapm.instrumentation.packages.django import DjangoAutoInstrumentation
 
diff --git a/tests/contrib/flask/flask_tests.py b/tests/contrib/flask/flask_tests.py
@@ -35,9 +35,9 @@
 import io
 import logging
 import os
+from unittest import mock
 from urllib.request import urlopen
 
-import mock
 from flask import signals
 
 import elasticapm
diff --git a/tests/contrib/serverless/azurefunctions/azure_functions_tests.py b/tests/contrib/serverless/azurefunctions/azure_functions_tests.py
@@ -33,9 +33,9 @@
 
 import datetime
 import os
+from unittest import mock
 
 import azure.functions as func
-import mock
 
 import elasticapm
 from elasticapm.conf import constants
diff --git a/tests/events/tests.py b/tests/events/tests.py
@@ -32,8 +32,9 @@
 
 from __future__ import absolute_import
 
+from unittest.mock import Mock
+
 import pytest
-from mock import Mock
 
 from elasticapm.events import Exception, Message
 
diff --git a/tests/fixtures.py b/tests/fixtures.py
@@ -46,10 +46,10 @@
 import zlib
 from collections import defaultdict
 from typing import Optional
+from unittest import mock
 from urllib.request import pathname2url
 
 import jsonschema
-import mock
 import pytest
 from pytest_localserver.http import ContentServer
 from werkzeug.wrappers import Request, Response
diff --git a/tests/instrumentation/base_tests.py b/tests/instrumentation/base_tests.py
@@ -31,8 +31,8 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import logging
+from unittest import mock
 
-import mock
 import pytest
 import wrapt
 
diff --git a/tests/instrumentation/transactions_store_tests.py b/tests/instrumentation/transactions_store_tests.py
@@ -32,8 +32,8 @@
 import logging
 import time
 from collections import defaultdict
+from unittest import mock
 
-import mock
 import pytest
 
 import elasticapm
diff --git a/tests/instrumentation/urllib_tests.py b/tests/instrumentation/urllib_tests.py
@@ -28,10 +28,10 @@
 #  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 import urllib.parse
+from unittest import mock
 from urllib.error import HTTPError, URLError
 from urllib.request import urlopen
 
-import mock
 import pytest
 
 from elasticapm.conf import constants
diff --git a/tests/metrics/base_tests.py b/tests/metrics/base_tests.py
@@ -31,8 +31,8 @@
 import logging
 import time
 from multiprocessing.dummy import Pool
+from unittest import mock
 
-import mock
 import pytest
 
 from elasticapm.conf import constants
diff --git a/tests/metrics/breakdown_tests.py b/tests/metrics/breakdown_tests.py
@@ -28,7 +28,8 @@
 #  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import mock
+from unittest import mock
+
 import pytest
 
 import elasticapm
diff --git a/tests/processors/tests.py b/tests/processors/tests.py
@@ -34,8 +34,8 @@
 
 import logging
 import os
+from unittest import mock
 
-import mock
 import pytest
 
 import elasticapm
@@ -464,7 +464,9 @@ def test_drop_events_in_processor(elasticapm_client, caplog):
     assert shouldnt_be_called_processor.call_count == 0
     assert elasticapm_client._transport.events[TRANSACTION][0] is None
     assert_any_record_contains(
-        caplog.records, "Dropped event of type transaction due to processor mock.mock.dropper", "elasticapm.transport"
+        caplog.records,
+        "Dropped event of type transaction due to processor unittest.mock.dropper",
+        "elasticapm.transport",
     )
 
 
diff --git a/tests/requirements/lint-isort.txt b/tests/requirements/lint-isort.txt
@@ -1,2 +1 @@
 isort
-mock
diff --git a/tests/requirements/reqs-base.txt b/tests/requirements/reqs-base.txt
@@ -14,7 +14,6 @@ jsonschema==4.17.3
 urllib3!=2.0.0,<3.0.0
 certifi
 Logbook
-mock
 pytz
 ecs_logging
 structlog
diff --git a/tests/scripts/envs/azure.sh b/tests/scripts/envs/azure.sh
@@ -0,0 +1 @@
+export PYTEST_MARKER="-m azurestorage"
diff --git a/tests/transports/test_base.py b/tests/transports/test_base.py
@@ -35,8 +35,8 @@
 import sys
 import time
 import timeit
+from unittest import mock
 
-import mock
 import pytest
 
 from elasticapm.transport.base import Transport, TransportState
diff --git a/tests/transports/test_urllib3.py b/tests/transports/test_urllib3.py
@@ -31,9 +31,9 @@
 
 import os
 import time
+from unittest import mock
 
 import certifi
-import mock
 import pytest
 import urllib3.poolmanager
 from urllib3.exceptions import MaxRetryError, TimeoutError
diff --git a/tests/utils/cloud_tests.py b/tests/utils/cloud_tests.py
@@ -29,8 +29,8 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import os
+from unittest import mock
 
-import mock
 import urllib3
 
 import elasticapm.utils.cloud
diff --git a/tests/utils/compat_tests.py b/tests/utils/compat_tests.py
@@ -28,7 +28,8 @@
 #  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import mock
+from unittest import mock
+
 import pytest
 
 from elasticapm.utils import compat
diff --git a/tests/utils/stacks/tests.py b/tests/utils/stacks/tests.py
@@ -34,9 +34,9 @@
 
 import os
 import pkgutil
+from unittest.mock import Mock
 
 import pytest
-from mock import Mock
 
 import elasticapm
 from elasticapm.conf import constants
diff --git a/tests/utils/threading_tests.py b/tests/utils/threading_tests.py
@@ -29,8 +29,8 @@
 
 import platform
 import time
+from unittest import mock
 
-import mock
 import pytest
 
 from elasticapm.utils.threading import IntervalTimer

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`#`
`39`	`39`	`#`
`40`	`40`
`41`		`-import mock`
	`41`	`+from unittest import mock`
`42`	`42`
`43`	`43`	`from elasticapm.conf.constants import ERROR`
`44`	`44`