diff --git a/.gitlab/common/test_infra_version.yml b/.gitlab/common/test_infra_version.yml index 17227bc9dcbef..65cc3ab566ee4 100644 --- a/.gitlab/common/test_infra_version.yml +++ b/.gitlab/common/test_infra_version.yml @@ -4,4 +4,4 @@ variables: # and check the job creating the image to make sure you have the right SHA prefix TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: "" # Make sure to update test-infra-definitions version in go.mod as well - TEST_INFRA_DEFINITIONS_BUILDIMAGES: 98a37ef8c8a9 + TEST_INFRA_DEFINITIONS_BUILDIMAGES: 5942f13180e5 diff --git a/cmd/agent/common/path/go.mod b/cmd/agent/common/path/go.mod index 21055fbfc2b90..80f1ae0214de1 100644 --- a/cmd/agent/common/path/go.mod +++ b/cmd/agent/common/path/go.mod @@ -10,14 +10,14 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 golang.org/x/sys v0.19.0 ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect diff --git a/cmd/cluster-agent/subcommands/start/command.go b/cmd/cluster-agent/subcommands/start/command.go index ec3082fde73c0..3077b35ad2c63 100644 --- a/cmd/cluster-agent/subcommands/start/command.go +++ b/cmd/cluster-agent/subcommands/start/command.go @@ -72,7 +72,6 @@ import ( rcclient "github.com/DataDog/datadog-agent/pkg/config/remote/client" commonsettings "github.com/DataDog/datadog-agent/pkg/config/settings" hostnameStatus "github.com/DataDog/datadog-agent/pkg/status/clusteragent/hostname" - collectorStatus "github.com/DataDog/datadog-agent/pkg/status/collector" endpointsStatus "github.com/DataDog/datadog-agent/pkg/status/endpoints" "github.com/DataDog/datadog-agent/pkg/status/health" "github.com/DataDog/datadog-agent/pkg/util" @@ -158,7 +157,6 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command { status.Params{ PythonVersionGetFunc: python.GetPythonVersion, }, - status.NewInformationProvider(collectorStatus.Provider{}), status.NewInformationProvider(leaderelection.Provider{}), status.NewInformationProvider(clusteragentMetricsStatus.Provider{}), status.NewInformationProvider(admissionpkg.Provider{}), diff --git a/cmd/trace-agent/test/testsuite/traces_test.go b/cmd/trace-agent/test/testsuite/traces_test.go index fb3afd422d137..1404d6b558b12 100644 --- a/cmd/trace-agent/test/testsuite/traces_test.go +++ b/cmd/trace-agent/test/testsuite/traces_test.go @@ -183,6 +183,24 @@ func TestTraces(t *testing.T) { } }) }) + + t.Run("probabilistic", func(t *testing.T) { + if err := r.RunAgent([]byte("apm_config:\r\n probabilistic_sampler:\r\n enabled: true\r\n sampling_percentage: 100\r\n")); err != nil { + t.Fatal(err) + } + defer r.KillAgent() + + p := testutil.GeneratePayload(10, &testutil.TraceConfig{ + MinSpans: 10, + Keep: true, + }, nil) + if err := r.Post(p); err != nil { + t.Fatal(err) + } + waitForTrace(t, &r, func(v *pb.AgentPayload) { + payloadsEqual(t, p, v) + }) + }) } // payloadsEqual validates that the traces in from are the same as the ones in to. diff --git a/comp/core/config/go.mod b/comp/core/config/go.mod index 82635108cef76..5aa2b785d6cb6 100644 --- a/comp/core/config/go.mod +++ b/comp/core/config/go.mod @@ -28,33 +28,33 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/cmd/agent/common/path v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 - github.com/DataDog/viper v1.13.2 + github.com/DataDog/datadog-agent/cmd/agent/common/path v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 + github.com/DataDog/viper v1.13.0 github.com/stretchr/testify v1.9.0 go.uber.org/fx v1.18.2 ) require ( - github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/comp/core/config/go.sum b/comp/core/config/go.sum index 4293b8f647237..7d82998d3c2a2 100644 --- a/comp/core/config/go.sum +++ b/comp/core/config/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/comp/core/hostname/hostnameinterface/go.mod b/comp/core/hostname/hostnameinterface/go.mod index e48908461d90b..1b03f6b99f467 100644 --- a/comp/core/hostname/hostnameinterface/go.mod +++ b/comp/core/hostname/hostnameinterface/go.mod @@ -8,13 +8,13 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 go.uber.org/fx v1.18.2 ) require ( - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect diff --git a/comp/core/log/go.mod b/comp/core/log/go.mod index 03ef993391ab1..a86b497e965bc 100644 --- a/comp/core/log/go.mod +++ b/comp/core/log/go.mod @@ -34,40 +34,40 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/logs v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/trace v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/logs v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/trace v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // v2.6 github.com/stretchr/testify v1.9.0 go.uber.org/fx v1.18.2 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect github.com/DataDog/datadog-go/v5 v5.5.0 // indirect github.com/DataDog/go-sqllexer v0.0.9 // indirect github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/comp/core/log/go.sum b/comp/core/log/go.sum index 718cbd0501e7f..310ef3f4ee9f0 100644 --- a/comp/core/log/go.sum +++ b/comp/core/log/go.sum @@ -9,8 +9,8 @@ github.com/DataDog/go-tuf v1.1.0-0.5.2 h1:4CagiIekonLSfL8GMHRHcHudo1fQnxELS9g4ti github.com/DataDog/go-tuf v1.1.0-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0 h1:10TPqpTlIkmDPFWVIEZ4ZX3rWrCrx3rEoeoAooZr6LM= github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0/go.mod h1:dvIWN9pA2zWNTw5rhDWZgzZnhcfpH++d+8d1SWW6xkY= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= diff --git a/comp/core/secrets/go.mod b/comp/core/secrets/go.mod index f4ac68eb406bd..3ebc828327e4f 100644 --- a/comp/core/secrets/go.mod +++ b/comp/core/secrets/go.mod @@ -15,12 +15,12 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 github.com/benbjohnson/clock v1.3.0 github.com/stretchr/testify v1.9.0 go.uber.org/fx v1.18.2 @@ -30,8 +30,8 @@ require ( ) require ( - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect diff --git a/comp/core/status/statusimpl/go.mod b/comp/core/status/statusimpl/go.mod index 8a85173a4910a..d1ccc4d66f80c 100644 --- a/comp/core/status/statusimpl/go.mod +++ b/comp/core/status/statusimpl/go.mod @@ -32,35 +32,35 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/status v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/flavor v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/status v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/flavor v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 go.uber.org/fx v1.18.2 golang.org/x/text v0.14.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/comp/core/status/statusimpl/go.sum b/comp/core/status/statusimpl/go.sum index 30d68fe491302..ba085300a670a 100644 --- a/comp/core/status/statusimpl/go.sum +++ b/comp/core/status/statusimpl/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/comp/core/telemetry/go.mod b/comp/core/telemetry/go.mod index 95a9eb9071465..7aaa558093544 100644 --- a/comp/core/telemetry/go.mod +++ b/comp/core/telemetry/go.mod @@ -8,7 +8,7 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 github.com/prometheus/client_golang v1.17.0 github.com/prometheus/client_model v0.5.0 github.com/stretchr/testify v1.9.0 @@ -19,7 +19,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/comp/forwarder/defaultforwarder/go.mod b/comp/forwarder/defaultforwarder/go.mod index f0cbdb1d4fac0..53382087e0c48 100644 --- a/comp/forwarder/defaultforwarder/go.mod +++ b/comp/forwarder/defaultforwarder/go.mod @@ -45,22 +45,22 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/status v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/common v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/status v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/common v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 github.com/golang/protobuf v1.5.3 github.com/hashicorp/go-multierror v1.1.1 github.com/stretchr/testify v1.9.0 @@ -70,21 +70,21 @@ require ( ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/logs v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/logs v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/comp/forwarder/defaultforwarder/go.sum b/comp/forwarder/defaultforwarder/go.sum index f9cba0816d1e2..83e8c2ec8a6e1 100644 --- a/comp/forwarder/defaultforwarder/go.sum +++ b/comp/forwarder/defaultforwarder/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/comp/forwarder/orchestrator/orchestratorinterface/go.mod b/comp/forwarder/orchestrator/orchestratorinterface/go.mod index 21c1ac265e348..ef4851790d674 100644 --- a/comp/forwarder/orchestrator/orchestratorinterface/go.mod +++ b/comp/forwarder/orchestrator/orchestratorinterface/go.mod @@ -47,7 +47,7 @@ replace ( ) -require github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder v0.54.0-rc.1 +require github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder v0.54.0-rc.2 // Internal deps fix version replace ( @@ -58,36 +58,36 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/status v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/common v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/status v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/common v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/comp/forwarder/orchestrator/orchestratorinterface/go.sum b/comp/forwarder/orchestrator/orchestratorinterface/go.sum index 3530b880dc303..236491acccda1 100644 --- a/comp/forwarder/orchestrator/orchestratorinterface/go.sum +++ b/comp/forwarder/orchestrator/orchestratorinterface/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/cast v1.3.1-0.20190301154711-1ee8c8bd14a3 h1:SobA9WYm4K/MUtWlbKaomWTmnuYp1KhIm8Wlx3vmpsg= github.com/DataDog/cast v1.3.1-0.20190301154711-1ee8c8bd14a3/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/comp/logs/agent/config/go.mod b/comp/logs/agent/config/go.mod index 9a14b3f5eed25..78075c84d1c95 100644 --- a/comp/logs/agent/config/go.mod +++ b/comp/logs/agent/config/go.mod @@ -31,32 +31,32 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 - github.com/DataDog/viper v1.13.2 + github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 + github.com/DataDog/viper v1.13.0 github.com/stretchr/testify v1.9.0 go.uber.org/fx v1.18.2 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/comp/logs/agent/config/go.sum b/comp/logs/agent/config/go.sum index acbfae7ceb13a..3c6d295d28ffa 100644 --- a/comp/logs/agent/config/go.sum +++ b/comp/logs/agent/config/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/comp/otelcol/collector-contrib/impl/go.mod b/comp/otelcol/collector-contrib/impl/go.mod index 9ee8c4b871203..440ee65a8a788 100644 --- a/comp/otelcol/collector-contrib/impl/go.mod +++ b/comp/otelcol/collector-contrib/impl/go.mod @@ -5,7 +5,7 @@ go 1.21.0 replace github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/def => ../def require ( - github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/def v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/def v0.54.0-rc.2 github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.98.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.98.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.98.0 diff --git a/comp/otelcol/logsagentpipeline/go.mod b/comp/otelcol/logsagentpipeline/go.mod index 8f0126f706e92..a6879a900e44b 100644 --- a/comp/otelcol/logsagentpipeline/go.mod +++ b/comp/otelcol/logsagentpipeline/go.mod @@ -52,51 +52,51 @@ replace ( github.com/DataDog/datadog-agent/pkg/version => ../../../pkg/version ) -require github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.54.0-rc.1 +require github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.54.0-rc.2 require ( github.com/DataDog/agent-payload/v5 v5.0.106 // indirect - github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/auditor v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/client v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/processor v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sds v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sender v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/startstop v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/auditor v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/client v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/processor v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sds v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sender v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/startstop v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect diff --git a/comp/otelcol/logsagentpipeline/go.sum b/comp/otelcol/logsagentpipeline/go.sum index e86ad8528268e..662b88c41f115 100644 --- a/comp/otelcol/logsagentpipeline/go.sum +++ b/comp/otelcol/logsagentpipeline/go.sum @@ -43,8 +43,8 @@ github.com/DataDog/agent-payload/v5 v5.0.106 h1:A3dGX+JYoL7OJe2crpxznW7hWxLxhOk/ github.com/DataDog/agent-payload/v5 v5.0.106/go.mod h1:COngtbYYCncpIPiE5D93QlXDH/3VAKk10jDNwGHcMRE= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe h1:efzxujZ7VHWFxjmWjcJyUEpPrN8qdiZPYb+dBw547Wo= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe/go.mod h1:TX7CTOQ3LbQjfAi4SwqUoR5gY1zfUk7VRBDTuArjaDc= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent.go b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent.go index 1f38eaaecdcaf..9ad68b1537cb6 100644 --- a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent.go +++ b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent.go @@ -206,7 +206,6 @@ func (a *Agent) SetupPipeline( // We pass the health handle to the auditor because it's the end of the pipeline and the most // critical part. Arguably it could also be plugged to the destination. auditorTTL := time.Duration(a.config.GetInt("logs_config.auditor_ttl")) * time.Hour - fmt.Println(a.config.GetString("logs_config.run_path")) auditor := auditor.New(a.config.GetString("logs_config.run_path"), auditor.DefaultRegistryFilename, auditorTTL, health) destinationsCtx := client.NewDestinationsContext() diff --git a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod index c520e909b498b..1d2f6bec9de85 100644 --- a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod +++ b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod @@ -54,26 +54,26 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/auditor v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/client v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/startstop v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/testutil v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/auditor v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/client v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/startstop v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/testutil v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 go.uber.org/fx v1.18.2 go.uber.org/zap v1.27.0 @@ -81,33 +81,33 @@ require ( require ( github.com/DataDog/agent-payload/v5 v5.0.106 // indirect - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/logs v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/processor v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sds v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sender v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/logs v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/processor v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sds v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sender v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect diff --git a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum index 10b7b931ebb13..f0bef09ee7d04 100644 --- a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum +++ b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum @@ -43,8 +43,8 @@ github.com/DataDog/agent-payload/v5 v5.0.106 h1:A3dGX+JYoL7OJe2crpxznW7hWxLxhOk/ github.com/DataDog/agent-payload/v5 v5.0.106/go.mod h1:COngtbYYCncpIPiE5D93QlXDH/3VAKk10jDNwGHcMRE= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe h1:efzxujZ7VHWFxjmWjcJyUEpPrN8qdiZPYb+dBw547Wo= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe/go.mod h1:TX7CTOQ3LbQjfAi4SwqUoR5gY1zfUk7VRBDTuArjaDc= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/comp/otelcol/otlp/components/exporter/logsagentexporter/go.mod b/comp/otelcol/otlp/components/exporter/logsagentexporter/go.mod index ceaf707277129..9670f545ea068 100644 --- a/comp/otelcol/otlp/components/exporter/logsagentexporter/go.mod +++ b/comp/otelcol/otlp/components/exporter/logsagentexporter/go.mod @@ -36,11 +36,11 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.14.0 github.com/stormcat24/protodep v0.1.8 @@ -51,26 +51,26 @@ require ( ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.13.0 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect diff --git a/comp/otelcol/otlp/components/exporter/logsagentexporter/go.sum b/comp/otelcol/otlp/components/exporter/logsagentexporter/go.sum index c3f2a255ba892..9a608f7ea77b2 100644 --- a/comp/otelcol/otlp/components/exporter/logsagentexporter/go.sum +++ b/comp/otelcol/otlp/components/exporter/logsagentexporter/go.sum @@ -8,8 +8,8 @@ github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0 h1:10TPq github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0/go.mod h1:dvIWN9pA2zWNTw5rhDWZgzZnhcfpH++d+8d1SWW6xkY= github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.14.0 h1:nma5ZICTbHZ0YoMu18ziWGSLK1ICzMm6rJTv+IatJ0U= github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.14.0/go.mod h1:xUiGj13q5uHPboc0xZ754fyusiF5C2RxNzOFdTbdZFA= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= diff --git a/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod b/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod index 691bd812e9edc..31b1c530946f3 100644 --- a/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod +++ b/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod @@ -56,11 +56,11 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/metrics v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/serializer v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/tagset v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/metrics v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/serializer v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/tagset v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.14.0 github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0 @@ -83,46 +83,46 @@ require ( require ( github.com/DataDog/agent-payload/v5 v5.0.114 // indirect - github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/status v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/forwarder/orchestrator/orchestratorinterface v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/serializer/compression v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/process/util/api v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/tagger/types v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/buf v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/common v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/json v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/sort v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/status v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/forwarder/orchestrator/orchestratorinterface v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/serializer/compression v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/process/util/api v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/tagger/types v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/buf v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/common v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/json v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/sort v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 // indirect github.com/DataDog/sketches-go v1.4.4 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/DataDog/zstd v1.5.5 // indirect github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f // indirect github.com/Microsoft/go-winio v0.6.1 // indirect diff --git a/comp/otelcol/otlp/components/exporter/serializerexporter/go.sum b/comp/otelcol/otlp/components/exporter/serializerexporter/go.sum index 4f8fe0e133ec0..7873c88aadd22 100644 --- a/comp/otelcol/otlp/components/exporter/serializerexporter/go.sum +++ b/comp/otelcol/otlp/components/exporter/serializerexporter/go.sum @@ -14,8 +14,8 @@ github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0 h1:QHx6B/VUx3rZ github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0/go.mod h1:q4c7zbmdnIdSJNZuBsveTk5ZeRkSkS2g6b8zzFF1mE4= github.com/DataDog/sketches-go v1.4.4 h1:dF52vzXRFSPOj2IjXSWLvXq3jubL4CI69kwYjJ1w5Z8= github.com/DataDog/sketches-go v1.4.4/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f h1:5Vuo4niPKFkfwW55jV4vY0ih3VQ9RaQqeqY67fvRn8A= diff --git a/comp/otelcol/otlp/testutil/go.mod b/comp/otelcol/otlp/testutil/go.mod index 6c478167ad0b6..486bfc2aaa95b 100644 --- a/comp/otelcol/otlp/testutil/go.mod +++ b/comp/otelcol/otlp/testutil/go.mod @@ -27,26 +27,26 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 go.opentelemetry.io/collector/pdata v1.4.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect diff --git a/comp/otelcol/otlp/testutil/go.sum b/comp/otelcol/otlp/testutil/go.sum index 8d811823089b0..018bc966e1a8c 100644 --- a/comp/otelcol/otlp/testutil/go.sum +++ b/comp/otelcol/otlp/testutil/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/comp/serializer/compression/go.mod b/comp/serializer/compression/go.mod index 6cef164fbace5..cc89aeb4e5324 100644 --- a/comp/serializer/compression/go.mod +++ b/comp/serializer/compression/go.mod @@ -29,30 +29,30 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/DataDog/zstd v1.5.5 go.uber.org/fx v1.18.2 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/comp/serializer/compression/go.sum b/comp/serializer/compression/go.sum index 6a2f4e42434c3..47d9e832104d0 100644 --- a/comp/serializer/compression/go.sum +++ b/comp/serializer/compression/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= diff --git a/go.mod b/go.mod index 987ba7b9a6d3b..1b75af648ea78 100644 --- a/go.mod +++ b/go.mod @@ -119,15 +119,15 @@ require ( code.cloudfoundry.org/lager v2.0.0+incompatible github.com/CycloneDX/cyclonedx-go v0.8.0 github.com/DataDog/appsec-internal-go v1.4.2 - github.com/DataDog/datadog-agent/pkg/gohai v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/obfuscate v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/security/secl v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/trace v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/gohai v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/obfuscate v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/security/secl v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/trace v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 github.com/DataDog/datadog-go/v5 v5.5.0 // do not update datadog-operator to 1.2.1 because the indirect dependency github.com/DataDog/datadog-api-client-go/v2 v2.15.0 is trigger a huge Go heap memory increase. github.com/DataDog/datadog-operator v1.1.0 @@ -138,7 +138,7 @@ require ( github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.14.0 github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0 github.com/DataDog/sketches-go v1.4.4 - github.com/DataDog/viper v1.13.2 + github.com/DataDog/viper v1.13.0 github.com/DataDog/watermarkpodautoscaler v0.6.1 github.com/DataDog/zstd v1.5.5 github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f // indirect @@ -603,79 +603,79 @@ require github.com/lorenzosaino/go-sysctl v0.3.1 require ( github.com/DATA-DOG/go-sqlmock v1.5.2 github.com/DataDog/agent-payload/v5 v5.0.114 - github.com/DataDog/datadog-agent/cmd/agent/common/path v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/status v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/status/statusimpl v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/forwarder/orchestrator/orchestratorinterface v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/netflow/payload v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/def v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/impl v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/serializerexporter v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/serializer/compression v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/api v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/logs v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/remote v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/errors v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/auditor v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/client v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/processor v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sds v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sender v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/metrics v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/networkdevice/profile v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/process/util/api v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/security/seclwin v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/serializer v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/tagger/types v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/tagset v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/cache v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/common v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/flavor v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/grpc v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/json v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/sort v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/startstop v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/testutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/uuid v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 + github.com/DataDog/datadog-agent/cmd/agent/common/path v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/status v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/status/statusimpl v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/forwarder/orchestrator/orchestratorinterface v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/netflow/payload v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/def v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/otelcol/collector-contrib/impl v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/serializerexporter v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/serializer/compression v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/api v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/logs v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/remote v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/errors v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/auditor v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/client v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/processor v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sds v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sender v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/metrics v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/networkdevice/profile v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/process/util/api v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/security/seclwin v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/serializer v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/tagger/types v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/tagset v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/cache v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/common v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/flavor v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/grpc v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/json v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/sort v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/startstop v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/testutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/uuid v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 github.com/DataDog/go-libddwaf/v2 v2.3.1 github.com/Datadog/dublin-traceroute v0.0.1 github.com/aquasecurity/trivy v0.49.2-0.20240227072422-e1ea02c7b80d @@ -748,11 +748,11 @@ require ( github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect github.com/Code-Hex/go-generics-cache v1.3.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/buf v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/buf v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.24.0 // indirect github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe // indirect github.com/DataDog/go-sqllexer v0.0.9 // indirect diff --git a/go.sum b/go.sum index 2612bfe7db5de..80124863c0c6b 100644 --- a/go.sum +++ b/go.sum @@ -788,8 +788,8 @@ github.com/DataDog/sketches-go v1.4.4 h1:dF52vzXRFSPOj2IjXSWLvXq3jubL4CI69kwYjJ1 github.com/DataDog/sketches-go v1.4.4/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/DataDog/trivy v0.0.0-20240426155824-6c986dae34c1 h1:0iL9+kxw9y4OJeI4pZAwxZ76ah0Sj6AEuv7mh3Vp0N0= github.com/DataDog/trivy v0.0.0-20240426155824-6c986dae34c1/go.mod h1:xmc7xCb5KSg2mFbztyInH8ciotVbad9SOmGFClgD0cU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/DataDog/walker v0.0.0-20230418153152-7f29bb2dc950 h1:2imDajw3V85w1iqHsuXN+hUBZQVF+r9eME8tsPq/HpA= github.com/DataDog/walker v0.0.0-20230418153152-7f29bb2dc950/go.mod h1:FU+7qU8DeQQgSZDmmThMJi93kPkLFgy0oVAcLxurjIk= github.com/DataDog/watermarkpodautoscaler v0.6.1 h1:KEj10Cm8wO/36lEOgqjgDfIMMpMPReY/+bDacWe7Adw= diff --git a/omnibus/config/software/pympler.rb b/omnibus/config/software/pympler.rb index 8dbffa28b690a..367a8d182e059 100644 --- a/omnibus/config/software/pympler.rb +++ b/omnibus/config/software/pympler.rb @@ -14,7 +14,7 @@ dependency 'setuptools3' end -if with_python_runtime? "3" +if with_python_runtime? "2" dependency 'pip2' end diff --git a/pkg/aggregator/ckey/go.mod b/pkg/aggregator/ckey/go.mod index 90df99b0426f3..8be23a7fbd710 100644 --- a/pkg/aggregator/ckey/go.mod +++ b/pkg/aggregator/ckey/go.mod @@ -8,8 +8,8 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/tagset v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/sort v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/tagset v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/sort v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 github.com/twmb/murmur3 v1.1.8 ) diff --git a/pkg/api/go.mod b/pkg/api/go.mod index 7b7a3a7eb4550..38a99b5a5e647 100644 --- a/pkg/api/go.mod +++ b/pkg/api/go.mod @@ -32,31 +32,31 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/api/go.sum b/pkg/api/go.sum index acbfae7ceb13a..3c6d295d28ffa 100644 --- a/pkg/api/go.sum +++ b/pkg/api/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/config/env/go.mod b/pkg/config/env/go.mod index cdf3123f4023e..39816ec63b8e4 100644 --- a/pkg/config/env/go.mod +++ b/pkg/config/env/go.mod @@ -11,16 +11,16 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/config/env/go.sum b/pkg/config/env/go.sum index 83cd2133790db..703cdedbc0204 100644 --- a/pkg/config/env/go.sum +++ b/pkg/config/env/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/config/logs/go.mod b/pkg/config/logs/go.mod index d4901e6d8649b..ba18cd45a0687 100644 --- a/pkg/config/logs/go.mod +++ b/pkg/config/logs/go.mod @@ -9,15 +9,15 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/google/go-cmp v0.6.0 // indirect diff --git a/pkg/config/logs/go.sum b/pkg/config/logs/go.sum index 1c9ac1a5b3c2b..7a44ab76fa08c 100644 --- a/pkg/config/logs/go.sum +++ b/pkg/config/logs/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= diff --git a/pkg/config/model/go.mod b/pkg/config/model/go.mod index 0812e2516bca2..e9fc93be33de7 100644 --- a/pkg/config/model/go.mod +++ b/pkg/config/model/go.mod @@ -9,8 +9,8 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/viper v1.13.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/viper v1.13.0 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 github.com/spf13/afero v1.1.2 github.com/spf13/pflag v1.0.3 @@ -19,7 +19,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.4.7 // indirect diff --git a/pkg/config/model/go.sum b/pkg/config/model/go.sum index 058b1554936f8..d107286e182af 100644 --- a/pkg/config/model/go.sum +++ b/pkg/config/model/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= diff --git a/pkg/config/remote/go.mod b/pkg/config/remote/go.mod index f50e24092e4ef..4f35bfe6f7dfd 100644 --- a/pkg/config/remote/go.mod +++ b/pkg/config/remote/go.mod @@ -20,14 +20,14 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/grpc v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/uuid v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/grpc v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/uuid v0.54.0-rc.2 github.com/Masterminds/semver v1.5.0 github.com/benbjohnson/clock v1.3.0 github.com/pkg/errors v0.9.1 @@ -39,7 +39,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/cache v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/cache v0.54.0-rc.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect @@ -56,9 +56,9 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect github.com/DataDog/go-tuf v1.1.0-0.5.2 - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.4.7 // indirect diff --git a/pkg/config/remote/go.sum b/pkg/config/remote/go.sum index 177d20654c7da..8d46a2302b2ab 100644 --- a/pkg/config/remote/go.sum +++ b/pkg/config/remote/go.sum @@ -46,8 +46,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/go-tuf v1.1.0-0.5.2 h1:4CagiIekonLSfL8GMHRHcHudo1fQnxELS9g4tiAupQ4= github.com/DataDog/go-tuf v1.1.0-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/config/setup/go.mod b/pkg/config/setup/go.mod index 5ac910194d8cd..6b182bfe67990 100644 --- a/pkg/config/setup/go.mod +++ b/pkg/config/setup/go.mod @@ -29,31 +29,31 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 gopkg.in/yaml.v2 v2.4.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/types v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/pkg/config/setup/go.sum b/pkg/config/setup/go.sum index 6b161c563169d..713974dd5ead4 100644 --- a/pkg/config/setup/go.sum +++ b/pkg/config/setup/go.sum @@ -3,8 +3,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/cast v1.3.1-0.20190301154711-1ee8c8bd14a3 h1:SobA9WYm4K/MUtWlbKaomWTmnuYp1KhIm8Wlx3vmpsg= github.com/DataDog/cast v1.3.1-0.20190301154711-1ee8c8bd14a3/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/config/utils/go.mod b/pkg/config/utils/go.mod index d0ed557f51959..48b540854ed99 100644 --- a/pkg/config/utils/go.mod +++ b/pkg/config/utils/go.mod @@ -28,27 +28,27 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/config/utils/go.sum b/pkg/config/utils/go.sum index 9e43ead02587a..0275e78d9551e 100644 --- a/pkg/config/utils/go.sum +++ b/pkg/config/utils/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/gohai/go.mod b/pkg/gohai/go.mod index 61a1e21649d03..bf58f5e9923b5 100644 --- a/pkg/gohai/go.mod +++ b/pkg/gohai/go.mod @@ -5,7 +5,7 @@ module github.com/DataDog/datadog-agent/pkg/gohai go 1.21.0 require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/moby/sys/mountinfo v0.7.1 github.com/shirou/gopsutil/v3 v3.24.1 @@ -14,7 +14,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/kr/pretty v0.3.1 // indirect diff --git a/pkg/logs/auditor/go.mod b/pkg/logs/auditor/go.mod index 0acc65b8fc381..6e57dc0877d4a 100644 --- a/pkg/logs/auditor/go.mod +++ b/pkg/logs/auditor/go.mod @@ -36,34 +36,34 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/logs/auditor/go.sum b/pkg/logs/auditor/go.sum index 9e43ead02587a..0275e78d9551e 100644 --- a/pkg/logs/auditor/go.sum +++ b/pkg/logs/auditor/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/logs/client/go.mod b/pkg/logs/client/go.mod index 238dd594ffda9..1d14536246487 100644 --- a/pkg/logs/client/go.mod +++ b/pkg/logs/client/go.mod @@ -42,43 +42,43 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 golang.org/x/net v0.24.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/pkg/logs/client/go.sum b/pkg/logs/client/go.sum index 103e523084770..6947ba74840fd 100644 --- a/pkg/logs/client/go.sum +++ b/pkg/logs/client/go.sum @@ -39,8 +39,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/logs/diagnostic/go.mod b/pkg/logs/diagnostic/go.mod index cebb7c0caa2cf..e58523f01fec0 100644 --- a/pkg/logs/diagnostic/go.mod +++ b/pkg/logs/diagnostic/go.mod @@ -38,36 +38,36 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/logs/diagnostic/go.sum b/pkg/logs/diagnostic/go.sum index acbfae7ceb13a..3c6d295d28ffa 100644 --- a/pkg/logs/diagnostic/go.sum +++ b/pkg/logs/diagnostic/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/logs/message/go.mod b/pkg/logs/message/go.mod index e48ed46ffa7e8..f9cd680bca9c2 100644 --- a/pkg/logs/message/go.mod +++ b/pkg/logs/message/go.mod @@ -34,32 +34,32 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/logs/message/go.sum b/pkg/logs/message/go.sum index 9e43ead02587a..0275e78d9551e 100644 --- a/pkg/logs/message/go.sum +++ b/pkg/logs/message/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/logs/metrics/go.mod b/pkg/logs/metrics/go.mod index 3713db137b271..0fdee9b2c4c80 100644 --- a/pkg/logs/metrics/go.mod +++ b/pkg/logs/metrics/go.mod @@ -10,14 +10,14 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/logs/pipeline/go.mod b/pkg/logs/pipeline/go.mod index af787d84e4870..17856fd3afd56 100644 --- a/pkg/logs/pipeline/go.mod +++ b/pkg/logs/pipeline/go.mod @@ -50,53 +50,53 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/auditor v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/client v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/processor v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sds v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sender v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/startstop v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/auditor v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/client v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/processor v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sds v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sender v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/startstop v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 go.uber.org/atomic v1.11.0 ) require ( github.com/DataDog/agent-payload/v5 v5.0.106 // indirect - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect diff --git a/pkg/logs/pipeline/go.sum b/pkg/logs/pipeline/go.sum index 3a380da8521d7..211c65a3c8d76 100644 --- a/pkg/logs/pipeline/go.sum +++ b/pkg/logs/pipeline/go.sum @@ -43,8 +43,8 @@ github.com/DataDog/agent-payload/v5 v5.0.106 h1:A3dGX+JYoL7OJe2crpxznW7hWxLxhOk/ github.com/DataDog/agent-payload/v5 v5.0.106/go.mod h1:COngtbYYCncpIPiE5D93QlXDH/3VAKk10jDNwGHcMRE= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe h1:efzxujZ7VHWFxjmWjcJyUEpPrN8qdiZPYb+dBw547Wo= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe/go.mod h1:TX7CTOQ3LbQjfAi4SwqUoR5gY1zfUk7VRBDTuArjaDc= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/logs/processor/go.mod b/pkg/logs/processor/go.mod index 0c3b04c01bfdb..8b1a82ea2cce9 100644 --- a/pkg/logs/processor/go.mod +++ b/pkg/logs/processor/go.mod @@ -42,42 +42,42 @@ replace ( require ( github.com/DataDog/agent-payload/v5 v5.0.106 - github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sds v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sds v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/pkg/logs/processor/go.sum b/pkg/logs/processor/go.sum index f7392ebb52400..8f92e515f64bc 100644 --- a/pkg/logs/processor/go.sum +++ b/pkg/logs/processor/go.sum @@ -43,8 +43,8 @@ github.com/DataDog/agent-payload/v5 v5.0.106 h1:A3dGX+JYoL7OJe2crpxznW7hWxLxhOk/ github.com/DataDog/agent-payload/v5 v5.0.106/go.mod h1:COngtbYYCncpIPiE5D93QlXDH/3VAKk10jDNwGHcMRE= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe h1:efzxujZ7VHWFxjmWjcJyUEpPrN8qdiZPYb+dBw547Wo= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe/go.mod h1:TX7CTOQ3LbQjfAi4SwqUoR5gY1zfUk7VRBDTuArjaDc= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/logs/sds/go.mod b/pkg/logs/sds/go.mod index 90afa478c86c3..2f08e84c88503 100644 --- a/pkg/logs/sds/go.mod +++ b/pkg/logs/sds/go.mod @@ -43,38 +43,38 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/pkg/logs/sds/go.sum b/pkg/logs/sds/go.sum index cab6d58f51849..0d47a73ab40ee 100644 --- a/pkg/logs/sds/go.sum +++ b/pkg/logs/sds/go.sum @@ -41,8 +41,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe h1:efzxujZ7VHWFxjmWjcJyUEpPrN8qdiZPYb+dBw547Wo= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe/go.mod h1:TX7CTOQ3LbQjfAi4SwqUoR5gY1zfUk7VRBDTuArjaDc= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/logs/sender/go.mod b/pkg/logs/sender/go.mod index 8b113b8250b8b..d38cde4db0aba 100644 --- a/pkg/logs/sender/go.mod +++ b/pkg/logs/sender/go.mod @@ -43,43 +43,43 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/client v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/client v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/message v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/benbjohnson/clock v1.3.5 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/metrics v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/pkg/logs/sender/go.sum b/pkg/logs/sender/go.sum index 2901479abbd15..c1e8fdb7bced6 100644 --- a/pkg/logs/sender/go.sum +++ b/pkg/logs/sender/go.sum @@ -39,8 +39,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/logs/sources/go.mod b/pkg/logs/sources/go.mod index 519f6e95fa279..b18f5e908b273 100644 --- a/pkg/logs/sources/go.mod +++ b/pkg/logs/sources/go.mod @@ -33,31 +33,31 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/logs/sources/go.sum b/pkg/logs/sources/go.sum index 9e43ead02587a..0275e78d9551e 100644 --- a/pkg/logs/sources/go.sum +++ b/pkg/logs/sources/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/logs/util/testutils/go.mod b/pkg/logs/util/testutils/go.mod index f05aa85e5cc23..01d00ed095738 100644 --- a/pkg/logs/util/testutils/go.mod +++ b/pkg/logs/util/testutils/go.mod @@ -35,30 +35,30 @@ replace ( github.com/DataDog/datadog-agent/pkg/version => ../../../version ) -require github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.1 +require github.com/DataDog/datadog-agent/pkg/logs/sources v0.54.0-rc.2 require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect diff --git a/pkg/logs/util/testutils/go.sum b/pkg/logs/util/testutils/go.sum index 9e43ead02587a..0275e78d9551e 100644 --- a/pkg/logs/util/testutils/go.sum +++ b/pkg/logs/util/testutils/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/metrics/go.mod b/pkg/metrics/go.mod index c4f9538b2ac92..909485f0623e5 100644 --- a/pkg/metrics/go.mod +++ b/pkg/metrics/go.mod @@ -19,26 +19,26 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/tagger/types v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/tagset v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/buf v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/tagger/types v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/tagset v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/buf v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0 github.com/stretchr/testify v1.9.0 go.uber.org/atomic v1.11.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/sort v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/sort v0.54.0-rc.2 // indirect github.com/DataDog/sketches-go v1.4.4 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect diff --git a/pkg/metrics/go.sum b/pkg/metrics/go.sum index 207e461f48445..2f423bbb2d2ab 100644 --- a/pkg/metrics/go.sum +++ b/pkg/metrics/go.sum @@ -45,8 +45,8 @@ github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0 h1:QHx6B/VUx3rZ github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0/go.mod h1:q4c7zbmdnIdSJNZuBsveTk5ZeRkSkS2g6b8zzFF1mE4= github.com/DataDog/sketches-go v1.4.4 h1:dF52vzXRFSPOj2IjXSWLvXq3jubL4CI69kwYjJ1w5Z8= github.com/DataDog/sketches-go v1.4.4/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= diff --git a/pkg/orchestrator/model/go.mod b/pkg/orchestrator/model/go.mod index 55c89a867e15f..29f18fc5e14b6 100644 --- a/pkg/orchestrator/model/go.mod +++ b/pkg/orchestrator/model/go.mod @@ -8,12 +8,12 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/patrickmn/go-cache v2.1.0+incompatible ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect go.uber.org/atomic v1.11.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/pkg/process/util/api/go.mod b/pkg/process/util/api/go.mod index b6d93823c01c3..69f4c64d09e15 100644 --- a/pkg/process/util/api/go.mod +++ b/pkg/process/util/api/go.mod @@ -11,15 +11,15 @@ replace ( require ( github.com/DataDog/agent-payload/v5 v5.0.114 - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect github.com/DataDog/mmh3 v0.0.0-20200805151601-30884ca2197a // indirect github.com/DataDog/zstd v1.4.8 // indirect github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f // indirect diff --git a/pkg/security/ebpf/c/include/hooks/exec.h b/pkg/security/ebpf/c/include/hooks/exec.h index 96bf0001fc94a..8a5111bfa9cf7 100644 --- a/pkg/security/ebpf/c/include/hooks/exec.h +++ b/pkg/security/ebpf/c/include/hooks/exec.h @@ -162,9 +162,14 @@ int hook__do_fork(ctx_t *ctx) { SEC("tracepoint/sched/sched_process_fork") int sched_process_fork(struct _tracepoint_sched_process_fork *args) { + u64 sched_process_fork_parent_pid_offset; + LOAD_CONSTANT("sched_process_fork_parent_pid_offset", sched_process_fork_parent_pid_offset); + u64 sched_process_fork_child_pid_offset; + LOAD_CONSTANT("sched_process_fork_child_pid_offset", sched_process_fork_child_pid_offset); + u32 pid = 0, parent_pid = 0; - bpf_probe_read(&pid, sizeof(pid), &args->child_pid); - bpf_probe_read(&parent_pid, sizeof(parent_pid), &args->parent_pid); + bpf_probe_read(&pid, sizeof(pid), (void *)args + sched_process_fork_child_pid_offset); + bpf_probe_read(&parent_pid, sizeof(parent_pid), (void *)args + sched_process_fork_parent_pid_offset); // ignore the rest if kworker struct syscall_cache_t *syscall = peek_syscall(EVENT_FORK); if (!syscall || syscall->fork.is_kthread || parent_pid == 2) { diff --git a/pkg/security/ebpf/kernel/kernel.go b/pkg/security/ebpf/kernel/kernel.go index 1eac581817d72..066ec71680da8 100644 --- a/pkg/security/ebpf/kernel/kernel.go +++ b/pkg/security/ebpf/kernel/kernel.go @@ -235,6 +235,11 @@ func (k *Version) IsRH9Kernel() bool { return k.OsRelease["PLATFORM_ID"] == "platform:el9" } +// IsRH9_3Kernel returns whether the kernel is a rh9.3 kernel +func (k *Version) IsRH9_3Kernel() bool { + return k.IsRH9Kernel() && strings.HasPrefix(k.OsRelease["VERSION_ID"], "9.3") +} + // IsSuseKernel returns whether the kernel is a suse kernel func (k *Version) IsSuseKernel() bool { return k.IsSLESKernel() || k.OsRelease["ID"] == "opensuse-leap" diff --git a/pkg/security/probe/constantfetch/available.go b/pkg/security/probe/constantfetch/available.go index 87ce92f3f2673..2e498c5a72ff7 100644 --- a/pkg/security/probe/constantfetch/available.go +++ b/pkg/security/probe/constantfetch/available.go @@ -9,8 +9,12 @@ package constantfetch import ( + "errors" + "github.com/DataDog/datadog-go/v5/statsd" + "github.com/cilium/ebpf/btf" + pkgebpf "github.com/DataDog/datadog-agent/pkg/ebpf" "github.com/DataDog/datadog-agent/pkg/security/ebpf/kernel" "github.com/DataDog/datadog-agent/pkg/security/probe/config" "github.com/DataDog/datadog-agent/pkg/security/seclog" @@ -44,3 +48,27 @@ func GetAvailableConstantFetchers(config *config.Config, kv *kernel.Version, sta return fetchers } + +// GetHasUsernamespaceFirstArgWithBtf uses BTF to check if the security_inode_setattr function has a user namespace as its first argument +func GetHasUsernamespaceFirstArgWithBtf() (bool, error) { + spec, err := pkgebpf.GetKernelSpec() + if err != nil { + return false, err + } + + var function *btf.Func + if err := spec.TypeByName("security_inode_setattr", &function); err != nil { + return false, err + } + + proto, ok := function.Type.(*btf.FuncProto) + if !ok { + return false, errors.New("security_inode_setattr has no prototype") + } + + if len(proto.Params) == 0 { + return false, errors.New("security_inode_setattr has no parameters") + } + + return proto.Params[0].Name != "dentry", nil +} diff --git a/pkg/security/probe/constantfetch/available_unsupported.go b/pkg/security/probe/constantfetch/available_unsupported.go index c8fb0d84c2278..b23f04bf8acaf 100644 --- a/pkg/security/probe/constantfetch/available_unsupported.go +++ b/pkg/security/probe/constantfetch/available_unsupported.go @@ -9,6 +9,8 @@ package constantfetch import ( + "errors" + "github.com/DataDog/datadog-go/v5/statsd" "github.com/DataDog/datadog-agent/pkg/security/ebpf/kernel" @@ -32,3 +34,8 @@ func GetAvailableConstantFetchers(_ *config.Config, kv *kernel.Version, _ statsd return fetchers } + +// GetHasUsernamespaceFirstArgWithBtf uses BTF to check if the security_inode_setattr function has a user namespace as its first argument +func GetHasUsernamespaceFirstArgWithBtf() (bool, error) { + return false, errors.New("unsupported BTF request") +} diff --git a/pkg/security/probe/constantfetch/constant_names.go b/pkg/security/probe/constantfetch/constant_names.go index 9695b009cc44b..5ae3e1d9ceb7b 100644 --- a/pkg/security/probe/constantfetch/constant_names.go +++ b/pkg/security/probe/constantfetch/constant_names.go @@ -28,6 +28,8 @@ const ( OffsetNameKernelCloneArgsExitSignal = "kernel_clone_args_exit_signal_offset" OffsetNameFileFinode = "file_f_inode_offset" OffsetNameFileFpath = "file_f_path_offset" + OffsetNameSchedProcessForkParentPid = "sched_process_fork_parent_pid_offset" + OffsetNameSchedProcessForkChildPid = "sched_process_fork_child_pid_offset" // bpf offsets OffsetNameBPFMapStructID = "bpf_map_id_offset" diff --git a/pkg/security/probe/constantfetch/fallback.go b/pkg/security/probe/constantfetch/fallback.go index 6efca313ff1bb..d0fae13d1a51d 100644 --- a/pkg/security/probe/constantfetch/fallback.go +++ b/pkg/security/probe/constantfetch/fallback.go @@ -137,6 +137,10 @@ func (f *FallbackConstantFetcher) appendRequest(id string) { value = getFileFinodeOffset(f.kernelVersion) case OffsetNameFileFpath: value = getFileFpathOffset(f.kernelVersion) + case OffsetNameSchedProcessForkChildPid: + value = getSchedProcessForkChildPidOffset(f.kernelVersion) + case OffsetNameSchedProcessForkParentPid: + value = getSchedProcessForkParentPidOffset(f.kernelVersion) } f.res[id] = value } @@ -994,3 +998,19 @@ func getFileFpathOffset(kv *kernel.Version) uint64 { return 16 } } + +func getSchedProcessForkParentPidOffset(kv *kernel.Version) uint64 { + if kv.IsInRangeCloseOpen(kernel.Kernel5_14, kernel.Kernel5_15) && kv.IsRH9_3Kernel() { + return 28 + } + + return 24 // for regular kernels +} + +func getSchedProcessForkChildPidOffset(kv *kernel.Version) uint64 { + if kv.IsInRangeCloseOpen(kernel.Kernel5_14, kernel.Kernel5_15) && kv.IsRH9_3Kernel() { + return 48 + } + + return 44 // for regular kernels +} diff --git a/pkg/security/probe/field_handlers_windows.go b/pkg/security/probe/field_handlers_windows.go index b7183daf13bbb..2c4fe52e3669f 100644 --- a/pkg/security/probe/field_handlers_windows.go +++ b/pkg/security/probe/field_handlers_windows.go @@ -43,6 +43,16 @@ func (fh *FieldHandlers) ResolveFileBasename(_ *model.Event, f *model.FileEvent) return f.BasenameStr } +// ResolveFimFilePath resolves the inode to a full path +func (fh *FieldHandlers) ResolveFimFilePath(_ *model.Event, f *model.FimFileEvent) string { + return f.PathnameStr +} + +// ResolveFimFileBasename resolves the inode to a full path +func (fh *FieldHandlers) ResolveFimFileBasename(_ *model.Event, f *model.FimFileEvent) string { + return f.BasenameStr +} + // ResolveProcessEnvp resolves the envp of the event as an array func (fh *FieldHandlers) ResolveProcessEnvp(_ *model.Event, process *model.Process) []string { return fh.resolvers.ProcessResolver.GetEnvp(process) diff --git a/pkg/security/probe/probe_ebpf.go b/pkg/security/probe/probe_ebpf.go index 8c5ae97e1b350..fb3f36cf63769 100644 --- a/pkg/security/probe/probe_ebpf.go +++ b/pkg/security/probe/probe_ebpf.go @@ -1776,10 +1776,21 @@ func getDoForkInput(kernelVersion *kernel.Version) uint64 { } func getHasUsernamespaceFirstArg(kernelVersion *kernel.Version) uint64 { - if kernelVersion.Code != 0 && kernelVersion.Code >= kernel.Kernel6_0 { + if val, err := constantfetch.GetHasUsernamespaceFirstArgWithBtf(); err == nil { + if val { + return 1 + } + return 0 + } + + switch { + case kernelVersion.Code != 0 && kernelVersion.Code >= kernel.Kernel6_0: return 1 + case kernelVersion.IsInRangeCloseOpen(kernel.Kernel5_14, kernel.Kernel5_15) && kernelVersion.IsRH9_3Kernel(): + return 1 + default: + return 0 } - return 0 } func getOvlPathInOvlInode(kernelVersion *kernel.Version) uint64 { @@ -1858,6 +1869,8 @@ func AppendProbeRequestsToFetcher(constantFetcher constantfetch.ConstantFetcher, constantFetcher.AppendOffsetofRequest(constantfetch.OffsetNameVMAreaStructFlags, "struct vm_area_struct", "vm_flags", "linux/mm_types.h") constantFetcher.AppendOffsetofRequest(constantfetch.OffsetNameFileFinode, "struct file", "f_inode", "linux/fs.h") constantFetcher.AppendOffsetofRequest(constantfetch.OffsetNameFileFpath, "struct file", "f_path", "linux/fs.h") + constantFetcher.AppendOffsetofRequest(constantfetch.OffsetNameSchedProcessForkChildPid, "trace_event_raw_sched_process_fork", "child_pid", "") + constantFetcher.AppendOffsetofRequest(constantfetch.OffsetNameSchedProcessForkParentPid, "trace_event_raw_sched_process_fork", "parent_pid", "") if kv.Code >= kernel.Kernel5_3 { constantFetcher.AppendOffsetofRequest(constantfetch.OffsetNameKernelCloneArgsExitSignal, "struct kernel_clone_args", "exit_signal", "linux/sched/task.h") } diff --git a/pkg/security/probe/probe_windows.go b/pkg/security/probe/probe_windows.go index 023fd51eca2c6..430b6686138f4 100644 --- a/pkg/security/probe/probe_windows.go +++ b/pkg/security/probe/probe_windows.go @@ -552,7 +552,7 @@ func (p *WindowsProbe) handleETWNotification(ev *model.Event, notif etwNotificat case *createNewFileArgs: ev.Type = uint32(model.CreateNewFileEventType) ev.CreateNewFile = model.CreateNewFileEvent{ - File: model.FileEvent{ + File: model.FimFileEvent{ FileObject: uint64(arg.fileObject), PathnameStr: arg.fileName, BasenameStr: filepath.Base(arg.fileName), @@ -571,12 +571,12 @@ func (p *WindowsProbe) handleETWNotification(ev *model.Event, notif etwNotificat case *renamePath: ev.Type = uint32(model.FileRenameEventType) ev.RenameFile = model.RenameFileEvent{ - Old: model.FileEvent{ + Old: model.FimFileEvent{ FileObject: p.renamePreArgs.fileObject, PathnameStr: p.renamePreArgs.path, BasenameStr: filepath.Base(p.renamePreArgs.path), }, - New: model.FileEvent{ + New: model.FimFileEvent{ FileObject: uint64(arg.fileObject), PathnameStr: arg.filePath, BasenameStr: filepath.Base(arg.filePath), @@ -585,7 +585,7 @@ func (p *WindowsProbe) handleETWNotification(ev *model.Event, notif etwNotificat case *setDeleteArgs: ev.Type = uint32(model.DeleteFileEventType) ev.DeleteFile = model.DeleteFileEvent{ - File: model.FileEvent{ + File: model.FimFileEvent{ FileObject: uint64(arg.fileObject), PathnameStr: arg.fileName, BasenameStr: filepath.Base(arg.fileName), @@ -594,7 +594,7 @@ func (p *WindowsProbe) handleETWNotification(ev *model.Event, notif etwNotificat case *writeArgs: ev.Type = uint32(model.WriteFileEventType) ev.WriteFile = model.WriteFileEvent{ - File: model.FileEvent{ + File: model.FimFileEvent{ FileObject: uint64(arg.fileObject), PathnameStr: arg.fileName, BasenameStr: filepath.Base(arg.fileName), diff --git a/pkg/security/secl/model/accessors_windows.go b/pkg/security/secl/model/accessors_windows.go index 336b5daa960e6..8e1f99823532f 100644 --- a/pkg/security/secl/model/accessors_windows.go +++ b/pkg/security/secl/model/accessors_windows.go @@ -63,42 +63,42 @@ func (m *Model) GetEvaluator(field eval.Field, regID eval.RegisterID) (eval.Eval Field: field, Weight: 9999 * eval.HandlerWeight, }, nil - case "create.file.name": + case "create.file.device_path": return &eval.StringEvaluator{ - OpOverrides: eval.CaseInsensitiveCmp, + OpOverrides: eval.WindowsPathCmp, EvalFnc: func(ctx *eval.Context) string { ev := ctx.Event.(*Event) - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.CreateNewFile.File) + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.CreateNewFile.File) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "create.file.name.length": + case "create.file.device_path.length": return &eval.IntEvaluator{ - OpOverrides: eval.CaseInsensitiveCmp, + OpOverrides: eval.WindowsPathCmp, EvalFnc: func(ctx *eval.Context) int { ev := ctx.Event.(*Event) - return len(ev.FieldHandlers.ResolveFileBasename(ev, &ev.CreateNewFile.File)) + return len(ev.FieldHandlers.ResolveFimFilePath(ev, &ev.CreateNewFile.File)) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "create.file.path": + case "create.file.name": return &eval.StringEvaluator{ - OpOverrides: eval.WindowsPathCmp, + OpOverrides: eval.CaseInsensitiveCmp, EvalFnc: func(ctx *eval.Context) string { ev := ctx.Event.(*Event) - return ev.FieldHandlers.ResolveFilePath(ev, &ev.CreateNewFile.File) + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.CreateNewFile.File) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "create.file.path.length": + case "create.file.name.length": return &eval.IntEvaluator{ - OpOverrides: eval.WindowsPathCmp, + OpOverrides: eval.CaseInsensitiveCmp, EvalFnc: func(ctx *eval.Context) int { ev := ctx.Event.(*Event) - return len(ev.FieldHandlers.ResolveFilePath(ev, &ev.CreateNewFile.File)) + return len(ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.CreateNewFile.File)) }, Field: field, Weight: eval.HandlerWeight, @@ -179,42 +179,42 @@ func (m *Model) GetEvaluator(field eval.Field, regID eval.RegisterID) (eval.Eval Field: field, Weight: eval.FunctionWeight, }, nil - case "delete.file.name": + case "delete.file.device_path": return &eval.StringEvaluator{ - OpOverrides: eval.CaseInsensitiveCmp, + OpOverrides: eval.WindowsPathCmp, EvalFnc: func(ctx *eval.Context) string { ev := ctx.Event.(*Event) - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.DeleteFile.File) + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.DeleteFile.File) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "delete.file.name.length": + case "delete.file.device_path.length": return &eval.IntEvaluator{ - OpOverrides: eval.CaseInsensitiveCmp, + OpOverrides: eval.WindowsPathCmp, EvalFnc: func(ctx *eval.Context) int { ev := ctx.Event.(*Event) - return len(ev.FieldHandlers.ResolveFileBasename(ev, &ev.DeleteFile.File)) + return len(ev.FieldHandlers.ResolveFimFilePath(ev, &ev.DeleteFile.File)) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "delete.file.path": + case "delete.file.name": return &eval.StringEvaluator{ - OpOverrides: eval.WindowsPathCmp, + OpOverrides: eval.CaseInsensitiveCmp, EvalFnc: func(ctx *eval.Context) string { ev := ctx.Event.(*Event) - return ev.FieldHandlers.ResolveFilePath(ev, &ev.DeleteFile.File) + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.DeleteFile.File) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "delete.file.path.length": + case "delete.file.name.length": return &eval.IntEvaluator{ - OpOverrides: eval.WindowsPathCmp, + OpOverrides: eval.CaseInsensitiveCmp, EvalFnc: func(ctx *eval.Context) int { ev := ctx.Event.(*Event) - return len(ev.FieldHandlers.ResolveFilePath(ev, &ev.DeleteFile.File)) + return len(ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.DeleteFile.File)) }, Field: field, Weight: eval.HandlerWeight, @@ -1220,82 +1220,82 @@ func (m *Model) GetEvaluator(field eval.Field, regID eval.RegisterID) (eval.Eval Field: field, Weight: eval.FunctionWeight, }, nil - case "rename.file.destination.name": + case "rename.file.destination.device_path": return &eval.StringEvaluator{ - OpOverrides: eval.CaseInsensitiveCmp, + OpOverrides: eval.WindowsPathCmp, EvalFnc: func(ctx *eval.Context) string { ev := ctx.Event.(*Event) - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.New) + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.New) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "rename.file.destination.name.length": + case "rename.file.destination.device_path.length": return &eval.IntEvaluator{ - OpOverrides: eval.CaseInsensitiveCmp, + OpOverrides: eval.WindowsPathCmp, EvalFnc: func(ctx *eval.Context) int { ev := ctx.Event.(*Event) - return len(ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.New)) + return len(ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.New)) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "rename.file.destination.path": + case "rename.file.destination.name": return &eval.StringEvaluator{ - OpOverrides: eval.WindowsPathCmp, + OpOverrides: eval.CaseInsensitiveCmp, EvalFnc: func(ctx *eval.Context) string { ev := ctx.Event.(*Event) - return ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.New) + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.New) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "rename.file.destination.path.length": + case "rename.file.destination.name.length": return &eval.IntEvaluator{ - OpOverrides: eval.WindowsPathCmp, + OpOverrides: eval.CaseInsensitiveCmp, EvalFnc: func(ctx *eval.Context) int { ev := ctx.Event.(*Event) - return len(ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.New)) + return len(ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.New)) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "rename.file.name": + case "rename.file.device_path": return &eval.StringEvaluator{ - OpOverrides: eval.CaseInsensitiveCmp, + OpOverrides: eval.WindowsPathCmp, EvalFnc: func(ctx *eval.Context) string { ev := ctx.Event.(*Event) - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.Old) + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.Old) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "rename.file.name.length": + case "rename.file.device_path.length": return &eval.IntEvaluator{ - OpOverrides: eval.CaseInsensitiveCmp, + OpOverrides: eval.WindowsPathCmp, EvalFnc: func(ctx *eval.Context) int { ev := ctx.Event.(*Event) - return len(ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.Old)) + return len(ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.Old)) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "rename.file.path": + case "rename.file.name": return &eval.StringEvaluator{ - OpOverrides: eval.WindowsPathCmp, + OpOverrides: eval.CaseInsensitiveCmp, EvalFnc: func(ctx *eval.Context) string { ev := ctx.Event.(*Event) - return ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.Old) + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.Old) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "rename.file.path.length": + case "rename.file.name.length": return &eval.IntEvaluator{ - OpOverrides: eval.WindowsPathCmp, + OpOverrides: eval.CaseInsensitiveCmp, EvalFnc: func(ctx *eval.Context) int { ev := ctx.Event.(*Event) - return len(ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.Old)) + return len(ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.Old)) }, Field: field, Weight: eval.HandlerWeight, @@ -1430,42 +1430,42 @@ func (m *Model) GetEvaluator(field eval.Field, regID eval.RegisterID) (eval.Eval Field: field, Weight: eval.FunctionWeight, }, nil - case "write.file.name": + case "write.file.device_path": return &eval.StringEvaluator{ - OpOverrides: eval.CaseInsensitiveCmp, + OpOverrides: eval.WindowsPathCmp, EvalFnc: func(ctx *eval.Context) string { ev := ctx.Event.(*Event) - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.WriteFile.File) + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.WriteFile.File) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "write.file.name.length": + case "write.file.device_path.length": return &eval.IntEvaluator{ - OpOverrides: eval.CaseInsensitiveCmp, + OpOverrides: eval.WindowsPathCmp, EvalFnc: func(ctx *eval.Context) int { ev := ctx.Event.(*Event) - return len(ev.FieldHandlers.ResolveFileBasename(ev, &ev.WriteFile.File)) + return len(ev.FieldHandlers.ResolveFimFilePath(ev, &ev.WriteFile.File)) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "write.file.path": + case "write.file.name": return &eval.StringEvaluator{ - OpOverrides: eval.WindowsPathCmp, + OpOverrides: eval.CaseInsensitiveCmp, EvalFnc: func(ctx *eval.Context) string { ev := ctx.Event.(*Event) - return ev.FieldHandlers.ResolveFilePath(ev, &ev.WriteFile.File) + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.WriteFile.File) }, Field: field, Weight: eval.HandlerWeight, }, nil - case "write.file.path.length": + case "write.file.name.length": return &eval.IntEvaluator{ - OpOverrides: eval.WindowsPathCmp, + OpOverrides: eval.CaseInsensitiveCmp, EvalFnc: func(ctx *eval.Context) int { ev := ctx.Event.(*Event) - return len(ev.FieldHandlers.ResolveFilePath(ev, &ev.WriteFile.File)) + return len(ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.WriteFile.File)) }, Field: field, Weight: eval.HandlerWeight, @@ -1478,10 +1478,10 @@ func (ev *Event) GetFields() []eval.Field { "container.created_at", "container.id", "container.tags", + "create.file.device_path", + "create.file.device_path.length", "create.file.name", "create.file.name.length", - "create.file.path", - "create.file.path.length", "create.registry.key_name", "create.registry.key_name.length", "create.registry.key_path", @@ -1490,10 +1490,10 @@ func (ev *Event) GetFields() []eval.Field { "create_key.registry.key_name.length", "create_key.registry.key_path", "create_key.registry.key_path.length", + "delete.file.device_path", + "delete.file.device_path.length", "delete.file.name", "delete.file.name.length", - "delete.file.path", - "delete.file.path.length", "delete.registry.key_name", "delete.registry.key_name.length", "delete.registry.key_path", @@ -1581,14 +1581,14 @@ func (ev *Event) GetFields() []eval.Field { "process.ppid", "process.user", "process.user_sid", + "rename.file.destination.device_path", + "rename.file.destination.device_path.length", "rename.file.destination.name", "rename.file.destination.name.length", - "rename.file.destination.path", - "rename.file.destination.path.length", + "rename.file.device_path", + "rename.file.device_path.length", "rename.file.name", "rename.file.name.length", - "rename.file.path", - "rename.file.path.length", "set.registry.key_name", "set.registry.key_name.length", "set.registry.key_path", @@ -1603,10 +1603,10 @@ func (ev *Event) GetFields() []eval.Field { "set_key_value.registry.value_name", "set_key_value.registry.value_name.length", "set_key_value.value_name", + "write.file.device_path", + "write.file.device_path.length", "write.file.name", "write.file.name.length", - "write.file.path", - "write.file.path.length", } } func (ev *Event) GetFieldValue(field eval.Field) (interface{}, error) { @@ -1617,14 +1617,14 @@ func (ev *Event) GetFieldValue(field eval.Field) (interface{}, error) { return ev.FieldHandlers.ResolveContainerID(ev, ev.BaseEvent.ContainerContext), nil case "container.tags": return ev.FieldHandlers.ResolveContainerTags(ev, ev.BaseEvent.ContainerContext), nil + case "create.file.device_path": + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.CreateNewFile.File), nil + case "create.file.device_path.length": + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.CreateNewFile.File), nil case "create.file.name": - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.CreateNewFile.File), nil + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.CreateNewFile.File), nil case "create.file.name.length": - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.CreateNewFile.File), nil - case "create.file.path": - return ev.FieldHandlers.ResolveFilePath(ev, &ev.CreateNewFile.File), nil - case "create.file.path.length": - return ev.FieldHandlers.ResolveFilePath(ev, &ev.CreateNewFile.File), nil + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.CreateNewFile.File), nil case "create.registry.key_name": return ev.CreateRegistryKey.Registry.KeyName, nil case "create.registry.key_name.length": @@ -1641,14 +1641,14 @@ func (ev *Event) GetFieldValue(field eval.Field) (interface{}, error) { return ev.CreateRegistryKey.Registry.KeyPath, nil case "create_key.registry.key_path.length": return len(ev.CreateRegistryKey.Registry.KeyPath), nil + case "delete.file.device_path": + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.DeleteFile.File), nil + case "delete.file.device_path.length": + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.DeleteFile.File), nil case "delete.file.name": - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.DeleteFile.File), nil + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.DeleteFile.File), nil case "delete.file.name.length": - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.DeleteFile.File), nil - case "delete.file.path": - return ev.FieldHandlers.ResolveFilePath(ev, &ev.DeleteFile.File), nil - case "delete.file.path.length": - return ev.FieldHandlers.ResolveFilePath(ev, &ev.DeleteFile.File), nil + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.DeleteFile.File), nil case "delete.registry.key_name": return ev.DeleteRegistryKey.Registry.KeyName, nil case "delete.registry.key_name.length": @@ -1986,22 +1986,22 @@ func (ev *Event) GetFieldValue(field eval.Field) (interface{}, error) { return ev.FieldHandlers.ResolveUser(ev, &ev.BaseEvent.ProcessContext.Process), nil case "process.user_sid": return ev.BaseEvent.ProcessContext.Process.OwnerSidString, nil + case "rename.file.destination.device_path": + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.New), nil + case "rename.file.destination.device_path.length": + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.New), nil case "rename.file.destination.name": - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.New), nil + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.New), nil case "rename.file.destination.name.length": - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.New), nil - case "rename.file.destination.path": - return ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.New), nil - case "rename.file.destination.path.length": - return ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.New), nil + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.New), nil + case "rename.file.device_path": + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.Old), nil + case "rename.file.device_path.length": + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.Old), nil case "rename.file.name": - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.Old), nil + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.Old), nil case "rename.file.name.length": - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.Old), nil - case "rename.file.path": - return ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.Old), nil - case "rename.file.path.length": - return ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.Old), nil + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.Old), nil case "set.registry.key_name": return ev.SetRegistryKeyValue.Registry.KeyName, nil case "set.registry.key_name.length": @@ -2030,14 +2030,14 @@ func (ev *Event) GetFieldValue(field eval.Field) (interface{}, error) { return len(ev.SetRegistryKeyValue.ValueName), nil case "set_key_value.value_name": return ev.SetRegistryKeyValue.ValueName, nil + case "write.file.device_path": + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.WriteFile.File), nil + case "write.file.device_path.length": + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.WriteFile.File), nil case "write.file.name": - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.WriteFile.File), nil + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.WriteFile.File), nil case "write.file.name.length": - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.WriteFile.File), nil - case "write.file.path": - return ev.FieldHandlers.ResolveFilePath(ev, &ev.WriteFile.File), nil - case "write.file.path.length": - return ev.FieldHandlers.ResolveFilePath(ev, &ev.WriteFile.File), nil + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.WriteFile.File), nil } return nil, &eval.ErrFieldNotFound{Field: field} } @@ -2049,13 +2049,13 @@ func (ev *Event) GetFieldEventType(field eval.Field) (eval.EventType, error) { return "*", nil case "container.tags": return "*", nil - case "create.file.name": + case "create.file.device_path": return "create", nil - case "create.file.name.length": + case "create.file.device_path.length": return "create", nil - case "create.file.path": + case "create.file.name": return "create", nil - case "create.file.path.length": + case "create.file.name.length": return "create", nil case "create.registry.key_name": return "create_key", nil @@ -2073,13 +2073,13 @@ func (ev *Event) GetFieldEventType(field eval.Field) (eval.EventType, error) { return "create_key", nil case "create_key.registry.key_path.length": return "create_key", nil - case "delete.file.name": + case "delete.file.device_path": return "delete", nil - case "delete.file.name.length": + case "delete.file.device_path.length": return "delete", nil - case "delete.file.path": + case "delete.file.name": return "delete", nil - case "delete.file.path.length": + case "delete.file.name.length": return "delete", nil case "delete.registry.key_name": return "delete_key", nil @@ -2255,22 +2255,22 @@ func (ev *Event) GetFieldEventType(field eval.Field) (eval.EventType, error) { return "*", nil case "process.user_sid": return "*", nil + case "rename.file.destination.device_path": + return "rename", nil + case "rename.file.destination.device_path.length": + return "rename", nil case "rename.file.destination.name": return "rename", nil case "rename.file.destination.name.length": return "rename", nil - case "rename.file.destination.path": + case "rename.file.device_path": return "rename", nil - case "rename.file.destination.path.length": + case "rename.file.device_path.length": return "rename", nil case "rename.file.name": return "rename", nil case "rename.file.name.length": return "rename", nil - case "rename.file.path": - return "rename", nil - case "rename.file.path.length": - return "rename", nil case "set.registry.key_name": return "set_key_value", nil case "set.registry.key_name.length": @@ -2299,13 +2299,13 @@ func (ev *Event) GetFieldEventType(field eval.Field) (eval.EventType, error) { return "set_key_value", nil case "set_key_value.value_name": return "set_key_value", nil - case "write.file.name": + case "write.file.device_path": return "write", nil - case "write.file.name.length": + case "write.file.device_path.length": return "write", nil - case "write.file.path": + case "write.file.name": return "write", nil - case "write.file.path.length": + case "write.file.name.length": return "write", nil } return "", &eval.ErrFieldNotFound{Field: field} @@ -2318,13 +2318,13 @@ func (ev *Event) GetFieldType(field eval.Field) (reflect.Kind, error) { return reflect.String, nil case "container.tags": return reflect.String, nil - case "create.file.name": + case "create.file.device_path": return reflect.String, nil - case "create.file.name.length": + case "create.file.device_path.length": return reflect.Int, nil - case "create.file.path": + case "create.file.name": return reflect.String, nil - case "create.file.path.length": + case "create.file.name.length": return reflect.Int, nil case "create.registry.key_name": return reflect.String, nil @@ -2342,13 +2342,13 @@ func (ev *Event) GetFieldType(field eval.Field) (reflect.Kind, error) { return reflect.String, nil case "create_key.registry.key_path.length": return reflect.Int, nil - case "delete.file.name": + case "delete.file.device_path": return reflect.String, nil - case "delete.file.name.length": + case "delete.file.device_path.length": return reflect.Int, nil - case "delete.file.path": + case "delete.file.name": return reflect.String, nil - case "delete.file.path.length": + case "delete.file.name.length": return reflect.Int, nil case "delete.registry.key_name": return reflect.String, nil @@ -2524,22 +2524,22 @@ func (ev *Event) GetFieldType(field eval.Field) (reflect.Kind, error) { return reflect.String, nil case "process.user_sid": return reflect.String, nil + case "rename.file.destination.device_path": + return reflect.String, nil + case "rename.file.destination.device_path.length": + return reflect.Int, nil case "rename.file.destination.name": return reflect.String, nil case "rename.file.destination.name.length": return reflect.Int, nil - case "rename.file.destination.path": + case "rename.file.device_path": return reflect.String, nil - case "rename.file.destination.path.length": + case "rename.file.device_path.length": return reflect.Int, nil case "rename.file.name": return reflect.String, nil case "rename.file.name.length": return reflect.Int, nil - case "rename.file.path": - return reflect.String, nil - case "rename.file.path.length": - return reflect.Int, nil case "set.registry.key_name": return reflect.String, nil case "set.registry.key_name.length": @@ -2568,13 +2568,13 @@ func (ev *Event) GetFieldType(field eval.Field) (reflect.Kind, error) { return reflect.Int, nil case "set_key_value.value_name": return reflect.String, nil - case "write.file.name": + case "write.file.device_path": return reflect.String, nil - case "write.file.name.length": + case "write.file.device_path.length": return reflect.Int, nil - case "write.file.path": + case "write.file.name": return reflect.String, nil - case "write.file.path.length": + case "write.file.name.length": return reflect.Int, nil } return reflect.Invalid, &eval.ErrFieldNotFound{Field: field} @@ -2614,6 +2614,15 @@ func (ev *Event) SetFieldValue(field eval.Field, value interface{}) error { return &eval.ErrValueTypeMismatch{Field: "BaseEvent.ContainerContext.Tags"} } return nil + case "create.file.device_path": + rv, ok := value.(string) + if !ok { + return &eval.ErrValueTypeMismatch{Field: "CreateNewFile.File.PathnameStr"} + } + ev.CreateNewFile.File.PathnameStr = rv + return nil + case "create.file.device_path.length": + return &eval.ErrFieldReadOnly{Field: "create.file.device_path.length"} case "create.file.name": rv, ok := value.(string) if !ok { @@ -2623,15 +2632,6 @@ func (ev *Event) SetFieldValue(field eval.Field, value interface{}) error { return nil case "create.file.name.length": return &eval.ErrFieldReadOnly{Field: "create.file.name.length"} - case "create.file.path": - rv, ok := value.(string) - if !ok { - return &eval.ErrValueTypeMismatch{Field: "CreateNewFile.File.PathnameStr"} - } - ev.CreateNewFile.File.PathnameStr = rv - return nil - case "create.file.path.length": - return &eval.ErrFieldReadOnly{Field: "create.file.path.length"} case "create.registry.key_name": rv, ok := value.(string) if !ok { @@ -2668,6 +2668,15 @@ func (ev *Event) SetFieldValue(field eval.Field, value interface{}) error { return nil case "create_key.registry.key_path.length": return &eval.ErrFieldReadOnly{Field: "create_key.registry.key_path.length"} + case "delete.file.device_path": + rv, ok := value.(string) + if !ok { + return &eval.ErrValueTypeMismatch{Field: "DeleteFile.File.PathnameStr"} + } + ev.DeleteFile.File.PathnameStr = rv + return nil + case "delete.file.device_path.length": + return &eval.ErrFieldReadOnly{Field: "delete.file.device_path.length"} case "delete.file.name": rv, ok := value.(string) if !ok { @@ -2677,15 +2686,6 @@ func (ev *Event) SetFieldValue(field eval.Field, value interface{}) error { return nil case "delete.file.name.length": return &eval.ErrFieldReadOnly{Field: "delete.file.name.length"} - case "delete.file.path": - rv, ok := value.(string) - if !ok { - return &eval.ErrValueTypeMismatch{Field: "DeleteFile.File.PathnameStr"} - } - ev.DeleteFile.File.PathnameStr = rv - return nil - case "delete.file.path.length": - return &eval.ErrFieldReadOnly{Field: "delete.file.path.length"} case "delete.registry.key_name": rv, ok := value.(string) if !ok { @@ -3508,6 +3508,15 @@ func (ev *Event) SetFieldValue(field eval.Field, value interface{}) error { } ev.BaseEvent.ProcessContext.Process.OwnerSidString = rv return nil + case "rename.file.destination.device_path": + rv, ok := value.(string) + if !ok { + return &eval.ErrValueTypeMismatch{Field: "RenameFile.New.PathnameStr"} + } + ev.RenameFile.New.PathnameStr = rv + return nil + case "rename.file.destination.device_path.length": + return &eval.ErrFieldReadOnly{Field: "rename.file.destination.device_path.length"} case "rename.file.destination.name": rv, ok := value.(string) if !ok { @@ -3517,15 +3526,15 @@ func (ev *Event) SetFieldValue(field eval.Field, value interface{}) error { return nil case "rename.file.destination.name.length": return &eval.ErrFieldReadOnly{Field: "rename.file.destination.name.length"} - case "rename.file.destination.path": + case "rename.file.device_path": rv, ok := value.(string) if !ok { - return &eval.ErrValueTypeMismatch{Field: "RenameFile.New.PathnameStr"} + return &eval.ErrValueTypeMismatch{Field: "RenameFile.Old.PathnameStr"} } - ev.RenameFile.New.PathnameStr = rv + ev.RenameFile.Old.PathnameStr = rv return nil - case "rename.file.destination.path.length": - return &eval.ErrFieldReadOnly{Field: "rename.file.destination.path.length"} + case "rename.file.device_path.length": + return &eval.ErrFieldReadOnly{Field: "rename.file.device_path.length"} case "rename.file.name": rv, ok := value.(string) if !ok { @@ -3535,15 +3544,6 @@ func (ev *Event) SetFieldValue(field eval.Field, value interface{}) error { return nil case "rename.file.name.length": return &eval.ErrFieldReadOnly{Field: "rename.file.name.length"} - case "rename.file.path": - rv, ok := value.(string) - if !ok { - return &eval.ErrValueTypeMismatch{Field: "RenameFile.Old.PathnameStr"} - } - ev.RenameFile.Old.PathnameStr = rv - return nil - case "rename.file.path.length": - return &eval.ErrFieldReadOnly{Field: "rename.file.path.length"} case "set.registry.key_name": rv, ok := value.(string) if !ok { @@ -3612,6 +3612,15 @@ func (ev *Event) SetFieldValue(field eval.Field, value interface{}) error { } ev.SetRegistryKeyValue.ValueName = rv return nil + case "write.file.device_path": + rv, ok := value.(string) + if !ok { + return &eval.ErrValueTypeMismatch{Field: "WriteFile.File.PathnameStr"} + } + ev.WriteFile.File.PathnameStr = rv + return nil + case "write.file.device_path.length": + return &eval.ErrFieldReadOnly{Field: "write.file.device_path.length"} case "write.file.name": rv, ok := value.(string) if !ok { @@ -3621,15 +3630,6 @@ func (ev *Event) SetFieldValue(field eval.Field, value interface{}) error { return nil case "write.file.name.length": return &eval.ErrFieldReadOnly{Field: "write.file.name.length"} - case "write.file.path": - rv, ok := value.(string) - if !ok { - return &eval.ErrValueTypeMismatch{Field: "WriteFile.File.PathnameStr"} - } - ev.WriteFile.File.PathnameStr = rv - return nil - case "write.file.path.length": - return &eval.ErrFieldReadOnly{Field: "write.file.path.length"} } return &eval.ErrFieldNotFound{Field: field} } diff --git a/pkg/security/secl/model/field_accessors_windows.go b/pkg/security/secl/model/field_accessors_windows.go index 077d12c7a8074..ddddacb0fc6ed 100644 --- a/pkg/security/secl/model/field_accessors_windows.go +++ b/pkg/security/secl/model/field_accessors_windows.go @@ -37,36 +37,36 @@ func (ev *Event) GetContainerTags() []string { return ev.FieldHandlers.ResolveContainerTags(ev, ev.BaseEvent.ContainerContext) } -// GetCreateFileName returns the value of the field, resolving if necessary -func (ev *Event) GetCreateFileName() string { +// GetCreateFileDevicePath returns the value of the field, resolving if necessary +func (ev *Event) GetCreateFileDevicePath() string { if ev.GetEventType().String() != "create" { return "" } - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.CreateNewFile.File) + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.CreateNewFile.File) } -// GetCreateFileNameLength returns the value of the field, resolving if necessary -func (ev *Event) GetCreateFileNameLength() int { +// GetCreateFileDevicePathLength returns the value of the field, resolving if necessary +func (ev *Event) GetCreateFileDevicePathLength() int { if ev.GetEventType().String() != "create" { return 0 } - return len(ev.FieldHandlers.ResolveFileBasename(ev, &ev.CreateNewFile.File)) + return len(ev.FieldHandlers.ResolveFimFilePath(ev, &ev.CreateNewFile.File)) } -// GetCreateFilePath returns the value of the field, resolving if necessary -func (ev *Event) GetCreateFilePath() string { +// GetCreateFileName returns the value of the field, resolving if necessary +func (ev *Event) GetCreateFileName() string { if ev.GetEventType().String() != "create" { return "" } - return ev.FieldHandlers.ResolveFilePath(ev, &ev.CreateNewFile.File) + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.CreateNewFile.File) } -// GetCreateFilePathLength returns the value of the field, resolving if necessary -func (ev *Event) GetCreateFilePathLength() int { +// GetCreateFileNameLength returns the value of the field, resolving if necessary +func (ev *Event) GetCreateFileNameLength() int { if ev.GetEventType().String() != "create" { return 0 } - return len(ev.FieldHandlers.ResolveFilePath(ev, &ev.CreateNewFile.File)) + return len(ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.CreateNewFile.File)) } // GetCreateRegistryKeyName returns the value of the field, resolving if necessary @@ -133,36 +133,36 @@ func (ev *Event) GetCreateKeyRegistryKeyPathLength() int { return len(ev.CreateRegistryKey.Registry.KeyPath) } -// GetDeleteFileName returns the value of the field, resolving if necessary -func (ev *Event) GetDeleteFileName() string { +// GetDeleteFileDevicePath returns the value of the field, resolving if necessary +func (ev *Event) GetDeleteFileDevicePath() string { if ev.GetEventType().String() != "delete" { return "" } - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.DeleteFile.File) + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.DeleteFile.File) } -// GetDeleteFileNameLength returns the value of the field, resolving if necessary -func (ev *Event) GetDeleteFileNameLength() int { +// GetDeleteFileDevicePathLength returns the value of the field, resolving if necessary +func (ev *Event) GetDeleteFileDevicePathLength() int { if ev.GetEventType().String() != "delete" { return 0 } - return len(ev.FieldHandlers.ResolveFileBasename(ev, &ev.DeleteFile.File)) + return len(ev.FieldHandlers.ResolveFimFilePath(ev, &ev.DeleteFile.File)) } -// GetDeleteFilePath returns the value of the field, resolving if necessary -func (ev *Event) GetDeleteFilePath() string { +// GetDeleteFileName returns the value of the field, resolving if necessary +func (ev *Event) GetDeleteFileName() string { if ev.GetEventType().String() != "delete" { return "" } - return ev.FieldHandlers.ResolveFilePath(ev, &ev.DeleteFile.File) + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.DeleteFile.File) } -// GetDeleteFilePathLength returns the value of the field, resolving if necessary -func (ev *Event) GetDeleteFilePathLength() int { +// GetDeleteFileNameLength returns the value of the field, resolving if necessary +func (ev *Event) GetDeleteFileNameLength() int { if ev.GetEventType().String() != "delete" { return 0 } - return len(ev.FieldHandlers.ResolveFilePath(ev, &ev.DeleteFile.File)) + return len(ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.DeleteFile.File)) } // GetDeleteRegistryKeyName returns the value of the field, resolving if necessary @@ -1293,68 +1293,68 @@ func (ev *Event) GetProcessUserSid() string { return ev.BaseEvent.ProcessContext.Process.OwnerSidString } -// GetRenameFileDestinationName returns the value of the field, resolving if necessary -func (ev *Event) GetRenameFileDestinationName() string { +// GetRenameFileDestinationDevicePath returns the value of the field, resolving if necessary +func (ev *Event) GetRenameFileDestinationDevicePath() string { if ev.GetEventType().String() != "rename" { return "" } - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.New) + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.New) } -// GetRenameFileDestinationNameLength returns the value of the field, resolving if necessary -func (ev *Event) GetRenameFileDestinationNameLength() int { +// GetRenameFileDestinationDevicePathLength returns the value of the field, resolving if necessary +func (ev *Event) GetRenameFileDestinationDevicePathLength() int { if ev.GetEventType().String() != "rename" { return 0 } - return len(ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.New)) + return len(ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.New)) } -// GetRenameFileDestinationPath returns the value of the field, resolving if necessary -func (ev *Event) GetRenameFileDestinationPath() string { +// GetRenameFileDestinationName returns the value of the field, resolving if necessary +func (ev *Event) GetRenameFileDestinationName() string { if ev.GetEventType().String() != "rename" { return "" } - return ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.New) + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.New) } -// GetRenameFileDestinationPathLength returns the value of the field, resolving if necessary -func (ev *Event) GetRenameFileDestinationPathLength() int { +// GetRenameFileDestinationNameLength returns the value of the field, resolving if necessary +func (ev *Event) GetRenameFileDestinationNameLength() int { if ev.GetEventType().String() != "rename" { return 0 } - return len(ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.New)) + return len(ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.New)) } -// GetRenameFileName returns the value of the field, resolving if necessary -func (ev *Event) GetRenameFileName() string { +// GetRenameFileDevicePath returns the value of the field, resolving if necessary +func (ev *Event) GetRenameFileDevicePath() string { if ev.GetEventType().String() != "rename" { return "" } - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.Old) + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.Old) } -// GetRenameFileNameLength returns the value of the field, resolving if necessary -func (ev *Event) GetRenameFileNameLength() int { +// GetRenameFileDevicePathLength returns the value of the field, resolving if necessary +func (ev *Event) GetRenameFileDevicePathLength() int { if ev.GetEventType().String() != "rename" { return 0 } - return len(ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.Old)) + return len(ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.Old)) } -// GetRenameFilePath returns the value of the field, resolving if necessary -func (ev *Event) GetRenameFilePath() string { +// GetRenameFileName returns the value of the field, resolving if necessary +func (ev *Event) GetRenameFileName() string { if ev.GetEventType().String() != "rename" { return "" } - return ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.Old) + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.Old) } -// GetRenameFilePathLength returns the value of the field, resolving if necessary -func (ev *Event) GetRenameFilePathLength() int { +// GetRenameFileNameLength returns the value of the field, resolving if necessary +func (ev *Event) GetRenameFileNameLength() int { if ev.GetEventType().String() != "rename" { return 0 } - return len(ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.Old)) + return len(ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.Old)) } // GetSetRegistryKeyName returns the value of the field, resolving if necessary @@ -1474,34 +1474,34 @@ func (ev *Event) GetTimestamp() time.Time { return ev.FieldHandlers.ResolveEventTime(ev, &ev.BaseEvent) } -// GetWriteFileName returns the value of the field, resolving if necessary -func (ev *Event) GetWriteFileName() string { +// GetWriteFileDevicePath returns the value of the field, resolving if necessary +func (ev *Event) GetWriteFileDevicePath() string { if ev.GetEventType().String() != "write" { return "" } - return ev.FieldHandlers.ResolveFileBasename(ev, &ev.WriteFile.File) + return ev.FieldHandlers.ResolveFimFilePath(ev, &ev.WriteFile.File) } -// GetWriteFileNameLength returns the value of the field, resolving if necessary -func (ev *Event) GetWriteFileNameLength() int { +// GetWriteFileDevicePathLength returns the value of the field, resolving if necessary +func (ev *Event) GetWriteFileDevicePathLength() int { if ev.GetEventType().String() != "write" { return 0 } - return len(ev.FieldHandlers.ResolveFileBasename(ev, &ev.WriteFile.File)) + return len(ev.FieldHandlers.ResolveFimFilePath(ev, &ev.WriteFile.File)) } -// GetWriteFilePath returns the value of the field, resolving if necessary -func (ev *Event) GetWriteFilePath() string { +// GetWriteFileName returns the value of the field, resolving if necessary +func (ev *Event) GetWriteFileName() string { if ev.GetEventType().String() != "write" { return "" } - return ev.FieldHandlers.ResolveFilePath(ev, &ev.WriteFile.File) + return ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.WriteFile.File) } -// GetWriteFilePathLength returns the value of the field, resolving if necessary -func (ev *Event) GetWriteFilePathLength() int { +// GetWriteFileNameLength returns the value of the field, resolving if necessary +func (ev *Event) GetWriteFileNameLength() int { if ev.GetEventType().String() != "write" { return 0 } - return len(ev.FieldHandlers.ResolveFilePath(ev, &ev.WriteFile.File)) + return len(ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.WriteFile.File)) } diff --git a/pkg/security/secl/model/field_handlers_windows.go b/pkg/security/secl/model/field_handlers_windows.go index bfd6634069655..481898b68a8e7 100644 --- a/pkg/security/secl/model/field_handlers_windows.go +++ b/pkg/security/secl/model/field_handlers_windows.go @@ -61,12 +61,12 @@ func (ev *Event) resolveFields(forADs bool) { // resolve event specific fields switch ev.GetEventType().String() { case "create": - _ = ev.FieldHandlers.ResolveFilePath(ev, &ev.CreateNewFile.File) - _ = ev.FieldHandlers.ResolveFileBasename(ev, &ev.CreateNewFile.File) + _ = ev.FieldHandlers.ResolveFimFilePath(ev, &ev.CreateNewFile.File) + _ = ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.CreateNewFile.File) case "create_key": case "delete": - _ = ev.FieldHandlers.ResolveFilePath(ev, &ev.DeleteFile.File) - _ = ev.FieldHandlers.ResolveFileBasename(ev, &ev.DeleteFile.File) + _ = ev.FieldHandlers.ResolveFimFilePath(ev, &ev.DeleteFile.File) + _ = ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.DeleteFile.File) case "delete_key": case "exec": _ = ev.FieldHandlers.ResolveFilePath(ev, &ev.Exec.Process.FileEvent) @@ -88,14 +88,14 @@ func (ev *Event) resolveFields(forADs bool) { _ = ev.FieldHandlers.ResolveProcessEnvp(ev, ev.Exit.Process) case "open_key": case "rename": - _ = ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.Old) - _ = ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.Old) - _ = ev.FieldHandlers.ResolveFilePath(ev, &ev.RenameFile.New) - _ = ev.FieldHandlers.ResolveFileBasename(ev, &ev.RenameFile.New) + _ = ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.Old) + _ = ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.Old) + _ = ev.FieldHandlers.ResolveFimFilePath(ev, &ev.RenameFile.New) + _ = ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.RenameFile.New) case "set_key_value": case "write": - _ = ev.FieldHandlers.ResolveFilePath(ev, &ev.WriteFile.File) - _ = ev.FieldHandlers.ResolveFileBasename(ev, &ev.WriteFile.File) + _ = ev.FieldHandlers.ResolveFimFilePath(ev, &ev.WriteFile.File) + _ = ev.FieldHandlers.ResolveFimFileBasename(ev, &ev.WriteFile.File) } } @@ -107,6 +107,8 @@ type FieldHandlers interface { ResolveEventTimestamp(ev *Event, e *BaseEvent) int ResolveFileBasename(ev *Event, e *FileEvent) string ResolveFilePath(ev *Event, e *FileEvent) string + ResolveFimFileBasename(ev *Event, e *FimFileEvent) string + ResolveFimFilePath(ev *Event, e *FimFileEvent) string ResolveProcessCmdLine(ev *Event, e *Process) string ResolveProcessCmdLineScrubbed(ev *Event, e *Process) string ResolveProcessCreatedAt(ev *Event, e *Process) int @@ -133,7 +135,13 @@ func (dfh *FakeFieldHandlers) ResolveEventTimestamp(ev *Event, e *BaseEvent) int func (dfh *FakeFieldHandlers) ResolveFileBasename(ev *Event, e *FileEvent) string { return e.BasenameStr } -func (dfh *FakeFieldHandlers) ResolveFilePath(ev *Event, e *FileEvent) string { return e.PathnameStr } +func (dfh *FakeFieldHandlers) ResolveFilePath(ev *Event, e *FileEvent) string { return e.PathnameStr } +func (dfh *FakeFieldHandlers) ResolveFimFileBasename(ev *Event, e *FimFileEvent) string { + return e.BasenameStr +} +func (dfh *FakeFieldHandlers) ResolveFimFilePath(ev *Event, e *FimFileEvent) string { + return e.PathnameStr +} func (dfh *FakeFieldHandlers) ResolveProcessCmdLine(ev *Event, e *Process) string { return e.CmdLine } func (dfh *FakeFieldHandlers) ResolveProcessCmdLineScrubbed(ev *Event, e *Process) string { return e.CmdLineScrubbed diff --git a/pkg/security/secl/model/model_windows.go b/pkg/security/secl/model/model_windows.go index 7837dda9c844a..8cd636dbbae0a 100644 --- a/pkg/security/secl/model/model_windows.go +++ b/pkg/security/secl/model/model_windows.go @@ -52,6 +52,13 @@ type FileEvent struct { BasenameStr string `field:"name,handler:ResolveFileBasename,opts:length" op_override:"eval.CaseInsensitiveCmp"` // SECLDoc[name] Definition:`File's basename` Example:`exec.file.name == "cmd.bat"` Description:`Matches the execution of any file named cmd.bat.` } +// FimFileEvent is the common file event type +type FimFileEvent struct { + FileObject uint64 `field:"-"` // handle numeric value + PathnameStr string `field:"device_path,handler:ResolveFimFilePath,opts:length" op_override:"eval.WindowsPathCmp"` // SECLDoc[device_path] Definition:`File's path` Example:`create.file.device_path == "\device\harddisk1\cmd.bat"` Description:`Matches the creation of the file located at c:\cmd.bat` + BasenameStr string `field:"name,handler:ResolveFimFileBasename,opts:length" op_override:"eval.CaseInsensitiveCmp"` // SECLDoc[name] Definition:`File's basename` Example:`create.file.name == "cmd.bat"` Description:`Matches the creation of any file named cmd.bat.` +} + // RegistryEvent is the common registry event type type RegistryEvent struct { KeyName string `field:"key_name,opts:length"` // SECLDoc[key_name] Definition:`Registry's name` @@ -112,23 +119,23 @@ type ExtraFieldHandlers interface { // CreateNewFileEvent defines file creation type CreateNewFileEvent struct { - File FileEvent `field:"file"` // SECLDoc[file] Definition:`File Event` + File FimFileEvent `field:"file"` // SECLDoc[file] Definition:`File Event` } // RenameFileEvent defines file renaming type RenameFileEvent struct { - Old FileEvent `field:"file"` // SECLDoc[file] Definition:`File Event` - New FileEvent `field:"file.destination"` // SECLDoc[file] Definition:`File Event` + Old FimFileEvent `field:"file"` // SECLDoc[file] Definition:`File Event` + New FimFileEvent `field:"file.destination"` // SECLDoc[file] Definition:`File Event` } // DeleteFileEvent represents an unlink event type DeleteFileEvent struct { - File FileEvent `field:"file"` // SECLDoc[file] Definition:`File Event` + File FimFileEvent `field:"file"` // SECLDoc[file] Definition:`File Event` } // WriteFileEvent represents a write event type WriteFileEvent struct { - File FileEvent `field:"file"` // SECLDoc[file] Definition:`File Event` + File FimFileEvent `field:"file"` // SECLDoc[file] Definition:`File Event` } // Registries diff --git a/pkg/security/seclwin/go.mod b/pkg/security/seclwin/go.mod index 37531e9399ad6..253891724ffdc 100644 --- a/pkg/security/seclwin/go.mod +++ b/pkg/security/seclwin/go.mod @@ -5,7 +5,7 @@ go 1.21 replace github.com/DataDog/datadog-agent/pkg/security/secl => ../secl require ( - github.com/DataDog/datadog-agent/pkg/security/secl v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/security/secl v0.54.0-rc.2 github.com/hashicorp/golang-lru/v2 v2.0.7 ) diff --git a/pkg/security/serializers/serializers_windows.go b/pkg/security/serializers/serializers_windows.go index 13e2fb72a988a..b1943d11c750e 100644 --- a/pkg/security/serializers/serializers_windows.go +++ b/pkg/security/serializers/serializers_windows.go @@ -91,6 +91,13 @@ func newFileSerializer(fe *model.FileEvent, e *model.Event, _ ...uint64) *FileSe } } +func newFimFileSerializer(fe *model.FimFileEvent, e *model.Event, _ ...uint64) *FileSerializer { + return &FileSerializer{ + Path: e.FieldHandlers.ResolveFimFilePath(e, fe), + Name: e.FieldHandlers.ResolveFimFileBasename(e, fe), + } +} + func newUserContextSerializer(e *model.Event) *UserContextSerializer { if e.ProcessContext == nil || e.ProcessContext.Pid == 0 || e == nil { return nil @@ -195,20 +202,20 @@ func NewEventSerializer(event *model.Event, opts *eval.Opts) *EventSerializer { switch eventType { case model.CreateNewFileEventType: s.FileEventSerializer = &FileEventSerializer{ - FileSerializer: *newFileSerializer(&event.CreateNewFile.File, event), + FileSerializer: *newFimFileSerializer(&event.CreateNewFile.File, event), } case model.FileRenameEventType: s.FileEventSerializer = &FileEventSerializer{ - FileSerializer: *newFileSerializer(&event.RenameFile.Old, event), - Destination: newFileSerializer(&event.RenameFile.New, event), + FileSerializer: *newFimFileSerializer(&event.RenameFile.Old, event), + Destination: newFimFileSerializer(&event.RenameFile.New, event), } case model.DeleteFileEventType: s.FileEventSerializer = &FileEventSerializer{ - FileSerializer: *newFileSerializer(&event.DeleteFile.File, event), + FileSerializer: *newFimFileSerializer(&event.DeleteFile.File, event), } case model.WriteFileEventType: s.FileEventSerializer = &FileEventSerializer{ - FileSerializer: *newFileSerializer(&event.WriteFile.File, event), + FileSerializer: *newFimFileSerializer(&event.WriteFile.File, event), } case model.CreateRegistryKeyEventType: s.RegistryEventSerializer = &RegistryEventSerializer{ diff --git a/pkg/security/tests/constants_test.go b/pkg/security/tests/constants_test.go index 9d64ef56d15d4..a8fddf5f5c313 100644 --- a/pkg/security/tests/constants_test.go +++ b/pkg/security/tests/constants_test.go @@ -22,6 +22,8 @@ import ( var BTFHubVsRcPossiblyMissingConstants = []string{ constantfetch.OffsetNameNFConnStructCTNet, constantfetch.OffsetNameIoKiocbStructCtx, + constantfetch.OffsetNameSchedProcessForkChildPid, + constantfetch.OffsetNameSchedProcessForkParentPid, } var RCVsFallbackPossiblyMissingConstants = []string{ @@ -29,6 +31,8 @@ var RCVsFallbackPossiblyMissingConstants = []string{ constantfetch.OffsetNameTaskStructPID, constantfetch.OffsetNameTaskStructPIDLink, constantfetch.OffsetNameDeviceStructNdNet, + constantfetch.OffsetNameSchedProcessForkChildPid, + constantfetch.OffsetNameSchedProcessForkParentPid, } var BTFHubVsFallbackPossiblyMissingConstants = []string{ @@ -36,6 +40,8 @@ var BTFHubVsFallbackPossiblyMissingConstants = []string{ constantfetch.OffsetNameTaskStructPID, constantfetch.OffsetNameTaskStructPIDLink, constantfetch.OffsetNameDeviceStructNdNet, + constantfetch.OffsetNameSchedProcessForkChildPid, + constantfetch.OffsetNameSchedProcessForkParentPid, } var BTFVsFallbackPossiblyMissingConstants = []string{ @@ -43,6 +49,8 @@ var BTFVsFallbackPossiblyMissingConstants = []string{ constantfetch.OffsetNameTaskStructPID, constantfetch.OffsetNameTaskStructPIDLink, constantfetch.OffsetNameDeviceStructNdNet, + constantfetch.OffsetNameSchedProcessForkChildPid, + constantfetch.OffsetNameSchedProcessForkParentPid, } func TestOctogonConstants(t *testing.T) { diff --git a/pkg/security/tests/file_windows_test.go b/pkg/security/tests/file_windows_test.go index a7484345fe160..d9895ec7f4965 100644 --- a/pkg/security/tests/file_windows_test.go +++ b/pkg/security/tests/file_windows_test.go @@ -25,7 +25,7 @@ func TestBasicFileTest(t *testing.T) { //ebpftest.LogLevel(t, "info") cfn := &rules.RuleDefinition{ ID: "test_create_file", - Expression: `create.file.name =~ "test.bad" && create.file.path =~ "\Device\*\Temp\**"`, + Expression: `create.file.name =~ "test.bad" && create.file.device_path =~ "\Device\*\Temp\**"`, } opts := testOpts{ enableFIM: true, @@ -68,7 +68,7 @@ func TestRenameFileEvent(t *testing.T) { // ebpftest.LogLevel(t, "info") cfn := &rules.RuleDefinition{ ID: "test_rename_file", - Expression: `rename.file.name =~ "test.bad" && rename.file.path =~ "\Device\*\Temp\**"`, + Expression: `rename.file.name =~ "test.bad" && rename.file.device_path =~ "\Device\*\Temp\**"`, } opts := testOpts{ enableFIM: true, @@ -105,7 +105,7 @@ func TestDeleteFileEvent(t *testing.T) { // ebpftest.LogLevel(t, "info") cfn := &rules.RuleDefinition{ ID: "test_delete_file", - Expression: `delete.file.name =~ "test.bad" && delete.file.path =~ "\Device\*\Temp\**"`, + Expression: `delete.file.name =~ "test.bad" && delete.file.device_path =~ "\Device\*\Temp\**"`, } opts := testOpts{ enableFIM: true, @@ -141,7 +141,7 @@ func TestWriteFileEvent(t *testing.T) { // ebpftest.LogLevel(t, "info") cfn := &rules.RuleDefinition{ ID: "test_write_file", - Expression: `write.file.name =~ "test.bad" && write.file.path =~ "\Device\*\Temp\**"`, + Expression: `write.file.name =~ "test.bad" && write.file.device_path =~ "\Device\*\Temp\**"`, } opts := testOpts{ enableFIM: true, diff --git a/pkg/serializer/go.mod b/pkg/serializer/go.mod index 7a9fbd0c477f7..35bd54cd38374 100644 --- a/pkg/serializer/go.mod +++ b/pkg/serializer/go.mod @@ -55,21 +55,21 @@ replace ( require ( github.com/DataDog/agent-payload/v5 v5.0.114 - github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/forwarder/orchestrator/orchestratorinterface v0.54.0-rc.1 - github.com/DataDog/datadog-agent/comp/serializer/compression v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/metrics v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/process/util/api v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/tagger/types v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/tagset v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/json v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/config v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/forwarder/orchestrator/orchestratorinterface v0.54.0-rc.2 + github.com/DataDog/datadog-agent/comp/serializer/compression v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/metrics v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/process/util/api v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/tagger/types v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/tagset v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/telemetry v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/json v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0 github.com/gogo/protobuf v1.3.2 github.com/json-iterator/go v1.1.12 @@ -80,34 +80,34 @@ require ( ) require ( - github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/status v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/buf v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/common v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/sort v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/status v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/status/health v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/backoff v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/buf v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/common v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/http v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/sort v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 // indirect github.com/DataDog/sketches-go v1.4.4 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/DataDog/zstd v1.5.5 // indirect github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f // indirect github.com/Microsoft/go-winio v0.6.1 // indirect diff --git a/pkg/serializer/go.sum b/pkg/serializer/go.sum index b732c8ce48de2..627113219dd0d 100644 --- a/pkg/serializer/go.sum +++ b/pkg/serializer/go.sum @@ -10,8 +10,8 @@ github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0 h1:QHx6B/VUx3rZ github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.14.0/go.mod h1:q4c7zbmdnIdSJNZuBsveTk5ZeRkSkS2g6b8zzFF1mE4= github.com/DataDog/sketches-go v1.4.4 h1:dF52vzXRFSPOj2IjXSWLvXq3jubL4CI69kwYjJ1w5Z8= github.com/DataDog/sketches-go v1.4.4/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f h1:5Vuo4niPKFkfwW55jV4vY0ih3VQ9RaQqeqY67fvRn8A= diff --git a/pkg/tagset/go.mod b/pkg/tagset/go.mod index aec0bffb503b7..35879436d4038 100644 --- a/pkg/tagset/go.mod +++ b/pkg/tagset/go.mod @@ -5,7 +5,7 @@ go 1.21.0 replace github.com/DataDog/datadog-agent/pkg/util/sort => ../util/sort/ require ( - github.com/DataDog/datadog-agent/pkg/util/sort v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/sort v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 github.com/twmb/murmur3 v1.1.8 ) diff --git a/pkg/telemetry/go.mod b/pkg/telemetry/go.mod index ab3d6af65d8df..5a90f1d12fe88 100644 --- a/pkg/telemetry/go.mod +++ b/pkg/telemetry/go.mod @@ -9,13 +9,13 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/core/telemetry v0.54.0-rc.2 go.uber.org/atomic v1.7.0 ) require ( - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.54.0-rc.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/trace/agent/agent_test.go b/pkg/trace/agent/agent_test.go index 84c9cd0dcc6bb..1bf2f5c99cec5 100644 --- a/pkg/trace/agent/agent_test.go +++ b/pkg/trace/agent/agent_test.go @@ -41,9 +41,10 @@ import ( "google.golang.org/protobuf/proto" - "github.com/DataDog/datadog-go/v5/statsd" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/DataDog/datadog-go/v5/statsd" ) func NewTestAgent(ctx context.Context, conf *config.AgentConfig, telemetryCollector telemetry.TelemetryCollector) *Agent { @@ -530,7 +531,7 @@ func TestProcess(t *testing.T) { } func spansToChunk(spans ...*pb.Span) *pb.TraceChunk { - return &pb.TraceChunk{Spans: spans} + return &pb.TraceChunk{Spans: spans, Tags: make(map[string]string)} } func dropped(c *pb.TraceChunk) *pb.TraceChunk { diff --git a/pkg/trace/agent/normalizer.go b/pkg/trace/agent/normalizer.go index dfdd0a6c4845f..dabceceb3d45b 100644 --- a/pkg/trace/agent/normalizer.go +++ b/pkg/trace/agent/normalizer.go @@ -200,9 +200,6 @@ func setChunkAttributes(chunk *pb.TraceChunk, root *pb.Span) { var set bool for _, span := range chunk.Spans { if dm, ok := span.Meta[tagDecisionMaker]; !set && ok { - if chunk.Tags == nil { - chunk.Tags = make(map[string]string) - } chunk.Tags[tagDecisionMaker] = dm set = true } diff --git a/pkg/trace/api/api.go b/pkg/trace/api/api.go index 1d02324657ce2..dcb27d8f796d0 100644 --- a/pkg/trace/api/api.go +++ b/pkg/trace/api/api.go @@ -758,6 +758,7 @@ func traceChunksFromSpans(spans []*pb.Span) []*pb.TraceChunk { traceChunks = append(traceChunks, &pb.TraceChunk{ Priority: int32(sampler.PriorityNone), Spans: t, + Tags: make(map[string]string), }) } return traceChunks @@ -769,6 +770,7 @@ func traceChunksFromTraces(traces pb.Traces) []*pb.TraceChunk { traceChunks = append(traceChunks, &pb.TraceChunk{ Priority: int32(sampler.PriorityNone), Spans: trace, + Tags: make(map[string]string), }) } diff --git a/pkg/trace/api/api_test.go b/pkg/trace/api/api_test.go index c6b6ddcdfbc5c..df17d9881382e 100644 --- a/pkg/trace/api/api_test.go +++ b/pkg/trace/api/api_test.go @@ -581,6 +581,7 @@ func TestDecodeV05(t *testing.T) { TracerVersion: "1.2.3", Chunks: []*pb.TraceChunk{ { + Tags: make(map[string]string), Priority: int32(sampler.PriorityNone), Spans: []*pb.Span{ { diff --git a/pkg/trace/go.mod b/pkg/trace/go.mod index 4e8eb0eaf9411..be5da7ec84328 100644 --- a/pkg/trace/go.mod +++ b/pkg/trace/go.mod @@ -10,17 +10,16 @@ go 1.21.0 replace github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible require ( - github.com/DataDog/datadog-agent/pkg/obfuscate v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/obfuscate v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 github.com/DataDog/datadog-go/v5 v5.5.0 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0 github.com/DataDog/sketches-go v1.4.2 - github.com/DataDog/zstd v1.5.5 github.com/Microsoft/go-winio v0.6.1 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/davecgh/go-spew v1.1.1 diff --git a/pkg/trace/go.sum b/pkg/trace/go.sum index 1464b52fe1287..cf5cef10fab0d 100644 --- a/pkg/trace/go.sum +++ b/pkg/trace/go.sum @@ -10,8 +10,6 @@ github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0 h1:10TPq github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.14.0/go.mod h1:dvIWN9pA2zWNTw5rhDWZgzZnhcfpH++d+8d1SWW6xkY= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= -github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= -github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= diff --git a/pkg/trace/sampler/probabilistic.go b/pkg/trace/sampler/probabilistic.go index 9221ada67ad2f..98c34ff208985 100644 --- a/pkg/trace/sampler/probabilistic.go +++ b/pkg/trace/sampler/probabilistic.go @@ -18,8 +18,9 @@ import ( "github.com/DataDog/datadog-agent/pkg/trace/log" "github.com/DataDog/datadog-agent/pkg/trace/watchdog" - "github.com/DataDog/datadog-go/v5/statsd" "go.uber.org/atomic" + + "github.com/DataDog/datadog-go/v5/statsd" ) const ( diff --git a/pkg/trace/writer/trace.go b/pkg/trace/writer/trace.go index 4875f2c1f5e65..18ab1d5f9c8b2 100644 --- a/pkg/trace/writer/trace.go +++ b/pkg/trace/writer/trace.go @@ -8,7 +8,6 @@ package writer import ( "compress/gzip" "errors" - "io" "runtime" "strings" "sync" @@ -22,7 +21,6 @@ import ( "github.com/DataDog/datadog-agent/pkg/trace/timing" "github.com/DataDog/datadog-go/v5/statsd" - "github.com/DataDog/zstd" ) // pathTraces is the target host API path for delivering traces. @@ -71,7 +69,7 @@ type TraceWriter struct { senders []*sender stop chan struct{} stats *info.TraceWriterInfo - wg sync.WaitGroup // waits for compressors + wg sync.WaitGroup // waits for gzippers tick time.Duration // flush frequency agentVersion string @@ -87,7 +85,6 @@ type TraceWriter struct { easylog *log.ThrottledLogger statsd statsd.ClientInterface timing timing.Reporter - useZstd bool } // NewTraceWriter returns a new TraceWriter. It is created for the given agent configuration and @@ -118,7 +115,6 @@ func NewTraceWriter( telemetryCollector: telemetryCollector, statsd: statsd, timing: timing, - useZstd: cfg.HasFeature("zstd-encoding"), } climit := cfg.TraceWriter.ConnectionLimit if climit == 0 { @@ -286,43 +282,25 @@ func (w *TraceWriter) serializer() { } w.stats.BytesUncompressed.Add(int64(len(b))) - var p *payload - var writer io.WriteCloser - - if w.useZstd { - p = newPayload(map[string]string{ - "Content-Type": "application/x-protobuf", - "Content-Encoding": "zstd", - headerLanguages: strings.Join(info.Languages(), "|"), - }) - - p.body.Grow(len(b) / 2) - writer = zstd.NewWriterLevel(p.body, zstd.BestSpeed) - - } else { - p = newPayload(map[string]string{ - "Content-Type": "application/x-protobuf", - "Content-Encoding": "gzip", - headerLanguages: strings.Join(info.Languages(), "|"), - }) - p.body.Grow(len(b) / 2) - - writer, err = gzip.NewWriterLevel(p.body, gzip.BestSpeed) - if err != nil { - // it will never happen, unless an invalid compression is chosen; - // we know gzip.BestSpeed is valid. - log.Errorf("Failed to compress trace paylod: %s", err) - return - } + p := newPayload(map[string]string{ + "Content-Type": "application/x-protobuf", + "Content-Encoding": "gzip", + headerLanguages: strings.Join(info.Languages(), "|"), + }) + p.body.Grow(len(b) / 2) + gzipw, err := gzip.NewWriterLevel(p.body, gzip.BestSpeed) + if err != nil { + // it will never happen, unless an invalid compression is chosen; + // we know gzip.BestSpeed is valid. + log.Errorf("gzip.NewWriterLevel: %d", err) + return } - - if _, err := writer.Write(b); err != nil { - log.Errorf("Error compressing trace payload: %v", err) + if _, err := gzipw.Write(b); err != nil { + log.Errorf("Error gzipping trace payload: %v", err) } - if err := writer.Close(); err != nil { - log.Errorf("Error closing compressed stream when writing trace payload: %v", err) + if err := gzipw.Close(); err != nil { + log.Errorf("Error closing gzip stream when writing trace payload: %v", err) } - sendPayloads(w.senders, p, w.syncMode) }() } diff --git a/pkg/trace/writer/trace_test.go b/pkg/trace/writer/trace_test.go index b7046ec3e1d6d..2f9b1a00f85b7 100644 --- a/pkg/trace/writer/trace_test.go +++ b/pkg/trace/writer/trace_test.go @@ -7,13 +7,11 @@ package writer import ( "compress/gzip" - "fmt" "io" "runtime" "sync" "testing" - "github.com/DataDog/zstd" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" @@ -44,45 +42,38 @@ func (s MockSampler) GetTargetTPS() float64 { var mockSampler = MockSampler{TargetTPS: 5, Enabled: true} func TestTraceWriter(t *testing.T) { - testCases := []bool{false, true} + srv := newTestServer() + cfg := &config.AgentConfig{ + Hostname: testHostname, + DefaultEnv: testEnv, + Endpoints: []*config.Endpoint{{ + APIKey: "123", + Host: srv.URL, + }}, + TraceWriter: &config.WriterConfig{ConnectionLimit: 200, QueueSize: 40}, + } - for _, tc := range testCases { - srv := newTestServer() - cfg := &config.AgentConfig{ - Hostname: testHostname, - DefaultEnv: testEnv, - Endpoints: []*config.Endpoint{{ - APIKey: "123", - Host: srv.URL, - }}, - TraceWriter: &config.WriterConfig{ConnectionLimit: 200, QueueSize: 40}, + t.Run("ok", func(t *testing.T) { + testSpans := []*SampledChunks{ + randomSampledSpans(20, 8), + randomSampledSpans(10, 0), + randomSampledSpans(40, 5), } - if tc { - cfg.Features = map[string]struct{}{"zstd-encoding": {}} + // Use a flush threshold that allows the first two entries to not overflow, + // but overflow on the third. + defer useFlushThreshold(testSpans[0].Size + testSpans[1].Size + 10)() + tw := NewTraceWriter(cfg, mockSampler, mockSampler, mockSampler, telemetry.NewNoopCollector(), &statsd.NoOpClient{}, &timing.NoopReporter{}) + tw.In = make(chan *SampledChunks) + go tw.Run() + for _, ss := range testSpans { + tw.In <- ss } - - t.Run(fmt.Sprintf("zstd_%t", tc), func(t *testing.T) { - testSpans := []*SampledChunks{ - randomSampledSpans(20, 8), - randomSampledSpans(10, 0), - randomSampledSpans(40, 5), - } - // Use a flush threshold that allows the first two entries to not overflow, - // but overflow on the third. - defer useFlushThreshold(testSpans[0].Size + testSpans[1].Size + 10)() - tw := NewTraceWriter(cfg, mockSampler, mockSampler, mockSampler, telemetry.NewNoopCollector(), &statsd.NoOpClient{}, &timing.NoopReporter{}) - tw.In = make(chan *SampledChunks) - go tw.Run() - for _, ss := range testSpans { - tw.In <- ss - } - tw.Stop() - // One payload flushes due to overflowing the threshold, and the second one - // because of stop. - assert.Equal(t, 2, srv.Accepted()) - payloadsContain(t, srv.Payloads(), testSpans, tc) - }) - } + tw.Stop() + // One payload flushes due to overflowing the threshold, and the second one + // because of stop. + assert.Equal(t, 2, srv.Accepted()) + payloadsContain(t, srv.Payloads(), testSpans) + }) } func TestTraceWriterMultipleEndpointsConcurrent(t *testing.T) { @@ -131,7 +122,7 @@ func TestTraceWriterMultipleEndpointsConcurrent(t *testing.T) { wg.Wait() tw.Stop() - payloadsContain(t, srv.Payloads(), testSpans, false) + payloadsContain(t, srv.Payloads(), testSpans) } // useFlushThreshold sets n as the number of bytes to be used as the flush threshold @@ -154,25 +145,14 @@ func randomSampledSpans(spans, events int) *SampledChunks { } // payloadsContain checks that the given payloads contain the given set of sampled spans. -func payloadsContain(t *testing.T, payloads []*payload, sampledSpans []*SampledChunks, shouldUseZstd bool) { +func payloadsContain(t *testing.T, payloads []*payload, sampledSpans []*SampledChunks) { t.Helper() var all pb.AgentPayload for _, p := range payloads { assert := assert.New(t) - var slurp []byte - var err error - var reader io.ReadCloser - - if shouldUseZstd { - reader = zstd.NewReader(p.body) - assert.NotNil(reader) - } else { - reader, err = gzip.NewReader(p.body) - assert.NoError(err) - } - - slurp, err = io.ReadAll(reader) - + gzipr, err := gzip.NewReader(p.body) + assert.NoError(err) + slurp, err := io.ReadAll(gzipr) assert.NoError(err) var payload pb.AgentPayload err = proto.Unmarshal(slurp, &payload) @@ -227,7 +207,7 @@ func TestTraceWriterFlushSync(t *testing.T) { tw.FlushSync() // Now all trace payloads should be sent assert.Equal(t, 1, srv.Accepted()) - payloadsContain(t, srv.Payloads(), testSpans, false) + payloadsContain(t, srv.Payloads(), testSpans) }) } @@ -296,7 +276,7 @@ func TestTraceWriterSyncStop(t *testing.T) { tw.Stop() // Now all trace payloads should be sent assert.Equal(t, 1, srv.Accepted()) - payloadsContain(t, srv.Payloads(), testSpans, false) + payloadsContain(t, srv.Payloads(), testSpans) }) } diff --git a/pkg/util/cgroups/go.mod b/pkg/util/cgroups/go.mod index f8c908ef9f9c5..89f8d80d238fc 100644 --- a/pkg/util/cgroups/go.mod +++ b/pkg/util/cgroups/go.mod @@ -9,8 +9,8 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 github.com/containerd/cgroups/v3 v3.0.2 github.com/google/go-cmp v0.5.8 github.com/karrick/godirwalk v1.17.0 @@ -18,7 +18,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/util/filesystem/go.mod b/pkg/util/filesystem/go.mod index c43a3bbe0ac0a..f5a024b6b1cba 100644 --- a/pkg/util/filesystem/go.mod +++ b/pkg/util/filesystem/go.mod @@ -9,7 +9,7 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 github.com/shirou/gopsutil/v3 v3.23.9 github.com/stretchr/testify v1.9.0 @@ -17,7 +17,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-ole/go-ole v1.2.6 // indirect diff --git a/pkg/util/flavor/go.mod b/pkg/util/flavor/go.mod index 6f0f37f06c6a3..77a31d4d73648 100644 --- a/pkg/util/flavor/go.mod +++ b/pkg/util/flavor/go.mod @@ -27,26 +27,26 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/config/setup v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.54.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/util/flavor/go.sum b/pkg/util/flavor/go.sum index 9e43ead02587a..0275e78d9551e 100644 --- a/pkg/util/flavor/go.sum +++ b/pkg/util/flavor/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/pkg/util/fxutil/go.mod b/pkg/util/fxutil/go.mod index b70de9448c1c3..16d5de8179667 100644 --- a/pkg/util/fxutil/go.mod +++ b/pkg/util/fxutil/go.mod @@ -3,7 +3,7 @@ module github.com/DataDog/datadog-agent/pkg/util/fxutil go 1.21.0 require ( - github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/def v0.54.0-rc.2 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.9.0 go.uber.org/fx v1.18.2 diff --git a/pkg/util/grpc/go.mod b/pkg/util/grpc/go.mod index a61a123e8f3ba..d6a0eed581dee 100644 --- a/pkg/util/grpc/go.mod +++ b/pkg/util/grpc/go.mod @@ -9,8 +9,8 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 github.com/stretchr/testify v1.9.0 @@ -19,7 +19,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect diff --git a/pkg/util/hostname/validate/go.mod b/pkg/util/hostname/validate/go.mod index 0b491bcff0846..895e1b734afb5 100644 --- a/pkg/util/hostname/validate/go.mod +++ b/pkg/util/hostname/validate/go.mod @@ -8,12 +8,12 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect diff --git a/pkg/util/http/go.mod b/pkg/util/http/go.mod index a1798fc4122b9..671624ac39779 100644 --- a/pkg/util/http/go.mod +++ b/pkg/util/http/go.mod @@ -10,15 +10,15 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/config/model v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/stretchr/testify v1.9.0 golang.org/x/net v0.24.0 ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect - github.com/DataDog/viper v1.13.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect + github.com/DataDog/viper v1.13.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.4.7 // indirect diff --git a/pkg/util/http/go.sum b/pkg/util/http/go.sum index 39b4a2f7a2e79..ee0739b130423 100644 --- a/pkg/util/http/go.sum +++ b/pkg/util/http/go.sum @@ -39,8 +39,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/viper v1.13.2 h1:GrYzwGiaEoliIXA4wPkx8MHIRY5sNi8frV1Fsv7VCJU= -github.com/DataDog/viper v1.13.2/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/DataDog/viper v1.13.0 h1:XE5cJiXeXkyijwgspwZiH6iroWYLgAPXTOhcBnDBOMs= +github.com/DataDog/viper v1.13.0/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= diff --git a/pkg/util/log/go.mod b/pkg/util/log/go.mod index b255c64b2b7b8..e524e2b120a5d 100644 --- a/pkg/util/log/go.mod +++ b/pkg/util/log/go.mod @@ -5,7 +5,7 @@ go 1.21.0 replace github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/stretchr/testify v1.9.0 go.uber.org/atomic v1.11.0 diff --git a/pkg/util/system/go.mod b/pkg/util/system/go.mod index 92544f51bd3b0..b2a3b744c0907 100644 --- a/pkg/util/system/go.mod +++ b/pkg/util/system/go.mod @@ -12,11 +12,11 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/testutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/testutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/winutil v0.54.0-rc.2 github.com/shirou/gopsutil/v3 v3.23.12 github.com/stretchr/testify v1.9.0 go.uber.org/atomic v1.11.0 @@ -24,7 +24,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-ole/go-ole v1.2.6 // indirect diff --git a/pkg/util/uuid/go.mod b/pkg/util/uuid/go.mod index 65afd19ce9b5a..e87836975c119 100644 --- a/pkg/util/uuid/go.mod +++ b/pkg/util/uuid/go.mod @@ -9,14 +9,14 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/cache v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/cache v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/shirou/gopsutil/v3 v3.24.1 golang.org/x/sys v0.19.0 ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect diff --git a/pkg/util/winutil/go.mod b/pkg/util/winutil/go.mod index c1f11bdc6e393..31a4f499458ca 100644 --- a/pkg/util/winutil/go.mod +++ b/pkg/util/winutil/go.mod @@ -8,7 +8,7 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/log v0.54.0-rc.2 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/fsnotify/fsnotify v1.7.0 github.com/stretchr/testify v1.9.0 @@ -17,7 +17,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.54.0-rc.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/release.json b/release.json index 5993d58256d87..93f254ba2b53e 100644 --- a/release.json +++ b/release.json @@ -44,7 +44,7 @@ "WINDOWS_APMINJECT_SHASUM": "c5c228f6030ce2e19b8bfb28bd054dc246c7f1c799431e73018e6cb46ee59d2f" }, "release-a6": { - "INTEGRATIONS_CORE_VERSION": "7.54.0-rc.1", + "INTEGRATIONS_CORE_VERSION": "7.54.0-rc.2", "OMNIBUS_SOFTWARE_VERSION": "7.54.0-rc.1", "OMNIBUS_RUBY_VERSION": "7.54.0-rc.1", "JMXFETCH_VERSION": "0.49.1", @@ -59,7 +59,7 @@ "WINDOWS_DDPROCMON_SHASUM": "7c13ba75f7a30704a6a4082e4cffc819c846fd6061c53372c8b9908fee11d621" }, "release-a7": { - "INTEGRATIONS_CORE_VERSION": "7.54.0-rc.1", + "INTEGRATIONS_CORE_VERSION": "7.54.0-rc.2", "OMNIBUS_SOFTWARE_VERSION": "7.54.0-rc.1", "OMNIBUS_RUBY_VERSION": "7.54.0-rc.1", "JMXFETCH_VERSION": "0.49.1", diff --git a/releasenotes/notes/bump-viper-version-to-1.13.1-daf1a3e5bb933264.yaml b/releasenotes/notes/bump-viper-version-to-1.13.1-daf1a3e5bb933264.yaml deleted file mode 100644 index 20a66e09542e7..0000000000000 --- a/releasenotes/notes/bump-viper-version-to-1.13.1-daf1a3e5bb933264.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -fixes: - - | - Bumping ``github.com/DataDog/viper`` version from ``1.13.0`` to ``1.13.2`` which fixes a bug where using secrets in - ``network_devices.snmp_traps.community_strings`` would discard default values in ``network_devices.snmp_traps``. diff --git a/test/fakeintake/go.mod b/test/fakeintake/go.mod index 9ea7f7a62f566..2b513c063a6c2 100644 --- a/test/fakeintake/go.mod +++ b/test/fakeintake/go.mod @@ -10,8 +10,8 @@ replace ( require ( github.com/DataDog/agent-payload/v5 v5.0.106 - github.com/DataDog/datadog-agent/comp/netflow/payload v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.1 + github.com/DataDog/datadog-agent/comp/netflow/payload v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.2 github.com/benbjohnson/clock v1.3.5 github.com/cenkalti/backoff/v4 v4.2.1 github.com/kr/pretty v0.3.1 diff --git a/test/kitchen/test-definitions/windows-install-test.yml b/test/kitchen/test-definitions/windows-install-test.yml index d8457745a4a98..b149a60ab7459 100644 --- a/test/kitchen/test-definitions/windows-install-test.yml +++ b/test/kitchen/test-definitions/windows-install-test.yml @@ -22,28 +22,3 @@ suites: APM_ENABLED=true dd-agent-rspec: skip_windows_signing_test: &skip_windows_signing_test <%= ENV['SKIP_SIGNATURE_TEST'] || false %> - - - name: win-install-fail - run_list: - - "recipe[dd-agent-install::_install_windows_base]" - attributes: - datadog: - <% dd_agent_config.each do |key, value| %> - <%= key %>: "<%= value %>" - <% end %> - dd-agent-install: - <% if ENV['AGENT_VERSION'] %> - windows_version: "<%= ENV['AGENT_VERSION'] %>" - <% end %> - windows_agent_url: <%= windows_agent_url %> - <% if ENV['WINDOWS_AGENT_FILE'] %> - windows_agent_filename: "<%= ENV['WINDOWS_AGENT_FILE'] %>" - <% end %> - agent_install_options: > - APIKEY=<%= api_key %> - LOGS_ENABLED=false - PROCESS_ENABLED=true - APM_ENABLED=true - WIXFAILWHENDEFERRED=1 - dd-agent-rspec: - skip_windows_signing_test: &skip_windows_signing_test <%= ENV['SKIP_SIGNATURE_TEST'] || false %> diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index 7ea1b994385ce..6c353955cbaf0 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -18,10 +18,10 @@ replace ( require ( github.com/DataDog/agent-payload/v5 v5.0.106 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/testutil v0.54.0-rc.1 - github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.1 - github.com/DataDog/datadog-agent/test/fakeintake v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/testutil v0.54.0-rc.2 + github.com/DataDog/datadog-agent/pkg/version v0.54.0-rc.2 + github.com/DataDog/datadog-agent/test/fakeintake v0.54.0-rc.2 github.com/DataDog/datadog-api-client-go v1.16.0 github.com/DataDog/datadog-api-client-go/v2 v2.19.0 // Are you bumping github.com/DataDog/test-infra-definitions ? @@ -29,7 +29,7 @@ require ( // `TEST_INFRA_DEFINITIONS_BUILDIMAGES` matches the commit sha in the module version // Example: github.com/DataDog/test-infra-definitions v0.0.0-YYYYMMDDHHmmSS-0123456789AB // => TEST_INFRA_DEFINITIONS_BUILDIMAGES: 0123456789AB - github.com/DataDog/test-infra-definitions v0.0.0-20240429073238-98a37ef8c8a9 + github.com/DataDog/test-infra-definitions v0.0.0-20240502112654-5942f13180e5 github.com/aws/aws-sdk-go-v2 v1.26.1 github.com/aws/aws-sdk-go-v2/config v1.27.11 github.com/aws/aws-sdk-go-v2/service/ec2 v1.138.1 @@ -61,7 +61,7 @@ require ( require ( dario.cat/mergo v1.0.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/proto v0.54.0-rc.2 github.com/DataDog/mmh3 v0.0.0-20200805151601-30884ca2197a // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f // indirect @@ -239,7 +239,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/optional v0.54.0-rc.2 github.com/mitchellh/mapstructure v1.5.0 github.com/pulumi/pulumi-aws/sdk/v6 v6.25.0 github.com/pulumi/pulumi-awsx/sdk/v2 v2.5.0 @@ -248,7 +248,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/comp/netflow/payload v0.54.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/netflow/payload v0.54.0-rc.2 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect github.com/pulumi/pulumi-docker/sdk/v4 v4.5.1 // indirect diff --git a/test/new-e2e/go.sum b/test/new-e2e/go.sum index 0e3e10730bcf5..ea08605863a9e 100644 --- a/test/new-e2e/go.sum +++ b/test/new-e2e/go.sum @@ -12,8 +12,8 @@ github.com/DataDog/datadog-api-client-go/v2 v2.19.0 h1:Wvz/63/q39EpVwSH1T8jVyRvP github.com/DataDog/datadog-api-client-go/v2 v2.19.0/go.mod h1:oD5Lx8Li3oPRa/BSBenkn4i48z+91gwYORF/+6ph71g= github.com/DataDog/mmh3 v0.0.0-20200805151601-30884ca2197a h1:m9REhmyaWD5YJ0P53ygRHxKKo+KM+nw+zz0hEdKztMo= github.com/DataDog/mmh3 v0.0.0-20200805151601-30884ca2197a/go.mod h1:SvsjzyJlSg0rKsqYgdcFxeEVflx3ZNAyFfkUHP0TxXg= -github.com/DataDog/test-infra-definitions v0.0.0-20240429073238-98a37ef8c8a9 h1:g+d1YcljTugMjOnAp3Y4b0InUTeajYxF+cTbFHIQ5T4= -github.com/DataDog/test-infra-definitions v0.0.0-20240429073238-98a37ef8c8a9/go.mod h1:dhXNuNLtnIvYoqfyFSQXpoknXyxLX4HMQqs6K2cTb5E= +github.com/DataDog/test-infra-definitions v0.0.0-20240502112654-5942f13180e5 h1:8KUtTYnO2x+N0SWw1N7mggX50ZKtifJvggynhzckBU8= +github.com/DataDog/test-infra-definitions v0.0.0-20240502112654-5942f13180e5/go.mod h1:dhXNuNLtnIvYoqfyFSQXpoknXyxLX4HMQqs6K2cTb5E= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f h1:5Vuo4niPKFkfwW55jV4vY0ih3VQ9RaQqeqY67fvRn8A= diff --git a/test/new-e2e/tests/apm/docker_test.go b/test/new-e2e/tests/apm/docker_test.go index 753eef3f2e346..8200ea0305a68 100644 --- a/test/new-e2e/tests/apm/docker_test.go +++ b/test/new-e2e/tests/apm/docker_test.go @@ -173,8 +173,6 @@ func (s *DockerFakeintakeSuite) TestBasicTrace() { } func (s *DockerFakeintakeSuite) TestProbabilitySampler() { - //TODO: Remove the skip once ADXT-226 is fixed - s.T().Skip("Flaky because of a weird error on docker-compose up") s.UpdateEnv(awsdocker.Provisioner(awsdocker.WithAgentOptions( append(dockerAgentOptions(s.transport), dockeragentparams.WithAgentServiceEnvVariable( diff --git a/test/new-e2e/tests/installer/docker.go b/test/new-e2e/tests/installer/docker.go index 3d0c1358388fd..36dcdafcae8cc 100644 --- a/test/new-e2e/tests/installer/docker.go +++ b/test/new-e2e/tests/installer/docker.go @@ -65,7 +65,6 @@ sudo systemctl start docker`, "/tmp/install-docker.sh", []byte(` set -e -sudo yum update sudo yum -y install docker sudo systemctl start docker`, ), diff --git a/test/new-e2e/tests/windows/install-test/assert.go b/test/new-e2e/tests/windows/install-test/assert.go index 8851756eadbe3..e3fee2a8c6cc6 100644 --- a/test/new-e2e/tests/windows/install-test/assert.go +++ b/test/new-e2e/tests/windows/install-test/assert.go @@ -130,6 +130,8 @@ func getExpectedConfigFiles() []string { `system-probe.yaml`, `security-agent.yaml`, `runtime-security.d\default.policy`, + `conf.d\win32_event_log.d\profiles\dd_security_events_high.yaml`, + `conf.d\win32_event_log.d\profiles\dd_security_events_low.yaml`, } } diff --git a/test/new-e2e/tests/windows/install-test/installtester.go b/test/new-e2e/tests/windows/install-test/installtester.go index a69b8122b66e8..b6810ad508a94 100644 --- a/test/new-e2e/tests/windows/install-test/installtester.go +++ b/test/new-e2e/tests/windows/install-test/installtester.go @@ -218,6 +218,12 @@ func (t *Tester) TestUninstallExpectations(tt *testing.T) { assert.ErrorIs(tt, err, fs.ErrNotExist, "uninstall should remove %s example config files", examplePath) } + _, err = t.host.Lstat(filepath.Join(t.expectedConfigRoot, "auth_token")) + assert.ErrorIs(tt, err, fs.ErrNotExist, "uninstall should remove auth_token") + + _, err = t.host.Lstat(filepath.Join(t.expectedConfigRoot, "checks.d")) + assert.ErrorIs(tt, err, fs.ErrNotExist, "uninstall should remove checks.d") + _, err = windows.GetSIDForUser(t.host, windows.MakeDownLevelLogonName(t.expectedUserDomain, t.expectedUserName), ) diff --git a/tools/windows/DatadogAgentInstaller/CustomActions/CleanUpFilesCustomAction.cs b/tools/windows/DatadogAgentInstaller/CustomActions/CleanUpFilesCustomAction.cs index 329f80aa92f09..26e6ea2c16995 100644 --- a/tools/windows/DatadogAgentInstaller/CustomActions/CleanUpFilesCustomAction.cs +++ b/tools/windows/DatadogAgentInstaller/CustomActions/CleanUpFilesCustomAction.cs @@ -17,9 +17,7 @@ private static ActionResult CleanupFiles(ISession session) Path.Combine(projectLocation, "embedded2"), Path.Combine(projectLocation, "embedded3"), Path.Combine(applicationDataLocation, "install_info"), - Path.Combine(applicationDataLocation, "auth_token"), - Path.Combine(applicationDataLocation, "conf.d", "win32_event_log.d", "profiles", "dd_security_events_high.yaml"), - Path.Combine(applicationDataLocation, "conf.d", "win32_event_log.d", "profiles", "dd_security_events_low.yaml"), + Path.Combine(applicationDataLocation, "auth_token") }; foreach (var path in toDelete) {