Skip to content

Commit 83757b3

Browse files
Kyle-NealeKyle-Neale
committed
fix merge conflicts
1 parent 8fd0064 commit 83757b3

631 files changed

Lines changed: 48491 additions & 2034 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.builders/images/linux-aarch64/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ RUN \
158158
# curl
159159
RUN \
160160
DOWNLOAD_URL="https://curl.haxx.se/download/curl-{{version}}.tar.gz" \
161-
VERSION="8.7.1" \
162-
SHA256="f91249c87f68ea00cf27c44fdfa5a78423e41e71b7d408e5901a9896d905c495" \
161+
VERSION="8.9.1" \
162+
SHA256="291124a007ee5111997825940b3876b3048f7d31e73e9caa681b80fe48b2dcd5" \
163163
RELATIVE_PATH="curl-{{version}}" \
164164
bash install-from-source.sh \
165165
--disable-manual \

‎.builders/images/linux-x86_64/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ RUN \
131131
# curl
132132
RUN \
133133
DOWNLOAD_URL="https://curl.haxx.se/download/curl-{{version}}.tar.gz" \
134-
VERSION="8.7.1" \
135-
SHA256="f91249c87f68ea00cf27c44fdfa5a78423e41e71b7d408e5901a9896d905c495" \
134+
VERSION="8.9.1" \
135+
SHA256="291124a007ee5111997825940b3876b3048f7d31e73e9caa681b80fe48b2dcd5" \
136136
RELATIVE_PATH="curl-{{version}}" \
137137
bash install-from-source.sh \
138138
--disable-manual \

‎.builders/images/macos-x86_64/builder_setup.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ RELATIVE_PATH="libxslt-{{version}}" \
7575

7676
# curl
7777
DOWNLOAD_URL="https://curl.haxx.se/download/curl-{{version}}.tar.gz" \
78-
VERSION="8.7.1" \
79-
SHA256="f91249c87f68ea00cf27c44fdfa5a78423e41e71b7d408e5901a9896d905c495" \
78+
VERSION="8.9.1" \
79+
SHA256="291124a007ee5111997825940b3876b3048f7d31e73e9caa681b80fe48b2dcd5" \
8080
RELATIVE_PATH="curl-{{version}}" \
8181
install-from-source \
8282
--disable-manual \

‎.builders/images/macos-x86_64/extra_build.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ fi
2626
# Make sure IBM MQ libraries are found under /opt/mqm even when we're using the builder cache
2727
sudo cp -Rf "${DD_PREFIX_PATH}/mqm" /opt
2828

29+
# lxml has some custom logic for finding the libxml and libxslt libraries that it depends on,
30+
# which ignores existing CFLAGS / LDFLAGS,
31+
# based on the xml2-config and xslt-config binaries provided by those libraries.
32+
# We need to override those to avoid the build from picking up the system ones.
33+
echo "WITH_XML2_CONFIG=${DD_PREFIX_PATH}/bin/xml2-config" >> $DD_ENV_FILE
34+
echo "WITH_XSLT_CONFIG=${DD_PREFIX_PATH}/bin/xslt-config" >> $DD_ENV_FILE
35+
2936
# Empty arrays are flagged as unset when using the `-u` flag. This is the safest way to work around that
3037
# (see https://stackoverflow.com/a/61551944)
3138
pip_no_binary=${always_build[@]+"${always_build[@]}"}

