Skip to content

Commit c789737

Browse files
authored
Merge pull request #47515 from wolfi-dev/wolfictl-ca39782b-eacf-41db-be24-8c8cc050202d
datadog-agent/7.64.1 package update
2 parents eecb279 + d0bb32a commit c789737

File tree

2 files changed

+11
-20
lines changed

2 files changed

+11
-20
lines changed

datadog-agent.yaml

+5-14
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package:
22
name: datadog-agent
33
# This package has two git checkouts. For each new release, the commit SHA for
44
# DataDog/integrations-core must also be updated.
5-
version: "7.63.3"
6-
epoch: 4
5+
version: "7.64.1"
6+
epoch: 0
77
description: "Collect events and metrics from your hosts that send data to Datadog."
88
copyright:
99
- license: Apache-2.0
@@ -98,7 +98,7 @@ pipeline:
9898
with:
9999
repository: https://github.com/DataDog/datadog-agent
100100
tag: ${{package.version}}
101-
expected-commit: eab078f2e713852de8e4f4c168ea009065841903
101+
expected-commit: 154bd424d2a764b4778c8421a9e5fdb8fd03c9eb
102102

103103
# Recent commit to the init.go code changed some of the logic of Python path resolving
104104
# for the embedded Python, causing issues. Let's revert the commit to return to the previous
@@ -125,20 +125,11 @@ pipeline:
125125
- uses: go/bump
126126
with:
127127
deps: |-
128-
golang.org/x/oauth2@v0.27.0
129128
golang.org/x/net@v0.36.0
129+
github.com/containerd/containerd@v1.7.27
130130
replaces: github.com/mholt/archiver/v3=github.com/anchore/archiver/v3@v3.5.2
131131
show-diff: true
132132

133-
- uses: go/bump
134-
with:
135-
modroot: pkg/trace
136-
# Requires +incompatible or it'll throw an error
137-
deps: |-
138-
github.com/docker/distribution@v2.8.3+incompatible
139-
golang.org/x/crypto@v0.35.0
140-
show-diff: true
141-
142133
- if: ${{build.arch}} == 'aarch64'
143134
name: Install clang-12
144135
runs: |
@@ -349,7 +340,7 @@ subpackages:
349340
with:
350341
repository: https://github.com/DataDog/integrations-core
351342
branch: ${{vars.datadog-major-minor-x}} # 7.x.y
352-
expected-commit: eb1cc6cf7b6d521bda3a8d1529cfe952e5355e89 # needs to be updated with each new release
343+
expected-commit: 143b5e0bfc592627f6da8453e6a283020487828e # needs to be updated with each new release
353344
- uses: patch
354345
with:
355346
patches: /home/build/int-core-datadog_checks_dev-pyproject-toml.patch /home/build/int-core-datadog_checks_base-pyproject-toml.patch /home/build/int-core-mysql-hatch-toml.patch /home/build/int-core-singlestore-hatch-toml.patch /home/build/int-core-agent_requirements-in.patch

datadog-agent/int-core-datadog_checks_base-pyproject-toml.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml
2-
index 8ff7f6b..860bb68 100644
2+
index cc9875d566..d30ea68a8d 100644
33
--- a/datadog_checks_base/pyproject.toml
44
+++ b/datadog_checks_base/pyproject.toml
55
@@ -36,7 +36,7 @@ db = [
66
deps = [
77
"binary==1.0.1",
8-
"cachetools==5.5.0",
8+
"cachetools==5.5.1",
99
- "cryptography==43.0.1",
1010
+ "cryptography==44.0.1",
1111
"ddtrace==2.10.6",
12-
"importlib-metadata==2.1.3; python_version < '3.8'",
13-
"jellyfish==1.1.0",
14-
@@ -58,7 +58,7 @@ http = [
15-
"botocore==1.36.1",
12+
"jellyfish==1.1.3",
13+
"prometheus-client==0.21.1",
14+
@@ -57,7 +57,7 @@ http = [
15+
"botocore==1.36.16",
1616
"oauthlib==3.2.2",
1717
"pyjwt==2.10.1",
1818
- "pyopenssl==24.2.1",

0 commit comments

Comments
 (0)