Zhengda.lu/incident 37187

.github/workflows/build-deps.yml → .github/workflows/resolve-build-deps.yaml

@@ -1,4 +1,4 @@
-name: Build dependencies
+name: Resolve Dependencies and Build Wheels
 
 on:
   workflow_dispatch:
@@ -236,8 +236,8 @@ jobs:
         path: output
 
   publish:
-    name: Publish artifacts
-    if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && (github.ref == github.event.repository.default_branch || startsWith(github.ref, '7.')))
+    name: Publish artifacts and update lockfiles via PR
+    if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && (github.ref_name == github.event.repository.default_branch || startsWith(github.ref_name, '7.')))
     needs:
     - build
     - build-macos

LICENSE-3rdparty.csv

@@ -11,7 +11,7 @@ binary,PyPI,Apache-2.0,Copyright 2018 Ofek Lev
 binary,PyPI,MIT,Copyright 2018 Ofek Lev
 boto3,PyPI,Apache-2.0,"Copyright 2013-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved."
 botocore,PyPI,Apache-2.0,"Copyright 2012-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved."
-cachetools,PyPI,MIT,Copyright (c) 2014-2025 Thomas Kemmer
+cachetools,PyPI,MIT,Copyright (c) 2014-2024 Thomas Kemmer
 check-postgres,"https://github.com/bucardo/",BSD-2-Clause,Copyright 2007 - 2023 Greg Sabino Mullane
 clickhouse-cityhash,PyPI,MIT,"Copyright (c) 2011, Alexander Marshalov <alone.amper@gmail.com>"
 clickhouse-driver,PyPI,MIT,Copyright (c) 2017 by Konstantin Lebedev.

agent_requirements.in

@@ -1,23 +1,23 @@
 aerospike==7.1.1; sys_platform != 'win32' and sys_platform != 'darwin'
 aws-requests-auth==0.4.3
-azure-identity==1.20.0
-beautifulsoup4==4.13.3
+azure-identity==1.19.0
+beautifulsoup4==4.12.3
 binary==1.0.1
-boto3==1.36.26
-botocore==1.36.26
-cachetools==5.5.2
+boto3==1.36.16
+botocore==1.36.16
+cachetools==5.5.1
 clickhouse-cityhash==1.0.2.4
 clickhouse-driver==0.2.9
 cm-client==45.0.4
 confluent-kafka==2.8.0
-cryptography==44.0.1
+cryptography==43.0.1
 ddtrace==2.10.6
 dnspython==2.7.0
 foundationdb==6.3.24
 hazelcast-python-client==5.5.0
 in-toto==2.0.0
 jellyfish==1.1.3
-kubernetes==32.0.1
+kubernetes==32.0.0
 lazy-loader==0.4
 ldap3==2.9.1
 lxml==5.1.1
@@ -41,7 +41,7 @@ pymongo[srv]==4.8.0; python_version >= '3.9'
 pymqi==1.12.11; sys_platform != 'darwin' or platform_machine != 'arm64'
 pymysql==1.1.1
 pyodbc==5.2.0; sys_platform != 'darwin' or platform_machine != 'arm64'
-pyopenssl==24.3.0
+pyopenssl==24.2.1
 pysmi==1.2.1
 pysnmp-mibs==0.1.6
 pysnmp==5.1.0
@@ -63,7 +63,7 @@ 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
+simplejson==3.19.3
 snowflake-connector-python==3.13.2
 supervisor==4.2.5
 tuf==4.0.0

amazon_msk/pyproject.toml

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

cisco_aci/pyproject.toml

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

datadog_checks_base/pyproject.toml

