From f736348547e42e0e9c9b1117fc4f88f71db5628e Mon Sep 17 00:00:00 2001 From: Paul Cacheux Date: Wed, 11 Dec 2024 14:20:00 +0100 Subject: [PATCH] remove now outdated comment and old security agent check --- .../workloadmeta/collectors/catalog/catalog.go | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/comp/core/workloadmeta/collectors/catalog/catalog.go b/comp/core/workloadmeta/collectors/catalog/catalog.go index e303a42328269..9133c24eab5e2 100644 --- a/comp/core/workloadmeta/collectors/catalog/catalog.go +++ b/comp/core/workloadmeta/collectors/catalog/catalog.go @@ -12,8 +12,6 @@ import ( "go.uber.org/fx" remoteworkloadmeta "github.com/DataDog/datadog-agent/comp/core/workloadmeta/collectors/internal/remote/workloadmeta" - workloadmeta "github.com/DataDog/datadog-agent/comp/core/workloadmeta/def" - "github.com/DataDog/datadog-agent/pkg/util/flavor" ) // GetCatalog returns the set of FX options to populate the catalog @@ -30,22 +28,8 @@ func GetCatalog() fx.Option { return fx.Options(opts...) } -// TODO: (components) Move remote-only to its own catalog, similar to how catalog-less works -// Depend on this catalog-remote using fx, instead of build tags - func remoteWorkloadmetaParams() fx.Option { - var filter *workloadmeta.Filter // Nil filter accepts everything - - // Security Agent is only interested in containers - // TODO: (components) create a Catalog component, the implementation used by - // security-agent can use this filter, instead of needing to chekc agent.flavor - if flavor.GetFlavor() == flavor.SecurityAgent { - filter = workloadmeta.NewFilterBuilder().AddKind(workloadmeta.KindContainer).Build() - } - return fx.Provide(func() remoteworkloadmeta.Params { - return remoteworkloadmeta.Params{ - Filter: filter, - } + return remoteworkloadmeta.Params{} }) }