[pull] master from DataDog:master

.deps/metadata.json

@@ -1,3 +1,3 @@
 {
-  "sha256": "13e691792b63fe5ab1502a5b4ca8b87ca957ffc7fcf1666cd8e4a4385a2a5da8"
+  "sha256": "44b1cd7750c9f84c794ec31d32952fce35238e3bdbf39ee886d1164e6b09fe92"
 }

LICENSE-3rdparty.csv

@@ -37,12 +37,12 @@ lxml,PyPI,BSD-3-Clause,Copyright (c) 2004 Infrae. All rights reserved.
 lz4,PyPI,BSD-3-Clause,"Copyright (c) 2012-2013, Steeve Morin"
 mmh3,PyPI,CC0-1.0,Copyright (c) 2011-2025 Hajime Senuma
 oauthlib,PyPI,BSD-3-Clause,Copyright (c) The OAuthlib Community
-openstacksdk,PyPI,Apache-2.0,Copyright OpenStack
-orjson,PyPI,Apache-2.0,Copyright ijl <ijl@mailbox.org>
-orjson,PyPI,MIT,Copyright (c) ijl <ijl@mailbox.org>
+openstacksdk,PyPI,Apache-2.0,Copyright OpenStack <openstack-discuss@lists.openstack.org>
+orjson,PyPI,Apache-2.0,
+orjson,PyPI,MIT,
 packaging,PyPI,Apache-2.0,Copyright (c) Donald Stufft and individual contributors.
 packaging,PyPI,BSD-3-Clause,Copyright (c) Donald Stufft and individual contributors.
-paramiko,PyPI,LGPL-2.1-only,Copyright (C) 2009 Jeff Forcier
+paramiko,PyPI,LGPL-2.1-only,Copyright (C) 2009 Jeff Forcier <jeff@bitprophet.org>
 ply,PyPI,BSD-3-Clause,Copyright (C) 2001-2018
 prometheus-client,PyPI,Apache-2.0,Copyright 2015 The Prometheus Authors
 protobuf,PyPI,BSD-3-Clause,Copyright 2008 Google Inc.  All rights reserved.

active_directory/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies

active_directory/pyproject.toml

@@ -36,7 +36,7 @@ dynamic = [
 
 [project.optional-dependencies]
 deps = [
-    "pywin32==310; sys_platform == 'win32'",
+    "pywin32==311; sys_platform == 'win32'",
 ]
 
 [project.urls]

agent_requirements.in

@@ -1,19 +1,19 @@
 aerospike==7.1.1; sys_platform != 'win32' and sys_platform != 'darwin'
 aws-requests-auth==0.4.3
-azure-identity==1.23.0
-beautifulsoup4==4.13.4
+azure-identity==1.24.0
+beautifulsoup4==4.13.5
 binary==1.0.2
-boto3==1.38.41
-botocore==1.38.41
-cachetools==6.1.0
+boto3==1.40.21
+botocore==1.40.21
+cachetools==6.2.0
 clickhouse-cityhash==1.0.2.4
 clickhouse-driver==0.2.9
 cm-client==45.0.4
 confluent-kafka==2.8.0
-cryptography==45.0.4
-ddtrace==3.9.3
+cryptography==45.0.6
+ddtrace==3.12.3
 dnspython==2.7.0
-fastavro==1.11.1
+fastavro==1.12.0
 foundationdb==6.3.25
 hazelcast-python-client==5.5.0
 in-toto==2.0.0
@@ -23,15 +23,15 @@ lazy-loader==0.4
 ldap3==2.9.1
 lxml==5.1.1
 lz4==4.4.4
-mmh3==5.1.0
+mmh3==5.2.0
 oauthlib==3.3.1
-openstacksdk==4.6.0
-orjson==3.11.1
+openstacksdk==4.7.0
+orjson==3.11.3
 packaging==25.0
-paramiko==3.5.1
+paramiko==4.0.0
 ply==3.11
 prometheus-client==0.22.1
-protobuf==6.31.1
+protobuf==6.32.0
 psutil==6.0.0
 psycopg[binary,pool]==3.2.7
 pyasn1==0.4.8
@@ -40,7 +40,7 @@ pydantic==2.11.7
 pyjwt==2.10.1
 pymongo[srv]==4.8.0; python_version >= '3.9'
 pymqi==1.12.11
-pymysql==1.1.1
+pymysql==1.1.2
 pyodbc==5.2.0
 pyopenssl==25.1.0
 pysmi==1.2.1
@@ -51,23 +51,23 @@ python-binary-memcached==0.31.4; sys_platform != 'win32'
 python-dateutil==2.9.0.post0
 python3-gearman==0.1.0; sys_platform != 'win32'
 pyvmomi==8.0.3.0.1
-pywin32==310; sys_platform == 'win32'
+pywin32==311; sys_platform == 'win32'
 pyyaml==6.0.2
-redis==6.2.0
+redis==6.4.0
 requests-kerberos==0.15.0
 requests-ntlm==1.3.0
 requests-oauthlib==2.0.0
 requests-toolbelt==1.0.0
 requests-unixsocket2==1.0.0
-requests==2.32.4
+requests==2.32.5
 rethinkdb==2.4.10.post1
 securesystemslib[crypto,pynacl]==0.28.0
 semver==3.0.4
 service-identity[idna]==24.2.0
 simplejson==3.20.1
-snowflake-connector-python==3.15.0
-supervisor==4.2.5
+snowflake-connector-python==3.17.2
+supervisor==4.3.0
 tuf==4.0.0
 urllib3==2.5.0
 vertica-python==1.4.0
-wrapt==1.17.2
+wrapt==1.17.3

amazon_msk/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies

amazon_msk/pyproject.toml

@@ -36,7 +36,7 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "boto3==1.38.41",
+    "boto3==1.40.21",
 ]
 
 [project.urls]

