From dc75d25a3ffa21e22c15bd3a9028ddb49d6844ed Mon Sep 17 00:00:00 2001 From: Sylvain Baubeau Date: Tue, 11 Nov 2025 01:42:55 +0100 Subject: [PATCH] [SBOM] Add running kernel information to metadata (#42845) Add running kernel information to metadata This allows to make finer matching against SBOM components. Co-authored-by: sylvain.baubeau (cherry picked from commit 604ccaa350f151d0a8b939bec0d61ba39d4ada21) --- comp/otelcol/collector-contrib/impl/go.mod | 2 +- comp/otelcol/collector-contrib/impl/go.sum | 4 ++-- comp/otelcol/ddflareextension/impl/go.mod | 2 +- comp/otelcol/ddflareextension/impl/go.sum | 4 ++-- comp/otelcol/logsagentpipeline/go.mod | 2 +- comp/otelcol/logsagentpipeline/go.sum | 4 ++-- .../logsagentpipelineimpl/go.mod | 2 +- .../logsagentpipelineimpl/go.sum | 4 ++-- .../connector/datadogconnector/go.mod | 2 +- .../connector/datadogconnector/go.sum | 4 ++-- .../exporter/datadogexporter/go.mod | 2 +- .../exporter/datadogexporter/go.sum | 4 ++-- .../exporter/serializerexporter/go.mod | 2 +- .../exporter/serializerexporter/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- pkg/collector/corechecks/sbom/processor.go | 19 +++++++++++++++++++ pkg/logs/pipeline/go.mod | 2 +- pkg/logs/pipeline/go.sum | 4 ++-- pkg/logs/processor/go.mod | 2 +- pkg/logs/processor/go.sum | 4 ++-- pkg/process/util/api/go.mod | 2 +- pkg/process/util/api/go.sum | 4 ++-- pkg/serializer/go.mod | 2 +- pkg/serializer/go.sum | 4 ++-- test/fakeintake/go.mod | 2 +- test/fakeintake/go.sum | 4 ++-- test/new-e2e/go.mod | 2 +- test/new-e2e/go.sum | 4 ++-- test/otel/go.mod | 2 +- test/otel/go.sum | 4 ++-- 31 files changed, 64 insertions(+), 45 deletions(-) diff --git a/comp/otelcol/collector-contrib/impl/go.mod b/comp/otelcol/collector-contrib/impl/go.mod index 146e0253666d26..c0dc7d59bffa42 100644 --- a/comp/otelcol/collector-contrib/impl/go.mod +++ b/comp/otelcol/collector-contrib/impl/go.mod @@ -72,7 +72,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect github.com/Code-Hex/go-generics-cache v1.5.1 // indirect - github.com/DataDog/agent-payload/v5 v5.0.174 // indirect + github.com/DataDog/agent-payload/v5 v5.0.175 // indirect github.com/DataDog/datadog-agent/comp/api/api/def v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/config v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/flare/builder v0.73.0-rc.5 // indirect diff --git a/comp/otelcol/collector-contrib/impl/go.sum b/comp/otelcol/collector-contrib/impl/go.sum index 8c7267eec67d84..66721b50cba226 100644 --- a/comp/otelcol/collector-contrib/impl/go.sum +++ b/comp/otelcol/collector-contrib/impl/go.sum @@ -31,8 +31,8 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Code-Hex/go-generics-cache v1.5.1 h1:6vhZGc5M7Y/YD8cIUcY8kcuQLB4cHR7U+0KMqAA0KcU= github.com/Code-Hex/go-generics-cache v1.5.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/datadog-api-client-go/v2 v2.47.0 h1:bhPu0F6BGUGBaDw4h576asJcffFatYufy8w3/39prqA= github.com/DataDog/datadog-api-client-go/v2 v2.47.0/go.mod h1:d3tOEgUd2kfsr9uuHQdY+nXrWp4uikgTgVCPdKNK30U= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= diff --git a/comp/otelcol/ddflareextension/impl/go.mod b/comp/otelcol/ddflareextension/impl/go.mod index 4cca7effb2946e..77d07d8d51883e 100644 --- a/comp/otelcol/ddflareextension/impl/go.mod +++ b/comp/otelcol/ddflareextension/impl/go.mod @@ -72,7 +72,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect github.com/Code-Hex/go-generics-cache v1.5.1 // indirect - github.com/DataDog/agent-payload/v5 v5.0.174 // indirect + github.com/DataDog/agent-payload/v5 v5.0.175 // indirect github.com/DataDog/datadog-agent/comp/api/api/def v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/config v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/flare/builder v0.73.0-rc.5 // indirect diff --git a/comp/otelcol/ddflareextension/impl/go.sum b/comp/otelcol/ddflareextension/impl/go.sum index d75ca8cc08bd58..a5ec81483a3291 100644 --- a/comp/otelcol/ddflareextension/impl/go.sum +++ b/comp/otelcol/ddflareextension/impl/go.sum @@ -36,8 +36,8 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Code-Hex/go-generics-cache v1.5.1 h1:6vhZGc5M7Y/YD8cIUcY8kcuQLB4cHR7U+0KMqAA0KcU= github.com/Code-Hex/go-generics-cache v1.5.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/datadog-api-client-go/v2 v2.47.0 h1:bhPu0F6BGUGBaDw4h576asJcffFatYufy8w3/39prqA= github.com/DataDog/datadog-api-client-go/v2 v2.47.0/go.mod h1:d3tOEgUd2kfsr9uuHQdY+nXrWp4uikgTgVCPdKNK30U= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= diff --git a/comp/otelcol/logsagentpipeline/go.mod b/comp/otelcol/logsagentpipeline/go.mod index 665fe0b7dba62b..639fa59c1d4a5e 100644 --- a/comp/otelcol/logsagentpipeline/go.mod +++ b/comp/otelcol/logsagentpipeline/go.mod @@ -5,7 +5,7 @@ go 1.24.0 require github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.73.0-rc.5 require ( - github.com/DataDog/agent-payload/v5 v5.0.174 // indirect + github.com/DataDog/agent-payload/v5 v5.0.175 // indirect github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/secrets/def v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/telemetry v0.73.0-rc.5 // indirect diff --git a/comp/otelcol/logsagentpipeline/go.sum b/comp/otelcol/logsagentpipeline/go.sum index 7cf42f0632de4a..9bb4ba53e8be86 100644 --- a/comp/otelcol/logsagentpipeline/go.sum +++ b/comp/otelcol/logsagentpipeline/go.sum @@ -1,6 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/viper v1.14.1-0.20251008075154-b33ffa9792d9 h1:uX4ZqokylxBI67r+AN09CiFY+s8Frmf33YZlyqIMBc4= github.com/DataDog/viper v1.14.1-0.20251008075154-b33ffa9792d9/go.mod h1:QGomve/3EbYfi58jADS97U2OKfsxqh2pWemuT0azbdk= github.com/DataDog/zstd v1.5.7 h1:ybO8RBeh29qrxIhCA9E8gKY6xfONU9T6G6aP9DTKfLE= diff --git a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod index 155fd8ff503fb7..f43864324c14d7 100644 --- a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod +++ b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod @@ -30,7 +30,7 @@ require ( ) require ( - github.com/DataDog/agent-payload/v5 v5.0.174 // indirect + github.com/DataDog/agent-payload/v5 v5.0.175 // indirect github.com/DataDog/datadog-agent/comp/api/api/def v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/flare/builder v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/flare/types v0.73.0-rc.5 // indirect diff --git a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum index b4f9cdc5e9c753..6ff4dc85e9dbcd 100644 --- a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum +++ b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum @@ -1,6 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/viper v1.14.1-0.20251008075154-b33ffa9792d9 h1:uX4ZqokylxBI67r+AN09CiFY+s8Frmf33YZlyqIMBc4= github.com/DataDog/viper v1.14.1-0.20251008075154-b33ffa9792d9/go.mod h1:QGomve/3EbYfi58jADS97U2OKfsxqh2pWemuT0azbdk= github.com/DataDog/zstd v1.5.7 h1:ybO8RBeh29qrxIhCA9E8gKY6xfONU9T6G6aP9DTKfLE= diff --git a/comp/otelcol/otlp/components/connector/datadogconnector/go.mod b/comp/otelcol/otlp/components/connector/datadogconnector/go.mod index b7ff3ace76683f..4874f27aea02c4 100644 --- a/comp/otelcol/otlp/components/connector/datadogconnector/go.mod +++ b/comp/otelcol/otlp/components/connector/datadogconnector/go.mod @@ -51,7 +51,7 @@ require ( ) require ( - github.com/DataDog/agent-payload/v5 v5.0.174 // indirect + github.com/DataDog/agent-payload/v5 v5.0.175 // indirect github.com/DataDog/datadog-agent/comp/api/api/def v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/config v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/flare/builder v0.73.0-rc.5 // indirect diff --git a/comp/otelcol/otlp/components/connector/datadogconnector/go.sum b/comp/otelcol/otlp/components/connector/datadogconnector/go.sum index 9c054eb4766e84..171234ef888627 100644 --- a/comp/otelcol/otlp/components/connector/datadogconnector/go.sum +++ b/comp/otelcol/otlp/components/connector/datadogconnector/go.sum @@ -1,6 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/datadog-api-client-go/v2 v2.47.0 h1:bhPu0F6BGUGBaDw4h576asJcffFatYufy8w3/39prqA= github.com/DataDog/datadog-api-client-go/v2 v2.47.0/go.mod h1:d3tOEgUd2kfsr9uuHQdY+nXrWp4uikgTgVCPdKNK30U= github.com/DataDog/datadog-go/v5 v5.8.1 h1:+GOES5W9zpKlhwHptZVW2C0NLVf7ilr7pHkDcbNvpIc= diff --git a/comp/otelcol/otlp/components/exporter/datadogexporter/go.mod b/comp/otelcol/otlp/components/exporter/datadogexporter/go.mod index 01364c07f9a2fa..eb937e0985d9ab 100644 --- a/comp/otelcol/otlp/components/exporter/datadogexporter/go.mod +++ b/comp/otelcol/otlp/components/exporter/datadogexporter/go.mod @@ -42,7 +42,7 @@ require ( require go.yaml.in/yaml/v2 v2.4.3 // indirect require ( - github.com/DataDog/agent-payload/v5 v5.0.174 // indirect + github.com/DataDog/agent-payload/v5 v5.0.175 // indirect github.com/DataDog/datadog-agent/comp/api/api/def v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/config v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/flare/builder v0.73.0-rc.5 // indirect diff --git a/comp/otelcol/otlp/components/exporter/datadogexporter/go.sum b/comp/otelcol/otlp/components/exporter/datadogexporter/go.sum index a13869321566d9..74c2e8d9c4f9ac 100644 --- a/comp/otelcol/otlp/components/exporter/datadogexporter/go.sum +++ b/comp/otelcol/otlp/components/exporter/datadogexporter/go.sum @@ -1,6 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/datadog-api-client-go/v2 v2.47.0 h1:bhPu0F6BGUGBaDw4h576asJcffFatYufy8w3/39prqA= github.com/DataDog/datadog-api-client-go/v2 v2.47.0/go.mod h1:d3tOEgUd2kfsr9uuHQdY+nXrWp4uikgTgVCPdKNK30U= github.com/DataDog/datadog-go/v5 v5.8.1 h1:+GOES5W9zpKlhwHptZVW2C0NLVf7ilr7pHkDcbNvpIc= diff --git a/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod b/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod index f58d74ef4b3a77..15f398bd47e035 100644 --- a/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod +++ b/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod @@ -52,7 +52,7 @@ require ( require go.yaml.in/yaml/v2 v2.4.3 // indirect require ( - github.com/DataDog/agent-payload/v5 v5.0.174 // indirect + github.com/DataDog/agent-payload/v5 v5.0.175 // indirect github.com/DataDog/datadog-agent/comp/api/api/def v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/flare/builder v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/flare/types v0.73.0-rc.5 // indirect diff --git a/comp/otelcol/otlp/components/exporter/serializerexporter/go.sum b/comp/otelcol/otlp/components/exporter/serializerexporter/go.sum index ae15f09e272418..6150bf6e30238c 100644 --- a/comp/otelcol/otlp/components/exporter/serializerexporter/go.sum +++ b/comp/otelcol/otlp/components/exporter/serializerexporter/go.sum @@ -1,6 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 h1:EbzDX8HPk5uE2FsJYxD74QmMw0/3CqSKhEr6teh0ncQ= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49/go.mod h1:SvsjzyJlSg0rKsqYgdcFxeEVflx3ZNAyFfkUHP0TxXg= github.com/DataDog/sketches-go v1.4.7 h1:eHs5/0i2Sdf20Zkj0udVFWuCrXGRFig2Dcfm5rtcTxc= diff --git a/go.mod b/go.mod index 3bf808ccf57482..16dd79fb9cd513 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( code.cloudfoundry.org/lager v2.0.0+incompatible github.com/CycloneDX/cyclonedx-go v0.9.2 github.com/DATA-DOG/go-sqlmock v1.5.2 - github.com/DataDog/agent-payload/v5 v5.0.174 + github.com/DataDog/agent-payload/v5 v5.0.175 github.com/DataDog/appsec-internal-go v1.14.0 github.com/DataDog/datadog-agent/comp/api/api/def v0.73.0-rc.5 github.com/DataDog/datadog-agent/comp/core/agenttelemetry/def v0.73.0-rc.5 diff --git a/go.sum b/go.sum index 3549c65c6f08f4..bafe412a3d98e2 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,8 @@ github.com/CycloneDX/cyclonedx-go v0.9.2 h1:688QHn2X/5nRezKe2ueIVCt+NRqf7fl3AVQk github.com/CycloneDX/cyclonedx-go v0.9.2/go.mod h1:vcK6pKgO1WanCdd61qx4bFnSsDJQ6SbM2ZuMIgq86Jg= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/appsec-internal-go v1.14.0 h1:MIEZ015kdpeSZSFYBQteSmg8f7zkQTWbMDHbSL9zBx8= github.com/DataDog/appsec-internal-go v1.14.0/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/aptly v1.5.3 h1:oLsRvjuXSVM4ia0N83dU3KiQeiJ6BaszYbTZOkSfDlw= diff --git a/pkg/collector/corechecks/sbom/processor.go b/pkg/collector/corechecks/sbom/processor.go index cf7aefef055907..58d8d374645f2b 100644 --- a/pkg/collector/corechecks/sbom/processor.go +++ b/pkg/collector/corechecks/sbom/processor.go @@ -36,6 +36,7 @@ import ( model "github.com/DataDog/agent-payload/v5/sbom" + gopsutil "github.com/shirou/gopsutil/v4/host" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" ) @@ -228,6 +229,13 @@ func (p *processor) unregisterContainer(ctr *workloadmeta.Container) { func (p *processor) processHostScanResult(result sbom.ScanResult) { log.Debugf("processing host scanresult: %v", result) + + info, err := gopsutil.Info() + if err != nil { + log.Warnf("Failed to get host info: %v", err) + info = &gopsutil.InfoStat{} + } + sbom := &model.SBOMEntity{ Status: model.SBOMStatus_SUCCESS, Type: model.SBOMSourceType_HOST_FILE_SYSTEM, @@ -235,6 +243,8 @@ func (p *processor) processHostScanResult(result sbom.ScanResult) { InUse: true, GeneratedAt: timestamppb.New(result.CreatedAt), GenerationDuration: bomconvert.ConvertDuration(result.Duration), + CpuArchitecture: info.KernelArch, + KernelVersion: info.KernelVersion, } if result.Error != nil { @@ -288,6 +298,13 @@ func (p *processor) triggerProcfsScan(ctr *workloadmeta.Container) { func (p *processor) processProcfsScanResult(result sbom.ScanResult) { log.Debugf("processing procfs scanresult: %v", result) + + info, err := gopsutil.Info() + if err != nil { + log.Warnf("Failed to get host info: %v", err) + info = &gopsutil.InfoStat{} + } + sbom := &model.SBOMEntity{ Status: model.SBOMStatus_SUCCESS, Id: result.RequestID, @@ -295,6 +312,8 @@ func (p *processor) processProcfsScanResult(result sbom.ScanResult) { InUse: true, GeneratedAt: timestamppb.New(result.CreatedAt), GenerationDuration: bomconvert.ConvertDuration(result.Duration), + CpuArchitecture: info.KernelArch, + KernelVersion: info.KernelVersion, } if result.Error != nil { diff --git a/pkg/logs/pipeline/go.mod b/pkg/logs/pipeline/go.mod index 661bb908731e11..821593fa84bb0d 100644 --- a/pkg/logs/pipeline/go.mod +++ b/pkg/logs/pipeline/go.mod @@ -24,7 +24,7 @@ require ( ) require ( - github.com/DataDog/agent-payload/v5 v5.0.174 // indirect + github.com/DataDog/agent-payload/v5 v5.0.175 // indirect github.com/DataDog/datadog-agent/comp/api/api/def v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/config v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/flare/builder v0.73.0-rc.5 // indirect diff --git a/pkg/logs/pipeline/go.sum b/pkg/logs/pipeline/go.sum index b4f9cdc5e9c753..6ff4dc85e9dbcd 100644 --- a/pkg/logs/pipeline/go.sum +++ b/pkg/logs/pipeline/go.sum @@ -1,6 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/viper v1.14.1-0.20251008075154-b33ffa9792d9 h1:uX4ZqokylxBI67r+AN09CiFY+s8Frmf33YZlyqIMBc4= github.com/DataDog/viper v1.14.1-0.20251008075154-b33ffa9792d9/go.mod h1:QGomve/3EbYfi58jADS97U2OKfsxqh2pWemuT0azbdk= github.com/DataDog/zstd v1.5.7 h1:ybO8RBeh29qrxIhCA9E8gKY6xfONU9T6G6aP9DTKfLE= diff --git a/pkg/logs/processor/go.mod b/pkg/logs/processor/go.mod index 6c9992f06b275c..94166d8ade9e2c 100644 --- a/pkg/logs/processor/go.mod +++ b/pkg/logs/processor/go.mod @@ -3,7 +3,7 @@ module github.com/DataDog/datadog-agent/pkg/logs/processor go 1.24.0 require ( - github.com/DataDog/agent-payload/v5 v5.0.174 + github.com/DataDog/agent-payload/v5 v5.0.175 github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.73.0-rc.5 github.com/DataDog/datadog-agent/comp/logs/agent/config v0.73.0-rc.5 github.com/DataDog/datadog-agent/pkg/config/model v0.73.0-rc.5 diff --git a/pkg/logs/processor/go.sum b/pkg/logs/processor/go.sum index 72a1e472e02607..9ff69a24ebb803 100644 --- a/pkg/logs/processor/go.sum +++ b/pkg/logs/processor/go.sum @@ -1,6 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/viper v1.14.1-0.20251008075154-b33ffa9792d9 h1:uX4ZqokylxBI67r+AN09CiFY+s8Frmf33YZlyqIMBc4= github.com/DataDog/viper v1.14.1-0.20251008075154-b33ffa9792d9/go.mod h1:QGomve/3EbYfi58jADS97U2OKfsxqh2pWemuT0azbdk= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= diff --git a/pkg/process/util/api/go.mod b/pkg/process/util/api/go.mod index 352f7ad596f2a9..83ab34293382cc 100644 --- a/pkg/process/util/api/go.mod +++ b/pkg/process/util/api/go.mod @@ -3,7 +3,7 @@ module github.com/DataDog/datadog-agent/pkg/process/util/api go 1.24.0 require ( - github.com/DataDog/agent-payload/v5 v5.0.174 + github.com/DataDog/agent-payload/v5 v5.0.175 github.com/DataDog/datadog-agent/pkg/config/utils v0.73.0-rc.5 github.com/DataDog/datadog-agent/pkg/telemetry v0.73.0-rc.5 github.com/gogo/protobuf v1.3.2 diff --git a/pkg/process/util/api/go.sum b/pkg/process/util/api/go.sum index 96bf92386ead84..080bb63c343dff 100644 --- a/pkg/process/util/api/go.sum +++ b/pkg/process/util/api/go.sum @@ -1,6 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 h1:EbzDX8HPk5uE2FsJYxD74QmMw0/3CqSKhEr6teh0ncQ= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49/go.mod h1:SvsjzyJlSg0rKsqYgdcFxeEVflx3ZNAyFfkUHP0TxXg= github.com/DataDog/viper v1.14.1-0.20251008075154-b33ffa9792d9 h1:uX4ZqokylxBI67r+AN09CiFY+s8Frmf33YZlyqIMBc4= diff --git a/pkg/serializer/go.mod b/pkg/serializer/go.mod index 47a99535dd992e..3a301f5b5ab5e8 100644 --- a/pkg/serializer/go.mod +++ b/pkg/serializer/go.mod @@ -3,7 +3,7 @@ module github.com/DataDog/datadog-agent/pkg/serializer go 1.24.0 require ( - github.com/DataDog/agent-payload/v5 v5.0.174 + github.com/DataDog/agent-payload/v5 v5.0.175 github.com/DataDog/datadog-agent/comp/core/config v0.73.0-rc.5 github.com/DataDog/datadog-agent/comp/core/log/def v0.73.0-rc.5 github.com/DataDog/datadog-agent/comp/core/log/mock v0.73.0-rc.5 diff --git a/pkg/serializer/go.sum b/pkg/serializer/go.sum index 41f95e74f79ca8..f22a57c29379d7 100644 --- a/pkg/serializer/go.sum +++ b/pkg/serializer/go.sum @@ -1,6 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 h1:EbzDX8HPk5uE2FsJYxD74QmMw0/3CqSKhEr6teh0ncQ= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49/go.mod h1:SvsjzyJlSg0rKsqYgdcFxeEVflx3ZNAyFfkUHP0TxXg= github.com/DataDog/sketches-go v1.4.7 h1:eHs5/0i2Sdf20Zkj0udVFWuCrXGRFig2Dcfm5rtcTxc= diff --git a/test/fakeintake/go.mod b/test/fakeintake/go.mod index ef9d6f858d2484..428bf2373cd6da 100644 --- a/test/fakeintake/go.mod +++ b/test/fakeintake/go.mod @@ -5,7 +5,7 @@ go 1.24.0 // every datadog-agent module replaced in the fakeintake go.mod needs to be copied in the Dockerfile require ( - github.com/DataDog/agent-payload/v5 v5.0.174 + github.com/DataDog/agent-payload/v5 v5.0.175 github.com/DataDog/datadog-agent/comp/netflow/payload v0.73.0-rc.5 github.com/DataDog/datadog-agent/pkg/metrics v0.73.0-rc.5 github.com/DataDog/datadog-agent/pkg/networkpath/payload v0.73.0-rc.5 diff --git a/test/fakeintake/go.sum b/test/fakeintake/go.sum index 1442f71b294676..f170662044c38a 100644 --- a/test/fakeintake/go.sum +++ b/test/fakeintake/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 h1:EbzDX8HPk5uE2FsJYxD74QmMw0/3CqSKhEr6teh0ncQ= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49/go.mod h1:SvsjzyJlSg0rKsqYgdcFxeEVflx3ZNAyFfkUHP0TxXg= github.com/DataDog/zstd v1.5.7 h1:ybO8RBeh29qrxIhCA9E8gKY6xfONU9T6G6aP9DTKfLE= diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index 41024dc91a67c7..c1b65fb6d4ff6a 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -7,7 +7,7 @@ go 1.24.9 // TODO: Implement hard check in CI require ( - github.com/DataDog/agent-payload/v5 v5.0.174 + github.com/DataDog/agent-payload/v5 v5.0.175 github.com/DataDog/datadog-agent/pkg/util/option v0.73.0-rc.5 github.com/DataDog/datadog-agent/pkg/util/pointer v0.73.0-rc.5 github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 diff --git a/test/new-e2e/go.sum b/test/new-e2e/go.sum index 10af79ad03a795..f1687fe4e3b6bb 100644 --- a/test/new-e2e/go.sum +++ b/test/new-e2e/go.sum @@ -4,8 +4,8 @@ github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEK github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs= github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/appsec-internal-go v1.14.0 h1:MIEZ015kdpeSZSFYBQteSmg8f7zkQTWbMDHbSL9zBx8= github.com/DataDog/appsec-internal-go v1.14.0/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-api-client-go v1.16.0 h1:5jOZv1m98criCvYTa3qpW8Hzv301nbZX3K9yJtwGyWY= diff --git a/test/otel/go.mod b/test/otel/go.mod index 59275db01e7774..4b59904e308801 100644 --- a/test/otel/go.mod +++ b/test/otel/go.mod @@ -71,7 +71,7 @@ require ( ) require ( - github.com/DataDog/agent-payload/v5 v5.0.174 // indirect + github.com/DataDog/agent-payload/v5 v5.0.175 // indirect github.com/DataDog/datadog-agent/comp/core/flare/builder v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/flare/types v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/comp/core/secrets/def v0.73.0-rc.5 // indirect diff --git a/test/otel/go.sum b/test/otel/go.sum index 715eb5d71d36ab..628db1467c6fd1 100644 --- a/test/otel/go.sum +++ b/test/otel/go.sum @@ -1,6 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/agent-payload/v5 v5.0.174 h1:QKqVOph6VM5jAXDgPeb/7QH3b4cZZNYOhFpDE5FgtEY= -github.com/DataDog/agent-payload/v5 v5.0.174/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= +github.com/DataDog/agent-payload/v5 v5.0.175 h1:iyzhnBKD8tTFCmOyA6Gllja2irXy+d+wEMvwDd5m4uc= +github.com/DataDog/agent-payload/v5 v5.0.175/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= github.com/DataDog/datadog-api-client-go/v2 v2.47.0 h1:bhPu0F6BGUGBaDw4h576asJcffFatYufy8w3/39prqA= github.com/DataDog/datadog-api-client-go/v2 v2.47.0/go.mod h1:d3tOEgUd2kfsr9uuHQdY+nXrWp4uikgTgVCPdKNK30U= github.com/DataDog/datadog-go/v5 v5.8.1 h1:+GOES5W9zpKlhwHptZVW2C0NLVf7ilr7pHkDcbNvpIc=