‎.codecov.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ coverage:
1818
target: 75
1919
flags:
2020
- aspdotnet
21+
AWS_Neuron:
22+
target: 75
23+
flags:
24+
- aws_neuron
2125
ActiveMQ_XML:
2226
target: 75
2327
flags:
@@ -206,6 +210,10 @@ coverage:
206210
target: 75
207211
flags:
208212
- fluentd
213+
Fly.io:
214+
target: 75
215+
flags:
216+
- fly_io
209217
FoundationDB:
210218
target: 75
211219
flags:
@@ -682,6 +690,10 @@ coverage:
682690
target: 75
683691
flags:
684692
- kyverno
693+
tibco_ems:
694+
target: 75
695+
flags:
696+
- tibco_ems
685697
vLLM:
686698
target: 75
687699
flags:
@@ -757,6 +769,11 @@ flags:
757769
paths:
758770
- avi_vantage/datadog_checks/avi_vantage
759771
- avi_vantage/tests
772+
aws_neuron:
773+
carryforward: true
774+
paths:
775+
- aws_neuron/datadog_checks/aws_neuron
776+
- aws_neuron/tests
760777
azure_iot_edge:
761778
carryforward: true
762779
paths:
@@ -962,6 +979,11 @@ flags:
962979
paths:
963980
- fluxcd/datadog_checks/fluxcd
964981
- fluxcd/tests
982+
fly_io:
983+
carryforward: true
984+
paths:
985+
- fly_io/datadog_checks/fly_io
986+
- fly_io/tests
965987
foundationdb:
966988
carryforward: true
967989
paths:
@@ -1442,6 +1464,11 @@ flags:
14421464
paths:
14431465
- teradata/datadog_checks/teradata
14441466
- teradata/tests
1467+
tibco_ems:
1468+
carryforward: true
1469+
paths:
1470+
- tibco_ems/datadog_checks/tibco_ems
1471+
- tibco_ems/tests
14451472
tls:
14461473
carryforward: true
14471474
paths:

‎.deps/image_digests.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"linux-aarch64": "sha256:c66ca3f412c8f2a55eb9e189e1be1c56c60834756f8654d66fa3e32fd23bb3d2",
3-
"linux-x86_64": "sha256:10ef3bdd6270368a753ddba7ddb140185b0f139748048c4ff9ecb25ab30e8af6",
4-
"windows-x86_64": "sha256:576d62bee2fca6420f9b6b399327287c7779bcf1295c08bca07aaf6ae60cde81"
2+
"linux-aarch64": "sha256:bb4ca64678ec1be3fe0c94b6f069912c4e78f52a1918b770e40066cc1c1a7191",
3+
"linux-x86_64": "sha256:cd58dce0bb12645ca22037094a13aab7b2509d17e219e2ec32876fd1aa8b8082",
4+
"windows-x86_64": "sha256:caa8cfa4d307c442edcc0cf42528ba4a5ca80b36371df22ce527a18ea41f6476"
55
}

‎.deps/metadata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"sha256": "4039fe36b2e988fc582e6f20b4f789715b27cae495893de136f3b8eb3d409ce9"
2+
"sha256": "5181bea9cee6fe3f956fa6ca53fc62b093be8ddf2ccbd778020075368d28da4c"
33
}

‎.deps/resolved/linux-aarch64_py2.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pymysql @ https://agent-int-packages.datadoghq.com/external/pymysql/PyMySQL-0.10
5555
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
5656
pyparsing @ https://agent-int-packages.datadoghq.com/external/pyparsing/pyparsing-2.4.7-py2.py3-none-any.whl#sha256=ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b
5757
pysmi @ https://agent-int-packages.datadoghq.com/external/pysmi/pysmi-0.3.4-py2.py3-none-any.whl#sha256=2ec6ebd41aaef562695e7d0058763c6e1e8c1fbf8710804c11ef3a857fc9cad7
58-
pysnmp @ https://agent-int-packages.datadoghq.com/external/pysnmp/pysnmp-4.4.9-py2.py3-none-any.whl#sha256=128a4832ce170213a59b82e7eeb886fc07d4b2e6eb638db8049af03f1014b0f8
58+
pysnmp @ https://agent-int-packages.datadoghq.com/external/pysnmp/pysnmp-4.4.10-py2.py3-none-any.whl#sha256=27cf85184963a0453f4bf2e1c86a50fe90b764c1376f6ade3bc68ba5d286de38
5959
pysnmp-mibs @ https://agent-int-packages.datadoghq.com/external/pysnmp-mibs/pysnmp_mibs-0.1.6-py2.py3-none-any.whl#sha256=5e153ebe8e767c07940cea435f866c623ff6b2376155c7da75085b08d3774d48
6060
pysocks @ https://agent-int-packages.datadoghq.com/external/pysocks/PySocks-1.7.1-py27-none-any.whl#sha256=08e69f092cc6dbe92a0fdd16eeb9b9ffbc13cadfe5ca4c7bd92ffb078b293299
6161
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

0 commit comments

Comments
 (0)
⚡