aspdotnet/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies

aspdotnet/pyproject.toml

@@ -36,7 +36,7 @@ dynamic = [
 
 [project.optional-dependencies]
 deps = [
-    "pywin32==310; sys_platform == 'win32'",
+    "pywin32==311; sys_platform == 'win32'",
 ]
 
 [project.urls]

cacti/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies

cacti/pyproject.toml

@@ -36,7 +36,7 @@ dynamic = [
 
 [project.optional-dependencies]
 deps = [
-    "pymysql==1.1.1",
+    "pymysql==1.1.2",
 ]
 
 [project.urls]

cisco_aci/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies

cisco_aci/pyproject.toml

@@ -36,7 +36,7 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "cryptography==45.0.4",
+    "cryptography==45.0.6",
 ]
 
 [project.urls]

datadog_checks_base/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies

datadog_checks_base/pyproject.toml

@@ -31,31 +31,31 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 db = [
-    "mmh3==5.1.0",
+    "mmh3==5.2.0",
 ]
 deps = [
     "binary==1.0.2",
-    "cachetools==6.1.0",
-    "cryptography==45.0.4",
-    "ddtrace==3.9.3",
+    "cachetools==6.2.0",
+    "cryptography==45.0.6",
+    "ddtrace==3.12.3",
     "jellyfish==1.2.0",
     "lazy-loader==0.4",
     "prometheus-client==0.22.1",
-    "protobuf==6.31.1",
+    "protobuf==6.32.0",
     "pydantic==2.11.7",
     "python-dateutil==2.9.0.post0",
-    "pywin32==310; sys_platform == 'win32'",
+    "pywin32==311; sys_platform == 'win32'",
     "pyyaml==6.0.2",
     "requests-toolbelt==1.0.0",
     "requests-unixsocket2==1.0.0",
-    "requests==2.32.4",
+    "requests==2.32.5",
     "simplejson==3.20.1",
     "urllib3==2.5.0",
-    "wrapt==1.17.2",
+    "wrapt==1.17.3",
 ]
 http = [
     "aws-requests-auth==0.4.3",
-    "botocore==1.38.41",
+    "botocore==1.40.21",
     "oauthlib==3.3.1",
     "pyjwt==2.10.1",
     "pyopenssl==25.1.0",
@@ -65,7 +65,7 @@ http = [
     "requests-oauthlib==2.0.0",
 ]
 json = [
-    "orjson==3.11.1",
+    "orjson==3.11.3",
 ]
 kube = [
     "kubernetes==33.1.0",
@@ -93,4 +93,4 @@ dev-mode-dirs = [
 ]
 
 [tool.ruff]
-extend = "../pyproject.toml"
+extend = "../pyproject.toml"

datadog_checks_base/tests/test_log.py

@@ -8,6 +8,7 @@
 
 import mock
 import pytest
+from ddtrace import tracer
 
 from datadog_checks import log
 from datadog_checks.base import AgentCheck
@@ -97,20 +98,30 @@ def test_log_trace_context_injection(integration_tracing_enabled):
     def _tracing_enabled():
         return integration_tracing_enabled, False
 
-    with mock.patch('datadog_checks.base.log.tracing_enabled', _tracing_enabled):
+    with mock.patch('datadog_checks.base.log.tracing_enabled', side_effect=_tracing_enabled):
         logger = logging.getLogger("test_log_trace_context_injection")
         logger.handlers = []
         handler = MockAgentLogHandler()
         assert handler.formatter.integration_tracing_enabled == integration_tracing_enabled
 
         logger.addHandler(handler)
         logger.setLevel(logging.INFO)
-        logger.info("hello", extra={'dd.trace_id': 1, 'dd.span_id': 2})
-
-        assert len(handler.records) == 1
-        record = handler.records[0]
 
         if integration_tracing_enabled:
-            assert "dd.trace_id=1 dd.span_id=2" in record
+            # ddtrace.auto patches the standard logging library to inject trace context.
+            # We import it here directly to ensure this test is self-contained and does not
+            # depend on test execution order or global state.
+            # This is also the behavior found on the AgentCheck when decorated with @traced_class
+            import ddtrace.auto  # noqa: F401
+
+            with tracer.trace("test") as span:
+                logger.info("hello")
+                assert len(handler.records) == 1
+                record = handler.records[0]
+                trace_id_hex = format(span.trace_id, 'x')
+                assert f"dd.trace_id={trace_id_hex} dd.span_id={span.span_id}" in record
         else:
+            logger.info("hello", extra={'dd.trace_id': 1, 'dd.span_id': 2})
+            assert len(handler.records) == 1
+            record = handler.records[0]
             assert "dd.trace_id=1 dd.span_id=2" not in record

ddev/changelog.d/21234.fixed

@@ -0,0 +1,2 @@
+Removes duplicated os.path.join when defining the path for the resolved folder.
+

ddev/src/ddev/cli/size/utils/common_funcs.py

@@ -95,7 +95,7 @@ def get_valid_platforms(repo_path: Path | str, versions: set[str]) -> set[str]:
     """
     Extracts the platforms we support from the .deps/resolved file names.
     """
-    resolved_path = os.path.join(repo_path, os.path.join(repo_path, ".deps", "resolved"))
+    resolved_path = os.path.join(repo_path, ".deps", "resolved")
     platforms = []
     for file in os.listdir(resolved_path):
         if any(version in file for version in versions):
@@ -107,7 +107,7 @@ def get_valid_versions(repo_path: Path | str) -> set[str]:
     """
     Extracts the Python versions we support from the .deps/resolved file names.
     """
-    resolved_path = os.path.join(repo_path, os.path.join(repo_path, ".deps", "resolved"))
+    resolved_path = os.path.join(repo_path, ".deps", "resolved")
     versions = []
     pattern = re.compile(r"\d+\.\d+")
     for file in os.listdir(resolved_path):
@@ -282,7 +282,7 @@ def get_dependencies(repo_path: str | Path, platform: str, version: str, compres
     Gets the list of dependencies for a given platform and Python version and returns a FileDataEntry that includes:
     Name, Version, Size_Bytes, Size, and Type.
     """
-    resolved_path = os.path.join(repo_path, os.path.join(repo_path, ".deps", "resolved"))
+    resolved_path = os.path.join(repo_path, ".deps", "resolved")
 
     for filename in os.listdir(resolved_path):
         file_path = os.path.join(resolved_path, filename)

dotnetclr/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies

dotnetclr/pyproject.toml

@@ -36,7 +36,7 @@ dynamic = [
 
 [project.optional-dependencies]
 deps = [
-    "pywin32==310; sys_platform == 'win32'",
+    "pywin32==311; sys_platform == 'win32'",
 ]
 
 [project.urls]

exchange_server/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies

exchange_server/pyproject.toml

@@ -36,7 +36,7 @@ dynamic = [
 
 [project.optional-dependencies]
 deps = [
-    "pywin32==310; sys_platform == 'win32'",
+    "pywin32==311; sys_platform == 'win32'",
 ]
 
 [project.urls]

http_check/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies

http_check/pyproject.toml

@@ -36,7 +36,7 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "cryptography==45.0.4",
+    "cryptography==45.0.6",
     "pysocks==1.7.1",
     "requests-ntlm==1.3.0",
 ]

iis/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies

iis/pyproject.toml

@@ -36,7 +36,7 @@ dynamic = [
 
 [project.optional-dependencies]
 deps = [
-    "pywin32==310; sys_platform == 'win32'",
+    "pywin32==311; sys_platform == 'win32'",
 ]
 
 [project.urls]

kafka_consumer/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies

kafka_consumer/pyproject.toml

@@ -37,8 +37,8 @@ license = "BSD-3-Clause"
 [project.optional-dependencies]
 deps = [
     "confluent-kafka==2.8.0",
-    "fastavro==1.11.1",
-    "protobuf==6.31.1",
+    "fastavro==1.12.0",
+    "protobuf==6.32.0",
 ]
 
 [project.urls]

mongo/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies

mongo/pyproject.toml

@@ -37,7 +37,7 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "cachetools==6.1.0",
+    "cachetools==6.2.0",
     "psutil==6.0.0",
     "pymongo[srv]==4.8.0; python_version >= '3.9'",
 ]

mysql/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies

mysql/pyproject.toml

@@ -36,10 +36,10 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "boto3==1.38.41",
-    "cachetools==6.1.0",
-    "cryptography==45.0.4",
-    "pymysql==1.1.1",
+    "boto3==1.40.21",
+    "cachetools==6.2.0",
+    "cryptography==45.0.6",
+    "pymysql==1.1.2",
 ]
 
 [project.urls]

openstack_controller/changelog.d/21217.added

@@ -0,0 +1 @@
+Update dependencies