Merge branch 'master' into nubtron/fix-repos-core

Author: AAraKKe

.builders/images/linux-aarch64/Dockerfile

@@ -36,11 +36,11 @@ RUN yum install -y perl-IPC-Cmd perl-CPANPLUS && \
  ldconfig
 
 # Compile and install Python 3
-ENV PYTHON3_VERSION=3.12.9
+ENV PYTHON3_VERSION=3.12.10
 RUN yum install -y libffi-devel && \
  DOWNLOAD_URL="https://python.org/ftp/python/{{version}}/Python-{{version}}.tgz" \
  VERSION="${PYTHON3_VERSION}" \
- SHA256="45313e4c5f0e8acdec9580161d565cf5fea578e3eabf25df7cc6355bf4afa1ee" \
+ SHA256="15d9c623abfd2165fe816ea1fb385d6ed8cf3c664661ab357f1782e3036a6dac" \
  RELATIVE_PATH="Python-{{version}}" \
  bash install-from-source.sh \
  --prefix=/opt/python/${PYTHON3_VERSION} \

.builders/images/linux-x86_64/Dockerfile

@@ -35,11 +35,11 @@ RUN yum install -y perl-IPC-Cmd perl-CPANPLUS && \
  ldconfig
 
 # Compile and install Python 3
-ENV PYTHON3_VERSION=3.12.9
+ENV PYTHON3_VERSION=3.12.10
 RUN yum install -y libffi-devel && \
  DOWNLOAD_URL="https://python.org/ftp/python/{{version}}/Python-{{version}}.tgz" \
  VERSION="${PYTHON3_VERSION}" \
- SHA256="45313e4c5f0e8acdec9580161d565cf5fea578e3eabf25df7cc6355bf4afa1ee" \
+ SHA256="15d9c623abfd2165fe816ea1fb385d6ed8cf3c664661ab357f1782e3036a6dac" \
  RELATIVE_PATH="Python-{{version}}" \
  bash install-from-source.sh --prefix=/opt/python/${PYTHON3_VERSION} --with-ensurepip=yes --enable-ipv6 --with-dbmliborder=
 ENV PATH="/opt/python/${PYTHON3_VERSION}/bin:${PATH}"

.builders/images/windows-x86_64/Dockerfile

@@ -82,11 +82,11 @@ RUN Get-RemoteFile `
     Approve-File -Path $($Env:USERPROFILE + '\.cargo\bin\rustc.exe') -Hash $Env:RUSTC_HASH
 
 # Install Python 3
-ENV PYTHON_VERSION="3.12.9"
+ENV PYTHON_VERSION="3.12.10"
 RUN Get-RemoteFile `
       -Uri https://www.python.org/ftp/python/$Env:PYTHON_VERSION/python-$Env:PYTHON_VERSION-amd64.exe `
       -Path python-$Env:PYTHON_VERSION-amd64.exe `
-      -Hash '2a52993092a19cfdffe126e2eeac46a4265e25705614546604ad44988e040c0f'; `
+      -Hash '67b5635e80ea51072b87941312d00ec8927c4db9ba18938f7ad2d27b328b95fb'; `
     Start-Process -Wait python-$Env:PYTHON_VERSION-amd64.exe -ArgumentList '/quiet', 'InstallAllUsers=1'; `
     Remove-Item python-$Env:PYTHON_VERSION-amd64.exe; `
     & 'C:\Program Files\Python312\python.exe' -m pip install --no-warn-script-location --upgrade pip; `

.codecov.yml

@@ -106,6 +106,10 @@ coverage:
         target: 75
         flags:
         - cassandra_nodetool
+      Celery:
+        target: 75
+        flags:
+        - celery
       Ceph:
         target: 75
         flags:
@@ -873,6 +877,11 @@ flags:
     paths:
     - cassandra_nodetool/datadog_checks/cassandra_nodetool
     - cassandra_nodetool/tests
+  celery:
+    carryforward: true
+    paths:
+    - celery/datadog_checks/celery
+    - celery/tests
   ceph:
     carryforward: true
     paths:

.coveragerc

@@ -55,3 +55,6 @@ exclude_lines =
 
     # Ignore non-runnable code
     if __name__ == .__main__.:
+
+    # Ignore TYPE_CHECKING blocks
+    if TYPE_CHECKING:

.cursor/rules/documentation.mdc

@@ -0,0 +1,12 @@
+---
+description: 
+globs: *md
+alwaysApply: false
+---
+## New files added
+When a new file is added make sure to make it available through the navigation configuration in the mkdocs file. If it is not clear where it should go, ask.
+
+## Style
+Maintain style consistent. The style should be technical and professional.
+
+Do not start lines/paragraphs with an inline code.

.cursor/rules/python-type-hinting.mdc

