From d5d581018c24eadd404aa8fb1920bb3add1d8e6c Mon Sep 17 00:00:00 2001 From: Jake Saferstein Date: Tue, 14 Apr 2026 11:00:55 -0400 Subject: [PATCH] feat(logs): add dual-send shadow gRPC pipeline --- comp/api/api/def/go.mod | 1 - comp/core/agenttelemetry/def/go.mod | 1 - comp/core/agenttelemetry/fx/go.mod | 2 +- comp/core/agenttelemetry/impl/go.mod | 2 +- comp/core/config/go.mod | 2 +- comp/core/configsync/go.mod | 2 +- .../delegatedauth/api/cloudauth/aws/go.mod | 2 +- comp/core/delegatedauth/go.mod | 2 +- comp/core/flare/builder/go.mod | 1 - comp/core/flare/types/go.mod | 1 - comp/core/hostname/hostnameinterface/go.mod | 1 - comp/core/ipc/def/go.mod | 1 - comp/core/ipc/httphelpers/go.mod | 2 +- comp/core/ipc/impl/go.mod | 2 +- comp/core/ipc/mock/go.mod | 2 +- comp/core/log/def/go.mod | 1 - comp/core/log/fx/go.mod | 2 +- comp/core/log/impl-trace/go.mod | 2 +- comp/core/log/impl/go.mod | 2 +- comp/core/log/mock/go.mod | 1 - comp/core/secrets/def/go.mod | 1 - comp/core/secrets/fx/go.mod | 2 +- comp/core/secrets/impl/go.mod | 2 +- comp/core/secrets/mock/go.mod | 1 - comp/core/secrets/noop-impl/go.mod | 1 - comp/core/secrets/utils/go.mod | 1 - comp/core/status/go.mod | 1 - comp/core/status/statusimpl/go.mod | 2 +- comp/core/tagger/def/go.mod | 2 +- comp/core/tagger/fx-remote/go.mod | 2 +- comp/core/tagger/generic_store/go.mod | 1 - comp/core/tagger/impl-remote/go.mod | 4 +- comp/core/tagger/origindetection/go.mod | 1 - comp/core/tagger/subscriber/go.mod | 1 - comp/core/tagger/tags/go.mod | 1 - comp/core/tagger/telemetry/go.mod | 1 - comp/core/tagger/types/go.mod | 1 - comp/core/tagger/utils/go.mod | 1 - comp/core/telemetry/go.mod | 1 - comp/def/go.mod | 1 - comp/forwarder/defaultforwarder/go.mod | 2 +- .../orchestrator/orchestratorinterface/go.mod | 2 +- comp/logs-library/go.mod | 1 - comp/logs/agent/agentimpl/agent.go | 4 + comp/logs/agent/agentimpl/agent_core_init.go | 1 + .../agent/agentimpl/agent_serverless_init.go | 1 + comp/logs/agent/config/config.go | 3 +- comp/logs/agent/config/endpoints.go | 3 + comp/logs/agent/config/go.mod | 2 +- comp/netflow/payload/go.mod | 1 - comp/otelcol/collector-contrib/def/go.mod | 1 - comp/otelcol/collector-contrib/impl/go.mod | 2 +- comp/otelcol/converter/def/go.mod | 1 - comp/otelcol/converter/impl/go.mod | 2 +- comp/otelcol/ddflareextension/def/go.mod | 1 - comp/otelcol/ddflareextension/impl/go.mod | 12 +- comp/otelcol/ddflareextension/impl/go.sum | 2 + comp/otelcol/ddflareextension/types/go.mod | 1 - comp/otelcol/ddprofilingextension/def/go.mod | 1 - comp/otelcol/ddprofilingextension/impl/go.mod | 2 +- comp/otelcol/logsagentpipeline/go.mod | 14 +- comp/otelcol/logsagentpipeline/go.sum | 2 + .../logsagentpipelineimpl/go.mod | 14 +- .../logsagentpipelineimpl/go.sum | 2 + .../exporter/datadogexporter/go.mod | 12 +- .../exporter/datadogexporter/go.sum | 2 + .../exporter/logsagentexporter/go.mod | 2 +- .../exporter/serializerexporter/go.mod | 2 +- .../otlp/components/metricsclient/go.mod | 1 - .../processor/infraattributesprocessor/go.mod | 2 +- comp/otelcol/otlp/testutil/go.mod | 2 +- comp/otelcol/status/def/go.mod | 1 - comp/otelcol/status/impl/go.mod | 2 +- comp/serializer/logscompression/go.mod | 2 +- comp/serializer/metricscompression/go.mod | 2 +- comp/trace/agent/def/go.mod | 1 - comp/trace/compression/def/go.mod | 1 - comp/trace/compression/impl-gzip/go.mod | 1 - comp/trace/compression/impl-zstd/go.mod | 1 - deps/go.MODULE.bazel | 6 + go.mod | 12 +- pkg/aggregator/ckey/go.mod | 1 - pkg/api/go.mod | 2 +- pkg/collector/check/defaults/go.mod | 1 - pkg/config/basic/go.mod | 1 - pkg/config/create/go.mod | 1 - pkg/config/env/go.mod | 2 +- pkg/config/helper/go.mod | 1 - pkg/config/mock/go.mod | 2 +- pkg/config/model/go.mod | 1 - pkg/config/nodetreemodel/go.mod | 1 - pkg/config/remote/go.mod | 2 +- pkg/config/render_config/go.mod | 1 - pkg/config/setup/go.mod | 2 +- pkg/config/structure/go.mod | 1 - pkg/config/teeconfig/go.mod | 1 - pkg/config/utils/go.mod | 2 +- pkg/config/viperconfig/go.mod | 1 - pkg/discovery/tracermetadata/model/go.mod | 1 - pkg/errors/go.mod | 1 - pkg/fips/go.mod | 1 - pkg/gohai/go.mod | 1 - pkg/logs/client/go.mod | 20 +-- pkg/logs/diagnostic/go.mod | 6 +- pkg/logs/message/go.mod | 9 +- pkg/logs/message/message.go | 10 +- pkg/logs/metrics/go.mod | 1 - pkg/logs/patterns/clustering/go.mod | 35 ++-- pkg/logs/patterns/clustering/go.sum | 36 ++-- pkg/logs/patterns/clustering/merging/go.mod | 2 - pkg/logs/patterns/eviction/go.mod | 2 - pkg/logs/patterns/processor/go.mod | 2 - pkg/logs/patterns/tags/go.mod | 45 ++--- pkg/logs/patterns/tags/go.sum | 68 +++---- pkg/logs/patterns/tags/tag_manager.go | 10 +- pkg/logs/patterns/token/go.mod | 2 - pkg/logs/patterns/tokenizer/rust/go.mod | 36 ++-- pkg/logs/patterns/tokenizer/rust/go.sum | 38 ++-- pkg/logs/pipeline/go.mod | 18 +- pkg/logs/pipeline/go.sum | 2 + pkg/logs/pipeline/pipeline.go | 20 +++ pkg/logs/pipeline/provider.go | 11 +- pkg/logs/processor/go.mod | 10 +- pkg/logs/processor/json.go | 36 ++-- pkg/logs/sender/go.mod | 19 +- pkg/logs/sender/grpc/batch_strategy.go | 2 +- pkg/logs/sender/grpc/batch_strategy_test.go | 2 +- pkg/logs/sender/grpc/dual_strategy.go | 167 ++++++++++++++++++ pkg/logs/sender/grpc/go.mod | 56 +++--- pkg/logs/sender/grpc/go.sum | 86 ++++----- pkg/logs/sender/grpc/inflight.go | 2 +- pkg/logs/sender/grpc/mock_state.go | 76 +++++--- pkg/logs/sender/grpc/sender.go | 39 ++-- pkg/logs/sender/grpc/stream_worker.go | 2 +- pkg/logs/sender/grpc/stream_worker_test.go | 2 +- pkg/logs/sender/http/http_sender.go | 6 + pkg/logs/sources/go.mod | 2 +- pkg/logs/status/statusinterface/go.mod | 1 - pkg/logs/status/utils/go.mod | 1 - pkg/logs/types/go.mod | 1 - pkg/logs/util/testutils/go.mod | 2 +- pkg/metrics/go.mod | 2 +- pkg/network/driver/go.mod | 1 - pkg/network/payload/go.mod | 1 - pkg/networkdevice/profile/go.mod | 1 - pkg/networkpath/payload/go.mod | 1 - pkg/obfuscate/go.mod | 1 - .../inframetadata/go.mod | 1 - .../gohai/internal/gohaitest/go.mod | 1 - .../otlp/attributes/go.mod | 1 - pkg/opentelemetry-mapping-go/otlp/logs/go.mod | 1 - .../otlp/metrics/go.mod | 1 - pkg/opentelemetry-mapping-go/otlp/rum/go.mod | 1 - pkg/orchestrator/model/go.mod | 1 - pkg/orchestrator/util/go.mod | 1 - pkg/process/util/api/go.mod | 2 +- pkg/proto/go.mod | 1 - pkg/proto/pbgo/statefulpb/BUILD.bazel | 5 +- pkg/remoteconfig/state/go.mod | 1 - pkg/security/secl/go.mod | 1 - pkg/security/seclwin/go.mod | 4 +- pkg/serializer/go.mod | 2 +- pkg/ssi/testutils/go.mod | 1 - pkg/status/health/go.mod | 1 - pkg/tagger/types/go.mod | 1 - pkg/tagset/go.mod | 1 - pkg/telemetry/go.mod | 1 - pkg/trace/go.mod | 2 +- pkg/trace/log/go.mod | 1 - pkg/trace/otel/go.mod | 2 +- pkg/trace/stats/go.mod | 1 - pkg/trace/traceutil/go.mod | 1 - pkg/util/aws/creds/go.mod | 2 +- pkg/util/backoff/go.mod | 1 - pkg/util/buf/go.mod | 1 - pkg/util/cache/go.mod | 1 - pkg/util/cgroups/go.mod | 1 - pkg/util/common/go.mod | 1 - pkg/util/compression/go.mod | 2 +- pkg/util/containers/image/go.mod | 1 - pkg/util/defaultpaths/go.mod | 2 +- pkg/util/executable/go.mod | 1 - pkg/util/filesystem/go.mod | 1 - pkg/util/flavor/go.mod | 2 +- pkg/util/fxutil/go.mod | 1 - pkg/util/grpc/go.mod | 4 +- pkg/util/hostinfo/go.mod | 1 - pkg/util/hostname/validate/go.mod | 1 - pkg/util/http/go.mod | 2 +- pkg/util/json/go.mod | 1 - pkg/util/jsonquery/go.mod | 1 - .../apiserver/common/namespace/go.mod | 2 +- pkg/util/log/go.mod | 1 - pkg/util/log/setup/go.mod | 2 +- pkg/util/option/go.mod | 1 - pkg/util/otel/go.mod | 1 - pkg/util/pointer/go.mod | 1 - pkg/util/prometheus/go.mod | 1 - pkg/util/quantile/go.mod | 1 - pkg/util/quantile/sketchtest/go.mod | 1 - pkg/util/scrubber/go.mod | 1 - pkg/util/sort/go.mod | 1 - pkg/util/startstop/go.mod | 1 - pkg/util/statstracker/go.mod | 1 - pkg/util/system/go.mod | 6 - pkg/util/system/go.sum | 8 - pkg/util/system/socket/go.mod | 2 - pkg/util/testutil/go.mod | 1 - pkg/util/utilizationtracker/go.mod | 1 - pkg/util/uuid/go.mod | 1 - pkg/util/winutil/go.mod | 1 - pkg/version/go.mod | 1 - test/e2e-framework/go.mod | 1 - test/fakeintake/go.mod | 1 - test/new-e2e/go.mod | 1 - test/otel/go.mod | 12 +- test/otel/go.sum | 2 + 217 files changed, 698 insertions(+), 526 deletions(-) create mode 100644 pkg/logs/sender/grpc/dual_strategy.go diff --git a/comp/api/api/def/go.mod b/comp/api/api/def/go.mod index 721f3ea0c0d9..3d70aaec12cb 100644 --- a/comp/api/api/def/go.mod +++ b/comp/api/api/def/go.mod @@ -118,7 +118,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/agenttelemetry/def/go.mod b/comp/core/agenttelemetry/def/go.mod index 4fd11f03328e..6060d3dafd54 100644 --- a/comp/core/agenttelemetry/def/go.mod +++ b/comp/core/agenttelemetry/def/go.mod @@ -127,7 +127,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/agenttelemetry/fx/go.mod b/comp/core/agenttelemetry/fx/go.mod index fcfeca2078f3..b9b50134ef26 100644 --- a/comp/core/agenttelemetry/fx/go.mod +++ b/comp/core/agenttelemetry/fx/go.mod @@ -52,6 +52,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.2 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.70.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/uuid v0.69.4 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.73.2 // indirect @@ -213,7 +214,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/agenttelemetry/impl/go.mod b/comp/core/agenttelemetry/impl/go.mod index f3084441be10..442acc0817df 100644 --- a/comp/core/agenttelemetry/impl/go.mod +++ b/comp/core/agenttelemetry/impl/go.mod @@ -60,6 +60,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/option v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.70.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/uuid v0.69.4 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.70.0 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -217,7 +218,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/config/go.mod b/comp/core/config/go.mod index 88c1275593da..a0b665c3437c 100644 --- a/comp/core/config/go.mod +++ b/comp/core/config/go.mod @@ -41,6 +41,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect @@ -184,7 +185,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/comp/core/configsync/go.mod b/comp/core/configsync/go.mod index b58deb963343..58bf7b4ab666 100644 --- a/comp/core/configsync/go.mod +++ b/comp/core/configsync/go.mod @@ -52,6 +52,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.76.0-devel // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.76.0-devel // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.76.0-devel // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.76.0-devel // indirect github.com/DataDog/datadog-agent/pkg/version v0.76.0-devel // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -204,7 +205,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/comp/core/delegatedauth/api/cloudauth/aws/go.mod b/comp/core/delegatedauth/api/cloudauth/aws/go.mod index cfcef575638e..b631e800cecd 100644 --- a/comp/core/delegatedauth/api/cloudauth/aws/go.mod +++ b/comp/core/delegatedauth/api/cloudauth/aws/go.mod @@ -33,6 +33,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/viper v1.15.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect @@ -174,7 +175,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../../../pkg/logs/processor diff --git a/comp/core/delegatedauth/go.mod b/comp/core/delegatedauth/go.mod index 0175264b6647..bd80ebdced51 100644 --- a/comp/core/delegatedauth/go.mod +++ b/comp/core/delegatedauth/go.mod @@ -37,6 +37,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/option v0.64.0-devel // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -190,7 +191,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/comp/core/flare/builder/go.mod b/comp/core/flare/builder/go.mod index 1969b05a4132..44b20d9ae6a3 100644 --- a/comp/core/flare/builder/go.mod +++ b/comp/core/flare/builder/go.mod @@ -106,7 +106,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/flare/types/go.mod b/comp/core/flare/types/go.mod index e90a9c873d96..f9acf4562f58 100644 --- a/comp/core/flare/types/go.mod +++ b/comp/core/flare/types/go.mod @@ -121,7 +121,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/hostname/hostnameinterface/go.mod b/comp/core/hostname/hostnameinterface/go.mod index f75819a9f628..e93e0cca9212 100644 --- a/comp/core/hostname/hostnameinterface/go.mod +++ b/comp/core/hostname/hostnameinterface/go.mod @@ -128,7 +128,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/ipc/def/go.mod b/comp/core/ipc/def/go.mod index cb4f005a5b70..c6c4de5d1058 100644 --- a/comp/core/ipc/def/go.mod +++ b/comp/core/ipc/def/go.mod @@ -106,7 +106,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/ipc/httphelpers/go.mod b/comp/core/ipc/httphelpers/go.mod index 881da8843303..48e32ac0c4c1 100644 --- a/comp/core/ipc/httphelpers/go.mod +++ b/comp/core/ipc/httphelpers/go.mod @@ -9,6 +9,7 @@ require ( github.com/DataDog/datadog-agent/pkg/config/model v0.73.0-rc.5 github.com/DataDog/datadog-agent/pkg/util/log v0.73.0-rc.5 github.com/DataDog/datadog-agent/pkg/util/system v0.72.0-rc.5 + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 github.com/mdlayher/vsock v1.2.1 github.com/stretchr/testify v1.11.1 ) @@ -193,7 +194,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/ipc/impl/go.mod b/comp/core/ipc/impl/go.mod index 6b15775522e5..807eacfeeab0 100644 --- a/comp/core/ipc/impl/go.mod +++ b/comp/core/ipc/impl/go.mod @@ -48,6 +48,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.72.0-rc.5 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -193,7 +194,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/ipc/mock/go.mod b/comp/core/ipc/mock/go.mod index f5ec070a38c7..afc17f845b8d 100644 --- a/comp/core/ipc/mock/go.mod +++ b/comp/core/ipc/mock/go.mod @@ -45,6 +45,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.72.0-rc.5 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -191,7 +192,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/log/def/go.mod b/comp/core/log/def/go.mod index 36ea1a51cf57..765da3ea3ce6 100644 --- a/comp/core/log/def/go.mod +++ b/comp/core/log/def/go.mod @@ -118,7 +118,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/log/fx/go.mod b/comp/core/log/fx/go.mod index 55eca0221842..a800a0a180f5 100644 --- a/comp/core/log/fx/go.mod +++ b/comp/core/log/fx/go.mod @@ -42,6 +42,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -188,7 +189,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/log/impl-trace/go.mod b/comp/core/log/impl-trace/go.mod index 7d00356fbf7b..f2c1e3a1db07 100644 --- a/comp/core/log/impl-trace/go.mod +++ b/comp/core/log/impl-trace/go.mod @@ -47,6 +47,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -191,7 +192,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/log/impl/go.mod b/comp/core/log/impl/go.mod index 2ce7b44880b5..07d45147b7f7 100644 --- a/comp/core/log/impl/go.mod +++ b/comp/core/log/impl/go.mod @@ -42,6 +42,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -187,7 +188,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/log/mock/go.mod b/comp/core/log/mock/go.mod index 19df9fb995ab..45bf0d382b38 100644 --- a/comp/core/log/mock/go.mod +++ b/comp/core/log/mock/go.mod @@ -120,7 +120,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/secrets/def/go.mod b/comp/core/secrets/def/go.mod index 2f1576fd5440..74d2f8681a40 100644 --- a/comp/core/secrets/def/go.mod +++ b/comp/core/secrets/def/go.mod @@ -106,7 +106,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/secrets/fx/go.mod b/comp/core/secrets/fx/go.mod index cdc2b9a4bbc3..6edeb9c6caa8 100644 --- a/comp/core/secrets/fx/go.mod +++ b/comp/core/secrets/fx/go.mod @@ -41,6 +41,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.68.3 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -205,7 +206,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/secrets/impl/go.mod b/comp/core/secrets/impl/go.mod index 4ff83c8a49dd..34cd4f0f6f15 100644 --- a/comp/core/secrets/impl/go.mod +++ b/comp/core/secrets/impl/go.mod @@ -48,6 +48,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/option v0.68.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect @@ -205,7 +206,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/secrets/mock/go.mod b/comp/core/secrets/mock/go.mod index 2da6e43ac1d7..37c5665b6fe5 100644 --- a/comp/core/secrets/mock/go.mod +++ b/comp/core/secrets/mock/go.mod @@ -114,7 +114,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/secrets/noop-impl/go.mod b/comp/core/secrets/noop-impl/go.mod index d89a97a83360..26ab8fa2f45b 100644 --- a/comp/core/secrets/noop-impl/go.mod +++ b/comp/core/secrets/noop-impl/go.mod @@ -129,7 +129,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/secrets/utils/go.mod b/comp/core/secrets/utils/go.mod index 2608c61f297d..fb902b0b49f5 100644 --- a/comp/core/secrets/utils/go.mod +++ b/comp/core/secrets/utils/go.mod @@ -121,7 +121,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/status/go.mod b/comp/core/status/go.mod index dcef8fc7e7e1..d5dddf275089 100644 --- a/comp/core/status/go.mod +++ b/comp/core/status/go.mod @@ -132,7 +132,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/comp/core/status/statusimpl/go.mod b/comp/core/status/statusimpl/go.mod index d8b10cba93dc..8d265e65dbff 100644 --- a/comp/core/status/statusimpl/go.mod +++ b/comp/core/status/statusimpl/go.mod @@ -48,6 +48,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/viper v1.15.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect @@ -195,7 +196,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/tagger/def/go.mod b/comp/core/tagger/def/go.mod index 6ac085d162d7..25776a6e6f01 100644 --- a/comp/core/tagger/def/go.mod +++ b/comp/core/tagger/def/go.mod @@ -45,6 +45,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/sort v0.60.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -192,7 +193,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/tagger/fx-remote/go.mod b/comp/core/tagger/fx-remote/go.mod index 61ce84d21333..3be346deb48a 100644 --- a/comp/core/tagger/fx-remote/go.mod +++ b/comp/core/tagger/fx-remote/go.mod @@ -64,6 +64,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/sort v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.72.0-rc.5 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -243,7 +244,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/tagger/generic_store/go.mod b/comp/core/tagger/generic_store/go.mod index c58ce79686b9..012811b9f67f 100644 --- a/comp/core/tagger/generic_store/go.mod +++ b/comp/core/tagger/generic_store/go.mod @@ -120,7 +120,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/tagger/impl-remote/go.mod b/comp/core/tagger/impl-remote/go.mod index 0144632bfd97..bc5bcd8330ae 100644 --- a/comp/core/tagger/impl-remote/go.mod +++ b/comp/core/tagger/impl-remote/go.mod @@ -28,7 +28,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/fxutil v0.73.0-rc.5 github.com/DataDog/datadog-agent/pkg/util/grpc v0.60.0 github.com/DataDog/datadog-agent/pkg/util/http v0.72.0-rc.5 - github.com/DataDog/datadog-agent/pkg/util/system v0.72.0-rc.5 + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 github.com/cenkalti/backoff/v5 v5.0.3 github.com/google/uuid v1.6.0 github.com/mdlayher/vsock v1.2.1 @@ -76,6 +76,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/sort v0.72.0-rc.5 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -250,7 +251,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/tagger/origindetection/go.mod b/comp/core/tagger/origindetection/go.mod index 4648d5cf7e59..051fb8f50fdf 100644 --- a/comp/core/tagger/origindetection/go.mod +++ b/comp/core/tagger/origindetection/go.mod @@ -118,7 +118,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/tagger/subscriber/go.mod b/comp/core/tagger/subscriber/go.mod index 78bec0f2ab33..3a073f913818 100644 --- a/comp/core/tagger/subscriber/go.mod +++ b/comp/core/tagger/subscriber/go.mod @@ -149,7 +149,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/tagger/tags/go.mod b/comp/core/tagger/tags/go.mod index ea7c51eada73..379e92aa6287 100644 --- a/comp/core/tagger/tags/go.mod +++ b/comp/core/tagger/tags/go.mod @@ -106,7 +106,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/tagger/telemetry/go.mod b/comp/core/tagger/telemetry/go.mod index 3451aa14bdcb..7d4ddd3c4540 100644 --- a/comp/core/tagger/telemetry/go.mod +++ b/comp/core/tagger/telemetry/go.mod @@ -126,7 +126,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/tagger/types/go.mod b/comp/core/tagger/types/go.mod index e19b139391b9..5facaca88fdb 100644 --- a/comp/core/tagger/types/go.mod +++ b/comp/core/tagger/types/go.mod @@ -120,7 +120,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/tagger/utils/go.mod b/comp/core/tagger/utils/go.mod index fc346970c17f..8f690ffc1d54 100644 --- a/comp/core/tagger/utils/go.mod +++ b/comp/core/tagger/utils/go.mod @@ -118,7 +118,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/core/telemetry/go.mod b/comp/core/telemetry/go.mod index c01f598f21af..ed4837d38b50 100644 --- a/comp/core/telemetry/go.mod +++ b/comp/core/telemetry/go.mod @@ -138,7 +138,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/comp/def/go.mod b/comp/def/go.mod index 92a6ab428c49..8f15edd95c37 100644 --- a/comp/def/go.mod +++ b/comp/def/go.mod @@ -118,7 +118,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/comp/forwarder/defaultforwarder/go.mod b/comp/forwarder/defaultforwarder/go.mod index 501dd21b0627..a210f7ff0865 100644 --- a/comp/forwarder/defaultforwarder/go.mod +++ b/comp/forwarder/defaultforwarder/go.mod @@ -61,6 +61,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/log v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/viper v1.15.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect @@ -217,7 +218,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/comp/forwarder/orchestrator/orchestratorinterface/go.mod b/comp/forwarder/orchestrator/orchestratorinterface/go.mod index 74dd2c2227f9..3953c5a0fab0 100644 --- a/comp/forwarder/orchestrator/orchestratorinterface/go.mod +++ b/comp/forwarder/orchestrator/orchestratorinterface/go.mod @@ -52,6 +52,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -216,7 +217,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/logs-library/go.mod b/comp/logs-library/go.mod index 0c367c1a0f55..e68e4751c97d 100644 --- a/comp/logs-library/go.mod +++ b/comp/logs-library/go.mod @@ -129,7 +129,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/comp/logs/agent/agentimpl/agent.go b/comp/logs/agent/agentimpl/agent.go index 755faa81c224..e568a836365c 100644 --- a/comp/logs/agent/agentimpl/agent.go +++ b/comp/logs/agent/agentimpl/agent.go @@ -23,6 +23,7 @@ import ( flaretypes "github.com/DataDog/datadog-agent/comp/core/flare/types" "github.com/DataDog/datadog-agent/comp/core/hostname" log "github.com/DataDog/datadog-agent/comp/core/log/def" + secrets "github.com/DataDog/datadog-agent/comp/core/secrets/def" statusComponent "github.com/DataDog/datadog-agent/comp/core/status" tagger "github.com/DataDog/datadog-agent/comp/core/tagger/def" workloadmeta "github.com/DataDog/datadog-agent/comp/core/workloadmeta/def" @@ -84,6 +85,7 @@ type dependencies struct { WMeta option.Option[workloadmeta.Component] SchedulerProviders []schedulers.Scheduler `group:"log-agent-scheduler"` Tagger tagger.Component + Secrets secrets.Component Compression logscompression.Component } @@ -106,6 +108,7 @@ type logAgent struct { inventoryAgent inventoryagent.Component hostname hostname.Component tagger tagger.Component + secrets secrets.Component sources *sources.LogSources services *service.Services @@ -161,6 +164,7 @@ func newLogsAgent(deps dependencies) provides { schedulerProviders: deps.SchedulerProviders, integrationsLogs: integrationsLogs, tagger: deps.Tagger, + secrets: deps.Secrets, compression: deps.Compression, } deps.Lc.Append(fx.Hook{ diff --git a/comp/logs/agent/agentimpl/agent_core_init.go b/comp/logs/agent/agentimpl/agent_core_init.go index 2bbac16f5a9a..f1a722da723f 100644 --- a/comp/logs/agent/agentimpl/agent_core_init.go +++ b/comp/logs/agent/agentimpl/agent_core_init.go @@ -115,6 +115,7 @@ func buildPipelineProvider(a *logAgent, processingRules []*config.ProcessingRule a.compression, a.config.GetBool("logs_config.disable_distributed_senders"), // legacy false, // serverless + a.secrets, ) return pipelineProvider } diff --git a/comp/logs/agent/agentimpl/agent_serverless_init.go b/comp/logs/agent/agentimpl/agent_serverless_init.go index 32e12c334a40..7ab6842be82d 100644 --- a/comp/logs/agent/agentimpl/agent_serverless_init.go +++ b/comp/logs/agent/agentimpl/agent_serverless_init.go @@ -57,6 +57,7 @@ func (a *logAgent) SetupPipeline( a.compression, true, // disable distributed sending for serverless true, // serverless + a.secrets, ) lnchrs := launchers.NewLaunchers(a.sources, pipelineProvider, a.auditor, a.tracker) diff --git a/comp/logs/agent/config/config.go b/comp/logs/agent/config/config.go index 37ec37edb3a8..4f8f64e5161e 100644 --- a/comp/logs/agent/config/config.go +++ b/comp/logs/agent/config/config.go @@ -434,7 +434,8 @@ func buildHTTPEndpoints(coreConfig pkgconfigmodel.Reader, logsConfig *LogsConfig batchMaxContentSize := logsConfig.batchMaxContentSize() inputChanSize := logsConfig.inputChanSize() - return NewEndpointsWithBatchSettings(main, additionals, false, true, logsConfig.isGRPCUse(), batchWait, batchMaxConcurrentSend, batchMaxSize, batchMaxContentSize, inputChanSize), nil + useGRPC := logsConfig.isGRPCUse() + return NewEndpointsWithBatchSettings(main, additionals, false, !useGRPC, useGRPC, batchWait, batchMaxConcurrentSend, batchMaxSize, batchMaxContentSize, inputChanSize), nil } type defaultParseAddressFunc func(string) (host string, port int, err error) diff --git a/comp/logs/agent/config/endpoints.go b/comp/logs/agent/config/endpoints.go index fd0be6c1a76d..093f3b8b03fb 100644 --- a/comp/logs/agent/config/endpoints.go +++ b/comp/logs/agent/config/endpoints.go @@ -75,6 +75,7 @@ type Endpoint struct { CompressionLevel int `mapstructure:"compression_level" json:"compression_level"` ProxyAddress string IsMRF bool `mapstructure:"-" json:"-"` + UseGRPC bool `mapstructure:"use_grpc" json:"use_grpc"` ConnectionResetInterval time.Duration BackoffFactor float64 @@ -198,6 +199,7 @@ func loadTCPAdditionalEndpoints(main Endpoint, l *LogsConfigKeys, registerCallba newE.TrackType = e.TrackType newE.Protocol = e.Protocol newE.Origin = e.Origin + newE.UseGRPC = e.UseGRPC if e.UseSSL != nil { newE.useSSL = *e.UseSSL @@ -224,6 +226,7 @@ func loadHTTPAdditionalEndpoints(main Endpoint, l *LogsConfigKeys, intakeTrackTy newE.isAdditionalEndpoint = true newE.additionalEndpointsIdx = idx + newE.UseGRPC = e.UseGRPC newE.UseCompression = main.UseCompression newE.CompressionKind = main.CompressionKind newE.CompressionLevel = main.CompressionLevel diff --git a/comp/logs/agent/config/go.mod b/comp/logs/agent/config/go.mod index 0300c31d7e1b..e1c10a3c5b70 100644 --- a/comp/logs/agent/config/go.mod +++ b/comp/logs/agent/config/go.mod @@ -44,6 +44,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/fxutil v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/option v0.64.0-devel // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -188,7 +189,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/netflow/payload/go.mod b/comp/netflow/payload/go.mod index 67c866e82158..4e9b60f3a012 100644 --- a/comp/netflow/payload/go.mod +++ b/comp/netflow/payload/go.mod @@ -106,7 +106,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/comp/otelcol/collector-contrib/def/go.mod b/comp/otelcol/collector-contrib/def/go.mod index 4cbb10379a1d..322dc189d833 100644 --- a/comp/otelcol/collector-contrib/def/go.mod +++ b/comp/otelcol/collector-contrib/def/go.mod @@ -235,7 +235,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/otelcol/collector-contrib/impl/go.mod b/comp/otelcol/collector-contrib/impl/go.mod index 58674a0edb2a..0bdf7679ed37 100644 --- a/comp/otelcol/collector-contrib/impl/go.mod +++ b/comp/otelcol/collector-contrib/impl/go.mod @@ -165,6 +165,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/util/sort v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.77.0-devel.0.20260213154712-e02b9359151a // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/version v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-api-client-go/v2 v2.55.0 // indirect @@ -659,7 +660,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/otelcol/converter/def/go.mod b/comp/otelcol/converter/def/go.mod index 225e907f5e27..fc7b62fdb2c5 100644 --- a/comp/otelcol/converter/def/go.mod +++ b/comp/otelcol/converter/def/go.mod @@ -127,7 +127,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/otelcol/converter/impl/go.mod b/comp/otelcol/converter/impl/go.mod index dba43960a5da..711598eca78e 100644 --- a/comp/otelcol/converter/impl/go.mod +++ b/comp/otelcol/converter/impl/go.mod @@ -52,6 +52,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -203,7 +204,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/otelcol/ddflareextension/def/go.mod b/comp/otelcol/ddflareextension/def/go.mod index 4bb20caba34f..e6915e830fa7 100644 --- a/comp/otelcol/ddflareextension/def/go.mod +++ b/comp/otelcol/ddflareextension/def/go.mod @@ -130,7 +130,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/otelcol/ddflareextension/impl/go.mod b/comp/otelcol/ddflareextension/impl/go.mod index 1aec8f000127..4a84a842a2be 100644 --- a/comp/otelcol/ddflareextension/impl/go.mod +++ b/comp/otelcol/ddflareextension/impl/go.mod @@ -67,6 +67,13 @@ require ( github.com/DataDog/datadog-agent/comp/core/delegatedauth v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/config/basic v0.0.0-20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/config/helper v0.77.0-devel.0.20260213154712-e02b9359151a // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering/merging v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/eviction v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/processor v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/tags v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/token v0.0.0 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/logs/sender/grpc v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/orchestrator/util v0.0.0-20251120165911-0b75c97e8b50 // indirect github.com/DataDog/datadog-agent/pkg/trace/log v0.77.0-devel.0.20260213154712-e02b9359151a // indirect @@ -75,12 +82,14 @@ require ( github.com/DataDog/datadog-agent/pkg/trace/traceutil v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/util/defaultpaths v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/util/kubernetes/apiserver/common/namespace v0.77.0-devel.0.20260211235139-a5361978c2b6 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/alecthomas/repr v0.5.2 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.291.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.72.1 // indirect github.com/aws/aws-sdk-go-v2/service/lightsail v1.50.10 // indirect github.com/aws/aws-sdk-go-v2/service/signin v1.0.8 // indirect github.com/containerd/platforms v1.0.0-rc.1 // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect github.com/hashicorp/consul/sdk v0.16.2 // indirect github.com/hashicorp/go-msgpack v1.1.5 // indirect github.com/hashicorp/go-msgpack/v2 v2.1.2 // indirect @@ -150,7 +159,7 @@ require ( github.com/DataDog/datadog-agent/pkg/config/create v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/config/env v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/config/mock v0.77.0-devel.0.20260213154712-e02b9359151a // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.77.0-devel.0.20260213154712-e02b9359151a // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.77.2 // indirect github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/config/setup v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/config/structure v0.77.0-devel.0.20260213154712-e02b9359151a // indirect @@ -634,7 +643,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/otelcol/ddflareextension/impl/go.sum b/comp/otelcol/ddflareextension/impl/go.sum index cac3ddd7632c..de916c933759 100644 --- a/comp/otelcol/ddflareextension/impl/go.sum +++ b/comp/otelcol/ddflareextension/impl/go.sum @@ -321,6 +321,8 @@ github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= +github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c= github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= diff --git a/comp/otelcol/ddflareextension/types/go.mod b/comp/otelcol/ddflareextension/types/go.mod index d07c4f05a0e1..f34a1a961a1c 100644 --- a/comp/otelcol/ddflareextension/types/go.mod +++ b/comp/otelcol/ddflareextension/types/go.mod @@ -106,7 +106,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/otelcol/ddprofilingextension/def/go.mod b/comp/otelcol/ddprofilingextension/def/go.mod index 39f043238177..d42b2aefe06d 100644 --- a/comp/otelcol/ddprofilingextension/def/go.mod +++ b/comp/otelcol/ddprofilingextension/def/go.mod @@ -130,7 +130,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/otelcol/ddprofilingextension/impl/go.mod b/comp/otelcol/ddprofilingextension/impl/go.mod index eeabf5e7ccbe..f175c68f49b2 100644 --- a/comp/otelcol/ddprofilingextension/impl/go.mod +++ b/comp/otelcol/ddprofilingextension/impl/go.mod @@ -91,6 +91,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/quantile v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.77.0-devel.0.20260213154712-e02b9359151a // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/version v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-api-client-go/v2 v2.55.0 // indirect @@ -382,7 +383,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/otelcol/logsagentpipeline/go.mod b/comp/otelcol/logsagentpipeline/go.mod index 394592e6ca5a..2656b79c031c 100644 --- a/comp/otelcol/logsagentpipeline/go.mod +++ b/comp/otelcol/logsagentpipeline/go.mod @@ -19,7 +19,7 @@ require ( github.com/DataDog/datadog-agent/pkg/config/create v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/config/env v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/config/helper v0.73.0-devel.0.20251030121902-cd89eab046d6 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.73.0-rc.5 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.77.2 // indirect github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.64.1 // indirect github.com/DataDog/datadog-agent/pkg/config/setup v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/config/structure v0.77.0-devel.0.20260211235139-a5361978c2b6 // indirect @@ -31,6 +31,13 @@ require ( github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/message v0.64.0-rc.12 // indirect github.com/DataDog/datadog-agent/pkg/logs/metrics v0.64.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering/merging v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/eviction v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/processor v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/tags v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/token v0.0.0 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/logs/processor v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/sender v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/sender/grpc v0.0.0-00010101000000-000000000000 // indirect @@ -38,8 +45,10 @@ require ( github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/types v0.71.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.74.1 // indirect github.com/DataDog/datadog-agent/pkg/telemetry v0.64.1 // indirect github.com/DataDog/datadog-agent/pkg/template v0.65.1 // indirect + github.com/DataDog/datadog-agent/pkg/trace/log v0.77.0-devel // indirect github.com/DataDog/datadog-agent/pkg/util/backoff v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/compression v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.64.0-rc.3 // indirect @@ -53,6 +62,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/startstop v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.64.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -67,6 +77,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.5.0 // indirect github.com/gofrs/flock v0.13.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect @@ -213,7 +224,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/comp/otelcol/logsagentpipeline/go.sum b/comp/otelcol/logsagentpipeline/go.sum index 18f7b3457a4a..dbbbe81506be 100644 --- a/comp/otelcol/logsagentpipeline/go.sum +++ b/comp/otelcol/logsagentpipeline/go.sum @@ -41,6 +41,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= +github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= diff --git a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod index 052ebf2809ff..61066ac0b599 100644 --- a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod +++ b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod @@ -11,7 +11,7 @@ require ( github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.61.0 github.com/DataDog/datadog-agent/comp/serializer/logscompression v0.64.0-rc.3 github.com/DataDog/datadog-agent/pkg/config/mock v0.70.0 - github.com/DataDog/datadog-agent/pkg/config/model v0.73.0-rc.5 + github.com/DataDog/datadog-agent/pkg/config/model v0.77.2 github.com/DataDog/datadog-agent/pkg/logs/client v0.64.0-rc.3 github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.64.0-rc.3 github.com/DataDog/datadog-agent/pkg/logs/message v0.64.0-rc.12 @@ -50,12 +50,21 @@ require ( github.com/DataDog/datadog-agent/pkg/config/utils v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/config/viperconfig v0.72.2 // indirect github.com/DataDog/datadog-agent/pkg/fips v0.64.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering/merging v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/eviction v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/processor v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/tags v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/token v0.0.0 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/logs/processor v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/sender/grpc v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/types v0.71.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.74.1 // indirect github.com/DataDog/datadog-agent/pkg/telemetry v0.64.1 // indirect github.com/DataDog/datadog-agent/pkg/template v0.65.1 // indirect + github.com/DataDog/datadog-agent/pkg/trace/log v0.77.0-devel // indirect github.com/DataDog/datadog-agent/pkg/util/backoff v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/compression v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/defaultpaths v0.64.0-devel // indirect @@ -68,6 +77,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.64.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -83,6 +93,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.5.0 // indirect github.com/gofrs/flock v0.13.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect @@ -226,7 +237,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum index 18f7b3457a4a..dbbbe81506be 100644 --- a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum +++ b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.sum @@ -41,6 +41,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= +github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= diff --git a/comp/otelcol/otlp/components/exporter/datadogexporter/go.mod b/comp/otelcol/otlp/components/exporter/datadogexporter/go.mod index 1aba71507427..b1e96a05abeb 100644 --- a/comp/otelcol/otlp/components/exporter/datadogexporter/go.mod +++ b/comp/otelcol/otlp/components/exporter/datadogexporter/go.mod @@ -76,7 +76,7 @@ require ( github.com/DataDog/datadog-agent/pkg/config/env v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/config/helper v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/config/mock v0.77.0-devel.0.20260213154712-e02b9359151a // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.77.0-devel.0.20260213154712-e02b9359151a // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.77.2 // indirect github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/config/setup v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/config/structure v0.77.0-devel.0.20260213154712-e02b9359151a // indirect @@ -86,6 +86,13 @@ require ( github.com/DataDog/datadog-agent/pkg/fips v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/logs/client v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.64.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering/merging v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/eviction v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/processor v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/tags v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/token v0.0.0 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/logs/processor v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/sender v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/sender/grpc v0.0.0-00010101000000-000000000000 // indirect @@ -131,6 +138,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/startstop v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.64.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.77.0-devel.0.20260213154712-e02b9359151a // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/version v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-api-client-go/v2 v2.55.0 // indirect @@ -163,6 +171,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/mock v1.7.0-rc.1 // indirect github.com/golang/snappy v1.0.0 // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect github.com/google/go-tpm v0.9.8 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/mux v1.8.1 // indirect @@ -367,7 +376,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../../../pkg/logs/processor diff --git a/comp/otelcol/otlp/components/exporter/datadogexporter/go.sum b/comp/otelcol/otlp/components/exporter/datadogexporter/go.sum index 44f684b7df0e..340228e9d4a8 100644 --- a/comp/otelcol/otlp/components/exporter/datadogexporter/go.sum +++ b/comp/otelcol/otlp/components/exporter/datadogexporter/go.sum @@ -82,6 +82,8 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs= github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= +github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= diff --git a/comp/otelcol/otlp/components/exporter/logsagentexporter/go.mod b/comp/otelcol/otlp/components/exporter/logsagentexporter/go.mod index 29afb40c2c94..c99025ceb851 100644 --- a/comp/otelcol/otlp/components/exporter/logsagentexporter/go.mod +++ b/comp/otelcol/otlp/components/exporter/logsagentexporter/go.mod @@ -77,6 +77,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/quantile v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.77.0-devel.0.20260213154712-e02b9359151a // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-api-client-go/v2 v2.55.0 // indirect github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 // indirect @@ -301,7 +302,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../../../pkg/logs/processor diff --git a/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod b/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod index c79a045c8443..22706c2cf9d2 100644 --- a/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod +++ b/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod @@ -57,6 +57,7 @@ require ( github.com/DataDog/datadog-agent/pkg/trace/traceutil v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/util/defaultpaths v0.64.0-devel // indirect github.com/DataDog/datadog-agent/pkg/util/flavor v0.70.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/mdlayher/socket v0.5.1 // indirect @@ -326,7 +327,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../../../pkg/logs/processor diff --git a/comp/otelcol/otlp/components/metricsclient/go.mod b/comp/otelcol/otlp/components/metricsclient/go.mod index d99c250b3ac6..c638bcf10c8e 100644 --- a/comp/otelcol/otlp/components/metricsclient/go.mod +++ b/comp/otelcol/otlp/components/metricsclient/go.mod @@ -132,7 +132,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../../pkg/logs/processor diff --git a/comp/otelcol/otlp/components/processor/infraattributesprocessor/go.mod b/comp/otelcol/otlp/components/processor/infraattributesprocessor/go.mod index cdb1e325ee09..e90b91f80bc8 100644 --- a/comp/otelcol/otlp/components/processor/infraattributesprocessor/go.mod +++ b/comp/otelcol/otlp/components/processor/infraattributesprocessor/go.mod @@ -96,6 +96,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/sort v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.72.0-rc.5 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/sketches-go v1.4.8 // indirect @@ -287,7 +288,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../../../pkg/logs/processor diff --git a/comp/otelcol/otlp/testutil/go.mod b/comp/otelcol/otlp/testutil/go.mod index e8a48a1885da..2b2ca32b6c64 100644 --- a/comp/otelcol/otlp/testutil/go.mod +++ b/comp/otelcol/otlp/testutil/go.mod @@ -41,6 +41,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -189,7 +190,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/otelcol/status/def/go.mod b/comp/otelcol/status/def/go.mod index eae743ee3f0d..aedb7c9f4ff2 100644 --- a/comp/otelcol/status/def/go.mod +++ b/comp/otelcol/status/def/go.mod @@ -106,7 +106,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/otelcol/status/impl/go.mod b/comp/otelcol/status/impl/go.mod index 4b07520e2f84..3d333d69e264 100644 --- a/comp/otelcol/status/impl/go.mod +++ b/comp/otelcol/status/impl/go.mod @@ -51,6 +51,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.72.0-rc.5 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -216,7 +217,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/serializer/logscompression/go.mod b/comp/serializer/logscompression/go.mod index e56a18e30702..c2d4274a3d9a 100644 --- a/comp/serializer/logscompression/go.mod +++ b/comp/serializer/logscompression/go.mod @@ -40,6 +40,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -187,7 +188,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/comp/serializer/metricscompression/go.mod b/comp/serializer/metricscompression/go.mod index 82bf65e820e2..c6274b6654d3 100644 --- a/comp/serializer/metricscompression/go.mod +++ b/comp/serializer/metricscompression/go.mod @@ -40,6 +40,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -187,7 +188,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/comp/trace/agent/def/go.mod b/comp/trace/agent/def/go.mod index 3b38438022ae..b759925414df 100644 --- a/comp/trace/agent/def/go.mod +++ b/comp/trace/agent/def/go.mod @@ -138,7 +138,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/trace/compression/def/go.mod b/comp/trace/compression/def/go.mod index d1c7fb93491c..00135e7cf5f3 100644 --- a/comp/trace/compression/def/go.mod +++ b/comp/trace/compression/def/go.mod @@ -106,7 +106,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/trace/compression/impl-gzip/go.mod b/comp/trace/compression/impl-gzip/go.mod index 637f16ea1be8..d657b29b794d 100644 --- a/comp/trace/compression/impl-gzip/go.mod +++ b/comp/trace/compression/impl-gzip/go.mod @@ -108,7 +108,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/comp/trace/compression/impl-zstd/go.mod b/comp/trace/compression/impl-zstd/go.mod index 73ba43df8acb..9af93c47da7b 100644 --- a/comp/trace/compression/impl-zstd/go.mod +++ b/comp/trace/compression/impl-zstd/go.mod @@ -111,7 +111,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/deps/go.MODULE.bazel b/deps/go.MODULE.bazel index 979cbbc89a7e..766b9606c656 100644 --- a/deps/go.MODULE.bazel +++ b/deps/go.MODULE.bazel @@ -161,6 +161,10 @@ use_repo( "com_github_datadog_datadog_agent_pkg_logs_diagnostic", "com_github_datadog_datadog_agent_pkg_logs_message", "com_github_datadog_datadog_agent_pkg_logs_metrics", + "com_github_datadog_datadog_agent_pkg_logs_patterns_clustering", + "com_github_datadog_datadog_agent_pkg_logs_patterns_clustering_merging", + "com_github_datadog_datadog_agent_pkg_logs_patterns_eviction", + "com_github_datadog_datadog_agent_pkg_logs_patterns_token", "com_github_datadog_datadog_agent_pkg_logs_pipeline", "com_github_datadog_datadog_agent_pkg_logs_processor", "com_github_datadog_datadog_agent_pkg_logs_sender", @@ -223,6 +227,7 @@ use_repo( "com_github_datadog_datadog_agent_pkg_util_sort", "com_github_datadog_datadog_agent_pkg_util_startstop", "com_github_datadog_datadog_agent_pkg_util_system", + "com_github_datadog_datadog_agent_pkg_util_system_socket", "com_github_datadog_datadog_agent_pkg_util_testutil", "com_github_datadog_datadog_agent_pkg_util_utilizationtracker", "com_github_datadog_datadog_agent_pkg_util_uuid", @@ -282,6 +287,7 @@ use_repo( "com_github_golangci_golangci_lint_v2", "com_github_google_btree", "com_github_google_cel_go", + "com_github_google_flatbuffers", "com_github_google_go_cmp", "com_github_google_go_containerregistry", "com_github_google_gofuzz", diff --git a/go.mod b/go.mod index 1e00062b024e..4e873998730d 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( github.com/DataDog/datadog-agent/pkg/config/env v0.77.0-devel.0.20260213154712-e02b9359151a github.com/DataDog/datadog-agent/pkg/config/helper v0.77.0-devel.0.20260213154712-e02b9359151a github.com/DataDog/datadog-agent/pkg/config/mock v0.77.0-devel.0.20260213154712-e02b9359151a - github.com/DataDog/datadog-agent/pkg/config/model v0.77.0-devel.0.20260213154712-e02b9359151a + github.com/DataDog/datadog-agent/pkg/config/model v0.77.2 github.com/DataDog/datadog-agent/pkg/config/remote v0.59.0-rc.5 github.com/DataDog/datadog-agent/pkg/config/setup v0.77.0-devel.0.20260213154712-e02b9359151a github.com/DataDog/datadog-agent/pkg/config/structure v0.77.0-devel.0.20260213154712-e02b9359151a @@ -975,6 +975,7 @@ require ( github.com/DataDog/datadog-agent/pkg/trace/stats v0.77.0-devel.0.20260213154712-e02b9359151a github.com/DataDog/datadog-agent/pkg/trace/traceutil v0.77.0-devel.0.20260213154712-e02b9359151a github.com/DataDog/datadog-agent/pkg/util/kubernetes/apiserver/common/namespace v0.77.0-devel.0.20260211235139-a5361978c2b6 + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 github.com/DataDog/ddtrivy v0.0.0-20260115083325-07614fb0b8d5 github.com/DataDog/rshell v0.0.9 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.41.0 @@ -1040,6 +1041,13 @@ require ( github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect github.com/DataDog/appsec-internal-go v1.14.0 // indirect github.com/DataDog/datadog-agent/comp/core/delegatedauth/api/cloudauth/aws v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering/merging v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/eviction v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/processor v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/tags v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/token v0.0.0 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/opentelemetry-mapping-go/inframetadata v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/opentelemetry-mapping-go/otlp/logs v0.74.0-devel.0.20251125141836-2ae7a968751c // indirect github.com/DataDog/datadog-agent/pkg/trace/otel v0.77.0-devel.0.20260213154712-e02b9359151a // indirect @@ -1086,6 +1094,7 @@ require ( github.com/go-ozzo/ozzo-validation v3.6.0+incompatible // indirect github.com/godbus/dbus v4.1.0+incompatible // indirect github.com/google/certificate-transparency-go v1.3.2 // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect github.com/google/go-metrics-stackdriver v0.2.0 // indirect github.com/google/licensecheck v0.3.1 // indirect github.com/gophercloud/gophercloud v0.1.0 // indirect @@ -1365,7 +1374,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ./pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ./pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ./pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ./pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ./pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ./pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ./pkg/logs/processor diff --git a/pkg/aggregator/ckey/go.mod b/pkg/aggregator/ckey/go.mod index 8f7c574e4138..b8c849e014d1 100644 --- a/pkg/aggregator/ckey/go.mod +++ b/pkg/aggregator/ckey/go.mod @@ -120,7 +120,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/api/go.mod b/pkg/api/go.mod index 5ea1412166b7..b3abb81cfd2e 100644 --- a/pkg/api/go.mod +++ b/pkg/api/go.mod @@ -36,6 +36,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/viper v1.15.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect @@ -175,7 +176,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/pkg/collector/check/defaults/go.mod b/pkg/collector/check/defaults/go.mod index 6234798beea7..db3a417473ab 100644 --- a/pkg/collector/check/defaults/go.mod +++ b/pkg/collector/check/defaults/go.mod @@ -106,7 +106,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/config/basic/go.mod b/pkg/config/basic/go.mod index b2347de67c42..4976fb1b8157 100644 --- a/pkg/config/basic/go.mod +++ b/pkg/config/basic/go.mod @@ -118,7 +118,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/config/create/go.mod b/pkg/config/create/go.mod index cb6e81ca4c00..8c80a5bf2717 100644 --- a/pkg/config/create/go.mod +++ b/pkg/config/create/go.mod @@ -141,7 +141,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/config/env/go.mod b/pkg/config/env/go.mod index f04efdd1277d..d1105cf05adc 100644 --- a/pkg/config/env/go.mod +++ b/pkg/config/env/go.mod @@ -7,6 +7,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/filesystem v0.61.0 github.com/DataDog/datadog-agent/pkg/util/log v0.64.0-devel github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 github.com/stretchr/testify v1.11.1 ) @@ -145,7 +146,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/config/helper/go.mod b/pkg/config/helper/go.mod index e64d87d7b1eb..c38b4f0449eb 100644 --- a/pkg/config/helper/go.mod +++ b/pkg/config/helper/go.mod @@ -138,7 +138,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/config/mock/go.mod b/pkg/config/mock/go.mod index 78212ef48ef4..01bd343d3cec 100644 --- a/pkg/config/mock/go.mod +++ b/pkg/config/mock/go.mod @@ -30,6 +30,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -169,7 +170,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/config/model/go.mod b/pkg/config/model/go.mod index bc961a7f3a6f..670ca28b616c 100644 --- a/pkg/config/model/go.mod +++ b/pkg/config/model/go.mod @@ -106,7 +106,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/config/nodetreemodel/go.mod b/pkg/config/nodetreemodel/go.mod index 7d9c47980b78..decc74727b23 100644 --- a/pkg/config/nodetreemodel/go.mod +++ b/pkg/config/nodetreemodel/go.mod @@ -142,7 +142,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/config/remote/go.mod b/pkg/config/remote/go.mod index 4beb68ca54f3..6718b30a06fb 100644 --- a/pkg/config/remote/go.mod +++ b/pkg/config/remote/go.mod @@ -36,6 +36,7 @@ require ( github.com/DataDog/datadog-agent/pkg/telemetry v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/template v0.65.1 // indirect github.com/DataDog/datadog-agent/pkg/util/fxutil v0.73.0-rc.5 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/go-viper/mapstructure/v2 v2.5.0 // indirect @@ -236,7 +237,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/config/render_config/go.mod b/pkg/config/render_config/go.mod index f950eff2d6a9..7c4ca4b05cb7 100644 --- a/pkg/config/render_config/go.mod +++ b/pkg/config/render_config/go.mod @@ -117,7 +117,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/config/setup/go.mod b/pkg/config/setup/go.mod index e23a725b546b..81b7d33c19b4 100644 --- a/pkg/config/setup/go.mod +++ b/pkg/config/setup/go.mod @@ -37,6 +37,7 @@ require ( github.com/DataDog/datadog-agent/pkg/template v0.65.1 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect @@ -173,7 +174,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/config/structure/go.mod b/pkg/config/structure/go.mod index 37af34e0c646..08007037d596 100644 --- a/pkg/config/structure/go.mod +++ b/pkg/config/structure/go.mod @@ -145,7 +145,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/config/teeconfig/go.mod b/pkg/config/teeconfig/go.mod index 7c92ddb0f9d3..b071440b0c45 100644 --- a/pkg/config/teeconfig/go.mod +++ b/pkg/config/teeconfig/go.mod @@ -124,7 +124,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/config/utils/go.mod b/pkg/config/utils/go.mod index d91e4ad5521c..0f73eea466a7 100644 --- a/pkg/config/utils/go.mod +++ b/pkg/config/utils/go.mod @@ -33,6 +33,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/viper v1.15.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect @@ -171,7 +172,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/config/viperconfig/go.mod b/pkg/config/viperconfig/go.mod index dbdd3bbba912..9200bb85cdfc 100644 --- a/pkg/config/viperconfig/go.mod +++ b/pkg/config/viperconfig/go.mod @@ -138,7 +138,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/discovery/tracermetadata/model/go.mod b/pkg/discovery/tracermetadata/model/go.mod index ee493dc26902..3ac580d293e2 100644 --- a/pkg/discovery/tracermetadata/model/go.mod +++ b/pkg/discovery/tracermetadata/model/go.mod @@ -121,7 +121,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/errors/go.mod b/pkg/errors/go.mod index 2bfb1f53a846..efdf7f7bc7de 100644 --- a/pkg/errors/go.mod +++ b/pkg/errors/go.mod @@ -118,7 +118,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/pkg/fips/go.mod b/pkg/fips/go.mod index 6f4ec9d62619..cd5b81fa6d4e 100644 --- a/pkg/fips/go.mod +++ b/pkg/fips/go.mod @@ -106,7 +106,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/pkg/gohai/go.mod b/pkg/gohai/go.mod index 59752fe70e13..d6e62bec1cd2 100644 --- a/pkg/gohai/go.mod +++ b/pkg/gohai/go.mod @@ -136,7 +136,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/pkg/logs/client/go.mod b/pkg/logs/client/go.mod index e6c19a052ca0..1a80ab0caf49 100644 --- a/pkg/logs/client/go.mod +++ b/pkg/logs/client/go.mod @@ -3,8 +3,6 @@ module github.com/DataDog/datadog-agent/pkg/logs/client go 1.25.0 require ( - github.com/DataDog/datadog-agent/comp/core/secrets/def v0.72.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/secrets/noop-impl v0.77.0-devel.0.20260211235139-a5361978c2b6 github.com/DataDog/datadog-agent/comp/core/telemetry v0.61.0 github.com/DataDog/datadog-agent/comp/logs/agent/config v0.61.0 github.com/DataDog/datadog-agent/pkg/config/mock v0.70.0 @@ -27,15 +25,12 @@ require ( require gopkg.in/yaml.v3 v3.0.1 // indirect require ( - github.com/DataDog/datadog-agent/comp/api/api/def v0.72.0-rc.1 // indirect + github.com/DataDog/agent-payload/v5 v5.0.191 // indirect github.com/DataDog/datadog-agent/comp/core/delegatedauth v0.0.0-00010101000000-000000000000 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/builder v0.61.0 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/types v0.72.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/status v0.73.0-rc.5 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets/def v0.72.0-rc.1 // indirect github.com/DataDog/datadog-agent/comp/def v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/config/basic v0.0.0-20260211235139-a5361978c2b6 // indirect - github.com/DataDog/datadog-agent/pkg/config/buildschema v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/config/create v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/config/env v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/config/helper v0.73.0-devel.0.20251030121902-cd89eab046d6 // indirect @@ -57,6 +52,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/viper v1.15.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect @@ -64,9 +60,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/dustin/go-humanize v1.0.1 // indirect github.com/ebitengine/purego v0.10.0 // indirect - github.com/fatih/color v1.18.0 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-viper/mapstructure/v2 v2.5.0 // indirect @@ -75,8 +69,6 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect github.com/magiconair/properties v1.8.10 // indirect - github.com/mattn/go-colorable v0.1.14 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect github.com/mdlayher/socket v0.5.1 // indirect github.com/mdlayher/vsock v1.2.1 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect @@ -107,8 +99,8 @@ require ( golang.org/x/sys v0.42.0 // indirect golang.org/x/text v0.35.0 // indirect golang.org/x/time v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect - google.golang.org/grpc v1.78.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect + google.golang.org/grpc v1.79.3 // indirect google.golang.org/protobuf v1.36.11 // indirect ) @@ -189,7 +181,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/api => ../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/basic => ../../../pkg/config/basic - github.com/DataDog/datadog-agent/pkg/config/buildschema => ../../../pkg/config/buildschema github.com/DataDog/datadog-agent/pkg/config/create => ../../../pkg/config/create github.com/DataDog/datadog-agent/pkg/config/env => ../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/helper => ../../../pkg/config/helper @@ -217,7 +208,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/logs/diagnostic/go.mod b/pkg/logs/diagnostic/go.mod index e4197c1baa32..985403f0137b 100644 --- a/pkg/logs/diagnostic/go.mod +++ b/pkg/logs/diagnostic/go.mod @@ -30,6 +30,7 @@ require ( github.com/DataDog/datadog-agent/pkg/fips v0.0.0 // indirect github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/logs/types v0.71.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/template v0.65.1 // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.61.0 // indirect @@ -40,6 +41,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -68,9 +70,6 @@ require ( github.com/tklauser/go-sysconf v0.3.16 // indirect github.com/tklauser/numcpus v0.11.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/otel/metric v1.42.0 // indirect - go.opentelemetry.io/otel/sdk v1.41.0 // indirect - go.opentelemetry.io/otel/trace v1.42.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/dig v1.19.0 // indirect go.uber.org/fx v1.24.0 // indirect @@ -193,7 +192,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/logs/message/go.mod b/pkg/logs/message/go.mod index a923f6458c9d..fa34674fbdfb 100644 --- a/pkg/logs/message/go.mod +++ b/pkg/logs/message/go.mod @@ -7,6 +7,7 @@ require ( github.com/DataDog/datadog-agent/comp/logs/agent/config v0.61.0 github.com/DataDog/datadog-agent/pkg/logs/sources v0.61.0 github.com/DataDog/datadog-agent/pkg/logs/types v0.71.0-rc.1 + github.com/DataDog/datadog-agent/pkg/proto v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/pkg/util/log v0.73.0-rc.5 github.com/stretchr/testify v1.11.1 ) @@ -35,6 +36,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -61,8 +63,9 @@ require ( github.com/tklauser/go-sysconf v0.3.16 // indirect github.com/tklauser/numcpus v0.11.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/otel v1.42.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.41.0 // indirect + go.opentelemetry.io/otel/metric v1.42.0 // indirect + go.opentelemetry.io/otel/sdk v1.41.0 // indirect + go.opentelemetry.io/otel/trace v1.42.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect @@ -71,7 +74,6 @@ require ( golang.org/x/sys v0.42.0 // indirect golang.org/x/text v0.35.0 // indirect golang.org/x/time v0.14.0 // indirect - gonum.org/v1/gonum v0.17.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect google.golang.org/grpc v1.79.3 // indirect google.golang.org/protobuf v1.36.11 // indirect @@ -182,7 +184,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/logs/message/message.go b/pkg/logs/message/message.go index 37c7113838df..5579e3b2cdee 100644 --- a/pkg/logs/message/message.go +++ b/pkg/logs/message/message.go @@ -13,7 +13,6 @@ import ( "github.com/DataDog/agent-payload/v5/statefulpb" "github.com/DataDog/datadog-agent/pkg/logs/sources" - "github.com/DataDog/datadog-agent/pkg/proto/pbgo/statefulpb" "github.com/DataDog/datadog-agent/pkg/util/log" ) @@ -96,6 +95,12 @@ type MessageMetadata struct { RawDataLen int // Tags added on processing ProcessingTags []string + // DualSendUUID is a correlation identifier shared by the HTTP and gRPC copies + // of the same log when dual-send is enabled. + DualSendUUID string + // EncodedTimestampMs stores the timestamp used by the HTTP JSON encoder so the + // gRPC path can emit the same timestamp for the same log. + EncodedTimestampMs int64 // Extra information from the parsers ParsingExtra // Extra information for Serverless Logs messages @@ -137,6 +142,9 @@ type MessageContent struct { //nolint:revive // structured content structuredContent StructuredContent State MessageContentState + // PreEncodedContent preserves the rendered log body before the encoder replaces + // m.content with the HTTP-encoded payload. + PreEncodedContent []byte } // MessageContentState is used to represent the MessageContent state. diff --git a/pkg/logs/metrics/go.mod b/pkg/logs/metrics/go.mod index 64e571c60220..a42d0bf0ca55 100644 --- a/pkg/logs/metrics/go.mod +++ b/pkg/logs/metrics/go.mod @@ -141,7 +141,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/logs/patterns/clustering/go.mod b/pkg/logs/patterns/clustering/go.mod index bbb5fc7d50ec..a8ca0c677341 100644 --- a/pkg/logs/patterns/clustering/go.mod +++ b/pkg/logs/patterns/clustering/go.mod @@ -1,47 +1,49 @@ module github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering -go 1.24.9 +go 1.25.0 require ( - github.com/DataDog/datadog-agent/pkg/config/setup v0.0.0-00010101000000-000000000000 + github.com/DataDog/datadog-agent/pkg/config/setup v0.61.0 github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering/merging v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/pkg/logs/patterns/eviction v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/pkg/logs/patterns/token v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/pkg/trace/log v0.77.0-devel - github.com/DataDog/datadog-agent/pkg/util/log v0.72.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.73.0-rc.5 github.com/stretchr/testify v1.11.1 ) require ( + github.com/DataDog/datadog-agent/comp/core/delegatedauth v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/comp/core/secrets/def v0.71.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/basic v0.0.0-20260211235139-a5361978c2b6 // indirect github.com/DataDog/datadog-agent/pkg/config/create v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/config/env v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/config/helper v0.73.0-devel.0.20251030121902-cd89eab046d6 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.72.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.64.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/structure v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/structure v0.77.0-devel.0.20260211235139-a5361978c2b6 // indirect github.com/DataDog/datadog-agent/pkg/config/teeconfig v0.64.1 // indirect github.com/DataDog/datadog-agent/pkg/config/viperconfig v0.72.2 // indirect github.com/DataDog/datadog-agent/pkg/fips v0.0.0 // indirect - github.com/DataDog/datadog-agent/pkg/template v0.64.1 // indirect + github.com/DataDog/datadog-agent/pkg/template v0.65.1 // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.72.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect - github.com/DataDog/viper v1.15.0 // indirect + github.com/DataDog/viper v1.15.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/ebitengine/purego v0.9.1 // indirect + github.com/ebitengine/purego v0.10.0 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-viper/mapstructure/v2 v2.5.0 // indirect github.com/gofrs/flock v0.13.0 // indirect - github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect + github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94 // indirect github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect github.com/magiconair/properties v1.8.10 // indirect github.com/mdlayher/socket v0.5.1 // indirect @@ -50,7 +52,7 @@ require ( github.com/pelletier/go-toml v1.9.5 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect - github.com/shirou/gopsutil/v4 v4.25.12 // indirect + github.com/shirou/gopsutil/v4 v4.26.2 // indirect github.com/spf13/cast v1.10.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.10 // indirect @@ -58,11 +60,12 @@ require ( github.com/tklauser/numcpus v0.11.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.uber.org/atomic v1.11.0 // indirect - golang.org/x/net v0.49.0 // indirect - golang.org/x/sync v0.19.0 // indirect - golang.org/x/sys v0.40.0 // indirect + go.yaml.in/yaml/v2 v2.4.3 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect + golang.org/x/net v0.52.0 // indirect + golang.org/x/sync v0.20.0 // indirect + golang.org/x/sys v0.42.0 // indirect golang.org/x/time v0.14.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) @@ -143,7 +146,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/api => ../../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/basic => ../../../../pkg/config/basic - github.com/DataDog/datadog-agent/pkg/config/buildschema => ../../../../pkg/config/buildschema github.com/DataDog/datadog-agent/pkg/config/create => ../../../../pkg/config/create github.com/DataDog/datadog-agent/pkg/config/env => ../../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/helper => ../../../../pkg/config/helper @@ -171,7 +173,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/logs/patterns/clustering/go.sum b/pkg/logs/patterns/clustering/go.sum index 69167816895d..367425fd7dbd 100644 --- a/pkg/logs/patterns/clustering/go.sum +++ b/pkg/logs/patterns/clustering/go.sum @@ -1,14 +1,14 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.15.0 h1:oV4rbRx+ylrbIAEBCw+8xKyH+eQF1DkVHDGz7RtmKlk= -github.com/DataDog/viper v1.15.0/go.mod h1:QGomve/3EbYfi58jADS97U2OKfsxqh2pWemuT0azbdk= +github.com/DataDog/viper v1.15.1 h1:kcdFE+qPndlWkhU4iEf/WpWQMCyVYHTv5HqvVf+SYJs= +github.com/DataDog/viper v1.15.1/go.mod h1:rDLDREOPd+gpEbA8y4Y/5wTvyLqvUiCmDXX0jRZy8mw= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A= -github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= +github.com/ebitengine/purego v0.10.0 h1:QIw4xfpWT6GWTzaW5XEKy3HXoqrJGx1ijYHzTF0/ISU= +github.com/ebitengine/purego v0.10.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -24,8 +24,8 @@ github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw= github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb h1:PGufWXXDq9yaev6xX1YQauaO1MV90e6Mpoq1I7Lz/VM= -github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb/go.mod h1:QiyDdbZLaJ/mZP4Zwc9g2QsfaEA4o7XvvgZegSci5/E= +github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94 h1:0G5JVG0aJDpWvH1r8idd+wbPcAH14UqIuUMepx3v9rE= +github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94/go.mod h1:MvF7bZQy5lD2WcLXjFytRVvnTrFvrjo/qGka1MIBOPE= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -54,8 +54,8 @@ github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= -github.com/shirou/gopsutil/v4 v4.25.12 h1:e7PvW/0RmJ8p8vPGJH4jvNkOyLmbkXgXW4m6ZPic6CY= -github.com/shirou/gopsutil/v4 v4.25.12/go.mod h1:EivAfP5x2EhLp2ovdpKSozecVXn1TmuG7SMzs/Wh4PU= +github.com/shirou/gopsutil/v4 v4.26.2 h1:X8i6sicvUFih4BmYIGT1m2wwgw2VG9YgrDTi7cIRGUI= +github.com/shirou/gopsutil/v4 v4.26.2/go.mod h1:LZ6ewCSkBqUpvSOf+LsTGnRinC6iaNUNMGBtDkJBaLQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY= github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo= @@ -78,17 +78,20 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= -golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= -golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= -golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= -golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= +go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= +go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= +golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= +golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= -golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= +golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -96,8 +99,5 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/logs/patterns/clustering/merging/go.mod b/pkg/logs/patterns/clustering/merging/go.mod index f7cc32949f09..1891f0800bc8 100644 --- a/pkg/logs/patterns/clustering/merging/go.mod +++ b/pkg/logs/patterns/clustering/merging/go.mod @@ -91,7 +91,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/api => ../../../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/basic => ../../../../../pkg/config/basic - github.com/DataDog/datadog-agent/pkg/config/buildschema => ../../../../../pkg/config/buildschema github.com/DataDog/datadog-agent/pkg/config/create => ../../../../../pkg/config/create github.com/DataDog/datadog-agent/pkg/config/env => ../../../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/helper => ../../../../../pkg/config/helper @@ -119,7 +118,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../../pkg/logs/processor diff --git a/pkg/logs/patterns/eviction/go.mod b/pkg/logs/patterns/eviction/go.mod index 4534bc4c0769..f69a3018be6f 100644 --- a/pkg/logs/patterns/eviction/go.mod +++ b/pkg/logs/patterns/eviction/go.mod @@ -90,7 +90,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/api => ../../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/basic => ../../../../pkg/config/basic - github.com/DataDog/datadog-agent/pkg/config/buildschema => ../../../../pkg/config/buildschema github.com/DataDog/datadog-agent/pkg/config/create => ../../../../pkg/config/create github.com/DataDog/datadog-agent/pkg/config/env => ../../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/helper => ../../../../pkg/config/helper @@ -118,7 +117,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/logs/patterns/processor/go.mod b/pkg/logs/patterns/processor/go.mod index 379850f16df1..c71e2d8072da 100644 --- a/pkg/logs/patterns/processor/go.mod +++ b/pkg/logs/patterns/processor/go.mod @@ -90,7 +90,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/api => ../../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/basic => ../../../../pkg/config/basic - github.com/DataDog/datadog-agent/pkg/config/buildschema => ../../../../pkg/config/buildschema github.com/DataDog/datadog-agent/pkg/config/create => ../../../../pkg/config/create github.com/DataDog/datadog-agent/pkg/config/env => ../../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/helper => ../../../../pkg/config/helper @@ -118,7 +117,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/eviction => ../../../../pkg/logs/patterns/eviction github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/logs/patterns/tags/go.mod b/pkg/logs/patterns/tags/go.mod index 7fc6939fd48f..3194e051798b 100644 --- a/pkg/logs/patterns/tags/go.mod +++ b/pkg/logs/patterns/tags/go.mod @@ -1,45 +1,47 @@ module github.com/DataDog/datadog-agent/pkg/logs/patterns/tags -go 1.24.9 +go 1.25.0 require ( - github.com/DataDog/datadog-agent/pkg/config/setup v0.0.0-00010101000000-000000000000 + github.com/DataDog/datadog-agent/pkg/config/setup v0.61.0 github.com/DataDog/datadog-agent/pkg/logs/patterns/eviction v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/pkg/proto v0.74.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.72.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.73.0-rc.5 github.com/stretchr/testify v1.11.1 ) require ( + github.com/DataDog/datadog-agent/comp/core/delegatedauth v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/comp/core/secrets/def v0.71.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/basic v0.0.0-20260211235139-a5361978c2b6 // indirect github.com/DataDog/datadog-agent/pkg/config/create v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/config/env v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/config/helper v0.73.0-devel.0.20251030121902-cd89eab046d6 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.72.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.64.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/structure v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/structure v0.77.0-devel.0.20260211235139-a5361978c2b6 // indirect github.com/DataDog/datadog-agent/pkg/config/teeconfig v0.64.1 // indirect github.com/DataDog/datadog-agent/pkg/config/viperconfig v0.72.2 // indirect github.com/DataDog/datadog-agent/pkg/fips v0.0.0 // indirect - github.com/DataDog/datadog-agent/pkg/template v0.64.1 // indirect + github.com/DataDog/datadog-agent/pkg/template v0.65.1 // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.72.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect - github.com/DataDog/viper v1.15.0 // indirect + github.com/DataDog/viper v1.15.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/ebitengine/purego v0.9.1 // indirect + github.com/ebitengine/purego v0.10.0 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-viper/mapstructure/v2 v2.5.0 // indirect github.com/gofrs/flock v0.13.0 // indirect - github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect + github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94 // indirect github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect github.com/magiconair/properties v1.8.10 // indirect github.com/mdlayher/socket v0.5.1 // indirect @@ -48,24 +50,27 @@ require ( github.com/pelletier/go-toml v1.9.5 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect - github.com/shirou/gopsutil/v4 v4.25.12 // indirect + github.com/shirou/gopsutil/v4 v4.26.2 // indirect github.com/spf13/cast v1.10.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.10 // indirect github.com/tklauser/go-sysconf v0.3.16 // indirect github.com/tklauser/numcpus v0.11.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/otel/sdk v1.39.0 // indirect + go.opentelemetry.io/otel/metric v1.42.0 // indirect + go.opentelemetry.io/otel/sdk v1.41.0 // indirect + go.opentelemetry.io/otel/trace v1.42.0 // indirect go.uber.org/atomic v1.11.0 // indirect - golang.org/x/net v0.49.0 // indirect - golang.org/x/sync v0.19.0 // indirect - golang.org/x/sys v0.40.0 // indirect - golang.org/x/text v0.33.0 // indirect + go.yaml.in/yaml/v2 v2.4.3 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect + golang.org/x/net v0.52.0 // indirect + golang.org/x/sync v0.20.0 // indirect + golang.org/x/sys v0.42.0 // indirect + golang.org/x/text v0.35.0 // indirect golang.org/x/time v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect - google.golang.org/grpc v1.78.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect + google.golang.org/grpc v1.79.3 // indirect google.golang.org/protobuf v1.36.11 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) @@ -146,7 +151,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/api => ../../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/basic => ../../../../pkg/config/basic - github.com/DataDog/datadog-agent/pkg/config/buildschema => ../../../../pkg/config/buildschema github.com/DataDog/datadog-agent/pkg/config/create => ../../../../pkg/config/create github.com/DataDog/datadog-agent/pkg/config/env => ../../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/helper => ../../../../pkg/config/helper @@ -174,7 +178,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/eviction => ../../../../pkg/logs/patterns/eviction github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/logs/patterns/tags/go.sum b/pkg/logs/patterns/tags/go.sum index f29c2997b7db..3f64354b8563 100644 --- a/pkg/logs/patterns/tags/go.sum +++ b/pkg/logs/patterns/tags/go.sum @@ -1,6 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/viper v1.15.0 h1:oV4rbRx+ylrbIAEBCw+8xKyH+eQF1DkVHDGz7RtmKlk= -github.com/DataDog/viper v1.15.0/go.mod h1:QGomve/3EbYfi58jADS97U2OKfsxqh2pWemuT0azbdk= +github.com/DataDog/viper v1.15.1 h1:kcdFE+qPndlWkhU4iEf/WpWQMCyVYHTv5HqvVf+SYJs= +github.com/DataDog/viper v1.15.1/go.mod h1:rDLDREOPd+gpEbA8y4Y/5wTvyLqvUiCmDXX0jRZy8mw= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= @@ -9,8 +9,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A= -github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= +github.com/ebitengine/purego v0.10.0 h1:QIw4xfpWT6GWTzaW5XEKy3HXoqrJGx1ijYHzTF0/ISU= +github.com/ebitengine/purego v0.10.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -34,8 +34,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb h1:PGufWXXDq9yaev6xX1YQauaO1MV90e6Mpoq1I7Lz/VM= -github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb/go.mod h1:QiyDdbZLaJ/mZP4Zwc9g2QsfaEA4o7XvvgZegSci5/E= +github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94 h1:0G5JVG0aJDpWvH1r8idd+wbPcAH14UqIuUMepx3v9rE= +github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94/go.mod h1:MvF7bZQy5lD2WcLXjFytRVvnTrFvrjo/qGka1MIBOPE= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -64,8 +64,8 @@ github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= -github.com/shirou/gopsutil/v4 v4.25.12 h1:e7PvW/0RmJ8p8vPGJH4jvNkOyLmbkXgXW4m6ZPic6CY= -github.com/shirou/gopsutil/v4 v4.25.12/go.mod h1:EivAfP5x2EhLp2ovdpKSozecVXn1TmuG7SMzs/Wh4PU= +github.com/shirou/gopsutil/v4 v4.26.2 h1:X8i6sicvUFih4BmYIGT1m2wwgw2VG9YgrDTi7cIRGUI= +github.com/shirou/gopsutil/v4 v4.26.2/go.mod h1:LZ6ewCSkBqUpvSOf+LsTGnRinC6iaNUNMGBtDkJBaLQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY= github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo= @@ -88,39 +88,42 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.39.1-0.20260115134311-f809f7d71e2d h1:d8jN5C+mHlN5HebF5NXapM8PW5Tq8LoBMUO/d7aqm4Y= -go.opentelemetry.io/otel v1.39.1-0.20260115134311-f809f7d71e2d/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8= -go.opentelemetry.io/otel/metric v1.39.1-0.20260115134311-f809f7d71e2d h1:Mv7jOS/papmlU4jeUx/ScvxT+UghI4YxgRG2ODBxqBA= -go.opentelemetry.io/otel/metric v1.39.1-0.20260115134311-f809f7d71e2d/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs= -go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18= -go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE= -go.opentelemetry.io/otel/sdk/metric v1.39.1-0.20260115134311-f809f7d71e2d h1:Xc+v+yOWogGc1bTp6ISSnWEgHjaerCiU1VWBZQ40ewo= -go.opentelemetry.io/otel/sdk/metric v1.39.1-0.20260115134311-f809f7d71e2d/go.mod h1:UVPnzxO3YDVhII6+YVBzgScV6MYwDUlW2G9lVMvFS7c= -go.opentelemetry.io/otel/trace v1.39.1-0.20260115134311-f809f7d71e2d h1:BbdGrkH9cVsrnmD3egDymUWUjG5tGK6oaobhpHmDrK8= -go.opentelemetry.io/otel/trace v1.39.1-0.20260115134311-f809f7d71e2d/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA= +go.opentelemetry.io/otel v1.42.0 h1:lSQGzTgVR3+sgJDAU/7/ZMjN9Z+vUip7leaqBKy4sho= +go.opentelemetry.io/otel v1.42.0/go.mod h1:lJNsdRMxCUIWuMlVJWzecSMuNjE7dOYyWlqOXWkdqCc= +go.opentelemetry.io/otel/metric v1.42.0 h1:2jXG+3oZLNXEPfNmnpxKDeZsFI5o4J+nz6xUlaFdF/4= +go.opentelemetry.io/otel/metric v1.42.0/go.mod h1:RlUN/7vTU7Ao/diDkEpQpnz3/92J9ko05BIwxYa2SSI= +go.opentelemetry.io/otel/sdk v1.41.0 h1:YPIEXKmiAwkGl3Gu1huk1aYWwtpRLeskpV+wPisxBp8= +go.opentelemetry.io/otel/sdk v1.41.0/go.mod h1:ahFdU0G5y8IxglBf0QBJXgSe7agzjE4GiTJ6HT9ud90= +go.opentelemetry.io/otel/sdk/metric v1.41.0 h1:siZQIYBAUd1rlIWQT2uCxWJxcCO7q3TriaMlf08rXw8= +go.opentelemetry.io/otel/sdk/metric v1.41.0/go.mod h1:HNBuSvT7ROaGtGI50ArdRLUnvRTRGniSUZbxiWxSO8Y= +go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4LenLmOYY= +go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= -golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= -golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= -golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= -golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= +go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= +go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= +golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= +golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= -golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE= -golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8= +golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= +golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= +golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b h1:Mv8VFug0MP9e5vUxfBcE3vUkV6CImK3cMNMIDFjmzxU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ= -google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc= -google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE= +google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -128,8 +131,5 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/logs/patterns/tags/tag_manager.go b/pkg/logs/patterns/tags/tag_manager.go index ec64de68f931..df3e852faea4 100644 --- a/pkg/logs/patterns/tags/tag_manager.go +++ b/pkg/logs/patterns/tags/tag_manager.go @@ -13,7 +13,7 @@ import ( "sync/atomic" "time" - "github.com/DataDog/datadog-agent/pkg/proto/pbgo/statefulpb" + "github.com/DataDog/agent-payload/v5/statefulpb" "github.com/DataDog/datadog-agent/pkg/util/log" ) @@ -21,11 +21,11 @@ import ( // It provides thread-safe operations for retrieving/creating IDs and building Tag proto messages // that reference those IDs. type TagManager struct { - stringToEntry map[string]*tagEntry - idToEntry map[uint64]*tagEntry - nextID atomic.Uint64 + stringToEntry map[string]*tagEntry + idToEntry map[uint64]*tagEntry + nextID atomic.Uint64 cachedMemoryBytes atomic.Int64 - mu sync.RWMutex + mu sync.RWMutex } // NewTagManager creates a new TagManager instance diff --git a/pkg/logs/patterns/token/go.mod b/pkg/logs/patterns/token/go.mod index d759e7f2a7d7..f074e17e118f 100644 --- a/pkg/logs/patterns/token/go.mod +++ b/pkg/logs/patterns/token/go.mod @@ -90,7 +90,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/api => ../../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/basic => ../../../../pkg/config/basic - github.com/DataDog/datadog-agent/pkg/config/buildschema => ../../../../pkg/config/buildschema github.com/DataDog/datadog-agent/pkg/config/create => ../../../../pkg/config/create github.com/DataDog/datadog-agent/pkg/config/env => ../../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/helper => ../../../../pkg/config/helper @@ -118,7 +117,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/eviction => ../../../../pkg/logs/patterns/eviction github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/logs/patterns/tokenizer/rust/go.mod b/pkg/logs/patterns/tokenizer/rust/go.mod index ffebd499eb57..16c2aec00c54 100644 --- a/pkg/logs/patterns/tokenizer/rust/go.mod +++ b/pkg/logs/patterns/tokenizer/rust/go.mod @@ -1,25 +1,28 @@ module github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust -go 1.24.9 +go 1.25.0 require github.com/DataDog/datadog-agent/pkg/logs/patterns/token v0.0.0 require ( github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering v0.0.0-00010101000000-000000000000 - github.com/DataDog/datadog-agent/pkg/util/log v0.72.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.73.0-rc.5 github.com/google/flatbuffers v25.2.10+incompatible github.com/stretchr/testify v1.11.1 ) require ( + github.com/DataDog/datadog-agent/comp/core/delegatedauth v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/comp/core/secrets/def v0.71.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/basic v0.0.0-20260211235139-a5361978c2b6 // indirect github.com/DataDog/datadog-agent/pkg/config/create v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/config/env v0.61.0 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.72.2 // indirect + github.com/DataDog/datadog-agent/pkg/config/helper v0.73.0-devel.0.20251030121902-cd89eab046d6 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.64.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.0.0-00010101000000-000000000000 // indirect - github.com/DataDog/datadog-agent/pkg/config/structure v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/structure v0.77.0-devel.0.20260211235139-a5361978c2b6 // indirect github.com/DataDog/datadog-agent/pkg/config/teeconfig v0.64.1 // indirect github.com/DataDog/datadog-agent/pkg/config/viperconfig v0.72.2 // indirect github.com/DataDog/datadog-agent/pkg/fips v0.0.0 // indirect @@ -30,20 +33,20 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.72.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect - github.com/DataDog/viper v1.15.0 // indirect + github.com/DataDog/viper v1.15.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/ebitengine/purego v0.9.1 // indirect + github.com/ebitengine/purego v0.10.0 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-viper/mapstructure/v2 v2.5.0 // indirect github.com/gofrs/flock v0.13.0 // indirect - github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect + github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94 // indirect github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect github.com/magiconair/properties v1.8.10 // indirect github.com/mdlayher/socket v0.5.1 // indirect @@ -52,7 +55,7 @@ require ( github.com/pelletier/go-toml v1.9.5 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect - github.com/shirou/gopsutil/v4 v4.25.12 // indirect + github.com/shirou/gopsutil/v4 v4.26.2 // indirect github.com/spf13/cast v1.10.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.10 // indirect @@ -60,11 +63,12 @@ require ( github.com/tklauser/numcpus v0.11.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.uber.org/atomic v1.11.0 // indirect - golang.org/x/net v0.49.0 // indirect - golang.org/x/sync v0.19.0 // indirect - golang.org/x/sys v0.40.0 // indirect + go.yaml.in/yaml/v2 v2.4.3 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect + golang.org/x/net v0.52.0 // indirect + golang.org/x/sync v0.20.0 // indirect + golang.org/x/sys v0.42.0 // indirect golang.org/x/time v0.14.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) @@ -145,7 +149,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/api => ../../../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/basic => ../../../../../pkg/config/basic - github.com/DataDog/datadog-agent/pkg/config/buildschema => ../../../../../pkg/config/buildschema github.com/DataDog/datadog-agent/pkg/config/create => ../../../../../pkg/config/create github.com/DataDog/datadog-agent/pkg/config/env => ../../../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/helper => ../../../../../pkg/config/helper @@ -174,7 +177,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../../pkg/logs/processor github.com/DataDog/datadog-agent/pkg/logs/sender => ../../../../../pkg/logs/sender @@ -211,7 +213,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/telemetry => ../../../../../pkg/telemetry github.com/DataDog/datadog-agent/pkg/template => ../../../../../pkg/template github.com/DataDog/datadog-agent/pkg/trace => ../../../../../pkg/trace - github.com/DataDog/datadog-agent/pkg/trace/log => ../../../../trace/log + github.com/DataDog/datadog-agent/pkg/trace/log => ../../../../../pkg/trace/log github.com/DataDog/datadog-agent/pkg/trace/otel => ../../../../../pkg/trace/otel github.com/DataDog/datadog-agent/pkg/trace/stats => ../../../../../pkg/trace/stats github.com/DataDog/datadog-agent/pkg/trace/traceutil => ../../../../../pkg/trace/traceutil diff --git a/pkg/logs/patterns/tokenizer/rust/go.sum b/pkg/logs/patterns/tokenizer/rust/go.sum index d67c43593e93..fea0b581fbfb 100644 --- a/pkg/logs/patterns/tokenizer/rust/go.sum +++ b/pkg/logs/patterns/tokenizer/rust/go.sum @@ -1,16 +1,14 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/datadog-agent/pkg/trace/log v0.77.0-devel h1:YRvR75YDLM4tX7CyzcE7vJmaRBESgxbPvayNNXIuU5g= -github.com/DataDog/datadog-agent/pkg/trace/log v0.77.0-devel/go.mod h1:qfkVWuGF1QQLLnnyIabg9aXMhzkkbzkJruNgn/BhMXQ= -github.com/DataDog/viper v1.15.0 h1:oV4rbRx+ylrbIAEBCw+8xKyH+eQF1DkVHDGz7RtmKlk= -github.com/DataDog/viper v1.15.0/go.mod h1:QGomve/3EbYfi58jADS97U2OKfsxqh2pWemuT0azbdk= +github.com/DataDog/viper v1.15.1 h1:kcdFE+qPndlWkhU4iEf/WpWQMCyVYHTv5HqvVf+SYJs= +github.com/DataDog/viper v1.15.1/go.mod h1:rDLDREOPd+gpEbA8y4Y/5wTvyLqvUiCmDXX0jRZy8mw= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A= -github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= +github.com/ebitengine/purego v0.10.0 h1:QIw4xfpWT6GWTzaW5XEKy3HXoqrJGx1ijYHzTF0/ISU= +github.com/ebitengine/purego v0.10.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -28,8 +26,8 @@ github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6F github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb h1:PGufWXXDq9yaev6xX1YQauaO1MV90e6Mpoq1I7Lz/VM= -github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb/go.mod h1:QiyDdbZLaJ/mZP4Zwc9g2QsfaEA4o7XvvgZegSci5/E= +github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94 h1:0G5JVG0aJDpWvH1r8idd+wbPcAH14UqIuUMepx3v9rE= +github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94/go.mod h1:MvF7bZQy5lD2WcLXjFytRVvnTrFvrjo/qGka1MIBOPE= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -58,8 +56,8 @@ github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= -github.com/shirou/gopsutil/v4 v4.25.12 h1:e7PvW/0RmJ8p8vPGJH4jvNkOyLmbkXgXW4m6ZPic6CY= -github.com/shirou/gopsutil/v4 v4.25.12/go.mod h1:EivAfP5x2EhLp2ovdpKSozecVXn1TmuG7SMzs/Wh4PU= +github.com/shirou/gopsutil/v4 v4.26.2 h1:X8i6sicvUFih4BmYIGT1m2wwgw2VG9YgrDTi7cIRGUI= +github.com/shirou/gopsutil/v4 v4.26.2/go.mod h1:LZ6ewCSkBqUpvSOf+LsTGnRinC6iaNUNMGBtDkJBaLQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY= github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo= @@ -82,17 +80,20 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= -golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= -golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= -golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= -golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= +go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= +go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= +golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= +golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= -golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= +golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -100,8 +101,5 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/logs/pipeline/go.mod b/pkg/logs/pipeline/go.mod index ad0084bf5fe5..a64c53cee6a5 100644 --- a/pkg/logs/pipeline/go.mod +++ b/pkg/logs/pipeline/go.mod @@ -4,21 +4,24 @@ go 1.25.0 require ( github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.61.0 + github.com/DataDog/datadog-agent/comp/core/secrets/def v0.72.0-rc.1 github.com/DataDog/datadog-agent/comp/logs/agent/config v0.61.0 github.com/DataDog/datadog-agent/comp/serializer/logscompression v0.64.0-devel github.com/DataDog/datadog-agent/pkg/config/mock v0.70.0 - github.com/DataDog/datadog-agent/pkg/config/model v0.73.0-rc.5 + github.com/DataDog/datadog-agent/pkg/config/model v0.77.2 github.com/DataDog/datadog-agent/pkg/config/setup v0.61.0 github.com/DataDog/datadog-agent/pkg/logs/client v0.61.0 github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.61.0 github.com/DataDog/datadog-agent/pkg/logs/message v0.64.0-rc.12 github.com/DataDog/datadog-agent/pkg/logs/metrics v0.61.0 + github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/pkg/logs/processor v0.61.0 github.com/DataDog/datadog-agent/pkg/logs/sender v0.61.0 github.com/DataDog/datadog-agent/pkg/logs/sender/grpc v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/pkg/logs/sources v0.61.0 github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.61.0 github.com/DataDog/datadog-agent/pkg/util/compression v0.56.0-rc.3 + github.com/DataDog/datadog-agent/pkg/util/log v0.73.0-rc.5 github.com/DataDog/datadog-agent/pkg/util/startstop v0.61.0 github.com/stretchr/testify v1.11.1 go.uber.org/atomic v1.11.0 @@ -30,7 +33,6 @@ require ( github.com/DataDog/datadog-agent/comp/core/delegatedauth v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/comp/core/flare/builder v0.61.0 // indirect github.com/DataDog/datadog-agent/comp/core/flare/types v0.72.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/secrets/def v0.72.0-rc.1 // indirect github.com/DataDog/datadog-agent/comp/core/secrets/noop-impl v0.77.0-devel.0.20260211235139-a5361978c2b6 // indirect github.com/DataDog/datadog-agent/comp/core/telemetry v0.61.0 // indirect github.com/DataDog/datadog-agent/comp/def v0.73.0-rc.5 // indirect @@ -45,10 +47,18 @@ require ( github.com/DataDog/datadog-agent/pkg/config/utils v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/config/viperconfig v0.72.2 // indirect github.com/DataDog/datadog-agent/pkg/fips v0.0.0 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering/merging v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/eviction v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/processor v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/tags v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/token v0.0.0 // indirect github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/logs/types v0.71.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.74.1 // indirect github.com/DataDog/datadog-agent/pkg/telemetry v0.64.1 // indirect github.com/DataDog/datadog-agent/pkg/template v0.65.1 // indirect + github.com/DataDog/datadog-agent/pkg/trace/log v0.77.0-devel // indirect github.com/DataDog/datadog-agent/pkg/util/backoff v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/defaultpaths v0.64.0-devel // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.61.0 // indirect @@ -56,12 +66,12 @@ require ( github.com/DataDog/datadog-agent/pkg/util/flavor v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/util/fxutil v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.61.0 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/option v0.64.0-devel // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -77,6 +87,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.5.0 // indirect github.com/gofrs/flock v0.13.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect @@ -222,7 +233,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor github.com/DataDog/datadog-agent/pkg/logs/sender => ../../../pkg/logs/sender diff --git a/pkg/logs/pipeline/go.sum b/pkg/logs/pipeline/go.sum index 18f7b3457a4a..dbbbe81506be 100644 --- a/pkg/logs/pipeline/go.sum +++ b/pkg/logs/pipeline/go.sum @@ -41,6 +41,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= +github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= diff --git a/pkg/logs/pipeline/pipeline.go b/pkg/logs/pipeline/pipeline.go index d2692ff5557e..780867f561a0 100644 --- a/pkg/logs/pipeline/pipeline.go +++ b/pkg/logs/pipeline/pipeline.go @@ -122,6 +122,10 @@ func getStrategy( return grpcsender.NewBatchStrategy(statefulInputChan, outputChan, flushChan, endpoints.BatchWait, endpoints.BatchMaxSize, endpoints.BatchMaxContentSize, "logs", encoder, pipelineMonitor, instanceID) } + if grpcEndpoint, ok := firstGRPCAdditionalEndpoint(endpoints); ok && !serverlessMeta.IsEnabled() { + grpcComp := buildEndpointCompressor(compressor, grpcEndpoint) + return grpcsender.NewDualStrategy(inputChan, outputChan, flushChan, grpcEndpoint, grpcComp, cfg, endpoints, serverlessMeta, encoder, pipelineMonitor, instanceID) + } return sender.NewBatchStrategy( inputChan, outputChan, @@ -139,3 +143,19 @@ func getStrategy( log.Infof("Pipeline: Using StreamStrategy (default)") return sender.NewStreamStrategy(inputChan, outputChan, compressor.NewCompressor(compressioncommon.NoneKind, 0)) } + +func firstGRPCAdditionalEndpoint(endpoints *config.Endpoints) (config.Endpoint, bool) { + for _, ep := range endpoints.Endpoints[1:] { + if ep.UseGRPC { + return ep, true + } + } + return config.Endpoint{}, false +} + +func buildEndpointCompressor(comp logscompression.Component, endpoint config.Endpoint) compressioncommon.Compressor { + if endpoint.UseCompression { + return comp.NewCompressor(endpoint.CompressionKind, endpoint.CompressionLevel) + } + return comp.NewCompressor(compressioncommon.NoneKind, 0) +} diff --git a/pkg/logs/pipeline/provider.go b/pkg/logs/pipeline/provider.go index 40e9cfbf4392..5365606d00e5 100644 --- a/pkg/logs/pipeline/provider.go +++ b/pkg/logs/pipeline/provider.go @@ -102,6 +102,16 @@ func NewProvider( if endpoints.UseGRPC { senderImpl = grpcsender.NewSender(numberOfPipelines, cfg, sink, endpoints, destinationsContext, compression) } else if endpoints.UseHTTP { + if _, ok := firstGRPCAdditionalEndpoint(endpoints); ok { + if endpoints.Main.ExtraHTTPHeaders == nil { + endpoints.Main.ExtraHTTPHeaders = map[string]string{} + } + endpoints.Main.ExtraHTTPHeaders["dd-shadow-ingest"] = "true" + if endpoints.Endpoints[0].ExtraHTTPHeaders == nil { + endpoints.Endpoints[0].ExtraHTTPHeaders = map[string]string{} + } + endpoints.Endpoints[0].ExtraHTTPHeaders["dd-shadow-ingest"] = "true" + } senderImpl = httpSender(numberOfPipelines, cfg, sink, endpoints, destinationsContext, serverlessMeta, legacyMode, secretsComp) } else { senderImpl = tcpSender(numberOfPipelines, cfg, sink, endpoints, destinationsContext, status, serverlessMeta, legacyMode) @@ -212,7 +222,6 @@ func httpSender( workersPerQueue, minSenderConcurrency, maxSenderConcurrency, - secretsComp, ) } diff --git a/pkg/logs/processor/go.mod b/pkg/logs/processor/go.mod index 44c7e6016e15..24cc85f0086a 100644 --- a/pkg/logs/processor/go.mod +++ b/pkg/logs/processor/go.mod @@ -3,7 +3,7 @@ module github.com/DataDog/datadog-agent/pkg/logs/processor go 1.25.0 require ( - github.com/DataDog/agent-payload/v5 v5.0.189 + github.com/DataDog/agent-payload/v5 v5.0.191 github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.61.0 github.com/DataDog/datadog-agent/comp/logs/agent/config v0.61.0 github.com/DataDog/datadog-agent/pkg/config/model v0.77.2 @@ -24,7 +24,6 @@ require ( github.com/DataDog/datadog-agent/comp/def v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/config/basic v0.0.0-20260211235139-a5361978c2b6 // indirect - github.com/DataDog/datadog-agent/pkg/config/buildschema v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/config/create v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/config/env v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/config/helper v0.73.0-devel.0.20251030121902-cd89eab046d6 // indirect @@ -48,6 +47,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -97,8 +97,8 @@ require ( golang.org/x/sys v0.42.0 // indirect golang.org/x/text v0.35.0 // indirect golang.org/x/time v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect - google.golang.org/grpc v1.78.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect + google.golang.org/grpc v1.79.3 // indirect google.golang.org/protobuf v1.36.11 // indirect ) @@ -179,7 +179,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/api => ../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/basic => ../../../pkg/config/basic - github.com/DataDog/datadog-agent/pkg/config/buildschema => ../../../pkg/config/buildschema github.com/DataDog/datadog-agent/pkg/config/create => ../../../pkg/config/create github.com/DataDog/datadog-agent/pkg/config/env => ../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/helper => ../../../pkg/config/helper @@ -208,7 +207,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/sender => ../../../pkg/logs/sender diff --git a/pkg/logs/processor/json.go b/pkg/logs/processor/json.go index aaa68f89ee27..564d85b35975 100644 --- a/pkg/logs/processor/json.go +++ b/pkg/logs/processor/json.go @@ -12,6 +12,7 @@ import ( "time" "github.com/DataDog/datadog-agent/pkg/logs/message" + "github.com/google/uuid" ) const nanoToMillis = 1000000 @@ -27,13 +28,14 @@ type jsonEncoder struct{} // JSON representation of a message. type jsonPayload struct { - Message ValidUtf8Bytes `json:"message"` - Status string `json:"status"` - Timestamp int64 `json:"timestamp"` - Hostname string `json:"hostname"` - Service string `json:"service"` - Source string `json:"ddsource"` - Tags string `json:"ddtags"` + Message ValidUtf8Bytes `json:"message"` + Status string `json:"status"` + Timestamp int64 `json:"timestamp"` + Hostname string `json:"hostname"` + Service string `json:"service"` + Source string `json:"ddsource"` + Tags string `json:"ddtags"` + DualSendUUID string `json:"dual-send-uuid"` } // Encode encodes a message into a JSON byte array. @@ -42,19 +44,25 @@ func (j *jsonEncoder) Encode(msg *message.Message, hostname string) error { return errors.New("message passed to encoder isn't rendered") } + msg.PreEncodedContent = msg.GetContent() + msg.MessageMetadata.Hostname = hostname + msg.MessageMetadata.DualSendUUID = uuid.NewString() + ts := time.Now().UTC() if !msg.ServerlessExtra.Timestamp.IsZero() { ts = msg.ServerlessExtra.Timestamp } + msg.MessageMetadata.EncodedTimestampMs = ts.UnixNano() / nanoToMillis encoded, err := json.Marshal(jsonPayload{ - Message: ValidUtf8Bytes(msg.GetContent()), - Status: msg.GetStatus(), - Timestamp: ts.UnixNano() / nanoToMillis, - Hostname: hostname, - Service: msg.Origin.Service(), - Source: msg.Origin.Source(), - Tags: msg.TagsToString(), + Message: ValidUtf8Bytes(msg.GetContent()), + Status: msg.GetStatus(), + Timestamp: msg.MessageMetadata.EncodedTimestampMs, + Hostname: hostname, + Service: msg.Origin.Service(), + Source: msg.Origin.Source(), + Tags: msg.TagsToString(), + DualSendUUID: msg.MessageMetadata.DualSendUUID, }) if err != nil { diff --git a/pkg/logs/sender/go.mod b/pkg/logs/sender/go.mod index da794ae2eaca..15315eb38aba 100644 --- a/pkg/logs/sender/go.mod +++ b/pkg/logs/sender/go.mod @@ -3,8 +3,6 @@ module github.com/DataDog/datadog-agent/pkg/logs/sender go 1.25.0 require ( - github.com/DataDog/datadog-agent/comp/core/secrets/def v0.72.0-rc.1 - github.com/DataDog/datadog-agent/comp/core/secrets/noop-impl v0.77.0-devel.0.20260211235139-a5361978c2b6 github.com/DataDog/datadog-agent/comp/logs/agent/config v0.61.0 github.com/DataDog/datadog-agent/comp/serializer/logscompression v0.64.0-devel github.com/DataDog/datadog-agent/pkg/config/mock v0.70.0 @@ -25,17 +23,17 @@ require ( require gopkg.in/yaml.v3 v3.0.1 // indirect require ( - github.com/DataDog/datadog-agent/comp/api/api/def v0.72.0-rc.1 // indirect + github.com/DataDog/agent-payload/v5 v5.0.191 // indirect github.com/DataDog/datadog-agent/comp/core/config v0.64.0-devel // indirect github.com/DataDog/datadog-agent/comp/core/delegatedauth v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/comp/core/flare/builder v0.61.0 // indirect github.com/DataDog/datadog-agent/comp/core/flare/types v0.72.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/status v0.73.0-rc.5 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets/def v0.72.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets/noop-impl v0.77.0-devel.0.20260211235139-a5361978c2b6 // indirect github.com/DataDog/datadog-agent/comp/core/telemetry v0.61.0 // indirect github.com/DataDog/datadog-agent/comp/def v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/config/basic v0.0.0-20260211235139-a5361978c2b6 // indirect - github.com/DataDog/datadog-agent/pkg/config/buildschema v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/config/create v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/config/env v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/config/helper v0.73.0-devel.0.20251030121902-cd89eab046d6 // indirect @@ -62,6 +60,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -70,9 +69,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/dustin/go-humanize v1.0.1 // indirect github.com/ebitengine/purego v0.10.0 // indirect - github.com/fatih/color v1.18.0 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-viper/mapstructure/v2 v2.5.0 // indirect @@ -81,8 +78,6 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect github.com/magiconair/properties v1.8.10 // indirect - github.com/mattn/go-colorable v0.1.14 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect github.com/mdlayher/socket v0.5.1 // indirect github.com/mdlayher/vsock v1.2.1 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect @@ -113,8 +108,8 @@ require ( golang.org/x/sys v0.42.0 // indirect golang.org/x/text v0.35.0 // indirect golang.org/x/time v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect - google.golang.org/grpc v1.78.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect + google.golang.org/grpc v1.79.3 // indirect google.golang.org/protobuf v1.36.11 // indirect ) @@ -195,7 +190,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/api => ../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/basic => ../../../pkg/config/basic - github.com/DataDog/datadog-agent/pkg/config/buildschema => ../../../pkg/config/buildschema github.com/DataDog/datadog-agent/pkg/config/create => ../../../pkg/config/create github.com/DataDog/datadog-agent/pkg/config/env => ../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/helper => ../../../pkg/config/helper @@ -224,7 +218,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/logs/sender/grpc/batch_strategy.go b/pkg/logs/sender/grpc/batch_strategy.go index d66c1a2cf48b..b21576aea5fd 100644 --- a/pkg/logs/sender/grpc/batch_strategy.go +++ b/pkg/logs/sender/grpc/batch_strategy.go @@ -12,10 +12,10 @@ import ( "github.com/benbjohnson/clock" "google.golang.org/protobuf/proto" + "github.com/DataDog/agent-payload/v5/statefulpb" "github.com/DataDog/datadog-agent/pkg/logs/message" "github.com/DataDog/datadog-agent/pkg/logs/metrics" "github.com/DataDog/datadog-agent/pkg/logs/sender" - "github.com/DataDog/datadog-agent/pkg/proto/pbgo/statefulpb" "github.com/DataDog/datadog-agent/pkg/telemetry" "github.com/DataDog/datadog-agent/pkg/util/compression" "github.com/DataDog/datadog-agent/pkg/util/log" diff --git a/pkg/logs/sender/grpc/batch_strategy_test.go b/pkg/logs/sender/grpc/batch_strategy_test.go index cae306edf1a5..cbd71d4861b2 100644 --- a/pkg/logs/sender/grpc/batch_strategy_test.go +++ b/pkg/logs/sender/grpc/batch_strategy_test.go @@ -16,10 +16,10 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" + "github.com/DataDog/agent-payload/v5/statefulpb" compressionfx "github.com/DataDog/datadog-agent/comp/serializer/logscompression/fx-mock" "github.com/DataDog/datadog-agent/pkg/logs/message" "github.com/DataDog/datadog-agent/pkg/logs/metrics" - "github.com/DataDog/datadog-agent/pkg/proto/pbgo/statefulpb" "github.com/DataDog/datadog-agent/pkg/util/compression" ) diff --git a/pkg/logs/sender/grpc/dual_strategy.go b/pkg/logs/sender/grpc/dual_strategy.go new file mode 100644 index 000000000000..970fdf88ee8a --- /dev/null +++ b/pkg/logs/sender/grpc/dual_strategy.go @@ -0,0 +1,167 @@ +// Unless explicitly stated otherwise all files in this repository are licensed +// under the Apache License Version 2.0. +// This product includes software developed at Datadog (https://www.datadoghq.com/). +// Copyright 2016-present Datadog, Inc. + +package grpc + +import ( + "github.com/DataDog/datadog-agent/comp/logs/agent/config" + pkgconfigmodel "github.com/DataDog/datadog-agent/pkg/config/model" + pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup" + "github.com/DataDog/datadog-agent/pkg/logs/client" + "github.com/DataDog/datadog-agent/pkg/logs/message" + "github.com/DataDog/datadog-agent/pkg/logs/metrics" + rtokenizer "github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust" + "github.com/DataDog/datadog-agent/pkg/logs/sender" + compressioncommon "github.com/DataDog/datadog-agent/pkg/util/compression" + "github.com/DataDog/datadog-agent/pkg/util/log" +) + +const grpcSecondaryBufferSize = 10000 + +// DualStrategy fans messages to both the primary HTTP strategy and a secondary gRPC stateful sender. +type DualStrategy struct { + inputChan chan *message.Message + httpInputChan chan *message.Message + grpcChan chan *message.Message + primary sender.Strategy + endpoint config.Endpoint + comp compressioncommon.Compressor + cfg pkgconfigmodel.Reader + endpoints *config.Endpoints + instanceID string + done chan struct{} +} + +func NewDualStrategy( + inputChan chan *message.Message, + outputChan chan *message.Payload, + flushChan chan struct{}, + grpcEndpoint config.Endpoint, + comp compressioncommon.Compressor, + cfg pkgconfigmodel.Reader, + endpoints *config.Endpoints, + serverlessMeta sender.ServerlessMeta, + httpEncoder compressioncommon.Compressor, + pipelineMonitor metrics.PipelineMonitor, + instanceID string, +) sender.Strategy { + if grpcEndpoint.ExtraHTTPHeaders == nil { + grpcEndpoint.ExtraHTTPHeaders = map[string]string{} + } + grpcEndpoint.ExtraHTTPHeaders["dd-shadow-only"] = "true" + + httpInputChan := make(chan *message.Message, cap(inputChan)) + primary := sender.NewBatchStrategy( + httpInputChan, + outputChan, + flushChan, + serverlessMeta, + endpoints.BatchWait, + endpoints.BatchMaxSize, + endpoints.BatchMaxContentSize, + "logs", + httpEncoder, + pipelineMonitor, + instanceID, + ) + + return &DualStrategy{ + inputChan: inputChan, + httpInputChan: httpInputChan, + grpcChan: make(chan *message.Message, grpcSecondaryBufferSize), + primary: primary, + endpoint: grpcEndpoint, + comp: comp, + cfg: cfg, + endpoints: endpoints, + instanceID: instanceID, + done: make(chan struct{}), + } +} + +func (d *DualStrategy) Start() { + d.primary.Start() + + conn, grpcClient, err := newGRPCClient(d.endpoint) + if err != nil { + log.Errorf("Failed to create gRPC connection for dual-send in pipeline %s: %v; continuing with HTTP only", d.instanceID, err) + go func() { + defer close(d.done) + for msg := range d.inputChan { + d.httpInputChan <- msg + } + close(d.httpInputChan) + }() + return + } + + tokenizer := rtokenizer.NewRustTokenizer() + translator := NewMessageTranslator(d.instanceID+"-dual", tokenizer) + statefulChan := translator.Start(d.grpcChan, d.cfg.GetInt("logs_config.message_channel_size")) + payloadChan := make(chan *message.Payload, inputChanBufferSize) + grpcFlushChan := make(chan struct{}, 1) + + pipelineMonitor := metrics.NewTelemetryPipelineMonitor() + batchStrat := NewBatchStrategy( + statefulChan, + payloadChan, + grpcFlushChan, + d.endpoints.BatchWait, + d.endpoints.BatchMaxSize, + d.endpoints.BatchMaxContentSize, + "grpc-dual", + d.comp, + pipelineMonitor, + d.instanceID, + ) + batchStrat.Start() + + destCtx := client.NewDestinationsContext() + destCtx.Start() + + maxInflight := d.cfg.GetInt("logs_config.grpc.max_inflight_payloads") + if maxInflight <= 0 { + maxInflight = pkgconfigsetup.DefaultMaxInflightPayloads + } + + worker := newStreamWorker( + "dual-"+d.instanceID, + payloadChan, + destCtx, + conn, + grpcClient, + &sender.NoopSink{}, + d.endpoint, + config.StreamLifetime(d.cfg), + d.comp, + maxInflight, + ) + worker.start() + + go func() { + defer close(d.done) + defer func() { + batchStrat.Stop() + worker.stop() + destCtx.Stop() + if err := conn.Close(); err != nil { + log.Warnf("Error closing gRPC dual-send connection %s: %v", d.instanceID, err) + } + }() + + for msg := range d.inputChan { + d.httpInputChan <- msg + d.grpcChan <- msg + } + + close(d.httpInputChan) + close(d.grpcChan) + }() +} + +func (d *DualStrategy) Stop() { + <-d.done + d.primary.Stop() +} diff --git a/pkg/logs/sender/grpc/go.mod b/pkg/logs/sender/grpc/go.mod index 807ad1c9fdfd..2f7f7da8660a 100644 --- a/pkg/logs/sender/grpc/go.mod +++ b/pkg/logs/sender/grpc/go.mod @@ -1,11 +1,11 @@ module github.com/DataDog/datadog-agent/pkg/logs/sender/grpc -go 1.24.9 +go 1.25.0 require ( github.com/DataDog/datadog-agent/comp/logs/agent/config v0.61.0 github.com/DataDog/datadog-agent/comp/serializer/logscompression v0.64.0-devel - github.com/DataDog/datadog-agent/pkg/config/model v0.72.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.77.2 github.com/DataDog/datadog-agent/pkg/config/setup v0.61.0 github.com/DataDog/datadog-agent/pkg/logs/client v0.61.0 github.com/DataDog/datadog-agent/pkg/logs/message v0.64.0-rc.12 @@ -22,34 +22,34 @@ require ( github.com/DataDog/datadog-agent/pkg/telemetry v0.64.1 github.com/DataDog/datadog-agent/pkg/util/backoff v0.61.0 github.com/DataDog/datadog-agent/pkg/util/compression v0.56.0-rc.3 - github.com/DataDog/datadog-agent/pkg/util/log v0.72.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.73.0-rc.5 github.com/DataDog/datadog-agent/pkg/version v0.72.2 github.com/benbjohnson/clock v1.3.5 github.com/stretchr/testify v1.11.1 go.uber.org/atomic v1.11.0 - google.golang.org/grpc v1.78.0 + google.golang.org/grpc v1.79.3 google.golang.org/protobuf v1.36.11 ) require ( - github.com/DataDog/agent-payload/v5 v5.0.179 // indirect - github.com/DataDog/datadog-agent/comp/api/api/def v0.72.0-rc.1 // indirect + github.com/DataDog/agent-payload/v5 v5.0.191 // indirect github.com/DataDog/datadog-agent/comp/core/config v0.64.0-devel // indirect + github.com/DataDog/datadog-agent/comp/core/delegatedauth v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/comp/core/flare/builder v0.61.0 // indirect github.com/DataDog/datadog-agent/comp/core/flare/types v0.72.0-rc.1 // indirect github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.61.0 // indirect github.com/DataDog/datadog-agent/comp/core/secrets/def v0.72.0-rc.1 // indirect - github.com/DataDog/datadog-agent/comp/core/secrets/noop-impl v0.0.0-20251003153905-4e3e64f07b69 // indirect - github.com/DataDog/datadog-agent/comp/core/status v0.72.0-rc.1 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets/noop-impl v0.77.0-devel.0.20260211235139-a5361978c2b6 // indirect github.com/DataDog/datadog-agent/comp/core/telemetry v0.61.0 // indirect - github.com/DataDog/datadog-agent/comp/def v0.61.0 // indirect + github.com/DataDog/datadog-agent/comp/def v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/basic v0.0.0-20260211235139-a5361978c2b6 // indirect github.com/DataDog/datadog-agent/pkg/config/create v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/config/env v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/config/helper v0.73.0-devel.0.20251030121902-cd89eab046d6 // indirect - github.com/DataDog/datadog-agent/pkg/config/mock v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/mock v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.64.1 // indirect - github.com/DataDog/datadog-agent/pkg/config/structure v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/structure v0.77.0-devel.0.20260211235139-a5361978c2b6 // indirect github.com/DataDog/datadog-agent/pkg/config/teeconfig v0.64.1 // indirect github.com/DataDog/datadog-agent/pkg/config/utils v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/config/viperconfig v0.72.2 // indirect @@ -61,37 +61,35 @@ require ( github.com/DataDog/datadog-agent/pkg/logs/types v0.71.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/template v0.65.1 // indirect github.com/DataDog/datadog-agent/pkg/trace/log v0.77.0-devel // indirect + github.com/DataDog/datadog-agent/pkg/util/defaultpaths v0.64.0-devel // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.61.0 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/flavor v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/option v0.64.0-devel // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.72.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect - github.com/DataDog/viper v1.15.0 // indirect + github.com/DataDog/viper v1.15.1 // indirect github.com/DataDog/zstd v1.5.7 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/dustin/go-humanize v1.0.1 // indirect - github.com/ebitengine/purego v0.9.1 // indirect - github.com/fatih/color v1.18.0 // indirect + github.com/ebitengine/purego v0.10.0 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-viper/mapstructure/v2 v2.5.0 // indirect github.com/gofrs/flock v0.13.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/flatbuffers v25.2.10+incompatible // indirect - github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect + github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect github.com/magiconair/properties v1.8.10 // indirect - github.com/mattn/go-colorable v0.1.14 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect github.com/mdlayher/socket v0.5.1 // indirect github.com/mdlayher/vsock v1.2.1 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect @@ -102,8 +100,8 @@ require ( github.com/prometheus/client_golang v1.23.2 // indirect github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.67.5 // indirect - github.com/prometheus/procfs v0.19.2 // indirect - github.com/shirou/gopsutil/v4 v4.25.12 // indirect + github.com/prometheus/procfs v0.20.1 // indirect + github.com/shirou/gopsutil/v4 v4.26.2 // indirect github.com/spf13/cast v1.10.0 // indirect github.com/spf13/cobra v1.10.2 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect @@ -116,13 +114,13 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.1 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect - golang.org/x/net v0.49.0 // indirect - golang.org/x/sync v0.19.0 // indirect - golang.org/x/sys v0.40.0 // indirect - golang.org/x/text v0.33.0 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect + golang.org/x/net v0.52.0 // indirect + golang.org/x/sync v0.20.0 // indirect + golang.org/x/sys v0.42.0 // indirect + golang.org/x/text v0.35.0 // indirect golang.org/x/time v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) @@ -203,7 +201,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/api => ../../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/basic => ../../../../pkg/config/basic - github.com/DataDog/datadog-agent/pkg/config/buildschema => ../../../../pkg/config/buildschema github.com/DataDog/datadog-agent/pkg/config/create => ../../../../pkg/config/create github.com/DataDog/datadog-agent/pkg/config/env => ../../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/helper => ../../../../pkg/config/helper @@ -232,7 +229,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/logs/sender/grpc/go.sum b/pkg/logs/sender/grpc/go.sum index 59ea180761df..dbbbe81506be 100644 --- a/pkg/logs/sender/grpc/go.sum +++ b/pkg/logs/sender/grpc/go.sum @@ -1,8 +1,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/agent-payload/v5 v5.0.179 h1:RGwAyXHqioHy/ARYDoX4XuEVZjipIoIjdpFW6aKr5dc= -github.com/DataDog/agent-payload/v5 v5.0.179/go.mod h1:9PtvPKsgZVTTvqgYtcwB4bjXAkxYzC2wzSXSadPRHv8= -github.com/DataDog/viper v1.15.0 h1:oV4rbRx+ylrbIAEBCw+8xKyH+eQF1DkVHDGz7RtmKlk= -github.com/DataDog/viper v1.15.0/go.mod h1:QGomve/3EbYfi58jADS97U2OKfsxqh2pWemuT0azbdk= +github.com/DataDog/agent-payload/v5 v5.0.191 h1:c26Eqt8/BrmYrVvmCppknxcoEQbfdZINOlij18VmkwA= +github.com/DataDog/agent-payload/v5 v5.0.191/go.mod h1:GyA1vuCeRywrNNCbYeR0cOYKE8QkOVNAFDqsH8VNF5M= +github.com/DataDog/viper v1.15.1 h1:kcdFE+qPndlWkhU4iEf/WpWQMCyVYHTv5HqvVf+SYJs= +github.com/DataDog/viper v1.15.1/go.mod h1:rDLDREOPd+gpEbA8y4Y/5wTvyLqvUiCmDXX0jRZy8mw= github.com/DataDog/zstd v1.5.7 h1:ybO8RBeh29qrxIhCA9E8gKY6xfONU9T6G6aP9DTKfLE= github.com/DataDog/zstd v1.5.7/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= @@ -18,12 +18,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= -github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A= -github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= -github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= -github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= +github.com/ebitengine/purego v0.10.0 h1:QIw4xfpWT6GWTzaW5XEKy3HXoqrJGx1ijYHzTF0/ISU= +github.com/ebitengine/purego v0.10.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -51,14 +47,14 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb h1:PGufWXXDq9yaev6xX1YQauaO1MV90e6Mpoq1I7Lz/VM= -github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb/go.mod h1:QiyDdbZLaJ/mZP4Zwc9g2QsfaEA4o7XvvgZegSci5/E= +github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94 h1:0G5JVG0aJDpWvH1r8idd+wbPcAH14UqIuUMepx3v9rE= +github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94/go.mod h1:MvF7bZQy5lD2WcLXjFytRVvnTrFvrjo/qGka1MIBOPE= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.18.3 h1:9PJRvfbmTabkOX8moIpXPbMMbYN60bWImDDU7L+/6zw= -github.com/klauspost/compress v1.18.3/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= +github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c= +github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -73,10 +69,6 @@ github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3/go.mod h1:autxFIv github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE= github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= -github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= -github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= -github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= -github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos= github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ= github.com/mdlayher/vsock v1.2.1 h1:pC1mTJTvjo1r9n9fbm7S1j04rCgCzhCOS5DY0zqHlnQ= @@ -99,13 +91,13 @@ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNw github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4= github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw= -github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws= -github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw= +github.com/prometheus/procfs v0.20.1 h1:XwbrGOIplXW/AU3YhIhLODXMJYyC1isLFfYCsTEycfc= +github.com/prometheus/procfs v0.20.1/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4UlK79eF5TGGo= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v4 v4.25.12 h1:e7PvW/0RmJ8p8vPGJH4jvNkOyLmbkXgXW4m6ZPic6CY= -github.com/shirou/gopsutil/v4 v4.25.12/go.mod h1:EivAfP5x2EhLp2ovdpKSozecVXn1TmuG7SMzs/Wh4PU= +github.com/shirou/gopsutil/v4 v4.26.2 h1:X8i6sicvUFih4BmYIGT1m2wwgw2VG9YgrDTi7cIRGUI= +github.com/shirou/gopsutil/v4 v4.26.2/go.mod h1:LZ6ewCSkBqUpvSOf+LsTGnRinC6iaNUNMGBtDkJBaLQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY= github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo= @@ -133,16 +125,16 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.39.1-0.20260115134311-f809f7d71e2d h1:d8jN5C+mHlN5HebF5NXapM8PW5Tq8LoBMUO/d7aqm4Y= -go.opentelemetry.io/otel v1.39.1-0.20260115134311-f809f7d71e2d/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8= -go.opentelemetry.io/otel/metric v1.39.1-0.20260115134311-f809f7d71e2d h1:Mv7jOS/papmlU4jeUx/ScvxT+UghI4YxgRG2ODBxqBA= -go.opentelemetry.io/otel/metric v1.39.1-0.20260115134311-f809f7d71e2d/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs= -go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18= -go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE= -go.opentelemetry.io/otel/sdk/metric v1.39.1-0.20260115134311-f809f7d71e2d h1:Xc+v+yOWogGc1bTp6ISSnWEgHjaerCiU1VWBZQ40ewo= -go.opentelemetry.io/otel/sdk/metric v1.39.1-0.20260115134311-f809f7d71e2d/go.mod h1:UVPnzxO3YDVhII6+YVBzgScV6MYwDUlW2G9lVMvFS7c= -go.opentelemetry.io/otel/trace v1.39.1-0.20260115134311-f809f7d71e2d h1:BbdGrkH9cVsrnmD3egDymUWUjG5tGK6oaobhpHmDrK8= -go.opentelemetry.io/otel/trace v1.39.1-0.20260115134311-f809f7d71e2d/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA= +go.opentelemetry.io/otel v1.42.0 h1:lSQGzTgVR3+sgJDAU/7/ZMjN9Z+vUip7leaqBKy4sho= +go.opentelemetry.io/otel v1.42.0/go.mod h1:lJNsdRMxCUIWuMlVJWzecSMuNjE7dOYyWlqOXWkdqCc= +go.opentelemetry.io/otel/metric v1.42.0 h1:2jXG+3oZLNXEPfNmnpxKDeZsFI5o4J+nz6xUlaFdF/4= +go.opentelemetry.io/otel/metric v1.42.0/go.mod h1:RlUN/7vTU7Ao/diDkEpQpnz3/92J9ko05BIwxYa2SSI= +go.opentelemetry.io/otel/sdk v1.41.0 h1:YPIEXKmiAwkGl3Gu1huk1aYWwtpRLeskpV+wPisxBp8= +go.opentelemetry.io/otel/sdk v1.41.0/go.mod h1:ahFdU0G5y8IxglBf0QBJXgSe7agzjE4GiTJ6HT9ud90= +go.opentelemetry.io/otel/sdk/metric v1.41.0 h1:siZQIYBAUd1rlIWQT2uCxWJxcCO7q3TriaMlf08rXw8= +go.opentelemetry.io/otel/sdk/metric v1.41.0/go.mod h1:HNBuSvT7ROaGtGI50ArdRLUnvRTRGniSUZbxiWxSO8Y= +go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4LenLmOYY= +go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/dig v1.19.0 h1:BACLhebsYdpQ7IROQ1AGPjrXcP5dF80U3gKoFzbaq/4= @@ -157,6 +149,7 @@ go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc= go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -167,28 +160,26 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= -golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= +golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= +golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= -golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= -golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= +golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE= -golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8= +golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= +golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -201,10 +192,10 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b h1:Mv8VFug0MP9e5vUxfBcE3vUkV6CImK3cMNMIDFjmzxU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ= -google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc= -google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE= +google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -212,8 +203,5 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/logs/sender/grpc/inflight.go b/pkg/logs/sender/grpc/inflight.go index 535c2153250f..521d8d5d08e6 100644 --- a/pkg/logs/sender/grpc/inflight.go +++ b/pkg/logs/sender/grpc/inflight.go @@ -8,8 +8,8 @@ package grpc import ( "google.golang.org/protobuf/proto" + "github.com/DataDog/agent-payload/v5/statefulpb" "github.com/DataDog/datadog-agent/pkg/logs/message" - "github.com/DataDog/datadog-agent/pkg/proto/pbgo/statefulpb" ) // inflightTracker is a bounded FIFO queue that tracks payloads in two regions: diff --git a/pkg/logs/sender/grpc/mock_state.go b/pkg/logs/sender/grpc/mock_state.go index 7e98d1232450..74ee420ac6fb 100644 --- a/pkg/logs/sender/grpc/mock_state.go +++ b/pkg/logs/sender/grpc/mock_state.go @@ -12,13 +12,13 @@ import ( "google.golang.org/protobuf/proto" + "github.com/DataDog/agent-payload/v5/statefulpb" pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup" "github.com/DataDog/datadog-agent/pkg/logs/message" "github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering" "github.com/DataDog/datadog-agent/pkg/logs/patterns/processor" "github.com/DataDog/datadog-agent/pkg/logs/patterns/tags" "github.com/DataDog/datadog-agent/pkg/logs/patterns/token" - "github.com/DataDog/datadog-agent/pkg/proto/pbgo/statefulpb" "github.com/DataDog/datadog-agent/pkg/util/log" ) @@ -34,6 +34,13 @@ type batchEntry struct { jsonContext []byte // from PreprocessJSON; nil if not JSON } +func getTranslatorContent(msg *message.Message) []byte { + if len(msg.PreEncodedContent) > 0 { + return msg.PreEncodedContent + } + return msg.GetContent() +} + const ( // defaultTokenizeBatchSize is the maximum number of messages to accumulate // before calling TokenizeBatch. Larger batches amortize CGo overhead more. @@ -121,7 +128,7 @@ func (mt *MessageTranslator) Start(inputChan chan *message.Message, bufferSize i batch := make([]batchEntry, 0, defaultTokenizeBatchSize) addEntry := func(msg *message.Message) { - content := msg.GetContent() + content := getTranslatorContent(msg) if len(content) == 0 { return // skip empty messages — no sidecar entry, no alignment break } @@ -206,7 +213,7 @@ func (mt *MessageTranslator) processBatch(batch []batchEntry, outputChan chan *m // processMessage is retained for testing and direct single-message use. // The Start loop now uses the batch pipeline (processBatch → processPreTokenized). func (mt *MessageTranslator) processMessage(msg *message.Message, outputChan chan *message.StatefulMessage) { - content := msg.GetContent() + content := getTranslatorContent(msg) if len(content) == 0 { return } @@ -379,13 +386,16 @@ func (mt *MessageTranslator) buildTagSet(msg *message.Message) (*statefulpb.TagS return tagSet, allTagsString, dictID, isNew } -// getMessageTimestamp returns the timestamp for the message, preferring ServerlessExtra.Timestamp +// getMessageTimestamp returns the timestamp for the message, preferring the HTTP +// encoder timestamp when available so the dual-send paths stay aligned. func getMessageTimestamp(msg *message.Message) time.Time { - ts := time.Now().UTC() + if msg.MessageMetadata.EncodedTimestampMs != 0 { + return time.UnixMilli(msg.MessageMetadata.EncodedTimestampMs).UTC() + } if !msg.ServerlessExtra.Timestamp.IsZero() { - ts = msg.ServerlessExtra.Timestamp + return msg.ServerlessExtra.Timestamp } - return ts + return time.Now().UTC() } // sendPatternDefine creates and sends a PatternDefine datum @@ -438,7 +448,7 @@ func (mt *MessageTranslator) sendDictEntryDefine(outputChan chan *message.Statef // sendRawLog creates and sends a raw log datum (currently unused) func (mt *MessageTranslator) sendRawLog(outputChan chan *message.StatefulMessage, msg *message.Message, contentStr string, ts time.Time, tagSet *statefulpb.TagSet) { - logDatum := buildRawLog(contentStr, ts, tagSet) + logDatum := buildRawLog(contentStr, ts, tagSet, msg.MessageMetadata.DualSendUUID) tlmPipelineRawLogsProcessed.Inc(mt.pipelineName) tlmPipelineRawLogsProcessedBytes.Add(float64(proto.Size(logDatum)), mt.pipelineName) @@ -451,7 +461,7 @@ func (mt *MessageTranslator) sendRawLog(outputChan chan *message.StatefulMessage // sendStructuredLog creates and sends a StructuredLog datum func (mt *MessageTranslator) sendStructuredLog(outputChan chan *message.StatefulMessage, msg *message.Message, timestamp int64, patternID uint64, dynamicValues []*statefulpb.DynamicValue, tagSet *statefulpb.TagSet, jsonContext []byte) { - logDatum := buildStructuredLog(timestamp, patternID, dynamicValues, tagSet, jsonContext) + logDatum := buildStructuredLog(timestamp, patternID, dynamicValues, tagSet, msg.MessageMetadata.DualSendUUID, jsonContext) tlmPipelinePatternLogsProcessed.Inc(mt.pipelineName) tlmPipelinePatternLogsProcessedBytes.Add(float64(proto.Size(logDatum)), mt.pipelineName) @@ -559,35 +569,43 @@ func (mt *MessageTranslator) fillDynamicValue( } // buildStructuredLog creates a Datum containing a StructuredLog -func buildStructuredLog(timestamp int64, patternID uint64, dynamicValues []*statefulpb.DynamicValue, tagSet *statefulpb.TagSet, jsonContext []byte) *statefulpb.Datum { +func buildStructuredLog(timestamp int64, patternID uint64, dynamicValues []*statefulpb.DynamicValue, tagSet *statefulpb.TagSet, uuid string, jsonContext []byte) *statefulpb.Datum { + log := &statefulpb.Log{ + Timestamp: timestamp, + Content: &statefulpb.Log_Structured{ + Structured: &statefulpb.StructuredLog{ + PatternId: patternID, + DynamicValues: dynamicValues, + JsonContext: jsonContext, + }, + }, + Tags: tagSet, + } + if uuid != "" { + log.Uuid = &uuid + } return &statefulpb.Datum{ Data: &statefulpb.Datum_Logs{ - Logs: &statefulpb.Log{ - Timestamp: timestamp, - Content: &statefulpb.Log_Structured{ - Structured: &statefulpb.StructuredLog{ - PatternId: patternID, - DynamicValues: dynamicValues, - JsonContext: jsonContext, - }, - }, - Tags: tagSet, - }, + Logs: log, }, } } // buildRawLog creates a Datum containing a raw log (no pattern) -func buildRawLog(content string, ts time.Time, tagSet *statefulpb.TagSet) *statefulpb.Datum { +func buildRawLog(content string, ts time.Time, tagSet *statefulpb.TagSet, uuid string) *statefulpb.Datum { + log := &statefulpb.Log{ + Timestamp: ts.UnixNano() / nanoToMillis, + Content: &statefulpb.Log_Raw{ + Raw: content, + }, + Tags: tagSet, + } + if uuid != "" { + log.Uuid = &uuid + } return &statefulpb.Datum{ Data: &statefulpb.Datum_Logs{ - Logs: &statefulpb.Log{ - Timestamp: ts.UnixNano() / nanoToMillis, - Content: &statefulpb.Log_Raw{ - Raw: content, - }, - Tags: tagSet, - }, + Logs: log, }, } } diff --git a/pkg/logs/sender/grpc/sender.go b/pkg/logs/sender/grpc/sender.go index 0662a1ab38b1..e7a68eef4e76 100644 --- a/pkg/logs/sender/grpc/sender.go +++ b/pkg/logs/sender/grpc/sender.go @@ -17,6 +17,7 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/keepalive" + "github.com/DataDog/agent-payload/v5/statefulpb" "github.com/DataDog/datadog-agent/comp/logs/agent/config" pkgconfigmodel "github.com/DataDog/datadog-agent/pkg/config/model" pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup" @@ -24,7 +25,6 @@ import ( "github.com/DataDog/datadog-agent/pkg/logs/message" "github.com/DataDog/datadog-agent/pkg/logs/metrics" "github.com/DataDog/datadog-agent/pkg/logs/sender" - "github.com/DataDog/datadog-agent/pkg/proto/pbgo/statefulpb" "github.com/DataDog/datadog-agent/pkg/util/compression" "github.com/DataDog/datadog-agent/pkg/util/log" "github.com/DataDog/datadog-agent/pkg/version" @@ -67,6 +67,10 @@ func (h *headerCredentials) GetRequestMetadata(_ context.Context, _ ...string) ( headers["dd-content-encoding"] = "identity" } + for k, v := range h.endpoint.ExtraHTTPHeaders { + headers[k] = v + } + return headers, nil } @@ -186,17 +190,12 @@ func NewSender( return sender } -// createConnection establishes the shared gRPC connection -func (s *Sender) createConnection() error { - log.Infof("Creating gRPC connection to %s:%d", s.endpoint.Host, s.endpoint.Port) - - // Build connection options +func newGRPCClient(endpoint config.Endpoint) (*grpc.ClientConn, statefulpb.StatefulLogsServiceClient, error) { var opts []grpc.DialOption - // Configure TLS - if s.endpoint.UseSSL() { + if endpoint.UseSSL() { tlsConfig := &tls.Config{ - ServerName: s.endpoint.Host, + ServerName: endpoint.Host, } opts = append(opts, grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig))) } else { @@ -216,7 +215,7 @@ func (s *Sender) createConnection() error { opts = append(opts, grpc.WithUserAgent(userAgent)) // Add headers via per-RPC credentials - headerCreds := &headerCredentials{endpoint: s.endpoint} + headerCreds := &headerCredentials{endpoint: endpoint} opts = append(opts, grpc.WithPerRPCCredentials(headerCreds)) // Add load balancing configuration, to utilize all available LB IPs @@ -225,16 +224,28 @@ func (s *Sender) createConnection() error { )) // Create connection, lazy connection establishment, does not block - address := fmt.Sprintf("%s:%d", s.endpoint.Host, s.endpoint.Port) + address := fmt.Sprintf("%s:%d", endpoint.Host, endpoint.Port) conn, err := grpc.NewClient(address, opts...) if err != nil { - return fmt.Errorf("failed to create gRPC connection: %w", err) + return nil, nil, fmt.Errorf("failed to create gRPC connection: %w", err) + } + + return conn, statefulpb.NewStatefulLogsServiceClient(conn), nil +} + +// createConnection establishes the shared gRPC connection +func (s *Sender) createConnection() error { + log.Infof("Creating gRPC connection to %s:%d", s.endpoint.Host, s.endpoint.Port) + + conn, client, err := newGRPCClient(s.endpoint) + if err != nil { + return err } s.conn = conn - s.client = statefulpb.NewStatefulLogsServiceClient(conn) + s.client = client - log.Infof("Successfully created gRPC connection to %s", address) + log.Infof("Successfully created gRPC connection to %s:%d", s.endpoint.Host, s.endpoint.Port) return nil } diff --git a/pkg/logs/sender/grpc/stream_worker.go b/pkg/logs/sender/grpc/stream_worker.go index 3bb95e26ba7d..2582246a1153 100644 --- a/pkg/logs/sender/grpc/stream_worker.go +++ b/pkg/logs/sender/grpc/stream_worker.go @@ -18,12 +18,12 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "github.com/DataDog/agent-payload/v5/statefulpb" "github.com/DataDog/datadog-agent/comp/logs/agent/config" "github.com/DataDog/datadog-agent/pkg/logs/client" "github.com/DataDog/datadog-agent/pkg/logs/message" "github.com/DataDog/datadog-agent/pkg/logs/metrics" "github.com/DataDog/datadog-agent/pkg/logs/sender" - "github.com/DataDog/datadog-agent/pkg/proto/pbgo/statefulpb" "github.com/DataDog/datadog-agent/pkg/util/backoff" "github.com/DataDog/datadog-agent/pkg/util/compression" "github.com/DataDog/datadog-agent/pkg/util/log" diff --git a/pkg/logs/sender/grpc/stream_worker_test.go b/pkg/logs/sender/grpc/stream_worker_test.go index a4144f5e04c0..3eb4a27c517e 100644 --- a/pkg/logs/sender/grpc/stream_worker_test.go +++ b/pkg/logs/sender/grpc/stream_worker_test.go @@ -22,11 +22,11 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "github.com/DataDog/agent-payload/v5/statefulpb" "github.com/DataDog/datadog-agent/comp/logs/agent/config" "github.com/DataDog/datadog-agent/pkg/logs/client" "github.com/DataDog/datadog-agent/pkg/logs/message" "github.com/DataDog/datadog-agent/pkg/logs/metrics" - "github.com/DataDog/datadog-agent/pkg/proto/pbgo/statefulpb" noopimpl "github.com/DataDog/datadog-agent/pkg/util/compression/impl-noop" ) diff --git a/pkg/logs/sender/http/http_sender.go b/pkg/logs/sender/http/http_sender.go index 54bbd48aa160..5bf3a7c01fb4 100644 --- a/pkg/logs/sender/http/http_sender.go +++ b/pkg/logs/sender/http/http_sender.go @@ -85,6 +85,9 @@ func httpDestinationFactory( reliable := []client.Destination{} additionals := []client.Destination{} for i, endpoint := range endpoints.GetReliableEndpoints() { + if endpoint.UseGRPC { + continue + } destMeta := client.NewDestinationMetadata(componentName, instanceID, "reliable", strconv.Itoa(i), evpCategory) if serverlessMeta.IsEnabled() { reliable = append(reliable, http.NewSyncDestination(endpoint, contentyType, destinationsContext, serverlessMeta.SenderDoneChan(), destMeta, cfg)) @@ -93,6 +96,9 @@ func httpDestinationFactory( } } for i, endpoint := range endpoints.GetUnReliableEndpoints() { + if endpoint.UseGRPC { + continue + } destMeta := client.NewDestinationMetadata(componentName, instanceID, "unreliable", strconv.Itoa(i), evpCategory) if serverlessMeta.IsEnabled() { additionals = append(additionals, http.NewSyncDestination(endpoint, contentyType, destinationsContext, serverlessMeta.SenderDoneChan(), destMeta, cfg)) diff --git a/pkg/logs/sources/go.mod b/pkg/logs/sources/go.mod index 603af80378d5..953c92abc843 100644 --- a/pkg/logs/sources/go.mod +++ b/pkg/logs/sources/go.mod @@ -35,6 +35,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -176,7 +177,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/logs/status/statusinterface/go.mod b/pkg/logs/status/statusinterface/go.mod index 94da1e8b72d8..ecb428fc38aa 100644 --- a/pkg/logs/status/statusinterface/go.mod +++ b/pkg/logs/status/statusinterface/go.mod @@ -107,7 +107,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/logs/status/utils/go.mod b/pkg/logs/status/utils/go.mod index b94d69814b5a..fb20bbd01be6 100644 --- a/pkg/logs/status/utils/go.mod +++ b/pkg/logs/status/utils/go.mod @@ -122,7 +122,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/logs/types/go.mod b/pkg/logs/types/go.mod index ccb219b6beea..066ec3689ad6 100644 --- a/pkg/logs/types/go.mod +++ b/pkg/logs/types/go.mod @@ -107,7 +107,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/logs/util/testutils/go.mod b/pkg/logs/util/testutils/go.mod index ae1a611880f8..422a4c37972e 100644 --- a/pkg/logs/util/testutils/go.mod +++ b/pkg/logs/util/testutils/go.mod @@ -31,6 +31,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -170,7 +171,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/metrics/go.mod b/pkg/metrics/go.mod index c7c7b852165d..812ce9c5e6b0 100644 --- a/pkg/metrics/go.mod +++ b/pkg/metrics/go.mod @@ -53,6 +53,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/sort v0.60.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/sketches-go v1.4.8 // indirect @@ -209,7 +210,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/pkg/network/driver/go.mod b/pkg/network/driver/go.mod index 549a6627b606..ee5750e97170 100644 --- a/pkg/network/driver/go.mod +++ b/pkg/network/driver/go.mod @@ -148,7 +148,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/network/payload/go.mod b/pkg/network/payload/go.mod index 2c8731a94fdf..82d54ca396f4 100644 --- a/pkg/network/payload/go.mod +++ b/pkg/network/payload/go.mod @@ -107,7 +107,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/networkdevice/profile/go.mod b/pkg/networkdevice/profile/go.mod index 687dcfa1e691..4736c4e6b054 100644 --- a/pkg/networkdevice/profile/go.mod +++ b/pkg/networkdevice/profile/go.mod @@ -131,7 +131,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/networkpath/payload/go.mod b/pkg/networkpath/payload/go.mod index 9a47ab3e77e3..7d8c66c27889 100644 --- a/pkg/networkpath/payload/go.mod +++ b/pkg/networkpath/payload/go.mod @@ -122,7 +122,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/obfuscate/go.mod b/pkg/obfuscate/go.mod index cd43789454e9..405bce09170d 100644 --- a/pkg/obfuscate/go.mod +++ b/pkg/obfuscate/go.mod @@ -132,7 +132,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/pkg/opentelemetry-mapping-go/inframetadata/go.mod b/pkg/opentelemetry-mapping-go/inframetadata/go.mod index c90cdfb87884..7ba2aa28e8f4 100644 --- a/pkg/opentelemetry-mapping-go/inframetadata/go.mod +++ b/pkg/opentelemetry-mapping-go/inframetadata/go.mod @@ -138,7 +138,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/opentelemetry-mapping-go/inframetadata/gohai/internal/gohaitest/go.mod b/pkg/opentelemetry-mapping-go/inframetadata/gohai/internal/gohaitest/go.mod index cd759c851cc5..c32dc5f981a2 100644 --- a/pkg/opentelemetry-mapping-go/inframetadata/gohai/internal/gohaitest/go.mod +++ b/pkg/opentelemetry-mapping-go/inframetadata/gohai/internal/gohaitest/go.mod @@ -125,7 +125,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../../../pkg/logs/processor diff --git a/pkg/opentelemetry-mapping-go/otlp/attributes/go.mod b/pkg/opentelemetry-mapping-go/otlp/attributes/go.mod index 478cf5383d89..36d875023424 100644 --- a/pkg/opentelemetry-mapping-go/otlp/attributes/go.mod +++ b/pkg/opentelemetry-mapping-go/otlp/attributes/go.mod @@ -146,7 +146,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/opentelemetry-mapping-go/otlp/logs/go.mod b/pkg/opentelemetry-mapping-go/otlp/logs/go.mod index 7349cbc21146..61f767da7057 100644 --- a/pkg/opentelemetry-mapping-go/otlp/logs/go.mod +++ b/pkg/opentelemetry-mapping-go/otlp/logs/go.mod @@ -165,7 +165,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/opentelemetry-mapping-go/otlp/metrics/go.mod b/pkg/opentelemetry-mapping-go/otlp/metrics/go.mod index 9b8daf351e29..bb9ee5da6f44 100644 --- a/pkg/opentelemetry-mapping-go/otlp/metrics/go.mod +++ b/pkg/opentelemetry-mapping-go/otlp/metrics/go.mod @@ -162,7 +162,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/opentelemetry-mapping-go/otlp/rum/go.mod b/pkg/opentelemetry-mapping-go/otlp/rum/go.mod index 913795c29e5e..75b100ab9c3d 100644 --- a/pkg/opentelemetry-mapping-go/otlp/rum/go.mod +++ b/pkg/opentelemetry-mapping-go/otlp/rum/go.mod @@ -132,7 +132,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/orchestrator/model/go.mod b/pkg/orchestrator/model/go.mod index 1796a9ab7167..2823fea35f61 100644 --- a/pkg/orchestrator/model/go.mod +++ b/pkg/orchestrator/model/go.mod @@ -121,7 +121,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/orchestrator/util/go.mod b/pkg/orchestrator/util/go.mod index 420ef0cd7937..7244fa2e60cc 100644 --- a/pkg/orchestrator/util/go.mod +++ b/pkg/orchestrator/util/go.mod @@ -119,7 +119,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/process/util/api/go.mod b/pkg/process/util/api/go.mod index 9e311544e27c..bec40f578046 100644 --- a/pkg/process/util/api/go.mod +++ b/pkg/process/util/api/go.mod @@ -36,6 +36,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 // indirect @@ -196,7 +197,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/proto/go.mod b/pkg/proto/go.mod index 2f6f7b5275cd..aee563f38b27 100644 --- a/pkg/proto/go.mod +++ b/pkg/proto/go.mod @@ -141,7 +141,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/pkg/proto/pbgo/statefulpb/BUILD.bazel b/pkg/proto/pbgo/statefulpb/BUILD.bazel index a38e3cb74e9b..ca69f000946f 100644 --- a/pkg/proto/pbgo/statefulpb/BUILD.bazel +++ b/pkg/proto/pbgo/statefulpb/BUILD.bazel @@ -2,7 +2,10 @@ load("@rules_go//go:def.bzl", "go_library") go_library( name = "statefulpb", - srcs = ["stateful_encoding.pb.go"], + srcs = [ + "stateful_encoding.pb.go", + "stateful_encoding_grpc.pb.go", + ], importpath = "github.com/DataDog/datadog-agent/pkg/proto/pbgo/statefulpb", visibility = ["//visibility:public"], deps = [ diff --git a/pkg/remoteconfig/state/go.mod b/pkg/remoteconfig/state/go.mod index a67113190ac7..a900dae95163 100644 --- a/pkg/remoteconfig/state/go.mod +++ b/pkg/remoteconfig/state/go.mod @@ -123,7 +123,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/security/secl/go.mod b/pkg/security/secl/go.mod index 8306ce37889e..ba76b894e1f9 100644 --- a/pkg/security/secl/go.mod +++ b/pkg/security/secl/go.mod @@ -144,7 +144,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/security/seclwin/go.mod b/pkg/security/seclwin/go.mod index 0672fc9e0d0a..3298946cb423 100644 --- a/pkg/security/seclwin/go.mod +++ b/pkg/security/seclwin/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/pkg/security/seclwin -go 1.25.0 +go 1.25.7 require ( github.com/DataDog/datadog-agent/pkg/discovery/tracermetadata/model v0.0.0-00010101000000-000000000000 @@ -97,7 +97,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/api => ../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/basic => ../../../pkg/config/basic - github.com/DataDog/datadog-agent/pkg/config/buildschema => ../../../pkg/config/buildschema github.com/DataDog/datadog-agent/pkg/config/create => ../../../pkg/config/create github.com/DataDog/datadog-agent/pkg/config/env => ../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/helper => ../../../pkg/config/helper @@ -126,7 +125,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/serializer/go.mod b/pkg/serializer/go.mod index 5e315c53a31c..e5e4768d89e1 100644 --- a/pkg/serializer/go.mod +++ b/pkg/serializer/go.mod @@ -76,6 +76,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/sort v0.60.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 // indirect github.com/DataDog/sketches-go v1.4.8 // indirect @@ -247,7 +248,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/pkg/ssi/testutils/go.mod b/pkg/ssi/testutils/go.mod index 885ce3b266d5..395faf863409 100644 --- a/pkg/ssi/testutils/go.mod +++ b/pkg/ssi/testutils/go.mod @@ -138,7 +138,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/status/health/go.mod b/pkg/status/health/go.mod index a15108f34018..73947ced5e3a 100644 --- a/pkg/status/health/go.mod +++ b/pkg/status/health/go.mod @@ -119,7 +119,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/tagger/types/go.mod b/pkg/tagger/types/go.mod index 6d286a4fddba..8ae4bcd7480e 100644 --- a/pkg/tagger/types/go.mod +++ b/pkg/tagger/types/go.mod @@ -109,7 +109,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/tagset/go.mod b/pkg/tagset/go.mod index 971661a36578..cc0d09119114 100644 --- a/pkg/tagset/go.mod +++ b/pkg/tagset/go.mod @@ -121,7 +121,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/pkg/telemetry/go.mod b/pkg/telemetry/go.mod index deb4f48a1054..671f7c96a394 100644 --- a/pkg/telemetry/go.mod +++ b/pkg/telemetry/go.mod @@ -140,7 +140,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/pkg/trace/go.mod b/pkg/trace/go.mod index 7beadf95e056..6c0401025b19 100644 --- a/pkg/trace/go.mod +++ b/pkg/trace/go.mod @@ -78,6 +78,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/fxutil v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/option v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.72.0-rc.5 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/go-sqllexer v0.2.1 // indirect @@ -250,7 +251,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/pkg/trace/log/go.mod b/pkg/trace/log/go.mod index c2d61dc6ca9f..2ee6079a10ed 100644 --- a/pkg/trace/log/go.mod +++ b/pkg/trace/log/go.mod @@ -122,7 +122,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/trace/otel/go.mod b/pkg/trace/otel/go.mod index 30b3cdee3bfc..2a71f26cd828 100644 --- a/pkg/trace/otel/go.mod +++ b/pkg/trace/otel/go.mod @@ -91,6 +91,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/sort v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.72.0-rc.5 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/go-sqllexer v0.2.1 // indirect @@ -296,7 +297,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/trace/stats/go.mod b/pkg/trace/stats/go.mod index 2bba040d4375..0b9ec821390b 100644 --- a/pkg/trace/stats/go.mod +++ b/pkg/trace/stats/go.mod @@ -165,7 +165,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/trace/traceutil/go.mod b/pkg/trace/traceutil/go.mod index 92a3b3f8a31a..128e402bb018 100644 --- a/pkg/trace/traceutil/go.mod +++ b/pkg/trace/traceutil/go.mod @@ -126,7 +126,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/aws/creds/go.mod b/pkg/util/aws/creds/go.mod index 5455b0b032d1..3716a5831924 100644 --- a/pkg/util/aws/creds/go.mod +++ b/pkg/util/aws/creds/go.mod @@ -30,6 +30,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -172,7 +173,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/util/backoff/go.mod b/pkg/util/backoff/go.mod index c3265530c54e..d139de7c4528 100644 --- a/pkg/util/backoff/go.mod +++ b/pkg/util/backoff/go.mod @@ -119,7 +119,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/buf/go.mod b/pkg/util/buf/go.mod index 998ed63b88ab..901f7ce1f7ea 100644 --- a/pkg/util/buf/go.mod +++ b/pkg/util/buf/go.mod @@ -119,7 +119,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/cache/go.mod b/pkg/util/cache/go.mod index 0f499a7b7624..5609f3bdb5f3 100644 --- a/pkg/util/cache/go.mod +++ b/pkg/util/cache/go.mod @@ -122,7 +122,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/cgroups/go.mod b/pkg/util/cgroups/go.mod index 23aefa0fa11d..a276f14b2431 100644 --- a/pkg/util/cgroups/go.mod +++ b/pkg/util/cgroups/go.mod @@ -135,7 +135,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/common/go.mod b/pkg/util/common/go.mod index 6054aa8b7344..4df4e611712b 100644 --- a/pkg/util/common/go.mod +++ b/pkg/util/common/go.mod @@ -119,7 +119,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/compression/go.mod b/pkg/util/compression/go.mod index d4a96ff108df..5c905605d3ed 100644 --- a/pkg/util/compression/go.mod +++ b/pkg/util/compression/go.mod @@ -41,6 +41,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -188,7 +189,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/containers/image/go.mod b/pkg/util/containers/image/go.mod index 13319eda0f1f..612b9f6837da 100644 --- a/pkg/util/containers/image/go.mod +++ b/pkg/util/containers/image/go.mod @@ -119,7 +119,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/util/defaultpaths/go.mod b/pkg/util/defaultpaths/go.mod index 6055c0a090a8..8ba4202fe2e7 100644 --- a/pkg/util/defaultpaths/go.mod +++ b/pkg/util/defaultpaths/go.mod @@ -30,6 +30,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect @@ -166,7 +167,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/executable/go.mod b/pkg/util/executable/go.mod index 5b36c41e5835..464b268200ba 100644 --- a/pkg/util/executable/go.mod +++ b/pkg/util/executable/go.mod @@ -119,7 +119,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/filesystem/go.mod b/pkg/util/filesystem/go.mod index 6e924dbb5075..00346ae27eb3 100644 --- a/pkg/util/filesystem/go.mod +++ b/pkg/util/filesystem/go.mod @@ -135,7 +135,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/flavor/go.mod b/pkg/util/flavor/go.mod index a8eca499b9bb..009517ffd014 100644 --- a/pkg/util/flavor/go.mod +++ b/pkg/util/flavor/go.mod @@ -31,6 +31,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -171,7 +172,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/fxutil/go.mod b/pkg/util/fxutil/go.mod index 47c08247ffa6..2361e469c8b7 100644 --- a/pkg/util/fxutil/go.mod +++ b/pkg/util/fxutil/go.mod @@ -128,7 +128,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/grpc/go.mod b/pkg/util/grpc/go.mod index 9d49e3d33584..11c7a0a38079 100644 --- a/pkg/util/grpc/go.mod +++ b/pkg/util/grpc/go.mod @@ -8,7 +8,7 @@ require ( github.com/DataDog/datadog-agent/pkg/proto v0.64.0-devel github.com/DataDog/datadog-agent/pkg/telemetry v0.70.0 github.com/DataDog/datadog-agent/pkg/util/log v0.73.0-rc.5 - github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/mdlayher/vsock v1.2.1 github.com/stretchr/testify v1.11.1 @@ -43,6 +43,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/option v0.72.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -217,7 +218,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/hostinfo/go.mod b/pkg/util/hostinfo/go.mod index 28cdefe37b1a..52a181184521 100644 --- a/pkg/util/hostinfo/go.mod +++ b/pkg/util/hostinfo/go.mod @@ -140,7 +140,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/hostname/validate/go.mod b/pkg/util/hostname/validate/go.mod index 4b7384441a01..757c60e1ffce 100644 --- a/pkg/util/hostname/validate/go.mod +++ b/pkg/util/hostname/validate/go.mod @@ -125,7 +125,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/util/http/go.mod b/pkg/util/http/go.mod index 71d2c328740f..37b2f1c3681c 100644 --- a/pkg/util/http/go.mod +++ b/pkg/util/http/go.mod @@ -32,6 +32,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -172,7 +173,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/json/go.mod b/pkg/util/json/go.mod index e8b0a0056416..df856523e49a 100644 --- a/pkg/util/json/go.mod +++ b/pkg/util/json/go.mod @@ -124,7 +124,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/jsonquery/go.mod b/pkg/util/jsonquery/go.mod index 2156b506000a..3b971ae75ffc 100644 --- a/pkg/util/jsonquery/go.mod +++ b/pkg/util/jsonquery/go.mod @@ -128,7 +128,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/kubernetes/apiserver/common/namespace/go.mod b/pkg/util/kubernetes/apiserver/common/namespace/go.mod index dfe37c094273..d90c86c2303a 100644 --- a/pkg/util/kubernetes/apiserver/common/namespace/go.mod +++ b/pkg/util/kubernetes/apiserver/common/namespace/go.mod @@ -27,6 +27,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -165,7 +166,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../../../pkg/logs/processor diff --git a/pkg/util/log/go.mod b/pkg/util/log/go.mod index ac4ea37e5312..5b1bcf073c1c 100644 --- a/pkg/util/log/go.mod +++ b/pkg/util/log/go.mod @@ -126,7 +126,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/log/setup/go.mod b/pkg/util/log/setup/go.mod index 1b69c3d3c9a7..aa38d378a468 100644 --- a/pkg/util/log/setup/go.mod +++ b/pkg/util/log/setup/go.mod @@ -31,6 +31,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.73.0-rc.5 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.61.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.72.2 // indirect github.com/DataDog/viper v1.15.1 // indirect @@ -171,7 +172,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/util/option/go.mod b/pkg/util/option/go.mod index 8a234254dcdd..27773cf35e9b 100644 --- a/pkg/util/option/go.mod +++ b/pkg/util/option/go.mod @@ -119,7 +119,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/otel/go.mod b/pkg/util/otel/go.mod index 0d95af68c373..c9ccb3644a76 100644 --- a/pkg/util/otel/go.mod +++ b/pkg/util/otel/go.mod @@ -140,7 +140,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/pointer/go.mod b/pkg/util/pointer/go.mod index 1c37a22e7c9c..748ebb0f6e79 100644 --- a/pkg/util/pointer/go.mod +++ b/pkg/util/pointer/go.mod @@ -107,7 +107,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/prometheus/go.mod b/pkg/util/prometheus/go.mod index fe3fbc2f4cb6..da86d1f34b00 100644 --- a/pkg/util/prometheus/go.mod +++ b/pkg/util/prometheus/go.mod @@ -145,7 +145,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/quantile/go.mod b/pkg/util/quantile/go.mod index 372ea43d765f..a06231a74f43 100644 --- a/pkg/util/quantile/go.mod +++ b/pkg/util/quantile/go.mod @@ -125,7 +125,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/quantile/sketchtest/go.mod b/pkg/util/quantile/sketchtest/go.mod index 0281d026214f..0e3bb5a8bc27 100644 --- a/pkg/util/quantile/sketchtest/go.mod +++ b/pkg/util/quantile/sketchtest/go.mod @@ -121,7 +121,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/util/scrubber/go.mod b/pkg/util/scrubber/go.mod index 07c5700fb0b3..d828181357cc 100644 --- a/pkg/util/scrubber/go.mod +++ b/pkg/util/scrubber/go.mod @@ -120,7 +120,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/sort/go.mod b/pkg/util/sort/go.mod index d26c1df110dd..a07768ace52f 100644 --- a/pkg/util/sort/go.mod +++ b/pkg/util/sort/go.mod @@ -119,7 +119,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/startstop/go.mod b/pkg/util/startstop/go.mod index 9efb55ec190f..920b39adebef 100644 --- a/pkg/util/startstop/go.mod +++ b/pkg/util/startstop/go.mod @@ -119,7 +119,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/statstracker/go.mod b/pkg/util/statstracker/go.mod index efa2fd0a35c3..881d059e91cf 100644 --- a/pkg/util/statstracker/go.mod +++ b/pkg/util/statstracker/go.mod @@ -119,7 +119,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/system/go.mod b/pkg/util/system/go.mod index 75a596bd38e5..df75614e1956 100644 --- a/pkg/util/system/go.mod +++ b/pkg/util/system/go.mod @@ -8,8 +8,6 @@ require ( github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 github.com/DataDog/datadog-agent/pkg/util/testutil v0.59.0 github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 - github.com/Microsoft/go-winio v0.6.2 - github.com/mdlayher/vsock v1.2.1 github.com/shirou/gopsutil/v4 v4.26.2 github.com/stretchr/testify v1.11.1 go.uber.org/atomic v1.11.0 @@ -28,15 +26,12 @@ require ( github.com/gofrs/flock v0.13.0 // indirect github.com/hectane/go-acl v0.0.0-20230225031251-cdfc9e3acf94 // indirect github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect - github.com/mdlayher/socket v0.5.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/tklauser/go-sysconf v0.3.16 // indirect github.com/tklauser/numcpus v0.11.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/net v0.52.0 // indirect - golang.org/x/sync v0.20.0 // indirect golang.org/x/time v0.14.0 // indirect ) @@ -145,7 +140,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/system/go.sum b/pkg/util/system/go.sum index b84e04a0a4e4..b2ca1f13fbc5 100644 --- a/pkg/util/system/go.sum +++ b/pkg/util/system/go.sum @@ -1,5 +1,3 @@ -github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= -github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ebitengine/purego v0.10.0 h1:QIw4xfpWT6GWTzaW5XEKy3HXoqrJGx1ijYHzTF0/ISU= @@ -19,10 +17,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 h1:PwQumkgq4/acIiZhtifTV5OUqqiP82UAl0h87xj/l9k= github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg= -github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos= -github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ= -github.com/mdlayher/vsock v1.2.1 h1:pC1mTJTvjo1r9n9fbm7S1j04rCgCzhCOS5DY0zqHlnQ= -github.com/mdlayher/vsock v1.2.1/go.mod h1:NRfCibel++DgeMD8z/hP+PPTjlNJsdPOmxcnENvE+SE= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU= @@ -43,8 +37,6 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= -golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/pkg/util/system/socket/go.mod b/pkg/util/system/socket/go.mod index 004160084e4b..46ade90682e3 100644 --- a/pkg/util/system/socket/go.mod +++ b/pkg/util/system/socket/go.mod @@ -92,7 +92,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/api => ../../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/basic => ../../../../pkg/config/basic - github.com/DataDog/datadog-agent/pkg/config/buildschema => ../../../../pkg/config/buildschema github.com/DataDog/datadog-agent/pkg/config/create => ../../../../pkg/config/create github.com/DataDog/datadog-agent/pkg/config/env => ../../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/helper => ../../../../pkg/config/helper @@ -121,7 +120,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../../pkg/logs/processor diff --git a/pkg/util/testutil/go.mod b/pkg/util/testutil/go.mod index dfd95c52ec95..f23676a0c598 100644 --- a/pkg/util/testutil/go.mod +++ b/pkg/util/testutil/go.mod @@ -121,7 +121,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/utilizationtracker/go.mod b/pkg/util/utilizationtracker/go.mod index 4bbca92654cf..512c06deab4a 100644 --- a/pkg/util/utilizationtracker/go.mod +++ b/pkg/util/utilizationtracker/go.mod @@ -122,7 +122,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/uuid/go.mod b/pkg/util/uuid/go.mod index 334b41162870..126a8fb39378 100644 --- a/pkg/util/uuid/go.mod +++ b/pkg/util/uuid/go.mod @@ -131,7 +131,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/util/winutil/go.mod b/pkg/util/winutil/go.mod index c2b2dc73e063..11aea3ed7c53 100644 --- a/pkg/util/winutil/go.mod +++ b/pkg/util/winutil/go.mod @@ -128,7 +128,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../../pkg/logs/processor diff --git a/pkg/version/go.mod b/pkg/version/go.mod index dee3dcf6d69d..fbcac357d5e0 100644 --- a/pkg/version/go.mod +++ b/pkg/version/go.mod @@ -119,7 +119,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/test/e2e-framework/go.mod b/test/e2e-framework/go.mod index f5981e0205c5..5b8872c1ca14 100644 --- a/test/e2e-framework/go.mod +++ b/test/e2e-framework/go.mod @@ -388,7 +388,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/test/fakeintake/go.mod b/test/fakeintake/go.mod index 1d8d96aac8a8..aa6723c39932 100644 --- a/test/fakeintake/go.mod +++ b/test/fakeintake/go.mod @@ -159,7 +159,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index 21342588fcef..cd080d2dab3c 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -465,7 +465,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/test/otel/go.mod b/test/otel/go.mod index aa040e8324a1..629b49546f0f 100644 --- a/test/otel/go.mod +++ b/test/otel/go.mod @@ -10,7 +10,7 @@ require ( github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.61.0 github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.62.0-devel.0.20241213165407-f95df913d2b7 github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.77.0-devel.0.20260213154712-e02b9359151a - github.com/DataDog/datadog-agent/pkg/config/model v0.77.0-devel.0.20260213154712-e02b9359151a + github.com/DataDog/datadog-agent/pkg/config/model v0.77.2 github.com/DataDog/datadog-agent/pkg/config/setup v0.77.0-devel.0.20260213154712-e02b9359151a github.com/DataDog/datadog-agent/pkg/proto v0.77.0-devel.0.20260213154712-e02b9359151a github.com/DataDog/datadog-agent/pkg/trace v0.77.0-devel.0.20260213154712-e02b9359151a @@ -58,6 +58,13 @@ require ( github.com/DataDog/datadog-agent/comp/core/delegatedauth v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/comp/core/secrets/noop-impl v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/config/basic v0.0.0-20260213154712-e02b9359151a // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/clustering/merging v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/eviction v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/processor v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/tags v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/token v0.0.0 // indirect + github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/logs/sender/grpc v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/orchestrator/util v0.0.0-20251120165911-0b75c97e8b50 // indirect @@ -66,9 +73,11 @@ require ( github.com/DataDog/datadog-agent/pkg/trace/traceutil v0.77.0-devel.0.20260213154712-e02b9359151a // indirect github.com/DataDog/datadog-agent/pkg/util/defaultpaths v0.70.0 // indirect github.com/DataDog/datadog-agent/pkg/util/flavor v0.71.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.61.0 // indirect github.com/DataDog/go-tuf v1.1.1-0.5.2 // indirect github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 // indirect github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/mdlayher/socket v0.5.1 // indirect github.com/mdlayher/vsock v1.2.1 // indirect @@ -344,7 +353,6 @@ replace ( github.com/DataDog/datadog-agent/pkg/logs/patterns/processor => ../../pkg/logs/patterns/processor github.com/DataDog/datadog-agent/pkg/logs/patterns/tags => ../../pkg/logs/patterns/tags github.com/DataDog/datadog-agent/pkg/logs/patterns/token => ../../pkg/logs/patterns/token - github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/go => ../../pkg/logs/patterns/tokenizer/go github.com/DataDog/datadog-agent/pkg/logs/patterns/tokenizer/rust => ../../pkg/logs/patterns/tokenizer/rust github.com/DataDog/datadog-agent/pkg/logs/pipeline => ../../pkg/logs/pipeline github.com/DataDog/datadog-agent/pkg/logs/processor => ../../pkg/logs/processor diff --git a/test/otel/go.sum b/test/otel/go.sum index 1139bdf99dc9..f88df3e06e71 100644 --- a/test/otel/go.sum +++ b/test/otel/go.sum @@ -79,6 +79,8 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs= github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= +github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/go-tpm v0.9.8 h1:slArAR9Ft+1ybZu0lBwpSmpwhRXaa85hWtMinMyRAWo=