@@ -35,8 +35,8 @@ db = [
 ]
 deps = [
     "binary==1.0.1",
-    "cachetools==5.5.2",
-    "cryptography==44.0.1",
+    "cachetools==5.5.1",
+    "cryptography==43.0.1",
     "ddtrace==2.10.6",
     "jellyfish==1.1.3",
     "lazy-loader==0.4",
@@ -49,15 +49,15 @@ deps = [
     "requests-toolbelt==1.0.0",
     "requests-unixsocket2==0.4.2",
     "requests==2.32.3",
-    "simplejson==3.20.1",
+    "simplejson==3.19.3",
     "wrapt==1.17.2",
 ]
 http = [
     "aws-requests-auth==0.4.3",
-    "botocore==1.36.26",
+    "botocore==1.36.16",
     "oauthlib==3.2.2",
     "pyjwt==2.10.1",
-    "pyopenssl==24.3.0",
+    "pyopenssl==24.2.1",
     "pysocks==1.7.1",
     "requests-kerberos==0.15.0",
     "requests-ntlm==1.3.0",
@@ -67,7 +67,7 @@ json = [
     "orjson==3.10.15",
 ]
 kube = [
-    "kubernetes==32.0.1",
+    "kubernetes==32.0.0",
     "requests-oauthlib==2.0.0",
 ]
 

http_check/pyproject.toml

@@ -36,7 +36,7 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "cryptography==44.0.1",
+    "cryptography==43.0.1",
     "requests-ntlm==1.3.0",
 ]
 

kubevirt_api/pyproject.toml

@@ -37,7 +37,7 @@ dynamic = [
 
 [project.optional-dependencies]
 deps = [
-    "kubernetes==32.0.1",
+    "kubernetes==32.0.0"
 ]
 
 [project.urls]

mongo/pyproject.toml

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

mysql/pyproject.toml

@@ -36,8 +36,8 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "cachetools==5.5.2",
-    "cryptography==44.0.1",
+    "cachetools==5.5.1",
+    "cryptography==43.0.1",
     "pymysql==1.1.1",
 ]
 

postgres/datadog_checks/postgres/relationsmanager.py

@@ -408,11 +408,8 @@ def filter_relation_query(self, query, schema_field):
             relation_filter = []
             if r.get(RELATION_NAME):
                 relation_filter.append("( relname = '{}'".format(r[RELATION_NAME]))
-            elif r.get(RELATION_REGEX) and r.get(RELATION_REGEX) != ".*":
+            elif r.get(RELATION_REGEX):
                 relation_filter.append("( relname ~ '{}'".format(r[RELATION_REGEX]))
-            else:
-                # Stub filter to allow for appending
-                relation_filter.append("( 1=1")
 
             if ALL_SCHEMAS not in r[SCHEMAS]:
                 schema_filter = ','.join("'{}'".format(s) for s in r[SCHEMAS])

postgres/datadog_checks/postgres/version_utils.py

@@ -69,22 +69,11 @@ def parse_version(raw_version):
                 version.append(0)
             return VersionInfo(*version)
         except ValueError:
-            pass
-        try:
             # Postgres might be in development, with format \d+[beta|rc]\d+
             match = re.match(r'(\d+)([a-zA-Z]+)(\d+)', raw_version)
             if match:
                 version = list(match.groups())
                 return VersionInfo.parse('{}.0.0-{}.{}'.format(*version))
-            else:
-                raise ValueError('Unable to match development version')
-        except ValueError:
-            # RDS changes the version format when the version switches to EOL.
-            # Example: 11.22-rds.20241121.
-            match = re.match(r'(\d+\.\d+)-rds\.(\d+)', raw_version)
-            if match:
-                version = list(match.groups())
-                return VersionInfo.parse('{}.{}'.format(*version))
         raise Exception("Cannot determine which version is {}".format(raw_version))
 
     @staticmethod

postgres/pyproject.toml

@@ -37,9 +37,9 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "azure-identity==1.20.0",
-    "boto3==1.36.26",
-    "cachetools==5.5.2",
+    "azure-identity==1.19.0",
+    "boto3==1.36.16",
+    "cachetools==5.5.1",
     "psycopg2-binary==2.9.9",
     "semver==3.0.4",
 ]

postgres/tests/test_version_utils.py

@@ -79,10 +79,3 @@ def test_transform_version():
         'version.scheme': 'semver',
     }
     assert expected == version
-
-
-def test_parse_rds_eol_version():
-    version = '11.22-rds.20241121'
-    v11_22_rds = VersionUtils.parse_version(version)
-
-    assert v11_22_rds == VersionInfo(11, 22, 20241121)

riakcs/pyproject.toml

@@ -36,7 +36,7 @@ dynamic = [
 
 [project.optional-dependencies]
 deps = [
-    "boto3==1.36.26",
+    "boto3==1.36.16",
 ]
 
 [project.urls]

spark/pyproject.toml

@@ -36,7 +36,7 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "beautifulsoup4==4.13.3",
+    "beautifulsoup4==4.12.3",
 ]
 
 [project.urls]

sqlserver/pyproject.toml

@@ -37,7 +37,7 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "azure-identity==1.20.0",
+    "azure-identity==1.19.0",
     "lxml==5.1.1",
     "pyodbc==5.2.0; sys_platform != 'darwin' or platform_machine != 'arm64'",
     "pywin32==308; sys_platform == 'win32'",

tls/pyproject.toml

@@ -36,7 +36,7 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "cryptography==44.0.1",
+    "cryptography==43.0.1",
     "service-identity[idna]==24.2.0",
 ]