@@ -0,0 +1,29 @@
+---
+description: 
+globs: **/*.py
+alwaysApply: false
+---
+## Generating new code
+When generating python code, always add type hinting to the methods. Use modern syntaxis, for example, instead of using `Optional[str]` use `str | None` and instead of using `List[str]` use `list[str]`.
+
+If a method yields a value but we are not returning anything or we do not accept anything sent to the generator, it is better to type the method as Iterator to explicitely expose the API of the method as simply something the caller can iterate over.
+
+## Refactoring code
+When refactoring existing code, never add type hints to method that are not type hinted unless asked explicitely.
+
+## The case of AnyStr
+AnyStr is normally used to define the type of a variable that can be either a string or bytes. This is soon to be deprecated and, instead, type parameter lits are a better solution. If AnyStr is used as type of several arguments in a given method signature, it is better to use type parameter lists and define the function as a generic function.
+
+```python
+# Soon to be deprecated
+def func(a: AnySTr, b: AnyStr):
+    pass
+
+# Preferred
+def func[T: (str, bytes)](a: T, b: T):
+    pass
+```
+
+This way, whether a and b are either strings or bytes, they cannot be mixed. 
+
+If a single argument is present in the function, `str | bytes` is preferred.

.cursor/rules/testing.mdc

@@ -3,5 +3,5 @@ description:
 globs: **/*.py
 alwaysApply: false
 ---
-Run unit and integration tests with `ddev --no-interactive test <INTEGRATION>`. For example, for the pbouncer integration, run `ddev --no-interactive test pgbouncer`.
-Run E2E tests with `ddev ddev --no-interactive env test <INTEGRATION> --dev`. For example, for the pbouncer integration, run `ddev ddev --no-interactive env test pgbouncer --dev`.
+Run unit and integration tests with `ddev --no-interactive test <INTEGRATION>`. For example, for the pgbouncer integration, run `ddev --no-interactive test pgbouncer`.
+Run E2E tests with `ddev --no-interactive env test <INTEGRATION> --dev`. For example, for the pgbouncer integration, run `ddev --no-interactive env test pgbouncer --dev`.

.ddev/ci/scripts/ddev/linux/55_fetch_master.sh

@@ -2,8 +2,8 @@
 
 set -ex
 
-# Only required on pull requests
-if [[ $GITHUB_BASE_REF ]]; then
+# Only required on non-master branches
+if [[ "$GITHUB_REF_NAME" != "master" ]]; then
   git fetch origin master:master
 fi
 

.ddev/ci/scripts/ddev/windows/55_fetch_master.bat

@@ -1,4 +1,4 @@
-:: Only required on pull requests
-if defined GITHUB_BASE_REF (
+:: Only required on non-master branches
+if "%GITHUB_REF_NAME%" NEQ "master" (
   git fetch origin master:master
 )

.ddev/ci/scripts/singlestore/linux/55_set_license_secret.sh

@@ -93,6 +93,8 @@ semver = ['BSD-3-Clause']
 simplejson = ['MIT']
 # https://github.com/Supervisor/supervisor/blob/master/LICENSES.txt
 supervisor = ['BSD-3-Clause-Modification']
+# https://github.com/prometheus/client_python/issues/1110
+prometheus-client = ['Apache-2.0']
 
 [overrides.dependencies.repo]
 PyYAML = 'https://github.com/yaml/pyyaml'
@@ -130,6 +132,7 @@ exclude = [
     'go-metro',
     'http_check',
     'kubelet',
+    'kubevirt',
     'kubernetes_state',
     'network',
     'ntp',
@@ -148,7 +151,6 @@ unsorted = [
 
 [overrides.dep.updates]
 exclude = [
-    'ddtrace',  # https://github.com/DataDog/integrations-core/pull/9132
     'pyasn1',  # https://github.com/pyasn1/pyasn1/issues/52
     'pysmi', # pysnmp dependent on pysmi version 1.2.1
     'pysnmp',  # Breaking snmp tests
@@ -159,7 +161,7 @@ exclude = [
     # https://github.com/DataDog/integrations-core/pull/15859
     'psycopg2-binary',
     'psutil',
-    'pymongo[srv]', # Upgrade from 4.8.0 to 4.10.1 causes "AttributeError: module 'pymongo' has no attribute 'mongo_client'"
+    'pymongo', # Upgrade from 4.8.0 to 4.10.1 causes "AttributeError: module 'pymongo' has no attribute 'mongo_client'"
 ]
 
 # Dependencies for the downloader that are security-related and should be updated separately from the others

.ddev/config.toml

@@ -1,5 +1,5 @@
 {
-  "linux-aarch64": "sha256:1a4a3ea10f1c2cafb3dc1fd9eda02826026e0e660f670f9c065b6b0782f4d901",
-  "linux-x86_64": "sha256:00483449e9a400fc6e5a8433cb063f0946e20e1feda5f70b910d1bd451b63936",
-  "windows-x86_64": "sha256:9f34e9b4e33bb55f8e25ef12d7ec6e7e9f6916691a0b849bb1ebfb65e153f2d9"
+  "linux-aarch64": "sha256:fe7765187251f8ad4b944de52ac93aae21e0b05b3cd132f18949365ef83480c8",
+  "linux-x86_64": "sha256:0b78aff97c081fe3e478f29eeb19f54473812a7510eed1527c269051d1ba8534",
+  "windows-x86_64": "sha256:e35fdbbd4fb4201ee6d203a437175ccf527775a8c371cefd5888bdcfabc3af9c"
 }

.deps/image_digests.json

@@ -1,3 +1,3 @@
 {
-  "sha256": "31b12fc41197bf7276278e2eff6b288ff53f922e96277aa9b8dfff37f272beea"
+  "sha256": "ad5ab7530687a62ff2ff0cffc75902d1998a727ad410f3e59d9e0fae0236d25d"
 }