Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

datadog-agent/7.63.1 package update #43828

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions datadog-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package:
name: datadog-agent
# This package has two git checkouts. For each new release, the commit SHA for
# DataDog/integrations-core must also be updated.
version: 7.60.1
epoch: 6
version: "7.63.1"
epoch: 0
description: "Collect events and metrics from your hosts that send data to Datadog."
copyright:
- license: Apache-2.0
Expand Down Expand Up @@ -94,8 +94,9 @@ pipeline:
with:
repository: https://github.com/DataDog/datadog-agent
tag: ${{package.version}}
expected-commit: 646618687e4f9351b5fe19cce678c9cd4b011e74
expected-commit: 46d9f78754ab42357054f7fb43a2d6ee901e3e0c

# Ensure that we don't run into nvidia GPU issues at runtime.
- runs: |
gccdir="$(GCC_SPEC_FILE=/dev/null gcc --print-search-dirs | grep ^install: | cut -d' ' -f2)"
sed -r 's/,?-z,now//' < "$gccdir/openssf.spec" > /home/build/openssf.spec
Expand All @@ -111,7 +112,6 @@ pipeline:

- uses: go/bump
with:
deps: github.com/moby/[email protected] golang.org/x/[email protected] github.com/go-git/go-git/[email protected]
replaces: github.com/mholt/archiver/v3=github.com/anchore/archiver/[email protected]
show-diff: true

Expand Down Expand Up @@ -157,6 +157,11 @@ pipeline:
# HOW DOES THIS WORK: https://stackoverflow.com/a/60357720
ln -s /usr/lib/libncursesw.so.6 /usr/lib/libtinfo.so.5

# There's a go version issue for some reason (possibly related to the use of gobumps), so we have to fix it. Otherwise, we get this build error:
# go: module . listed in go.work file requires go >= 1.24.0, but go.work lists go 1.23.1; to update it:
# go work use
go work use

# Build once to correctly setup links/generates. The system-probe we end
# up using will be part of the multicall below.
unshare --user --map-root-user \
Expand Down Expand Up @@ -296,11 +301,11 @@ subpackages:
- uses: git-checkout
with:
repository: https://github.com/DataDog/integrations-core
branch: ${{vars.datadog-major-minor-x}} # 7.59.x
expected-commit: 3189af0e0ae840c9a4bab3131662c7fd6b0de7fb # needs to be updated with each new release
branch: ${{vars.datadog-major-minor-x}} # 7.x.y
expected-commit: eb1cc6cf7b6d521bda3a8d1529cfe952e5355e89 # needs to be updated with each new release
- uses: patch
with:
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 /home/build/int-core-snowflake-pyproject-toml.patch
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
- runs: |
# This is needed to work around the error "ValueError: ZIP does not support timestamps before 1980"
SOURCE_DATE_EPOCH=315532800
Expand Down Expand Up @@ -416,7 +421,7 @@ subpackages:
pipeline:
- uses: go/bump
with:
deps: google.golang.org/[email protected] github.com/golang/[email protected]
deps: github.com/golang/[email protected]
- uses: go/build
with:
packages: ./cmd/server
Expand Down
13 changes: 2 additions & 11 deletions datadog-agent/int-core-agent_requirements-in.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,9 @@ index 859d088..4f7bde9 100644
@@ -10,7 +10,7 @@ clickhouse-cityhash==1.0.2.4
clickhouse-driver==0.2.9
cm-client==45.0.4
confluent-kafka==2.6.1
confluent-kafka==2.8.0
-cryptography==43.0.1
+cryptography==44.0.1
ddtrace==2.10.6
dnspython==2.6.1
dnspython==2.7.0
foundationdb==6.3.24
@@ -65,7 +65,7 @@ securesystemslib[crypto,pynacl]==0.28.0
semver==3.0.2
service-identity[idna]==24.1.0
simplejson==3.19.3
-snowflake-connector-python==3.12.1
+snowflake-connector-python==3.12.3; python_version > '3.0'
supervisor==4.2.5
tuf==4.0.0
uptime==3.0.1
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ index 8ff7f6b..860bb68 100644
"importlib-metadata==2.1.3; python_version < '3.8'",
"jellyfish==1.1.0",
@@ -58,7 +58,7 @@ http = [
"botocore==1.35.10",
"botocore==1.36.1",
"oauthlib==3.2.2",
"pyjwt==2.9.0",
"pyjwt==2.10.1",
- "pyopenssl==24.2.1",
+ "pyopenssl==24.3.0",
"pysocks==1.7.1",
Expand Down
13 changes: 0 additions & 13 deletions datadog-agent/int-core-snowflake-pyproject-toml.patch

This file was deleted.

Loading