fix merge conflicts

DataDog · Aug 29, 2024 · 83757b3 · 83757b3
1 parent 8fd0064
commit 83757b3
Show file tree

Hide file tree

Showing 631 changed files with 48,491 additions and 2,034 deletions.
diff --git a/.builders/images/linux-aarch64/Dockerfile b/.builders/images/linux-aarch64/Dockerfile
@@ -158,8 +158,8 @@ RUN \
 # curl
 RUN \
  DOWNLOAD_URL="https://curl.haxx.se/download/curl-{{version}}.tar.gz" \
- VERSION="8.7.1" \
- SHA256="f91249c87f68ea00cf27c44fdfa5a78423e41e71b7d408e5901a9896d905c495" \
+ VERSION="8.9.1" \
+ SHA256="291124a007ee5111997825940b3876b3048f7d31e73e9caa681b80fe48b2dcd5" \
  RELATIVE_PATH="curl-{{version}}" \
   bash install-from-source.sh \
     --disable-manual \

diff --git a/.builders/images/linux-x86_64/Dockerfile b/.builders/images/linux-x86_64/Dockerfile
@@ -131,8 +131,8 @@ RUN \
 # curl
 RUN \
  DOWNLOAD_URL="https://curl.haxx.se/download/curl-{{version}}.tar.gz" \
- VERSION="8.7.1" \
- SHA256="f91249c87f68ea00cf27c44fdfa5a78423e41e71b7d408e5901a9896d905c495" \
+ VERSION="8.9.1" \
+ SHA256="291124a007ee5111997825940b3876b3048f7d31e73e9caa681b80fe48b2dcd5" \
  RELATIVE_PATH="curl-{{version}}" \
   bash install-from-source.sh \
     --disable-manual \

diff --git a/.builders/images/macos-x86_64/builder_setup.sh b/.builders/images/macos-x86_64/builder_setup.sh
@@ -75,8 +75,8 @@ RELATIVE_PATH="libxslt-{{version}}" \
 
 # curl
 DOWNLOAD_URL="https://curl.haxx.se/download/curl-{{version}}.tar.gz" \
-VERSION="8.7.1" \
-SHA256="f91249c87f68ea00cf27c44fdfa5a78423e41e71b7d408e5901a9896d905c495" \
+VERSION="8.9.1" \
+SHA256="291124a007ee5111997825940b3876b3048f7d31e73e9caa681b80fe48b2dcd5" \
 RELATIVE_PATH="curl-{{version}}" \
   install-from-source \
     --disable-manual \

diff --git a/.builders/images/macos-x86_64/extra_build.sh b/.builders/images/macos-x86_64/extra_build.sh
@@ -26,6 +26,13 @@ fi
 # Make sure IBM MQ libraries are found under /opt/mqm even when we're using the builder cache
 sudo cp -Rf "${DD_PREFIX_PATH}/mqm" /opt
 
+# lxml has some custom logic for finding the libxml and libxslt libraries that it depends on,
+# which ignores existing CFLAGS / LDFLAGS,
+# based on the xml2-config and xslt-config binaries provided by those libraries.
+# We need to override those to avoid the build from picking up the system ones.
+echo "WITH_XML2_CONFIG=${DD_PREFIX_PATH}/bin/xml2-config" >> $DD_ENV_FILE
+echo "WITH_XSLT_CONFIG=${DD_PREFIX_PATH}/bin/xslt-config" >> $DD_ENV_FILE
+
 # Empty arrays are flagged as unset when using the `-u` flag. This is the safest way to work around that
 # (see https://stackoverflow.com/a/61551944)
 pip_no_binary=${always_build[@]+"${always_build[@]}"}

diff --git a/.codecov.yml b/.codecov.yml
@@ -18,6 +18,10 @@ coverage:
         target: 75
         flags:
         - aspdotnet
+      AWS_Neuron:
+        target: 75
+        flags:
+        - aws_neuron
       ActiveMQ_XML:
         target: 75
         flags:
@@ -206,6 +210,10 @@ coverage:
         target: 75
         flags:
         - fluentd
+      Fly.io:
+        target: 75
+        flags:
+        - fly_io
       FoundationDB:
         target: 75
         flags:
@@ -682,6 +690,10 @@ coverage:
         target: 75
         flags:
         - kyverno
+      tibco_ems:
+        target: 75
+        flags:
+        - tibco_ems
       vLLM:
         target: 75
         flags:
@@ -757,6 +769,11 @@ flags:
     paths:
     - avi_vantage/datadog_checks/avi_vantage
     - avi_vantage/tests
