diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 92f4e0cae5b31..42466f04064aa 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -330,6 +330,9 @@ # Additional notification to @iglendd about Agent Telemetry changes for optional approval and governance acknowledgement /comp/core/agenttelemetry @DataDog/agent-shared-components @iglendd +# trace-agent logging implementation should also notify agent-apm +/comp/core/log/impl-trace @DataDog/agent-apm + # pkg /pkg/ @DataDog/agent-shared-components /pkg/api/ @DataDog/agent-shared-components diff --git a/cmd/trace-agent/test/testsuite/config_set_test.go b/cmd/trace-agent/test/testsuite/config_set_test.go index dbf6da1206e10..ee2065f63c7a2 100644 --- a/cmd/trace-agent/test/testsuite/config_set_test.go +++ b/cmd/trace-agent/test/testsuite/config_set_test.go @@ -11,13 +11,13 @@ import ( "testing" "time" - "github.com/DataDog/datadog-agent/cmd/trace-agent/test" - "github.com/cihub/seelog" "github.com/stretchr/testify/assert" + + "github.com/DataDog/datadog-agent/cmd/trace-agent/test" ) -func TestConfigSetHandler(t *testing.T) { +func TestConfigSetHandlerUnauthenticated(t *testing.T) { var r test.Runner if err := r.Start(); err != nil { t.Fatal(err) @@ -41,8 +41,6 @@ func TestConfigSetHandler(t *testing.T) { t.Fatal(err) } - logstr = r.AgentLog() - assert.NotContains(t, logstr, "Switched log level to") - assert.Equal(t, 200, resp.StatusCode) + assert.Equal(t, http.StatusUnauthorized, resp.StatusCode) resp.Body.Close() } diff --git a/comp/core/log/impl-trace/go.mod b/comp/core/log/impl-trace/go.mod index 4bbf09ab70ea0..558e49758e123 100644 --- a/comp/core/log/impl-trace/go.mod +++ b/comp/core/log/impl-trace/go.mod @@ -40,11 +40,11 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.3 + github.com/DataDog/datadog-agent/comp/core/config v0.59.0 github.com/DataDog/datadog-agent/comp/core/log/def v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/pkg/config/env v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.3 - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.59.0 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect; v2.6 github.com/stretchr/testify v1.10.0 @@ -52,14 +52,14 @@ require ( ) require ( - github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.3 + github.com/DataDog/datadog-agent/comp/def v0.59.0 github.com/DataDog/datadog-agent/pkg/config/mock v0.59.0 github.com/DataDog/datadog-agent/pkg/util/log/setup v0.0.0-00010101000000-000000000000 ) require ( - github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/builder v0.59.0 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/types v0.59.0 // indirect github.com/DataDog/datadog-agent/comp/core/secrets v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/config/model v0.59.0 // indirect diff --git a/comp/otelcol/ddflareextension/impl/go.mod b/comp/otelcol/ddflareextension/impl/go.mod index eddb0d30de66e..6c75776d13338 100644 --- a/comp/otelcol/ddflareextension/impl/go.mod +++ b/comp/otelcol/ddflareextension/impl/go.mod @@ -108,7 +108,7 @@ require ( github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def v0.58.0 github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/datadogexporter v0.59.0 github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/processor/infraattributesprocessor v0.59.0 - github.com/DataDog/datadog-agent/pkg/api v0.57.1 + github.com/DataDog/datadog-agent/pkg/api v0.59.0 github.com/DataDog/datadog-agent/pkg/config/mock v0.59.0 github.com/DataDog/datadog-agent/pkg/version v0.59.0 github.com/google/go-cmp v0.6.0 diff --git a/comp/otelcol/otlp/components/exporter/datadogexporter/go.mod b/comp/otelcol/otlp/components/exporter/datadogexporter/go.mod index bf26c428e8156..03d38db4ad006 100644 --- a/comp/otelcol/otlp/components/exporter/datadogexporter/go.mod +++ b/comp/otelcol/otlp/components/exporter/datadogexporter/go.mod @@ -139,14 +139,14 @@ require ( github.com/DataDog/datadog-agent/comp/core/secrets v0.59.0 // indirect github.com/DataDog/datadog-agent/comp/core/status v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/core/telemetry v0.57.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.57.1 // indirect + github.com/DataDog/datadog-agent/comp/def v0.59.0 // indirect github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/forwarder/orchestrator/orchestratorinterface v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/serializer/compression v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/api v0.57.1 // indirect + github.com/DataDog/datadog-agent/pkg/api v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/config/env v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/config/mock v0.59.0 // indirect @@ -155,7 +155,7 @@ require ( github.com/DataDog/datadog-agent/pkg/config/setup v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/config/structure v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/config/teeconfig v0.60.0-devel // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.57.1 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.3 // indirect @@ -182,7 +182,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/common v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.59.0 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.57.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/json v0.56.0-rc.3 // indirect diff --git a/comp/otelcol/otlp/components/statsprocessor/go.mod b/comp/otelcol/otlp/components/statsprocessor/go.mod index ae2cd3d4f9fd2..5d552885f7b36 100644 --- a/comp/otelcol/otlp/components/statsprocessor/go.mod +++ b/comp/otelcol/otlp/components/statsprocessor/go.mod @@ -37,9 +37,9 @@ require ( github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.59.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.59.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.59.0 // indirect github.com/DataDog/go-sqllexer v0.0.17 // indirect github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect github.com/DataDog/sketches-go v1.4.6 // indirect diff --git a/comp/trace/agent/impl/run.go b/comp/trace/agent/impl/run.go index d42d90b41fbff..df25106b78755 100644 --- a/comp/trace/agent/impl/run.go +++ b/comp/trace/agent/impl/run.go @@ -70,6 +70,12 @@ func runAgentSidekicks(ag component) error { log.Errorf("could not set auth token: %s", err) } else { ag.Agent.DebugServer.AddRoute("/config", ag.config.GetConfigHandler()) + api.AttachEndpoint(api.Endpoint{ + Pattern: "/config/set", + Handler: func(_ *api.HTTPReceiver) http.Handler { + return ag.config.SetHandler() + }, + }) } if secrets, ok := ag.secrets.Get(); ok { // Adding a route to trigger a secrets refresh from the CLI. @@ -92,13 +98,6 @@ func runAgentSidekicks(ag component) error { })) } - api.AttachEndpoint(api.Endpoint{ - Pattern: "/config/set", - Handler: func(_ *api.HTTPReceiver) http.Handler { - return ag.config.SetHandler() - }, - }) - log.Infof("Trace agent running on host %s", tracecfg.Hostname) if pcfg := profilingConfig(tracecfg); pcfg != nil { if err := profiling.Start(*pcfg); err != nil { diff --git a/comp/trace/config/config.go b/comp/trace/config/config.go index e92e4b510034e..717d65074bb64 100644 --- a/comp/trace/config/config.go +++ b/comp/trace/config/config.go @@ -133,6 +133,9 @@ func (c *cfg) SetHandler() http.Handler { httpError(w, http.StatusMethodNotAllowed, fmt.Errorf("%s method not allowed, only %s", req.Method, http.MethodPost)) return } + if apiutil.Validate(w, req) != nil { + return + } for key, values := range req.URL.Query() { if len(values) == 0 { continue diff --git a/comp/trace/config/config_test.go b/comp/trace/config/config_test.go index 7bdc5950e9cbf..f428a7da51bc4 100644 --- a/comp/trace/config/config_test.go +++ b/comp/trace/config/config_test.go @@ -2234,6 +2234,38 @@ func TestGetCoreConfigHandler(t *testing.T) { assert.Contains(t, conf, "apm_config") } +func TestSetConfigHandler(t *testing.T) { + config := buildConfigComponent(t, true, fx.Supply(corecomp.Params{})) + + handler := config.SetHandler().ServeHTTP + + // Refuse non POST query + resp := httptest.NewRecorder() + req := httptest.NewRequest("GET", "/config", nil) + handler(resp, req) + assert.Equal(t, http.StatusMethodNotAllowed, resp.Code) + + // Refuse missing auth token + resp = httptest.NewRecorder() + req = httptest.NewRequest("POST", "/config", nil) + handler(resp, req) + assert.Equal(t, http.StatusUnauthorized, resp.Code) + + // Refuse invalid auth token + resp = httptest.NewRecorder() + req = httptest.NewRequest("POST", "/config", nil) + req.Header.Set("Authorization", "Bearer ABCDE") + handler(resp, req) + assert.Equal(t, http.StatusForbidden, resp.Code) + + // Accept valid auth token return OK + resp = httptest.NewRecorder() + req = httptest.NewRequest("POST", "/config", nil) + req.Header.Set("Authorization", "Bearer "+apiutil.GetAuthToken()) + handler(resp, req) + assert.Equal(t, http.StatusOK, resp.Code) +} + func TestDisableReceiverConfig(t *testing.T) { config := buildConfigComponent(t, true, fx.Replace(corecomp.MockParams{ Params: corecomp.Params{ConfFilePath: "./testdata/disable_receiver.yaml"}, diff --git a/comp/trace/config/setup.go b/comp/trace/config/setup.go index 4cdb5f832eae2..f19c5eeaf8a4f 100644 --- a/comp/trace/config/setup.go +++ b/comp/trace/config/setup.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" + apiutil "github.com/DataDog/datadog-agent/pkg/api/util" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes" corecompcfg "github.com/DataDog/datadog-agent/comp/core/config" @@ -121,6 +122,7 @@ func prepareConfig(c corecompcfg.Component, tagger tagger.Component) (*config.Ag return tagger.Tag(types.NewEntityID(types.ContainerID, cid), types.HighCardinality) } cfg.ContainerProcRoot = coreConfigObject.GetString("container_proc_root") + cfg.GetAgentAuthToken = apiutil.GetAuthToken return cfg, nil } diff --git a/go.mod b/go.mod index 7d1ddbeffe448..db7a637f947c1 100644 --- a/go.mod +++ b/go.mod @@ -679,7 +679,7 @@ require ( github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.59.0 github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.56.0-rc.3 github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.59.0-rc.6 - github.com/DataDog/datadog-agent/pkg/api v0.57.1 + github.com/DataDog/datadog-agent/pkg/api v0.59.0 github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.59.0 github.com/DataDog/datadog-agent/pkg/config/env v0.59.0 github.com/DataDog/datadog-agent/pkg/config/mock v0.59.0 diff --git a/pkg/trace/config/config.go b/pkg/trace/config/config.go index bc84e401c88bf..5d0e59f059e39 100644 --- a/pkg/trace/config/config.go +++ b/pkg/trace/config/config.go @@ -460,6 +460,10 @@ type AgentConfig struct { // Azure container apps tags, in the form of a comma-separated list of // key-value pairs, starting with a comma AzureContainerAppTags string + + // GetAgentAuthToken retrieves an auth token to communicate with other agent processes + // Function will be nil if in an environment without an auth token + GetAgentAuthToken func() string `json:"-"` } // RemoteClient client is used to APM Sampling Updates from a remote source. diff --git a/pkg/trace/go.mod b/pkg/trace/go.mod index 331d452284d45..bd0db6ed04e59 100644 --- a/pkg/trace/go.mod +++ b/pkg/trace/go.mod @@ -17,9 +17,9 @@ require ( github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.3 github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.3 github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.3 - github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.3 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.3 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.3 + github.com/DataDog/datadog-agent/pkg/util/log v0.59.0 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.59.0 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.59.0 github.com/DataDog/datadog-go/v5 v5.5.0 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.21.0 github.com/DataDog/sketches-go v1.4.6 diff --git a/pkg/trace/remoteconfighandler/remote_config_handler.go b/pkg/trace/remoteconfighandler/remote_config_handler.go index 017d858a4cc74..a1d24e7b8e744 100644 --- a/pkg/trace/remoteconfighandler/remote_config_handler.go +++ b/pkg/trace/remoteconfighandler/remote_config_handler.go @@ -91,6 +91,8 @@ func (h *RemoteConfigHandler) onAgentConfigUpdate(updates map[string]state.RawCo return } + // todo refactor shared code + if len(mergedConfig.LogLevel) > 0 { // Get the current log level var newFallback seelog.LogLevel @@ -98,7 +100,12 @@ func (h *RemoteConfigHandler) onAgentConfigUpdate(updates map[string]state.RawCo if err == nil { h.configState.FallbackLogLevel = newFallback.String() var resp *http.Response - resp, err = http.Post(fmt.Sprintf(h.configSetEndpointFormatString, mergedConfig.LogLevel), "", nil) + var req *http.Request + req, err = h.buildLogLevelRequest(mergedConfig.LogLevel) + if err != nil { + return + } + resp, err = http.DefaultClient.Do(req) if err == nil { resp.Body.Close() h.configState.LatestLogLevel = mergedConfig.LogLevel @@ -111,7 +118,12 @@ func (h *RemoteConfigHandler) onAgentConfigUpdate(updates map[string]state.RawCo if err == nil && currentLogLevel.String() == h.configState.LatestLogLevel { pkglog.Infof("Removing remote-config log level override of the trace-agent, falling back to %s", h.configState.FallbackLogLevel) var resp *http.Response - resp, err = http.Post(fmt.Sprintf(h.configSetEndpointFormatString, h.configState.FallbackLogLevel), "", nil) + var req *http.Request + req, err = h.buildLogLevelRequest(h.configState.FallbackLogLevel) + if err != nil { + return + } + resp, err = http.DefaultClient.Do(req) if err == nil { resp.Body.Close() } @@ -135,6 +147,18 @@ func (h *RemoteConfigHandler) onAgentConfigUpdate(updates map[string]state.RawCo } } +func (h *RemoteConfigHandler) buildLogLevelRequest(newLevel string) (*http.Request, error) { + req, err := http.NewRequest(http.MethodPost, fmt.Sprintf(h.configSetEndpointFormatString, newLevel), nil) + if err != nil { + pkglog.Infof("Failed to build request to change log level of the trace-agent to %s through remote config", newLevel) + return nil, err + } + if h.agentConfig.GetAgentAuthToken != nil { + req.Header.Set("Authorization", "Bearer "+h.agentConfig.GetAgentAuthToken()) + } + return req, nil +} + func (h *RemoteConfigHandler) onUpdate(update map[string]state.RawConfig, _ func(string, state.ApplyStatus)) { if len(update) == 0 { log.Debugf("no samplers configuration in remote config update payload") diff --git a/pkg/trace/remoteconfighandler/remote_config_handler_test.go b/pkg/trace/remoteconfighandler/remote_config_handler_test.go index da1be045ba4db..6d3cde4a49711 100644 --- a/pkg/trace/remoteconfighandler/remote_config_handler_test.go +++ b/pkg/trace/remoteconfighandler/remote_config_handler_test.go @@ -13,14 +13,15 @@ import ( "strings" "testing" + "github.com/cihub/seelog" + "github.com/golang/mock/gomock" + "github.com/stretchr/testify/assert" + "github.com/DataDog/datadog-agent/pkg/remoteconfig/state" "github.com/DataDog/datadog-agent/pkg/remoteconfig/state/products/apmsampling" "github.com/DataDog/datadog-agent/pkg/trace/config" pkglog "github.com/DataDog/datadog-agent/pkg/util/log" "github.com/DataDog/datadog-agent/pkg/util/pointer" - "github.com/cihub/seelog" - "github.com/golang/mock/gomock" - "github.com/stretchr/testify/assert" ) // nolint: revive @@ -193,7 +194,8 @@ func TestLogLevel(t *testing.T) { rareSampler := NewMockrareSampler(ctrl) pkglog.SetupLogger(seelog.Default, "debug") - srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + assert.Equal(t, "Bearer fakeToken", r.Header.Get("Authorization")) w.WriteHeader(200) })) defer srv.Close() @@ -204,6 +206,9 @@ func TestLogLevel(t *testing.T) { DefaultEnv: "agent-env", ReceiverHost: "127.0.0.1", ReceiverPort: port, + GetAgentAuthToken: func() string { + return "fakeToken" + }, } h := New(&agentConfig, prioritySampler, rareSampler, errorsSampler) diff --git a/pkg/trace/stats/oteltest/go.mod b/pkg/trace/stats/oteltest/go.mod index 0f6d4141b9c07..aabc79c264479 100644 --- a/pkg/trace/stats/oteltest/go.mod +++ b/pkg/trace/stats/oteltest/go.mod @@ -25,9 +25,9 @@ require ( github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.59.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.59.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.59.0 // indirect github.com/DataDog/go-sqllexer v0.0.17 // indirect github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect github.com/DataDog/sketches-go v1.4.6 // indirect diff --git a/releasenotes/notes/traceagent-loglevel-027cc2c0e581b195.yaml b/releasenotes/notes/traceagent-loglevel-027cc2c0e581b195.yaml new file mode 100644 index 0000000000000..abcef3986cc0b --- /dev/null +++ b/releasenotes/notes/traceagent-loglevel-027cc2c0e581b195.yaml @@ -0,0 +1,11 @@ +# Each section from every release note are combined when the +# CHANGELOG.rst is rendered. So the text needs to be worded so that +# it does not depend on any information only available in another +# section. This may mean repeating some details, but each section +# must be readable independently of the other. +# +# Each section note must be formatted as reStructuredText. +--- +enhancements: + - | + APM: The trace agent endpoint for changing the configured log level now requires authentication so it is only accessible to other Agent processes. diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index 5053d1a984771..4e07b944663fd 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -48,10 +48,10 @@ require ( github.com/DataDog/agent-payload/v5 v5.0.137 github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def v0.56.2 github.com/DataDog/datadog-agent/pkg/util/optional v0.59.0 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.2 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.2 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.59.0 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.59.0 github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.2 - github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.3 + github.com/DataDog/datadog-agent/pkg/version v0.59.0 github.com/DataDog/datadog-agent/test/fakeintake v0.56.0-rc.3 github.com/DataDog/datadog-api-client-go v1.16.0 github.com/DataDog/datadog-api-client-go/v2 v2.31.0 diff --git a/test/otel/go.mod b/test/otel/go.mod index d7223e48d1316..1fa91df93b234 100644 --- a/test/otel/go.mod +++ b/test/otel/go.mod @@ -94,7 +94,7 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/config v0.57.1 + github.com/DataDog/datadog-agent/comp/core/config v0.59.0 github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/core/log/def v0.56.0-rc.1 github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.3 @@ -126,11 +126,11 @@ require ( require ( github.com/DataDog/agent-payload/v5 v5.0.137 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/builder v0.57.1 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/types v0.57.1 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/core/secrets v0.59.0 // indirect github.com/DataDog/datadog-agent/comp/core/telemetry v0.57.1 // indirect - github.com/DataDog/datadog-agent/comp/def v0.57.1 // indirect + github.com/DataDog/datadog-agent/comp/def v0.59.0 // indirect github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.3 // indirect @@ -140,7 +140,7 @@ require ( github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.60.0-devel // indirect github.com/DataDog/datadog-agent/pkg/config/structure v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/config/teeconfig v0.60.0-devel // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.57.1 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.3 // indirect @@ -161,7 +161,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.59.0 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.57.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.59.0 // indirect @@ -173,7 +173,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/system v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system/socket v0.59.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.59.0 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.57.1 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.3 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.31.0 // indirect github.com/DataDog/datadog-go/v5 v5.5.0 // indirect github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240816154533-f7f9beb53a42 // indirect diff --git a/tools/retry_file_dump/go.mod b/tools/retry_file_dump/go.mod index ed65fca4950b0..7fca970324657 100644 --- a/tools/retry_file_dump/go.mod +++ b/tools/retry_file_dump/go.mod @@ -7,9 +7,9 @@ module github.com/DataDog/datadog-agent/tools/retry_file_dump go 1.22.0 -require github.com/golang/protobuf v1.4.3 +require github.com/golang/protobuf v1.5.4 require ( github.com/google/go-cmp v0.6.0 // indirect - google.golang.org/protobuf v1.23.0 // indirect + google.golang.org/protobuf v1.35.2 // indirect ) diff --git a/tools/retry_file_dump/go.sum b/tools/retry_file_dump/go.sum index 87b425aebfe54..3b856ba5c8cdb 100644 --- a/tools/retry_file_dump/go.sum +++ b/tools/retry_file_dump/go.sum @@ -1,20 +1,6 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=