Skip to content

Commit

Permalink
refactor pkg/config references to pkg/config/setup go module (#29019)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jackgopack4
jackgopack4 authored Sep 3, 2024
1 parent 3c0e037 commit b2819e3
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 56 deletions.
6 changes: 3 additions & 3 deletions pkg/util/containers/env_vars_filter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"sync"

"github.com/DataDog/datadog-agent/pkg/config"
pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
)

var (
Expand Down Expand Up @@ -43,12 +43,12 @@ var (
func EnvVarFilterFromConfig() EnvFilter {
envFilterOnce.Do(func() {
configEnvVars := make([]string, 0)
dockerEnvs := config.Datadog().GetStringMapString("docker_env_as_tags")
dockerEnvs := pkgconfigsetup.Datadog().GetStringMapString("docker_env_as_tags")
for envName := range dockerEnvs {
configEnvVars = append(configEnvVars, envName)
}

containerEnvs := config.Datadog().GetStringMapString("container_env_as_tags")
containerEnvs := pkgconfigsetup.Datadog().GetStringMapString("container_env_as_tags")
for envName := range containerEnvs {
configEnvVars = append(configEnvVars, envName)
}
Expand Down
34 changes: 17 additions & 17 deletions pkg/util/containers/filter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strconv"
"strings"

"github.com/DataDog/datadog-agent/pkg/config"
pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
"github.com/DataDog/datadog-agent/pkg/util/log"
)

Expand Down Expand Up @@ -173,7 +173,7 @@ func GetSharedMetricFilter() (*Filter, error) {
// GetPauseContainerFilter returns a filter only excluding pause containers
func GetPauseContainerFilter() (*Filter, error) {
var excludeList []string
if config.Datadog().GetBool("exclude_pause_container") {
if pkgconfigsetup.Datadog().GetBool("exclude_pause_container") {
excludeList = append(excludeList,
pauseContainerGCR,
pauseContainerOpenshift,
Expand Down Expand Up @@ -256,21 +256,21 @@ func NewFilter(ft FilterType, includeList, excludeList []string) (*Filter, error
func newMetricFilterFromConfig() (*Filter, error) {
// We merge `container_include` and `container_include_metrics` as this filter
// is used by all core and python checks (so components sending metrics).
includeList := config.Datadog().GetStringSlice("container_include")
excludeList := config.Datadog().GetStringSlice("container_exclude")
includeList = append(includeList, config.Datadog().GetStringSlice("container_include_metrics")...)
excludeList = append(excludeList, config.Datadog().GetStringSlice("container_exclude_metrics")...)
includeList := pkgconfigsetup.Datadog().GetStringSlice("container_include")
excludeList := pkgconfigsetup.Datadog().GetStringSlice("container_exclude")
includeList = append(includeList, pkgconfigsetup.Datadog().GetStringSlice("container_include_metrics")...)
excludeList = append(excludeList, pkgconfigsetup.Datadog().GetStringSlice("container_exclude_metrics")...)

if len(includeList) == 0 {
// support legacy "ac_include" config
includeList = config.Datadog().GetStringSlice("ac_include")
includeList = pkgconfigsetup.Datadog().GetStringSlice("ac_include")
}
if len(excludeList) == 0 {
// support legacy "ac_exclude" config
excludeList = config.Datadog().GetStringSlice("ac_exclude")
excludeList = pkgconfigsetup.Datadog().GetStringSlice("ac_exclude")
}

if config.Datadog().GetBool("exclude_pause_container") {
if pkgconfigsetup.Datadog().GetBool("exclude_pause_container") {
excludeList = append(excludeList,
pauseContainerGCR,
pauseContainerOpenshift,
Expand Down Expand Up @@ -303,22 +303,22 @@ func NewAutodiscoveryFilter(ft FilterType) (*Filter, error) {
excludeList := []string{}
switch ft {
case GlobalFilter:
includeList = config.Datadog().GetStringSlice("container_include")
excludeList = config.Datadog().GetStringSlice("container_exclude")
includeList = pkgconfigsetup.Datadog().GetStringSlice("container_include")
excludeList = pkgconfigsetup.Datadog().GetStringSlice("container_exclude")
if len(includeList) == 0 {
// fallback and support legacy "ac_include" config
includeList = config.Datadog().GetStringSlice("ac_include")
includeList = pkgconfigsetup.Datadog().GetStringSlice("ac_include")
}
if len(excludeList) == 0 {
// fallback and support legacy "ac_exclude" config
excludeList = config.Datadog().GetStringSlice("ac_exclude")
excludeList = pkgconfigsetup.Datadog().GetStringSlice("ac_exclude")
}
case MetricsFilter:
includeList = config.Datadog().GetStringSlice("container_include_metrics")
excludeList = config.Datadog().GetStringSlice("container_exclude_metrics")
includeList = pkgconfigsetup.Datadog().GetStringSlice("container_include_metrics")
excludeList = pkgconfigsetup.Datadog().GetStringSlice("container_exclude_metrics")
case LogsFilter:
includeList = config.Datadog().GetStringSlice("container_include_logs")
excludeList = config.Datadog().GetStringSlice("container_exclude_logs")
includeList = pkgconfigsetup.Datadog().GetStringSlice("container_include_logs")
excludeList = pkgconfigsetup.Datadog().GetStringSlice("container_exclude_logs")
}
return NewFilter(ft, includeList, excludeList)
}
Expand Down
72 changes: 36 additions & 36 deletions pkg/util/containers/filter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/DataDog/datadog-agent/pkg/config"
pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
)

type ctnDef struct {
Expand Down Expand Up @@ -418,9 +418,9 @@ func TestIsExcludedByAnnotation(t *testing.T) {
}

func TestNewMetricFilterFromConfig(t *testing.T) {
config.Datadog().SetDefault("exclude_pause_container", true)
config.Datadog().SetDefault("ac_include", []string{"image:apache.*"})
config.Datadog().SetDefault("ac_exclude", []string{"name:dd-.*"})
pkgconfigsetup.Datadog().SetDefault("exclude_pause_container", true)
pkgconfigsetup.Datadog().SetDefault("ac_include", []string{"image:apache.*"})
pkgconfigsetup.Datadog().SetDefault("ac_exclude", []string{"name:dd-.*"})

f, err := newMetricFilterFromConfig()
require.NoError(t, err)
Expand All @@ -431,20 +431,20 @@ func TestNewMetricFilterFromConfig(t *testing.T) {
assert.True(t, f.IsExcluded(nil, "dummy", "k8s.gcr.io/pause-amd64:3.1", ""))
assert.True(t, f.IsExcluded(nil, "dummy", "rancher/pause-amd64:3.1", ""))

config.Datadog().SetDefault("exclude_pause_container", false)
pkgconfigsetup.Datadog().SetDefault("exclude_pause_container", false)
f, err = newMetricFilterFromConfig()
require.NoError(t, err)
assert.False(t, f.IsExcluded(nil, "dummy", "k8s.gcr.io/pause-amd64:3.1", ""))

config.Datadog().SetDefault("exclude_pause_container", true)
config.Datadog().SetDefault("ac_include", []string{})
config.Datadog().SetDefault("ac_exclude", []string{})
pkgconfigsetup.Datadog().SetDefault("exclude_pause_container", true)
pkgconfigsetup.Datadog().SetDefault("ac_include", []string{})
pkgconfigsetup.Datadog().SetDefault("ac_exclude", []string{})

config.Datadog().SetDefault("exclude_pause_container", false)
config.Datadog().SetDefault("container_include", []string{"image:apache.*"})
config.Datadog().SetDefault("container_exclude", []string{"name:dd-.*"})
config.Datadog().SetDefault("container_include_metrics", []string{"image:nginx.*"})
config.Datadog().SetDefault("container_exclude_metrics", []string{"name:ddmetric-.*"})
pkgconfigsetup.Datadog().SetDefault("exclude_pause_container", false)
pkgconfigsetup.Datadog().SetDefault("container_include", []string{"image:apache.*"})
pkgconfigsetup.Datadog().SetDefault("container_exclude", []string{"name:dd-.*"})
pkgconfigsetup.Datadog().SetDefault("container_include_metrics", []string{"image:nginx.*"})
pkgconfigsetup.Datadog().SetDefault("container_exclude_metrics", []string{"name:ddmetric-.*"})

f, err = newMetricFilterFromConfig()
require.NoError(t, err)
Expand All @@ -460,8 +460,8 @@ func TestNewAutodiscoveryFilter(t *testing.T) {
resetConfig()

// Global - legacy config
config.Datadog().SetDefault("ac_include", []string{"image:apache.*"})
config.Datadog().SetDefault("ac_exclude", []string{"name:dd-.*"})
pkgconfigsetup.Datadog().SetDefault("ac_include", []string{"image:apache.*"})
pkgconfigsetup.Datadog().SetDefault("ac_exclude", []string{"name:dd-.*"})

f, err := NewAutodiscoveryFilter(GlobalFilter)
require.NoError(t, err)
Expand All @@ -474,10 +474,10 @@ func TestNewAutodiscoveryFilter(t *testing.T) {
resetConfig()

// Global - new config - legacy config ignored
config.Datadog().SetDefault("container_include", []string{"image:apache.*"})
config.Datadog().SetDefault("container_exclude", []string{"name:dd-.*"})
config.Datadog().SetDefault("ac_include", []string{"image:apache/legacy.*"})
config.Datadog().SetDefault("ac_exclude", []string{"name:dd/legacy-.*"})
pkgconfigsetup.Datadog().SetDefault("container_include", []string{"image:apache.*"})
pkgconfigsetup.Datadog().SetDefault("container_exclude", []string{"name:dd-.*"})
pkgconfigsetup.Datadog().SetDefault("ac_include", []string{"image:apache/legacy.*"})
pkgconfigsetup.Datadog().SetDefault("ac_exclude", []string{"name:dd/legacy-.*"})

f, err = NewAutodiscoveryFilter(GlobalFilter)
require.NoError(t, err)
Expand All @@ -491,8 +491,8 @@ func TestNewAutodiscoveryFilter(t *testing.T) {
resetConfig()

// Metrics
config.Datadog().SetDefault("container_include_metrics", []string{"image:apache.*"})
config.Datadog().SetDefault("container_exclude_metrics", []string{"name:dd-.*"})
pkgconfigsetup.Datadog().SetDefault("container_include_metrics", []string{"image:apache.*"})
pkgconfigsetup.Datadog().SetDefault("container_exclude_metrics", []string{"name:dd-.*"})

f, err = NewAutodiscoveryFilter(MetricsFilter)
require.NoError(t, err)
Expand All @@ -505,8 +505,8 @@ func TestNewAutodiscoveryFilter(t *testing.T) {
resetConfig()

// Logs
config.Datadog().SetDefault("container_include_logs", []string{"image:apache.*"})
config.Datadog().SetDefault("container_exclude_logs", []string{"name:dd-.*"})
pkgconfigsetup.Datadog().SetDefault("container_include_logs", []string{"image:apache.*"})
pkgconfigsetup.Datadog().SetDefault("container_exclude_logs", []string{"name:dd-.*"})

f, err = NewAutodiscoveryFilter(LogsFilter)
require.NoError(t, err)
Expand All @@ -519,8 +519,8 @@ func TestNewAutodiscoveryFilter(t *testing.T) {
resetConfig()

// Filter errors - non-duplicate error messages
config.Datadog().SetDefault("container_include", []string{"image:apache.*", "invalid"})
config.Datadog().SetDefault("container_exclude", []string{"name:dd-.*", "invalid"})
pkgconfigsetup.Datadog().SetDefault("container_include", []string{"image:apache.*", "invalid"})
pkgconfigsetup.Datadog().SetDefault("container_exclude", []string{"name:dd-.*", "invalid"})

f, err = NewAutodiscoveryFilter(GlobalFilter)
require.NoError(t, err)
Expand All @@ -538,8 +538,8 @@ func TestNewAutodiscoveryFilter(t *testing.T) {
resetConfig()

// Filter errors - invalid regex
config.Datadog().SetDefault("container_include", []string{"image:apache.*", "kube_namespace:?"})
config.Datadog().SetDefault("container_exclude", []string{"name:dd-.*", "invalid"})
pkgconfigsetup.Datadog().SetDefault("container_include", []string{"image:apache.*", "kube_namespace:?"})
pkgconfigsetup.Datadog().SetDefault("container_exclude", []string{"name:dd-.*", "invalid"})

f, err = NewAutodiscoveryFilter(GlobalFilter)
assert.Error(t, err, errors.New("invalid regex '?': error parsing regexp: missing argument to repetition operator: `?`"))
Expand Down Expand Up @@ -672,13 +672,13 @@ func TestParseFilters(t *testing.T) {
}

func resetConfig() {
config.Datadog().SetDefault("exclude_pause_container", true)
config.Datadog().SetDefault("container_include", []string{})
config.Datadog().SetDefault("container_exclude", []string{})
config.Datadog().SetDefault("container_include_metrics", []string{})
config.Datadog().SetDefault("container_exclude_metrics", []string{})
config.Datadog().SetDefault("container_include_logs", []string{})
config.Datadog().SetDefault("container_exclude_logs", []string{})
config.Datadog().SetDefault("ac_include", []string{})
config.Datadog().SetDefault("ac_exclude", []string{})
pkgconfigsetup.Datadog().SetDefault("exclude_pause_container", true)
pkgconfigsetup.Datadog().SetDefault("container_include", []string{})
pkgconfigsetup.Datadog().SetDefault("container_exclude", []string{})
pkgconfigsetup.Datadog().SetDefault("container_include_metrics", []string{})
pkgconfigsetup.Datadog().SetDefault("container_exclude_metrics", []string{})
pkgconfigsetup.Datadog().SetDefault("container_include_logs", []string{})
pkgconfigsetup.Datadog().SetDefault("container_exclude_logs", []string{})
pkgconfigsetup.Datadog().SetDefault("ac_include", []string{})
pkgconfigsetup.Datadog().SetDefault("ac_exclude", []string{})
}

0 comments on commit b2819e3

Please sign in to comment.