+  aws_neuron:
+    carryforward: true
+    paths:
+    - aws_neuron/datadog_checks/aws_neuron
+    - aws_neuron/tests
   azure_iot_edge:
     carryforward: true
     paths:
@@ -962,6 +979,11 @@ flags:
     paths:
     - fluxcd/datadog_checks/fluxcd
     - fluxcd/tests
+  fly_io:
+    carryforward: true
+    paths:
+    - fly_io/datadog_checks/fly_io
+    - fly_io/tests
   foundationdb:
     carryforward: true
     paths:
@@ -1442,6 +1464,11 @@ flags:
     paths:
     - teradata/datadog_checks/teradata
     - teradata/tests
+  tibco_ems:
+    carryforward: true
+    paths:
+    - tibco_ems/datadog_checks/tibco_ems
+    - tibco_ems/tests
   tls:
     carryforward: true
     paths:

diff --git a/.deps/image_digests.json b/.deps/image_digests.json
@@ -1,5 +1,5 @@
 {
-  "linux-aarch64": "sha256:c66ca3f412c8f2a55eb9e189e1be1c56c60834756f8654d66fa3e32fd23bb3d2",
-  "linux-x86_64": "sha256:10ef3bdd6270368a753ddba7ddb140185b0f139748048c4ff9ecb25ab30e8af6",
-  "windows-x86_64": "sha256:576d62bee2fca6420f9b6b399327287c7779bcf1295c08bca07aaf6ae60cde81"
+  "linux-aarch64": "sha256:bb4ca64678ec1be3fe0c94b6f069912c4e78f52a1918b770e40066cc1c1a7191",
+  "linux-x86_64": "sha256:cd58dce0bb12645ca22037094a13aab7b2509d17e219e2ec32876fd1aa8b8082",
+  "windows-x86_64": "sha256:caa8cfa4d307c442edcc0cf42528ba4a5ca80b36371df22ce527a18ea41f6476"
 }
diff --git a/.deps/metadata.json b/.deps/metadata.json
@@ -1,3 +1,3 @@
 {
-  "sha256": "4039fe36b2e988fc582e6f20b4f789715b27cae495893de136f3b8eb3d409ce9"
+  "sha256": "5181bea9cee6fe3f956fa6ca53fc62b093be8ddf2ccbd778020075368d28da4c"
 }
diff --git a/.deps/resolved/linux-aarch64_py2.txt b/.deps/resolved/linux-aarch64_py2.txt
@@ -55,7 +55,7 @@ pymysql @ https://agent-int-packages.datadoghq.com/external/pymysql/PyMySQL-0.10
 pynacl @ https://agent-int-packages.datadoghq.com/built/pynacl/PyNaCl-1.4.0-20240806143216-cp27-cp27mu-manylinux2014_aarch64.manylinux_2_17_aarch64.whl#sha256=cbca692a1338269810ebfb746745b92d920900723f926a856d03a183c49e688e
 pyparsing @ https://agent-int-packages.datadoghq.com/external/pyparsing/pyparsing-2.4.7-py2.py3-none-any.whl#sha256=ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b
 pysmi @ https://agent-int-packages.datadoghq.com/external/pysmi/pysmi-0.3.4-py2.py3-none-any.whl#sha256=2ec6ebd41aaef562695e7d0058763c6e1e8c1fbf8710804c11ef3a857fc9cad7
-pysnmp @ https://agent-int-packages.datadoghq.com/external/pysnmp/pysnmp-4.4.9-py2.py3-none-any.whl#sha256=128a4832ce170213a59b82e7eeb886fc07d4b2e6eb638db8049af03f1014b0f8
+pysnmp @ https://agent-int-packages.datadoghq.com/external/pysnmp/pysnmp-4.4.10-py2.py3-none-any.whl#sha256=27cf85184963a0453f4bf2e1c86a50fe90b764c1376f6ade3bc68ba5d286de38
 pysnmp-mibs @ https://agent-int-packages.datadoghq.com/external/pysnmp-mibs/pysnmp_mibs-0.1.6-py2.py3-none-any.whl#sha256=5e153ebe8e767c07940cea435f866c623ff6b2376155c7da75085b08d3774d48
 pysocks @ https://agent-int-packages.datadoghq.com/external/pysocks/PySocks-1.7.1-py27-none-any.whl#sha256=08e69f092cc6dbe92a0fdd16eeb9b9ffbc13cadfe5ca4c7bd92ffb078b293299
 python-binary-memcached @ https://agent-int-packages.datadoghq.com/built/python-binary-memcached/python_binary_memcached-0.26.1-20240402155053-py2-none-manylinux2014_aarch64.whl#sha256=781b2f98a07bb11341f1187d39b15515b935f292037aeaf387a6b519498776c7