Skip to content

Commit

Permalink
Merge branch 'main' into len.gamburg/improve-agent-restart-service
Browse files Browse the repository at this point in the history
  • Loading branch information
@iglendd
iglendd authored May 3, 2024
2 parents 447a9fc + cba18c7 commit e510fe7
Show file tree
Hide file tree
Showing 131 changed files with 1,491 additions and 1,426 deletions.
2 changes: 1 addition & 1 deletion .gitlab/common/test_infra_version.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions cmd/agent/common/path/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions cmd/cluster-agent/subcommands/start/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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{}),
Expand Down
18 changes: 18 additions & 0 deletions cmd/trace-agent/test/testsuite/traces_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
44 changes: 22 additions & 22 deletions comp/core/config/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions comp/core/config/go.sum
View file

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

4 changes: 2 additions & 2 deletions comp/core/hostname/hostnameinterface/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
48 changes: 24 additions & 24 deletions comp/core/log/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions comp/core/log/go.sum
View file

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

16 changes: 8 additions & 8 deletions comp/core/secrets/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
46 changes: 23 additions & 23 deletions comp/core/status/statusimpl/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions comp/core/status/statusimpl/go.sum
View file

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

4 changes: 2 additions & 2 deletions comp/core/telemetry/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading

0 comments on commit e510fe7

Please sign in to comment.