Skip to content

[SBOM] Add running kernel information to metadata (#42845) #42959

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 13, 2025
Merged

[SBOM] Add running kernel information to metadata (#42845) #42959

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc75d25
[SBOM] Add running kernel information to metadata (#42845)
lebauce Nov 11, 2025
a6dbda1
Merge branch '7.73.x' into backport-42845-to-7.73.x
kacper-murzyn Nov 13, 2025
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
2 changes: 1 addition & 1 deletion comp/otelcol/collector-contrib/impl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions comp/otelcol/collector-contrib/impl/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/ddflareextension/impl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions comp/otelcol/ddflareextension/impl/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/logsagentpipeline/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions comp/otelcol/logsagentpipeline/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/otlp/components/connector/datadogconnector/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions comp/otelcol/otlp/components/connector/datadogconnector/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/otlp/components/exporter/datadogexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions comp/otelcol/otlp/components/exporter/datadogexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comp/otelcol/otlp/components/exporter/serializerexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions comp/otelcol/otlp/components/exporter/serializerexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions pkg/collector/corechecks/sbom/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -228,13 +229,22 @@ 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,
Id: p.hostname,
InUse: true,
GeneratedAt: timestamppb.New(result.CreatedAt),
GenerationDuration: bomconvert.ConvertDuration(result.Duration),
CpuArchitecture: info.KernelArch,
KernelVersion: info.KernelVersion,
}

if result.Error != nil {
Expand Down Expand Up @@ -288,13 +298,22 @@ 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,
Type: model.SBOMSourceType_CONTAINER_FILE_SYSTEM,
InUse: true,
GeneratedAt: timestamppb.New(result.CreatedAt),
GenerationDuration: bomconvert.ConvertDuration(result.Duration),
CpuArchitecture: info.KernelArch,
KernelVersion: info.KernelVersion,
}

if result.Error != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/logs/pipeline/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/logs/pipeline/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/logs/processor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/logs/processor/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/process/util/api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/process/util/api/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/serializer/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/serializer/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/fakeintake/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/fakeintake/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/new-e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/new-e2e/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading