From 9125b80946a50cd2fc9c87ebb9afaf87302ea0b5 Mon Sep 17 00:00:00 2001 From: Celian Raimbault Date: Mon, 24 Feb 2025 14:04:37 +0100 Subject: [PATCH 1/9] [bump-test-infra-agent6] Bumped test infra --- .gitlab-ci.yml | 2 +- test/new-e2e/go.mod | 89 ++++++++++----------- test/new-e2e/go.sum | 184 ++++++++++++++++++++++---------------------- 3 files changed, 138 insertions(+), 137 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9dee4dc2ce87f..aceffb993450a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -170,7 +170,7 @@ variables: # and check the job creating the image to make sure you have the right SHA prefix TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: "" # Make sure to update test-infra-definitions version in go.mod as well - TEST_INFRA_DEFINITIONS_BUILDIMAGES: eefd2de87300 + TEST_INFRA_DEFINITIONS_BUILDIMAGES: fc57c00046a6 DATADOG_AGENT_BUILDERS: v28719426-b6a4fd9 DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index 859d1d8324eb8..b9f89e1f5878f 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -31,9 +31,9 @@ require ( // `TEST_INFRA_DEFINITIONS_BUILDIMAGES` matches the commit sha in the module version // Example: github.com/DataDog/test-infra-definitions v0.0.0-YYYYMMDDHHmmSS-0123456789AB // => TEST_INFRA_DEFINITIONS_BUILDIMAGES: 0123456789AB - github.com/DataDog/test-infra-definitions v0.0.0-20241121181216-eefd2de87300 - github.com/aws/aws-sdk-go-v2 v1.32.2 - github.com/aws/aws-sdk-go-v2/config v1.27.40 + github.com/DataDog/test-infra-definitions v0.0.0-20250224120713-fc57c00046a6 + github.com/aws/aws-sdk-go-v2 v1.32.7 + github.com/aws/aws-sdk-go-v2/config v1.28.7 github.com/aws/aws-sdk-go-v2/service/ec2 v1.138.1 github.com/aws/aws-sdk-go-v2/service/eks v1.35.1 github.com/aws/aws-sdk-go-v2/service/ssm v1.44.1 @@ -44,7 +44,7 @@ require ( github.com/google/uuid v1.6.0 github.com/kr/pretty v0.3.1 github.com/pkg/sftp v1.13.6 - github.com/pulumi/pulumi/sdk/v3 v3.137.0 + github.com/pulumi/pulumi/sdk/v3 v3.145.0 github.com/samber/lo v1.47.0 github.com/sethvargo/go-retry v0.2.4 github.com/stretchr/testify v1.10.0 @@ -75,23 +75,23 @@ require ( github.com/agext/levenshtein v1.2.3 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/atotto/clipboard v0.1.4 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.17.38 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.48 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.19 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.47.4 - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.0 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.0 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.0 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.65.0 - github.com/aws/aws-sdk-go-v2/service/sso v1.23.4 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.4 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.31.4 // indirect - github.com/aws/smithy-go v1.22.0 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.26 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.53.2 + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.7 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.7 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.7 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.72.0 + github.com/aws/aws-sdk-go-v2/service/sso v1.24.8 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.7 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.33.3 // indirect + github.com/aws/smithy-go v1.22.1 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect @@ -103,7 +103,7 @@ require ( github.com/cloudflare/circl v1.3.7 // indirect github.com/containerd/console v1.0.4 // indirect github.com/cyphar/filepath-securejoin v0.2.5 // indirect - github.com/davecgh/go-spew v1.1.1 + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/djherbis/times v1.6.0 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect @@ -124,7 +124,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/glog v1.2.1 // indirect + github.com/golang/glog v1.2.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/btree v1.0.1 // indirect @@ -136,7 +136,7 @@ require ( github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/hcl/v2 v2.20.1 // indirect + github.com/hashicorp/hcl/v2 v2.22.0 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect @@ -177,19 +177,19 @@ require ( github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pkg/term v1.1.0 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect github.com/pulumi/esc v0.10.0 // indirect github.com/pulumi/pulumi-command/sdk v1.0.1 // indirect - github.com/pulumi/pulumi-libvirt/sdk v0.4.7 // indirect + github.com/pulumi/pulumi-libvirt/sdk v0.5.4 // indirect // pulumi-random v4.14.0 uses GO 1.21: // https://github.com/pulumi/pulumi-random/blob/v4.14.0/sdk/go.mod#L3 // So, do not upgrade pulumi-random to v4.14.0 or above before migration to GO 1.21. - github.com/pulumi/pulumi-random/sdk/v4 v4.16.6 // indirect + github.com/pulumi/pulumi-random/sdk/v4 v4.16.8 // indirect github.com/pulumi/pulumi-tls/sdk/v4 v4.11.1 // indirect github.com/pulumiverse/pulumi-time/sdk v0.1.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect - github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/rogpeppe/go-internal v1.13.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -213,15 +213,14 @@ require ( golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/mod v0.19.0 // indirect golang.org/x/net v0.33.0 // indirect - golang.org/x/oauth2 v0.18.0 // indirect + golang.org/x/oauth2 v0.22.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/text v0.21.0 golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.23.0 // indirect - google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect - google.golang.org/grpc v1.63.2 // indirect - google.golang.org/protobuf v1.34.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect + google.golang.org/grpc v1.67.1 // indirect + google.golang.org/protobuf v1.35.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect @@ -242,22 +241,24 @@ require ( require ( github.com/DataDog/datadog-agent/pkg/util/optional v0.55.2 github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 - github.com/pulumi/pulumi-aws/sdk/v6 v6.56.1 - github.com/pulumi/pulumi-awsx/sdk/v2 v2.16.1 - github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.17.1 + github.com/pulumi/pulumi-aws/sdk/v6 v6.66.2 + github.com/pulumi/pulumi-awsx/sdk/v2 v2.19.0 + github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.19.0 ) require ( github.com/BurntSushi/toml v1.2.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecr v1.36.2 // indirect - github.com/pulumi/pulumi-azure-native-sdk/authorization/v2 v2.67.0 // indirect - github.com/pulumi/pulumi-azure-native-sdk/compute/v2 v2.56.0 // indirect - github.com/pulumi/pulumi-azure-native-sdk/containerservice/v2 v2.67.0 // indirect - github.com/pulumi/pulumi-azure-native-sdk/network/v2 v2.67.0 // indirect - github.com/pulumi/pulumi-azure-native-sdk/v2 v2.67.0 // indirect - github.com/pulumi/pulumi-docker/sdk/v4 v4.5.5 // indirect - github.com/pulumi/pulumi-eks/sdk/v2 v2.7.8 // indirect - github.com/pulumi/pulumi-gcp/sdk/v6 v6.67.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecr v1.38.1 // indirect + github.com/iwdgo/sigintwindows v0.2.2 // indirect + github.com/pulumi/pulumi-azure-native-sdk/authorization/v2 v2.81.0 // indirect + github.com/pulumi/pulumi-azure-native-sdk/compute/v2 v2.81.0 // indirect + github.com/pulumi/pulumi-azure-native-sdk/containerservice/v2 v2.81.0 // indirect + github.com/pulumi/pulumi-azure-native-sdk/managedidentity/v2 v2.81.0 // indirect + github.com/pulumi/pulumi-azure-native-sdk/network/v2 v2.81.0 // indirect + github.com/pulumi/pulumi-azure-native-sdk/v2 v2.81.0 // indirect + github.com/pulumi/pulumi-docker/sdk/v4 v4.5.8 // indirect + github.com/pulumi/pulumi-eks/sdk/v3 v3.7.0 // indirect github.com/pulumi/pulumi-gcp/sdk/v7 v7.38.0 // indirect ) diff --git a/test/new-e2e/go.sum b/test/new-e2e/go.sum index 4e858b001dab8..ee8e01bc1d640 100644 --- a/test/new-e2e/go.sum +++ b/test/new-e2e/go.sum @@ -8,14 +8,16 @@ github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/DataDog/agent-payload/v5 v5.0.106 h1:A3dGX+JYoL7OJe2crpxznW7hWxLxhOk/17WbYskRWVk= github.com/DataDog/agent-payload/v5 v5.0.106/go.mod h1:COngtbYYCncpIPiE5D93QlXDH/3VAKk10jDNwGHcMRE= +github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd h1:kam3LA9L/VuBRPQLqW4CBnelpxF1KY4WGbb/W2UHn2g= +github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd/go.mod h1:BECd5pnMX9MEnARCAV+S7M0Sk/gYwopL7QlhCFdXSI0= github.com/DataDog/datadog-api-client-go v1.16.0 h1:5jOZv1m98criCvYTa3qpW8Hzv301nbZX3K9yJtwGyWY= github.com/DataDog/datadog-api-client-go v1.16.0/go.mod h1:PgrP2ABuJWL3Auw2iEkemAJ/r72ghG4DQQmb5sgnKW4= github.com/DataDog/datadog-api-client-go/v2 v2.19.0 h1:Wvz/63/q39EpVwSH1T8jVyRvPcMfEABenU7sD3dO2Lc= github.com/DataDog/datadog-api-client-go/v2 v2.19.0/go.mod h1:oD5Lx8Li3oPRa/BSBenkn4i48z+91gwYORF/+6ph71g= github.com/DataDog/mmh3 v0.0.0-20200805151601-30884ca2197a h1:m9REhmyaWD5YJ0P53ygRHxKKo+KM+nw+zz0hEdKztMo= github.com/DataDog/mmh3 v0.0.0-20200805151601-30884ca2197a/go.mod h1:SvsjzyJlSg0rKsqYgdcFxeEVflx3ZNAyFfkUHP0TxXg= -github.com/DataDog/test-infra-definitions v0.0.0-20241121181216-eefd2de87300 h1:0GJaAEtbgWXHHwshVIPYiWKUxgdpdoJsxDHTqy9O3JE= -github.com/DataDog/test-infra-definitions v0.0.0-20241121181216-eefd2de87300/go.mod h1:l0n0FQYdWWQxbI5a2EkuynRQIteUQcYOaOhdxD9TvJs= +github.com/DataDog/test-infra-definitions v0.0.0-20250224120713-fc57c00046a6 h1:oWnW6UOfl9HpyRrWWok5XLArgU/UQ8LiweGZIiC9J8Q= +github.com/DataDog/test-infra-definitions v0.0.0-20250224120713-fc57c00046a6/go.mod h1:l+XwYwMuZpin+jhQQZAumCaeqZAz/6b7CJ+8bBmWXYU= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f h1:5Vuo4niPKFkfwW55jV4vY0ih3VQ9RaQqeqY67fvRn8A= @@ -45,52 +47,52 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= -github.com/aws/aws-sdk-go-v2 v1.32.2 h1:AkNLZEyYMLnx/Q/mSKkcMqwNFXMAvFto9bNsHqcTduI= -github.com/aws/aws-sdk-go-v2 v1.32.2/go.mod h1:2SK5n0a2karNTv5tbP1SjsX0uhttou00v/HpXKM1ZUo= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 h1:pT3hpW0cOHRJx8Y0DfJUEQuqPild8jRGmSFmBgvydr0= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6/go.mod h1:j/I2++U0xX+cr44QjHay4Cvxj6FUbnxrgmqN3H1jTZA= -github.com/aws/aws-sdk-go-v2/config v1.27.40 h1:sie4mPBGFOO+Z27+yHzvyN31G20h/bf2xb5mCbpLv2Q= -github.com/aws/aws-sdk-go-v2/config v1.27.40/go.mod h1:4KW7Aa5tNo+0VHnuLnnE1vPHtwMurlNZNS65IdcewHA= -github.com/aws/aws-sdk-go-v2/credentials v1.17.38 h1:iM90eRhCeZtlkzCNCG1JysOzJXGYf5rx80aD1lUgNDU= -github.com/aws/aws-sdk-go-v2/credentials v1.17.38/go.mod h1:TCVYPZeQuLaYNEkf/TVn6k5k/zdVZZ7xH9po548VNNg= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 h1:C/d03NAmh8C4BZXhuRNboF/DqhBkBCeDiJDcaqIT5pA= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14/go.mod h1:7I0Ju7p9mCIdlrfS+JCgqcYD0VXz/N4yozsox+0o078= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21 h1:UAsR3xA31QGf79WzpG/ixT9FZvQlh5HY1NRqSHBNOCk= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21/go.mod h1:JNr43NFf5L9YaG3eKTm7HQzls9J+A9YYcGI5Quh1r2Y= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21 h1:6jZVETqmYCadGFvrYEQfC5fAQmlo80CeL5psbno6r0s= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21/go.mod h1:1SR0GbLlnN3QUmYaflZNiH1ql+1qrSiB2vwcJ+4UM60= +github.com/aws/aws-sdk-go-v2 v1.32.7 h1:ky5o35oENWi0JYWUZkB7WYvVPP+bcRF5/Iq7JWSb5Rw= +github.com/aws/aws-sdk-go-v2 v1.32.7/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 h1:lL7IfaFzngfx0ZwUGOZdsFFnQ5uLvR0hWqqhyE7Q9M8= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7/go.mod h1:QraP0UcVlQJsmHfioCrveWOC1nbiWUl3ej08h4mXWoc= +github.com/aws/aws-sdk-go-v2/config v1.28.7 h1:GduUnoTXlhkgnxTD93g1nv4tVPILbdNQOzav+Wpg7AE= +github.com/aws/aws-sdk-go-v2/config v1.28.7/go.mod h1:vZGX6GVkIE8uECSUHB6MWAUsd4ZcG2Yq/dMa4refR3M= +github.com/aws/aws-sdk-go-v2/credentials v1.17.48 h1:IYdLD1qTJ0zanRavulofmqut4afs45mOWEI+MzZtTfQ= +github.com/aws/aws-sdk-go-v2/credentials v1.17.48/go.mod h1:tOscxHN3CGmuX9idQ3+qbkzrjVIx32lqDSU1/0d/qXs= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22 h1:kqOrpojG71DxJm/KDPO+Z/y1phm1JlC8/iT+5XRmAn8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22/go.mod h1:NtSFajXVVL8TA2QNngagVZmUtXciyrHOt7xgz4faS/M= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 h1:I/5wmGMffY4happ8NOCuIUEWGUvvFp5NSeQcXl9RHcI= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26/go.mod h1:FR8f4turZtNy6baO0KJ5FJUmXH/cSkI9fOngs0yl6mA= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 h1:zXFLuEuMMUOvEARXFUVJdfqZ4bvvSgdGRq/ATcrQxzM= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26/go.mod h1:3o2Wpy0bogG1kyOPrgkXA8pgIfEEv0+m19O9D5+W8y8= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.19 h1:FKdiFzTxlTRO71p0C7VrLbkkdW8qfMKF5+ej6bTmkT0= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.19/go.mod h1:abO3pCj7WLQPTllnSeYImqFfkGrmJV0JovWo/gqT5N0= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.26 h1:GeNJsIFHB+WW5ap2Tec4K6dzcVTsRbsT1Lra46Hv9ME= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.26/go.mod h1:zfgMpwHDXX2WGoG84xG2H+ZlPTkJUU4YUvx2svLQYWo= github.com/aws/aws-sdk-go-v2/service/ec2 v1.138.1 h1:ToFONzxcc0i0xp9towBF/aVy8qwqGSs3siKoOZiYEMk= github.com/aws/aws-sdk-go-v2/service/ec2 v1.138.1/go.mod h1:lTBYr5XTnzQ+fG7EdenYlhrDifjdGJ/Lxul24zeuTNU= -github.com/aws/aws-sdk-go-v2/service/ecr v1.36.2 h1:VDQaVwGOokbd3VUbHF+wupiffdrbAZPdQnr5XZMJqrs= -github.com/aws/aws-sdk-go-v2/service/ecr v1.36.2/go.mod h1:lvUlMghKYmSxSfv0vU7pdU/8jSY+s0zpG8xXhaGKCw0= -github.com/aws/aws-sdk-go-v2/service/ecs v1.47.4 h1:CTkPGE8fiElvLtYWl/U+Eu5+1fVXiZbJUjyVCRSRgxk= -github.com/aws/aws-sdk-go-v2/service/ecs v1.47.4/go.mod h1:sMFLFhL27cKYa/eQYZp4asvIwHsnJWrAzTUpy9AQdnU= +github.com/aws/aws-sdk-go-v2/service/ecr v1.38.1 h1:pCI3RIJnZEUs0evNm+pdDzvAp+YwpabUyQTPPvxO8oY= +github.com/aws/aws-sdk-go-v2/service/ecr v1.38.1/go.mod h1:NqKnlZvLl4Tp2UH/GEc/nhbjmPQhwOXmLp2eldiszLM= +github.com/aws/aws-sdk-go-v2/service/ecs v1.53.2 h1:o/FdG76sTAoC8h20j6bSBE6MPJYOZhNIh0nJ8Q8druY= +github.com/aws/aws-sdk-go-v2/service/ecs v1.53.2/go.mod h1:YpTRClSDOPvN2e3kiIrYOx1sI+YKTZVmlMiNO2AwYhE= github.com/aws/aws-sdk-go-v2/service/eks v1.35.1 h1:qaPIfeZlp+hE5QlEhkTl4zVWvBOaUN/qYgPtSinl9NM= github.com/aws/aws-sdk-go-v2/service/eks v1.35.1/go.mod h1:palnwFpS00oHlkjnWiwh6HKqtKyJSc90X54t3gKqrVU= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 h1:TToQNkvGguu209puTojY/ozlqy2d/SFNcoLIqTFi42g= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0/go.mod h1:0jp+ltwkf+SwG2fm/PKo8t4y8pJSgOCO4D8Lz3k0aHQ= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.0 h1:FQNWhRuSq8QwW74GtU0MrveNhZbqvHsA4dkA9w8fTDQ= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.0/go.mod h1:j/zZ3zmWfGCK91K73YsfHP53BSTLSjL/y6YN39XbBLM= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.0 h1:AdbiDUgQZmM28rDIZbiSwFxz8+3B94aOXxzs6oH+EA0= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.0/go.mod h1:uV476Bd80tiDTX4X2redMtagQUg65aU/gzPojSJ4kSI= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.0 h1:1NKXS8XfhMM0bg5wVYa/eOH8AM2f6JijugbKEyQFTIg= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.0/go.mod h1:ph931DUfVfgrhZR7py9olSvHCiRpvaGxNvlWBcXxFds= -github.com/aws/aws-sdk-go-v2/service/s3 v1.65.0 h1:2dSm7frMrw2tdJ0QvyccQNJyPGaP24dyDgZ6h1QJMGU= -github.com/aws/aws-sdk-go-v2/service/s3 v1.65.0/go.mod h1:4XSVpw66upN8wND3JZA29eXl2NOZvfFVq7DIP6xvfuQ= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1/go.mod h1:9nu0fVANtYiAePIBh2/pFUSwtJ402hLnp854CNoDOeE= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.7 h1:tB4tNw83KcajNAzaIMhkhVI2Nt8fAZd5A5ro113FEMY= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.7/go.mod h1:lvpyBGkZ3tZ9iSsUIcC2EWp+0ywa7aK3BLT+FwZi+mQ= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.7 h1:8eUsivBQzZHqe/3FE+cqwfH+0p5Jo8PFM/QYQSmeZ+M= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.7/go.mod h1:kLPQvGUmxn/fqiCrDeohwG33bq2pQpGeY62yRO6Nrh0= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.7 h1:Hi0KGbrnr57bEHWM0bJ1QcBzxLrL/k2DHvGYhb8+W1w= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.7/go.mod h1:wKNgWgExdjjrm4qvfbTorkvocEstaoDl4WCvGfeCy9c= +github.com/aws/aws-sdk-go-v2/service/s3 v1.72.0 h1:SAfh4pNx5LuTafKKWR02Y+hL3A+3TX8cTKG1OIAJaBk= +github.com/aws/aws-sdk-go-v2/service/s3 v1.72.0/go.mod h1:r+xl5yzMk9083rMR+sJ5TYj9Tihvf/l1oxzZXDgGj2Q= github.com/aws/aws-sdk-go-v2/service/ssm v1.44.1 h1:LwoTceR/pj+zzIuVrBrESQ5K8N0T0F3agz+yUXIoVxA= github.com/aws/aws-sdk-go-v2/service/ssm v1.44.1/go.mod h1:N/ISupi87tK6YpOxPDTmF7i6qedc0HYPiUuUY8zU6RI= -github.com/aws/aws-sdk-go-v2/service/sso v1.23.4 h1:ck/Y8XWNR1gHa4BFkwE3oSu7XDJGwl+8TI7E/RB2EcQ= -github.com/aws/aws-sdk-go-v2/service/sso v1.23.4/go.mod h1:XRlMvmad0ZNL+75C5FYdMvbbLkd6qiqz6foR1nA1PXY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.4 h1:4f2/JKYZHAZbQ7koBpZ012bKi32NHPY0m7TDuJgsbug= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.4/go.mod h1:FnvDM4sfa+isJ3kDXIzAB9GAwVSzFzSy97uZ3IsHo4E= -github.com/aws/aws-sdk-go-v2/service/sts v1.31.4 h1:uK6dUUdJtqutK1XO/tmNaQMJiPLCJY/eAeOOmqQ6ygY= -github.com/aws/aws-sdk-go-v2/service/sts v1.31.4/go.mod h1:yMWe0F+XG0DkRZK5ODZhG7BEFYhLXi2dqGsv6tX0cgI= -github.com/aws/smithy-go v1.22.0 h1:uunKnWlcoL3zO7q+gG2Pk53joueEOsnNB28QdMsmiMM= -github.com/aws/smithy-go v1.22.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= +github.com/aws/aws-sdk-go-v2/service/sso v1.24.8 h1:CvuUmnXI7ebaUAhbJcDy9YQx8wHR69eZ9I7q5hszt/g= +github.com/aws/aws-sdk-go-v2/service/sso v1.24.8/go.mod h1:XDeGv1opzwm8ubxddF0cgqkZWsyOtw4lr6dxwmb6YQg= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.7 h1:F2rBfNAL5UyswqoeWv9zs74N/NanhK16ydHW1pahX6E= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.7/go.mod h1:JfyQ0g2JG8+Krq0EuZNnRwX0mU0HrwY/tG6JNfcqh4k= +github.com/aws/aws-sdk-go-v2/service/sts v1.33.3 h1:Xgv/hyNgvLda/M9l9qxXc4UFSgppnRczLxlMs5Ae/QY= +github.com/aws/aws-sdk-go-v2/service/sts v1.33.3/go.mod h1:5Gn+d+VaaRgsjewpMvGazt0WfcFO+Md4wLOuBfGR9Bc= +github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro= +github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= @@ -104,8 +106,8 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk= github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA= github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0= @@ -131,8 +133,9 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo= github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= 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/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c= github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0= github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg= @@ -196,8 +199,8 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.2.1 h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4= -github.com/golang/glog v1.2.1/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= +github.com/golang/glog v1.2.2 h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY= +github.com/golang/glog v1.2.2/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -209,8 +212,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= @@ -223,7 +224,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -245,12 +245,14 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc= -github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4= +github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M= +github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/iwdgo/sigintwindows v0.2.2 h1:P6oWzpvV7MrEAmhUgs+zmarrWkyL77ycZz4v7+1gYAE= +github.com/iwdgo/sigintwindows v0.2.2/go.mod h1:70wPb8oz8OnxPvsj2QMUjgIVhb8hMu5TUgX8KfFl7QY= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -355,8 +357,9 @@ github.com/pkg/sftp v1.13.6 h1:JFZT4XbOU7l77xGSpOdW+pwIMqP044IyjXX6FGyEKFo= github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk= github.com/pkg/term v1.1.0 h1:xIAAdCMh3QIAy+5FrE8Ad8XoDhEU4ufwbaSozViP9kk= github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +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/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -370,40 +373,40 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435 github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE= github.com/pulumi/esc v0.10.0 h1:jzBKzkLVW0mePeanDRfqSQoCJ5yrkux0jIwAkUxpRKE= github.com/pulumi/esc v0.10.0/go.mod h1:2Bfa+FWj/xl8CKqRTWbWgDX0SOD4opdQgvYSURTGK2c= -github.com/pulumi/pulumi-aws/sdk/v6 v6.56.1 h1:wA38Ep4sEphX+3YGwFfaxRHs7NQv8dNObFepX6jaRa4= -github.com/pulumi/pulumi-aws/sdk/v6 v6.56.1/go.mod h1:m/ejZ2INurqq/ncDjJfgC1Ff/lnbt0J/uO33BnPVots= -github.com/pulumi/pulumi-awsx/sdk/v2 v2.16.1 h1:6082hB+ILpPB/0V5F+LTmHbX1BO54tCVOQCVOL/FYI4= -github.com/pulumi/pulumi-awsx/sdk/v2 v2.16.1/go.mod h1:z2bnBPHNYfk72IW1P01H9qikBtBSBhCwi3QpH6Y/38Q= -github.com/pulumi/pulumi-azure-native-sdk/authorization/v2 v2.67.0 h1:mgmmbFEoc1YOu81K9Bl/MVWE8cGloEdiCeIw394vXcM= -github.com/pulumi/pulumi-azure-native-sdk/authorization/v2 v2.67.0/go.mod h1:WmvulRFoc+dOk/el9y6u7z3CvA+yljL8HJXajmvZTYo= -github.com/pulumi/pulumi-azure-native-sdk/compute/v2 v2.56.0 h1:MFOd6X9FPlixzriy14fBHv7pFCCh/mu1pwHtSSjqfJ4= -github.com/pulumi/pulumi-azure-native-sdk/compute/v2 v2.56.0/go.mod h1:453Ff5wNscroYfq+zxME7Nbt7HdZv+dh0zLZwLyGBws= -github.com/pulumi/pulumi-azure-native-sdk/containerservice/v2 v2.67.0 h1:jvruQQSO1ESk7APFQ3mAge7C9SWKU9nbBHrilcyeSGU= -github.com/pulumi/pulumi-azure-native-sdk/containerservice/v2 v2.67.0/go.mod h1:d5nmekK1mrjM9Xo/JGGVlAs7mqqftBo3DmKji+1zbmw= -github.com/pulumi/pulumi-azure-native-sdk/network/v2 v2.67.0 h1:r26Xl6FdOJnbLs1ny9ekuRjFxAocZK8jS8SLrgXKEFE= -github.com/pulumi/pulumi-azure-native-sdk/network/v2 v2.67.0/go.mod h1:8yXZtmHe2Zet5pb8gZ7D730d0VAm4kYUdwCj7sjhz6g= -github.com/pulumi/pulumi-azure-native-sdk/v2 v2.67.0 h1:FgfXLypiQ/DKWRPQpyNaftXcGl5HVgA93msBZTQ6Ddk= -github.com/pulumi/pulumi-azure-native-sdk/v2 v2.67.0/go.mod h1:0y4wJUCX1eA3ZSn0jJIRXtHeJA7qgbPfkrR9qvj+5D4= +github.com/pulumi/pulumi-aws/sdk/v6 v6.66.2 h1:mHiPVwdSQp5VjpvCdPy52FeMiNcscKvJP+len/mfqdU= +github.com/pulumi/pulumi-aws/sdk/v6 v6.66.2/go.mod h1:C+L8LtajPSwGsZiGgknkCwClUzXk+ZXzSGkOZTQMp3U= +github.com/pulumi/pulumi-awsx/sdk/v2 v2.19.0 h1:jil2EBzZnKsRDrLfvx2gnAaq17HQLrTbpPsIb3h+98U= +github.com/pulumi/pulumi-awsx/sdk/v2 v2.19.0/go.mod h1:r+K4M7jnLqvvQDeR/0mBRq2EPZaqsDg24Ciy3ml/thA= +github.com/pulumi/pulumi-azure-native-sdk/authorization/v2 v2.81.0 h1:Njext/i2DuW6k9qMj7WJmIBuw7PLZ8ccTYEtU3PbX5s= +github.com/pulumi/pulumi-azure-native-sdk/authorization/v2 v2.81.0/go.mod h1:ef8sOceyTKmnts+QOHAymAVLWXNtKljgl27oOYcq978= +github.com/pulumi/pulumi-azure-native-sdk/compute/v2 v2.81.0 h1:xvUrVxwjfhaZCeohnMQN/cTSFKfZGIXsneEWFbtdBXY= +github.com/pulumi/pulumi-azure-native-sdk/compute/v2 v2.81.0/go.mod h1:1HK2Eltgq1lFSts/sI1RZE5Mw12qyKdBsszqcnTpbd4= +github.com/pulumi/pulumi-azure-native-sdk/containerservice/v2 v2.81.0 h1:eQ0/SzOhXcKwESbc0Ahujeo4kI/Y88ghAxblRrcYe6U= +github.com/pulumi/pulumi-azure-native-sdk/containerservice/v2 v2.81.0/go.mod h1:vsCzO0onkZpFxJWaGsGtFxiD3nV08/P8pNK2wAkTe7w= +github.com/pulumi/pulumi-azure-native-sdk/managedidentity/v2 v2.81.0 h1:bA2AUo2Mtpyitew41O24kw7wqBqVAhOkUx9Zj4gkTas= +github.com/pulumi/pulumi-azure-native-sdk/managedidentity/v2 v2.81.0/go.mod h1:cH/JouDXyXfBGvPFBjedwNK9EDYTbWeJmEnoj13Pnpk= +github.com/pulumi/pulumi-azure-native-sdk/network/v2 v2.81.0 h1:RST/rJXeyqqedEkYvS3QvipKwfimvfkbYTai51dz+sI= +github.com/pulumi/pulumi-azure-native-sdk/network/v2 v2.81.0/go.mod h1:pGBaaI/HvyNybS+QVtr5r96IXMepBJpeKg4cXkcIt7U= +github.com/pulumi/pulumi-azure-native-sdk/v2 v2.81.0 h1:kGzTe5+RY9/i8dqzV5OyUUxkKgFZE2Fc9QR6t48ec7A= +github.com/pulumi/pulumi-azure-native-sdk/v2 v2.81.0/go.mod h1:UtcE2JL42940vODuX0oAYmBqWIMRIaRhEDBaQGyr+vA= github.com/pulumi/pulumi-command/sdk v1.0.1 h1:ZuBSFT57nxg/fs8yBymUhKLkjJ6qmyN3gNvlY/idiN0= github.com/pulumi/pulumi-command/sdk v1.0.1/go.mod h1:C7sfdFbUIoXKoIASfXUbP/U9xnwPfxvz8dBpFodohlA= -github.com/pulumi/pulumi-docker/sdk/v4 v4.5.5 h1:7OjAfgLz5PAy95ynbgPAlWls5WBe4I/QW/61TdPWRlQ= -github.com/pulumi/pulumi-docker/sdk/v4 v4.5.5/go.mod h1:XZKLFXbw13olxuztlWnmVUPYZp2a+BqzqhuMl0j/Ow8= -github.com/pulumi/pulumi-eks/sdk/v2 v2.7.8 h1:NeCKFxyOLpAaG4pJDk7+ewnCuV2IbXR7PggYSNujOno= -github.com/pulumi/pulumi-eks/sdk/v2 v2.7.8/go.mod h1:ARGNnIZENIpDUVSX21JEQJKrESj/0u0r0iT61rpb86I= -github.com/pulumi/pulumi-gcp/sdk/v6 v6.67.1 h1:PUH/sUbJmBmHjNFNthJ/dW2+riFuJV0FhrGAwuUuRIg= -github.com/pulumi/pulumi-gcp/sdk/v6 v6.67.1/go.mod h1:OmZeji3dNMwB1qldAlaQfcfJPc2BaZyweVGH7Ej4SJg= +github.com/pulumi/pulumi-docker/sdk/v4 v4.5.8 h1:rik9L2SIpsoDenY51MkogR6GWgu/0Sy/XmyQmKWNUqU= +github.com/pulumi/pulumi-docker/sdk/v4 v4.5.8/go.mod h1:eph7BPNPkEIIK882/Ll4dbeHl5wZEc/UvTcUW0CK1UY= +github.com/pulumi/pulumi-eks/sdk/v3 v3.7.0 h1:aDLyVV93p1g9nswSaH78mPiRZEXF6441eJRO5NLA1B4= +github.com/pulumi/pulumi-eks/sdk/v3 v3.7.0/go.mod h1:QbAamxfUpDJC81BGtyEuV0P88RrdbOjQEhbgY+OOPpg= github.com/pulumi/pulumi-gcp/sdk/v7 v7.38.0 h1:21oSj+TKlKTzQcxN9Hik7iSNNHPUQXN4s3itOnahy/w= github.com/pulumi/pulumi-gcp/sdk/v7 v7.38.0/go.mod h1:YaEZms1NgXFqGhObKVofcAeWXu2V+3t/BAXdHQZq7fU= -github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.17.1 h1:VDX+hu+qK3fbf2FodgG5kfh2h1bHK0FKirW1YqKWkRc= -github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.17.1/go.mod h1:e69ohZtUePLLYNLXYgiOWp0FvRGg6ya/3fsq3o00nN0= -github.com/pulumi/pulumi-libvirt/sdk v0.4.7 h1:/BBnqqx/Gbg2vINvJxXIVb58THXzw2lSqFqxlRSXH9M= -github.com/pulumi/pulumi-libvirt/sdk v0.4.7/go.mod h1:VKvjhAm1sGtzKZruYwIhgascabEx7+oVVRCoxp/cPi4= -github.com/pulumi/pulumi-random/sdk/v4 v4.16.6 h1:M9BSF13bQxj74C61nBTVITrsgT6oRR6cgudsKz7WOFU= -github.com/pulumi/pulumi-random/sdk/v4 v4.16.6/go.mod h1:l5ew7S/G1GspPLH9KeWXqxQ4ZmS2hh2sEMv3bW9M3yc= +github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.19.0 h1:7AjJpUyW6YHHpZr0bI6Fy1A3/b7ERxq1LAo5mlyNN1Y= +github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.19.0/go.mod h1:ATS+UN8pguMxypQAK+SaPewesU+UN5dpf93PNqVuHzs= +github.com/pulumi/pulumi-libvirt/sdk v0.5.4 h1:7nS8ATK0Iml+yid80BrkW8WDynzwWYevx0cLpbPOYdM= +github.com/pulumi/pulumi-libvirt/sdk v0.5.4/go.mod h1:HPx6S9mhaHpSHTKDVERTMaziKEpSqY8Trm+m2z1iJ3k= +github.com/pulumi/pulumi-random/sdk/v4 v4.16.8 h1:ZrVKUJUYgphlD1zY35CiS6hdVN75wur5NjMDVIxWrJA= +github.com/pulumi/pulumi-random/sdk/v4 v4.16.8/go.mod h1:0xQ8Gg8izJMYYCM6fBLY2TUkmEpaVczAx1yFk5OwuSg= github.com/pulumi/pulumi-tls/sdk/v4 v4.11.1 h1:tXemWrzeVTqG8zq6hBdv1TdPFXjgZ+dob63a/6GlF1o= github.com/pulumi/pulumi-tls/sdk/v4 v4.11.1/go.mod h1:hODo3iEmmXDFOXqPK+V+vwI0a3Ww7BLjs5Tgamp86Ng= -github.com/pulumi/pulumi/sdk/v3 v3.137.0 h1:bxhYpOY7Z4xt+VmezEpHuhjpOekkaMqOjzxFg/1OhCw= -github.com/pulumi/pulumi/sdk/v3 v3.137.0/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI= +github.com/pulumi/pulumi/sdk/v3 v3.145.0 h1:r5iOgz67RElFXJt4GVVY2SBGh5sR24mL9NOcKBiBi/k= +github.com/pulumi/pulumi/sdk/v3 v3.145.0/go.mod h1:5pZySnw3RiQKddx8orThjEFmWsXkGAY3ktKOxZj2Ym4= github.com/pulumiverse/pulumi-time/sdk v0.1.0 h1:xfi9HKDgV+GgDxQ23oSv9KxC3DQqViGTcMrJICRgJv0= github.com/pulumiverse/pulumi-time/sdk v0.1.0/go.mod h1:NUa1zA74DF002WrM6iF111A6UjX9knPpXufVRvBwNyg= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -411,8 +414,8 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI= @@ -518,8 +521,8 @@ golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= -golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= +golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= +golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -565,7 +568,6 @@ 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.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= @@ -597,13 +599,13 @@ google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= -google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= +google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -612,10 +614,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4= -google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= From 5746bba80478a2eb04e19f1e83c18719216ff2de Mon Sep 17 00:00:00 2001 From: Celian Raimbault Date: Mon, 24 Feb 2025 15:04:48 +0100 Subject: [PATCH 2/9] [bump-test-infra-agent6] Backport #32360: rename package optional to option --- cmd/agent/common/loader.go | 4 +- cmd/agent/common/test_helpers.go | 2 +- cmd/agent/subcommands/diagnose/command.go | 8 +-- cmd/agent/subcommands/flare/command.go | 6 +- cmd/agent/subcommands/jmx/command.go | 10 ++-- cmd/agent/subcommands/run/command.go | 14 ++--- cmd/agent/subcommands/run/command_windows.go | 4 +- .../subcommands/run/command.go | 6 +- cmd/cluster-agent/api/agent/agent.go | 8 +-- cmd/cluster-agent/api/server.go | 4 +- .../subcommands/diagnose/command.go | 2 +- .../subcommands/start/command.go | 8 +-- cmd/dogstatsd/subcommands/start/command.go | 6 +- cmd/otel-agent/main.go | 4 +- cmd/process-agent/command/main_common.go | 4 +- cmd/security-agent/main_windows.go | 4 +- .../subcommands/start/command.go | 4 +- cmd/system-probe/api/module/factory_linux.go | 4 +- cmd/system-probe/api/module/factory_others.go | 4 +- cmd/system-probe/api/module/loader.go | 9 +-- cmd/system-probe/api/restart.go | 4 +- cmd/system-probe/api/server.go | 4 +- cmd/system-probe/config/config.go | 2 +- cmd/system-probe/modules/compliance.go | 4 +- .../modules/crashdetect_windows.go | 4 +- .../modules/dynamic_instrumentation.go | 4 +- cmd/system-probe/modules/ebpf.go | 4 +- cmd/system-probe/modules/eventmonitor.go | 4 +- .../modules/language_detection.go | 4 +- cmd/system-probe/modules/network_tracer.go | 4 +- cmd/system-probe/modules/oom_kill_probe.go | 4 +- cmd/system-probe/modules/ping.go | 9 +-- cmd/system-probe/modules/process.go | 4 +- cmd/system-probe/modules/tcp_queue_tracer.go | 4 +- cmd/system-probe/modules/traceroute.go | 11 ++-- cmd/system-probe/subcommands/run/command.go | 8 +-- cmd/systray/command/command.go | 2 +- cmd/trace-agent/subcommands/run/command.go | 4 +- .../test_agent_demultiplexer.go | 6 +- .../sendermanager.go | 11 ++-- comp/api/api/apiimpl/api.go | 14 ++--- comp/api/api/apiimpl/api_mock.go | 6 +- comp/api/api/apiimpl/grpc.go | 12 ++-- comp/api/api/apiimpl/internal/agent/agent.go | 8 +-- comp/api/api/apiimpl/server.go | 10 ++-- comp/api/api/apiimpl/server_cmd.go | 10 ++-- comp/api/api/component.go | 6 +- comp/api/authtoken/component.go | 7 ++- .../authtoken/createandfetchimpl/authtoken.go | 6 +- comp/api/authtoken/fetchonlyimpl/authtoken.go | 6 +- .../agentcrashdetectimpl/agentcrashdetect.go | 4 +- .../winregistry/impl/winregistryimpl.go | 31 +++++----- .../collector/collectorimpl/collector.go | 6 +- .../collector/collectorimpl/collector_mock.go | 6 +- comp/collector/collector/component.go | 7 ++- .../autodiscoveryimpl/autoconfig.go | 16 ++--- .../autodiscoveryimpl/autoconfig_mock.go | 7 ++- .../autodiscoveryimpl/autoconfig_test.go | 6 +- .../core/autodiscovery/listeners/container.go | 4 +- comp/core/autodiscovery/listeners/kubelet.go | 4 +- .../core/autodiscovery/listeners/listeners.go | 4 +- comp/core/config/go.mod | 4 +- comp/core/configsync/configsyncimpl/module.go | 8 +-- .../configsyncimpl/module_integration_test.go | 4 +- comp/core/flare/flare.go | 8 +-- comp/core/flare/flare_test.go | 7 ++- comp/core/log/go.mod | 4 +- comp/core/status/statusimpl/go.mod | 4 +- comp/core/sysprobeconfig/component.go | 7 ++- .../sysprobeconfigimpl/config.go | 6 +- .../sysprobeconfigimpl/config_mock.go | 9 +-- comp/core/tagger/tagger.go | 13 +++-- comp/core/workloadmeta/component.go | 6 +- comp/core/workloadmeta/component_mock.go | 6 +- comp/core/workloadmeta/workloadmeta.go | 6 +- comp/dogstatsd/listeners/uds_common.go | 6 +- comp/dogstatsd/listeners/uds_datagram.go | 4 +- comp/dogstatsd/listeners/uds_datagram_test.go | 2 +- comp/dogstatsd/listeners/uds_linux.go | 8 +-- comp/dogstatsd/listeners/uds_linux_test.go | 2 +- comp/dogstatsd/listeners/uds_nolinux.go | 4 +- comp/dogstatsd/listeners/uds_stream.go | 4 +- comp/dogstatsd/listeners/uds_stream_test.go | 2 +- comp/dogstatsd/server/convert_bench_test.go | 7 ++- comp/dogstatsd/server/parse.go | 4 +- comp/dogstatsd/server/server.go | 8 +-- comp/dogstatsd/server/server_test.go | 4 +- comp/dogstatsd/server/server_worker.go | 4 +- comp/dogstatsd/server/serverless.go | 2 +- comp/forwarder/defaultforwarder/go.mod | 4 +- .../eventplatformimpl/epforwarder.go | 6 +- .../eventplatformimpl/epforwarder_mock.go | 7 ++- .../forwarder_no_orchestrator.go | 2 +- .../forwarder_orchestrator.go | 2 +- .../forwarder_orchestrator_mock.go | 2 +- .../orchestrator/orchestratorinterface/go.mod | 4 +- .../client/clientimpl/client.go | 2 +- .../client/clientimpl/client_test.go | 6 +- comp/logs/agent/agent.go | 10 ++-- comp/logs/agent/agent_core_init.go | 4 +- comp/logs/agent/agent_serverless_init.go | 4 +- comp/logs/agent/config/go.mod | 4 +- comp/logs/agent/mock.go | 9 +-- comp/metadata/bundle_test.go | 4 +- .../inventoryagentimpl/inventoryagent.go | 6 +- .../inventorychecksimpl/inventorychecks.go | 10 ++-- .../inventorychecks_test.go | 22 +++---- comp/metadata/runner/runnerimpl/runner.go | 11 ++-- comp/otelcol/collector/pipeline.go | 4 +- .../exporter/serializerexporter/go.mod | 4 +- comp/remote-config/rcclient/component.go | 4 +- .../rcclient/rcclientimpl/rcclient.go | 6 +- .../rcservice/rcserviceimpl/rcservice.go | 6 +- .../rcservicehaimpl/rcserviceha.go | 6 +- comp/updater/updater/updaterimpl/updater.go | 4 +- .../updater/updaterimpl/updater_test.go | 2 +- go.mod | 4 +- modules.yml | 2 +- pkg/aggregator/check_sampler_bench_test.go | 6 +- pkg/aggregator/demultiplexer_mock.go | 6 +- pkg/aggregator/mocksender/mocksender.go | 6 +- pkg/aggregator/sender_test.go | 6 +- pkg/api/go.mod | 4 +- pkg/cli/standalone/jmx.go | 12 ++-- pkg/cli/standalone/jmx_nojmx.go | 8 +-- pkg/cli/subcommands/check/command.go | 10 ++-- pkg/cli/subcommands/dcaflare/command.go | 12 ++-- pkg/collector/corechecks/cluster/helm/helm.go | 6 +- pkg/collector/corechecks/cluster/helm/stub.go | 6 +- .../cluster/ksm/kubernetes_state.go | 6 +- pkg/collector/corechecks/cluster/ksm/stub.go | 6 +- .../kubernetes_apiserver.go | 6 +- .../cluster/kubernetesapiserver/stub.go | 6 +- .../cluster/orchestrator/orchestrator.go | 6 +- .../corechecks/cluster/orchestrator/stub.go | 6 +- .../corechecks/containerimage/check.go | 6 +- .../corechecks/containerlifecycle/check.go | 6 +- .../corechecks/containers/containerd/check.go | 8 +-- .../corechecks/containers/containerd/stub.go | 6 +- .../corechecks/containers/cri/check.go | 8 +-- .../corechecks/containers/cri/stub.go | 6 +- .../corechecks/containers/docker/check.go | 11 ++-- .../corechecks/containers/docker/stub.go | 6 +- .../corechecks/containers/generic/check.go | 8 +-- .../corechecks/containers/kubelet/kubelet.go | 6 +- .../corechecks/containers/kubelet/stub.go | 6 +- pkg/collector/corechecks/ebpf/ebpf.go | 6 +- .../corechecks/ebpf/oomkill/oom_kill.go | 6 +- pkg/collector/corechecks/ebpf/oomkill/stub.go | 6 +- pkg/collector/corechecks/ebpf/stub.go | 6 +- .../corechecks/ebpf/tcpqueuelength/stub.go | 6 +- .../ebpf/tcpqueuelength/tcp_queue_length.go | 6 +- pkg/collector/corechecks/embed/apm/apm.go | 6 +- pkg/collector/corechecks/embed/apm/stub.go | 6 +- .../corechecks/embed/process/process_agent.go | 6 +- .../corechecks/embed/process/stub.go | 6 +- pkg/collector/corechecks/loader.go | 4 +- pkg/collector/corechecks/loader_test.go | 6 +- .../corechecks/net/network/network.go | 6 +- pkg/collector/corechecks/net/network/stub.go | 6 +- pkg/collector/corechecks/net/ntp/ntp.go | 6 +- .../corechecks/networkpath/networkpath.go | 6 +- .../corechecks/nvidia/jetson/jetson.go | 6 +- .../corechecks/nvidia/jetson/stub.go | 6 +- pkg/collector/corechecks/oracle/oracle.go | 6 +- pkg/collector/corechecks/oracle/stub.go | 6 +- .../corechecks/orchestrator/ecs/ecs.go | 6 +- .../corechecks/orchestrator/ecs/stub.go | 6 +- .../corechecks/orchestrator/pod/pod.go | 6 +- .../corechecks/orchestrator/pod/stub.go | 6 +- pkg/collector/corechecks/sbom/check.go | 6 +- .../corechecks/sbom/check_no_trivy.go | 6 +- .../corechecks/sbom/processor_test.go | 4 +- pkg/collector/corechecks/snmp/snmp.go | 6 +- .../corechecks/system/cpu/cpu/cpu.go | 6 +- .../corechecks/system/cpu/cpu/cpu_windows.go | 6 +- .../corechecks/system/cpu/load/load.go | 6 +- .../corechecks/system/cpu/load/stub.go | 6 +- .../corechecks/system/disk/disk/disk.go | 6 +- .../corechecks/system/disk/disk/stub.go | 6 +- .../corechecks/system/disk/io/iostats.go | 6 +- .../system/filehandles/file_handles.go | 6 +- .../system/filehandles/file_handles_bsd.go | 6 +- .../filehandles/file_handles_windows.go | 6 +- .../corechecks/system/memory/memory.go | 6 +- .../corechecks/system/uptime/uptime.go | 6 +- .../corechecks/system/wincrashdetect/stub.go | 6 +- .../system/wincrashdetect/wincrashdetect.go | 6 +- .../corechecks/system/winkmem/stub.go | 6 +- .../corechecks/system/winkmem/winkmem.go | 6 +- .../corechecks/system/winproc/stub.go | 6 +- .../system/winproc/winproc_windows.go | 6 +- pkg/collector/corechecks/systemd/stub.go | 6 +- pkg/collector/corechecks/systemd/systemd.go | 6 +- pkg/collector/corechecks/telemetry/check.go | 6 +- .../corechecks/windows_event_log/check.go | 6 +- .../corechecks/windows_event_log/config.go | 58 +++++++++---------- .../windows_event_log/config_helpers.go | 10 ++-- .../windows_event_log/config_test.go | 5 +- .../unsupported_platforms.go | 6 +- pkg/collector/scheduler.go | 6 +- pkg/config/aliases.go | 6 +- pkg/config/setup/config.go | 8 +-- pkg/config/setup/config_secret_test.go | 9 +-- pkg/config/setup/config_test.go | 8 +-- pkg/config/setup/go.mod | 4 +- pkg/config/utils/endpoints_test.go | 8 ++- pkg/config/utils/go.mod | 4 +- pkg/diagnose/check.go | 8 +-- pkg/diagnose/runner.go | 17 +++--- pkg/eventmonitor/eventmonitor.go | 4 +- pkg/flare/archive_docker.go | 7 ++- pkg/flare/archive_nodocker.go | 4 +- pkg/logs/auditor/go.mod | 4 +- pkg/logs/client/go.mod | 4 +- pkg/logs/diagnostic/go.mod | 4 +- pkg/logs/launchers/container/launcher.go | 6 +- .../launchers/container/launcher_nodocker.go | 4 +- pkg/logs/launchers/container/launcher_test.go | 10 ++-- .../container/tailerfactory/factory.go | 6 +- .../container/tailerfactory/file_test.go | 6 +- pkg/logs/message/go.mod | 4 +- pkg/logs/pipeline/go.mod | 4 +- pkg/logs/processor/go.mod | 4 +- pkg/logs/sender/go.mod | 4 +- pkg/logs/sources/go.mod | 4 +- pkg/logs/util/testutils/go.mod | 4 +- pkg/network/config/config_bpf_linux_test.go | 4 +- pkg/process/util/containers/containers.go | 4 +- pkg/sbom/collectors/collectors.go | 4 +- pkg/sbom/collectors/containerd/containerd.go | 6 +- pkg/sbom/collectors/docker/docker.go | 6 +- pkg/sbom/collectors/host/host.go | 4 +- pkg/sbom/scanner/scanner.go | 8 +-- pkg/security/probe/probe_ebpf.go | 4 +- pkg/security/probe/probe_linux.go | 4 +- pkg/security/probe/probe_windows.go | 9 +-- pkg/security/resolvers/resolvers_ebpf.go | 4 +- pkg/security/resolvers/sbom/resolver.go | 4 +- .../resolvers/sbom/resolver_unsupported.go | 4 +- pkg/security/tests/module_tester_linux.go | 2 +- pkg/security/tests/module_tester_windows.go | 2 +- pkg/serializer/go.mod | 4 +- .../metrics/containerd/collector.go | 4 +- pkg/util/containers/metrics/cri/collector.go | 4 +- .../containers/metrics/docker/collector.go | 8 +-- .../metrics/docker/collector_test.go | 4 +- .../metrics/ecsfargate/collector.go | 4 +- .../containers/metrics/kubelet/collector.go | 4 +- .../containers/metrics/provider/provider.go | 6 +- .../metrics/provider/provider_test.go | 5 +- .../containers/metrics/provider/registry.go | 10 ++-- .../metrics/provider/registry_test.go | 13 +++-- .../metrics/system/collector_linux.go | 4 +- pkg/util/flavor/go.mod | 4 +- pkg/util/{optional => option}/go.mod | 2 +- pkg/util/{optional => option}/go.sum | 0 .../optional.go => option/option.go} | 32 +++++----- .../option_test.go} | 20 +++---- pkg/util/trivy/cache.go | 6 +- pkg/util/trivy/cache_test.go | 6 +- pkg/util/trivy/trivy.go | 8 +-- rtloader/test/helpers/helpers.go | 1 + .../integration/dogstatsd/origin_detection.go | 2 +- .../listeners/docker/docker_listener_test.go | 2 +- test/integration/utils/compose.go | 2 +- test/new-e2e/go.mod | 4 +- .../secretsutils/helpers.go | 6 +- 268 files changed, 852 insertions(+), 823 deletions(-) rename pkg/util/{optional => option}/go.mod (77%) rename pkg/util/{optional => option}/go.sum (100%) rename pkg/util/{optional/optional.go => option/option.go} (67%) rename pkg/util/{optional/optional_test.go => option/option_test.go} (82%) diff --git a/cmd/agent/common/loader.go b/cmd/agent/common/loader.go index 492d486b4f567..2e338af82998d 100644 --- a/cmd/agent/common/loader.go +++ b/cmd/agent/common/loader.go @@ -16,7 +16,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/sbom/scanner" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // GetWorkloadmetaInit provides the InitHelper for workloadmeta so it can be injected as a Param @@ -25,7 +25,7 @@ func GetWorkloadmetaInit() workloadmeta.InitHelper { return workloadmeta.InitHelper(func(ctx context.Context, wm workloadmeta.Component) error { // SBOM scanner needs to be called here as initialization is required prior to the // catalog getting instantiated and initialized. - sbomScanner, err := scanner.CreateGlobalScanner(config.Datadog, optional.NewOption(wm)) + sbomScanner, err := scanner.CreateGlobalScanner(config.Datadog, option.New(wm)) if err != nil { return fmt.Errorf("failed to create SBOM scanner: %s", err) } else if sbomScanner != nil { diff --git a/cmd/agent/common/test_helpers.go b/cmd/agent/common/test_helpers.go index f9048ec9faae6..aa9598bf81b67 100644 --- a/cmd/agent/common/test_helpers.go +++ b/cmd/agent/common/test_helpers.go @@ -17,7 +17,7 @@ import ( "github.com/DataDog/datadog-agent/cmd/agent/common/path" "github.com/DataDog/datadog-agent/comp/core/secrets" "github.com/DataDog/datadog-agent/pkg/config" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // SetupConfigForTest fires up the configuration system and returns warnings if any. diff --git a/cmd/agent/subcommands/diagnose/command.go b/cmd/agent/subcommands/diagnose/command.go index 53bb630ee7cba..363933ebb406b 100644 --- a/cmd/agent/subcommands/diagnose/command.go +++ b/cmd/agent/subcommands/diagnose/command.go @@ -33,7 +33,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/diagnose/diagnosis" "github.com/DataDog/datadog-agent/pkg/util/fxutil" utillog "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/cihub/seelog" "github.com/fatih/color" @@ -234,9 +234,9 @@ This command print the package-signing metadata payload. This payload is used by func cmdDiagnose(cliParams *cliParams, senderManager diagnosesendermanager.Component, - wmeta optional.Option[workloadmeta.Component], + wmeta option.Option[workloadmeta.Component], ac autodiscovery.Component, - collector optional.Option[collector.Component], + collector option.Option[collector.Component], secretResolver secrets.Component) error { diagCfg := diagnosis.Config{ Verbose: cliParams.verbose, @@ -245,7 +245,7 @@ func cmdDiagnose(cliParams *cliParams, Exclude: cliParams.exclude, } - diagnoseDeps := diagnose.NewSuitesDeps(senderManager, collector, secretResolver, wmeta, optional.NewOption(ac)) + diagnoseDeps := diagnose.NewSuitesDeps(senderManager, collector, secretResolver, wmeta, option.New(ac)) // Is it List command if cliParams.listSuites { diagnose.ListStdOut(color.Output, diagCfg, diagnoseDeps) diff --git a/cmd/agent/subcommands/flare/command.go b/cmd/agent/subcommands/flare/command.go index 3c47aa3b35a60..973fe23408308 100644 --- a/cmd/agent/subcommands/flare/command.go +++ b/cmd/agent/subcommands/flare/command.go @@ -47,7 +47,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/serializer" "github.com/DataDog/datadog-agent/pkg/util/fxutil" "github.com/DataDog/datadog-agent/pkg/util/input" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // cliParams are the command-line arguments for this subcommand @@ -239,8 +239,8 @@ func makeFlare(flareComp flare.Component, config config.Component, _ sysprobeconfig.Component, cliParams *cliParams, - _ optional.Option[workloadmeta.Component], - _ optional.Option[tagger.Component]) error { + _ option.Option[workloadmeta.Component], + _ option.Option[tagger.Component]) error { var ( profile flare.ProfileData err error diff --git a/cmd/agent/subcommands/jmx/command.go b/cmd/agent/subcommands/jmx/command.go index 2ebfe1e304f20..c3cf7cb86ac24 100644 --- a/cmd/agent/subcommands/jmx/command.go +++ b/cmd/agent/subcommands/jmx/command.go @@ -58,7 +58,7 @@ import ( pkgconfig "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/config/model" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type cliParams struct { @@ -147,11 +147,11 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command { fx.Provide(func() demultiplexer.Component { return nil }), fx.Provide(func() inventorychecks.Component { return nil }), fx.Provide(func() packagesigning.Component { return nil }), - fx.Provide(func() optional.Option[rcservice.Component] { return optional.NewNoneOption[rcservice.Component]() }), - fx.Provide(func() optional.Option[rcserviceha.Component] { return optional.NewNoneOption[rcserviceha.Component]() }), + fx.Provide(func() option.Option[rcservice.Component] { return optional.NewNoneOption[rcservice.Component]() }), + fx.Provide(func() option.Option[rcserviceha.Component] { return optional.NewNoneOption[rcserviceha.Component]() }), fx.Provide(func() status.Component { return nil }), fx.Provide(func() eventplatformreceiver.Component { return nil }), - fx.Provide(func() optional.Option[collector.Component] { return optional.NewNoneOption[collector.Component]() }), + fx.Provide(func() option.Option[collector.Component] { return optional.NewNoneOption[collector.Component]() }), fx.Provide(tagger.NewTaggerParamsForCoreAgent), tagger.Module(), autodiscoveryimpl.Module(), @@ -291,7 +291,7 @@ func runJmxCommandConsole(config config.Component, diagnoseSendermanager diagnosesendermanager.Component, secretResolver secrets.Component, agentAPI internalAPI.Component, - collector optional.Option[collector.Component]) error { + collector option.Option[collector.Component]) error { // This prevents log-spam from "comp/core/workloadmeta/collectors/internal/remote/process_collector/process_collector.go" // It appears that this collector creates some contention in AD. // Disabling it is both more efficient and gets rid of this log spam diff --git a/cmd/agent/subcommands/run/command.go b/cmd/agent/subcommands/run/command.go index 5150b31d3dfb7..87d872ec512ca 100644 --- a/cmd/agent/subcommands/run/command.go +++ b/cmd/agent/subcommands/run/command.go @@ -127,7 +127,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/installinfo" "github.com/DataDog/datadog-agent/pkg/util/kubernetes/apiserver/leaderelection" pkglog "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/version" // runtime init routines @@ -203,7 +203,7 @@ func run(log log.Component, demultiplexer demultiplexer.Component, sharedSerializer serializer.MetricSerializer, cliParams *cliParams, - logsAgent optional.Option[logsAgent.Component], + logsAgent option.Option[logsAgent.Component], processAgent processAgent.Component, otelcollector otelcollector.Component, _ host.Component, @@ -347,8 +347,8 @@ func getSharedFxOption() fx.Option { fx.Provide(tagger.NewTaggerParamsForCoreAgent), tagger.Module(), autodiscoveryimpl.Module(), - fx.Provide(func(ac autodiscovery.Component) optional.Option[autodiscovery.Component] { - return optional.NewOption[autodiscovery.Component](ac) + fx.Provide(func(ac autodiscovery.Component) option.Option[autodiscovery.Component] { + return option.New[autodiscovery.Component](ac) }), // TODO: (components) - some parts of the agent (such as the logs agent) implicitly depend on the global state @@ -409,7 +409,7 @@ func startAgent( taggerComp tagger.Component, ac autodiscovery.Component, rcclient rcclient.Component, - logsAgent optional.Option[logsAgent.Component], + logsAgent option.Option[logsAgent.Component], _ processAgent.Component, _ defaultforwarder.Component, _ serializer.MetricSerializer, @@ -559,7 +559,7 @@ func startAgent( ac, logsAgent, demultiplexer, - optional.NewOption(collector), + option.New(collector), ); err != nil { return log.Errorf("Error while starting api server, exiting: %v", err) } @@ -604,7 +604,7 @@ func startAgent( // Set up check collector commonchecks.RegisterChecks(wmeta) - ac.AddScheduler("check", pkgcollector.InitCheckScheduler(optional.NewOption(collector), demultiplexer), true) + ac.AddScheduler("check", pkgcollector.InitCheckScheduler(option.New(collector), demultiplexer), true) demultiplexer.AddAgentStartupTelemetry(version.AgentVersion) diff --git a/cmd/agent/subcommands/run/command_windows.go b/cmd/agent/subcommands/run/command_windows.go index a1a4f0debe2f1..cf4df76d4cdb9 100644 --- a/cmd/agent/subcommands/run/command_windows.go +++ b/cmd/agent/subcommands/run/command_windows.go @@ -66,7 +66,7 @@ import ( "github.com/DataDog/datadog-agent/comp/remote-config/rcclient" "github.com/DataDog/datadog-agent/pkg/serializer" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" // runtime init routines ) @@ -97,7 +97,7 @@ func StartAgentWithDefaults(ctxChan <-chan context.Context) (<-chan error, error ac autodiscovery.Component, rcclient rcclient.Component, forwarder defaultforwarder.Component, - logsAgent optional.Option[logsAgent.Component], + logsAgent option.Option[logsAgent.Component], processAgent processAgent.Component, metadataRunner runner.Component, sharedSerializer serializer.MetricSerializer, diff --git a/cmd/cluster-agent-cloudfoundry/subcommands/run/command.go b/cmd/cluster-agent-cloudfoundry/subcommands/run/command.go index b6039175a03c3..4e9a91e483413 100644 --- a/cmd/cluster-agent-cloudfoundry/subcommands/run/command.go +++ b/cmd/cluster-agent-cloudfoundry/subcommands/run/command.go @@ -55,7 +55,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" "github.com/DataDog/datadog-agent/pkg/util/hostname" pkglog "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/version" "go.uber.org/fx" @@ -159,12 +159,12 @@ func run(log log.Component, common.LoadComponents(secretResolver, wmeta, ac, pkgconfig.Datadog.GetString("confd_path")) // Set up check collector - ac.AddScheduler("check", pkgcollector.InitCheckScheduler(optional.NewOption(collector), demultiplexer), true) + ac.AddScheduler("check", pkgcollector.InitCheckScheduler(option.New(collector), demultiplexer), true) // start the autoconfig, this will immediately run any configured check ac.LoadAndRun(mainCtx) - if err = api.StartServer(wmeta, taggerComp, ac, demultiplexer, optional.NewOption(collector), statusComponent, secretResolver); err != nil { + if err = api.StartServer(wmeta, taggerComp, ac, demultiplexer, option.New(collector), statusComponent, secretResolver); err != nil { return log.Errorf("Error while starting agent API, exiting: %v", err) } diff --git a/cmd/cluster-agent/api/agent/agent.go b/cmd/cluster-agent/api/agent/agent.go index 553885e713fde..ce5d7de141bf8 100644 --- a/cmd/cluster-agent/api/agent/agent.go +++ b/cmd/cluster-agent/api/agent/agent.go @@ -35,12 +35,12 @@ import ( "github.com/DataDog/datadog-agent/pkg/status/health" "github.com/DataDog/datadog-agent/pkg/util/hostname" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/version" ) // SetupHandlers adds the specific handlers for cluster agent endpoints -func SetupHandlers(r *mux.Router, wmeta workloadmeta.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, collector optional.Option[collector.Component], statusComponent status.Component, secretResolver secrets.Component) { +func SetupHandlers(r *mux.Router, wmeta workloadmeta.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, collector option.Option[collector.Component], statusComponent status.Component, secretResolver secrets.Component) { r.HandleFunc("/version", getVersion).Methods("GET") r.HandleFunc("/hostname", getHostname).Methods("GET") r.HandleFunc("/flare", func(w http.ResponseWriter, r *http.Request) { @@ -133,7 +133,7 @@ func getHostname(w http.ResponseWriter, r *http.Request) { w.Write(j) } -func makeFlare(w http.ResponseWriter, r *http.Request, senderManager sender.DiagnoseSenderManager, collector optional.Option[collector.Component], secretResolver secrets.Component, wmeta workloadmeta.Component, statusComponent status.Component, ac autodiscovery.Component) { +func makeFlare(w http.ResponseWriter, r *http.Request, senderManager sender.DiagnoseSenderManager, collector option.Option[collector.Component], secretResolver secrets.Component, wmeta workloadmeta.Component, statusComponent status.Component, ac autodiscovery.Component) { log.Infof("Making a flare") w.Header().Set("Content-Type", "application/json") @@ -156,7 +156,7 @@ func makeFlare(w http.ResponseWriter, r *http.Request, senderManager sender.Diag if logFile == "" { logFile = path.DefaultDCALogFile } - diagnoseDeps := diagnose.NewSuitesDeps(senderManager, collector, secretResolver, optional.NewOption(wmeta), optional.NewOption[autodiscovery.Component](ac)) + diagnoseDeps := diagnose.NewSuitesDeps(senderManager, collector, secretResolver, option.New(wmeta), option.New[autodiscovery.Component](ac)) filePath, err := flare.CreateDCAArchive(false, path.GetDistPath(), logFile, profile, diagnoseDeps, statusComponent) if err != nil || filePath == "" { if err != nil { diff --git a/cmd/cluster-agent/api/server.go b/cmd/cluster-agent/api/server.go index d5beb4528134f..bddde7e34443c 100644 --- a/cmd/cluster-agent/api/server.go +++ b/cmd/cluster-agent/api/server.go @@ -44,7 +44,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/config" pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/core" grpcutil "github.com/DataDog/datadog-agent/pkg/util/grpc" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) var ( @@ -54,7 +54,7 @@ var ( ) // StartServer creates the router and starts the HTTP server -func StartServer(w workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, collector optional.Option[collector.Component], statusComponent status.Component, secretResolver secrets.Component) error { +func StartServer(w workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, collector option.Option[collector.Component], statusComponent status.Component, secretResolver secrets.Component) error { // create the root HTTP router router = mux.NewRouter() apiRouter = router.PathPrefix("/api/v1").Subrouter() diff --git a/cmd/cluster-agent/subcommands/diagnose/command.go b/cmd/cluster-agent/subcommands/diagnose/command.go index 5863468bea65e..487052b27604d 100644 --- a/cmd/cluster-agent/subcommands/diagnose/command.go +++ b/cmd/cluster-agent/subcommands/diagnose/command.go @@ -26,7 +26,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/diagnose" "github.com/DataDog/datadog-agent/pkg/diagnose/diagnosis" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Commands returns a slice of subcommands for the 'cluster-agent' command. diff --git a/cmd/cluster-agent/subcommands/start/command.go b/cmd/cluster-agent/subcommands/start/command.go index 8132cbee8a3f3..09e142fd71106 100644 --- a/cmd/cluster-agent/subcommands/start/command.go +++ b/cmd/cluster-agent/subcommands/start/command.go @@ -19,7 +19,7 @@ import ( "time" "github.com/DataDog/datadog-agent/pkg/remoteconfig/state" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/cmd/agent/common" "github.com/DataDog/datadog-agent/cmd/agent/common/path" @@ -184,7 +184,7 @@ func start(log log.Component, secretResolver secrets.Component, statusComponent status.Component, collector collector.Component, - rcService optional.Option[rccomp.Component]) error { + rcService option.Option[rccomp.Component]) error { stopCh := make(chan struct{}) mainCtx, mainCtxCancel := context.WithCancel(context.Background()) @@ -263,7 +263,7 @@ func start(log log.Component, } // Starting server early to ease investigations - if err := api.StartServer(wmeta, taggerComp, ac, demultiplexer, optional.NewOption(collector), statusComponent, secretResolver); err != nil { + if err := api.StartServer(wmeta, taggerComp, ac, demultiplexer, option.New(collector), statusComponent, secretResolver); err != nil { return fmt.Errorf("Error while starting agent API, exiting: %v", err) } @@ -344,7 +344,7 @@ func start(log log.Component, // Set up check collector registerChecks() - ac.AddScheduler("check", pkgcollector.InitCheckScheduler(optional.NewOption(collector), demultiplexer), true) + ac.AddScheduler("check", pkgcollector.InitCheckScheduler(option.New(collector), demultiplexer), true) // start the autoconfig, this will immediately run any configured check ac.LoadAndRun(mainCtx) diff --git a/cmd/dogstatsd/subcommands/start/command.go b/cmd/dogstatsd/subcommands/start/command.go index e389e2ccf5812..8735522f22925 100644 --- a/cmd/dogstatsd/subcommands/start/command.go +++ b/cmd/dogstatsd/subcommands/start/command.go @@ -57,7 +57,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util" "github.com/DataDog/datadog-agent/pkg/util/fxutil" pkglog "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/version" ) @@ -177,8 +177,8 @@ func start( params *Params, server dogstatsdServer.Component, _ defaultforwarder.Component, - wmeta optional.Option[workloadmeta.Component], - _ optional.Option[tagger.Component], + wmeta option.Option[workloadmeta.Component], + _ option.Option[tagger.Component], demultiplexer demultiplexer.Component, _ runner.Component, _ resources.Component, diff --git a/cmd/otel-agent/main.go b/cmd/otel-agent/main.go index 6d04ffac46423..d8cb3774b77fc 100644 --- a/cmd/otel-agent/main.go +++ b/cmd/otel-agent/main.go @@ -36,7 +36,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/serializer" "github.com/DataDog/datadog-agent/pkg/telemetry" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "go.uber.org/fx" ) @@ -50,7 +50,7 @@ var cfgPath = flag.String("config", "/opt/datadog-agent/etc/datadog.yaml", "agen func run( c collector.Component, demux *aggregator.AgentDemultiplexer, - logsAgent optional.Option[logsAgent.Component], //nolint:revive // TODO fix unused-parameter + logsAgent option.Option[logsAgent.Component], //nolint:revive // TODO fix unused-parameter ) error { // Setup stats telemetry handler if sender, err := demux.GetDefaultSender(); err == nil { diff --git a/cmd/process-agent/command/main_common.go b/cmd/process-agent/command/main_common.go index e778371e421bf..03a815d7699f3 100644 --- a/cmd/process-agent/command/main_common.go +++ b/cmd/process-agent/command/main_common.go @@ -51,7 +51,7 @@ import ( ddutil "github.com/DataDog/datadog-agent/pkg/util" "github.com/DataDog/datadog-agent/pkg/util/fxutil" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/version" ) @@ -192,7 +192,7 @@ func runApp(ctx context.Context, globalParams *GlobalParams) error { _ profiler.Component, _ expvars.Component, _ apiserver.Component, - _ optional.Option[configsync.Component], + _ option.Option[configsync.Component], // TODO: This is needed by the container-provider which is not currently a component. // We should ensure the tagger is a dependency when converting to a component. _ tagger.Component, diff --git a/cmd/security-agent/main_windows.go b/cmd/security-agent/main_windows.go index 74ad49a94e9f9..f16e038a2a203 100644 --- a/cmd/security-agent/main_windows.go +++ b/cmd/security-agent/main_windows.go @@ -54,7 +54,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/security/utils" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/startstop" "github.com/DataDog/datadog-agent/pkg/util/winutil/servicemain" ) @@ -182,7 +182,7 @@ func (s *service) Run(svcctx context.Context) error { fetchonlyimpl.Module(), configsyncimpl.OptionalModule(), // Force the instantiation of the component - fx.Invoke(func(_ optional.Option[configsync.Component]) {}), + fx.Invoke(func(_ option.Option[configsync.Component]) {}), ) return err diff --git a/cmd/security-agent/subcommands/start/command.go b/cmd/security-agent/subcommands/start/command.go index d36d9977ba908..86d887b711de0 100644 --- a/cmd/security-agent/subcommands/start/command.go +++ b/cmd/security-agent/subcommands/start/command.go @@ -67,7 +67,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/status/health" "github.com/DataDog/datadog-agent/pkg/util" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/profiling" "github.com/DataDog/datadog-agent/pkg/util/startstop" "github.com/DataDog/datadog-agent/pkg/version" @@ -193,7 +193,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command { fetchonlyimpl.Module(), configsyncimpl.OptionalModule(), // Force the instantiation of the component - fx.Invoke(func(_ optional.Option[configsync.Component]) {}), + fx.Invoke(func(_ option.Option[configsync.Component]) {}), ) }, } diff --git a/cmd/system-probe/api/module/factory_linux.go b/cmd/system-probe/api/module/factory_linux.go index 9579d8acb3ec2..46b00e4aae464 100644 --- a/cmd/system-probe/api/module/factory_linux.go +++ b/cmd/system-probe/api/module/factory_linux.go @@ -10,13 +10,13 @@ package module import ( sysconfigtypes "github.com/DataDog/datadog-agent/cmd/system-probe/config/types" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Factory encapsulates the initialization of a Module type Factory struct { Name sysconfigtypes.ModuleName ConfigNamespaces []string - Fn func(cfg *sysconfigtypes.Config, wmeta optional.Option[workloadmeta.Component]) (Module, error) + Fn func(cfg *sysconfigtypes.Config, wmeta option.Option[workloadmeta.Component]) (Module, error) NeedsEBPF func() bool } diff --git a/cmd/system-probe/api/module/factory_others.go b/cmd/system-probe/api/module/factory_others.go index 9773ea4bfa86d..053497ef74762 100644 --- a/cmd/system-probe/api/module/factory_others.go +++ b/cmd/system-probe/api/module/factory_others.go @@ -10,12 +10,12 @@ package module import ( sysconfigtypes "github.com/DataDog/datadog-agent/cmd/system-probe/config/types" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Factory encapsulates the initialization of a Module type Factory struct { Name sysconfigtypes.ModuleName ConfigNamespaces []string - Fn func(cfg *sysconfigtypes.Config, wmeta optional.Option[workloadmeta.Component]) (Module, error) + Fn func(cfg *sysconfigtypes.Config, wmeta option.Option[workloadmeta.Component]) (Module, error) } diff --git a/cmd/system-probe/api/module/loader.go b/cmd/system-probe/api/module/loader.go index ce5a6c9fd6a5d..1126c91ae29e6 100644 --- a/cmd/system-probe/api/module/loader.go +++ b/cmd/system-probe/api/module/loader.go @@ -13,11 +13,12 @@ import ( "sync" "time" + "github.com/gorilla/mux" + sysconfigtypes "github.com/DataDog/datadog-agent/cmd/system-probe/config/types" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "github.com/gorilla/mux" + "github.com/DataDog/datadog-agent/pkg/util/option" ) var l *loader @@ -62,7 +63,7 @@ func withModule(name sysconfigtypes.ModuleName, fn func()) { // * Initialization using the provided Factory; // * Registering the HTTP endpoints of each module; // * Register the gRPC server; -func Register(cfg *sysconfigtypes.Config, httpMux *mux.Router, factories []Factory, wmeta optional.Option[workloadmeta.Component]) error { +func Register(cfg *sysconfigtypes.Config, httpMux *mux.Router, factories []Factory, wmeta option.Option[workloadmeta.Component]) error { var enabledModulesFactories []Factory for _, factory := range factories { if !cfg.ModuleIsEnabled(factory.Name) { @@ -138,7 +139,7 @@ func GetStats() map[string]interface{} { } // RestartModule triggers a module restart -func RestartModule(factory Factory, wmeta optional.Option[workloadmeta.Component]) error { +func RestartModule(factory Factory, wmeta option.Option[workloadmeta.Component]) error { l.Lock() defer l.Unlock() diff --git a/cmd/system-probe/api/restart.go b/cmd/system-probe/api/restart.go index b0ffaddd493df..807c3d551aec6 100644 --- a/cmd/system-probe/api/restart.go +++ b/cmd/system-probe/api/restart.go @@ -15,10 +15,10 @@ import ( sysconfigtypes "github.com/DataDog/datadog-agent/cmd/system-probe/config/types" "github.com/DataDog/datadog-agent/cmd/system-probe/modules" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) -func restartModuleHandler(w http.ResponseWriter, r *http.Request, wmeta optional.Option[workloadmeta.Component]) { +func restartModuleHandler(w http.ResponseWriter, r *http.Request, wmeta option.Option[workloadmeta.Component]) { vars := mux.Vars(r) moduleName := sysconfigtypes.ModuleName(vars["module-name"]) diff --git a/cmd/system-probe/api/server.go b/cmd/system-probe/api/server.go index 24c4549d2833f..afe1675931554 100644 --- a/cmd/system-probe/api/server.go +++ b/cmd/system-probe/api/server.go @@ -22,11 +22,11 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/process/net" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // StartServer starts the HTTP and gRPC servers for the system-probe, which registers endpoints from all enabled modules. -func StartServer(cfg *sysconfigtypes.Config, telemetry telemetry.Component, wmeta optional.Option[workloadmeta.Component]) error { +func StartServer(cfg *sysconfigtypes.Config, telemetry telemetry.Component, wmeta option.Option[workloadmeta.Component]) error { conn, err := net.NewListener(cfg.SocketAddress) if err != nil { return fmt.Errorf("error creating IPC socket: %s", err) diff --git a/cmd/system-probe/config/config.go b/cmd/system-probe/config/config.go index f9f915cdfb3ad..49f101d70d7eb 100644 --- a/cmd/system-probe/config/config.go +++ b/cmd/system-probe/config/config.go @@ -19,7 +19,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/secrets" aconfig "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/config/model" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( diff --git a/cmd/system-probe/modules/compliance.go b/cmd/system-probe/modules/compliance.go index 3668907198099..0db4f9c2690a6 100644 --- a/cmd/system-probe/modules/compliance.go +++ b/cmd/system-probe/modules/compliance.go @@ -22,7 +22,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/compliance/dbconfig" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "go.uber.org/atomic" ) @@ -36,7 +36,7 @@ import ( var ComplianceModule = module.Factory{ Name: config.ComplianceModule, ConfigNamespaces: []string{}, - Fn: func(cfg *sysconfigtypes.Config, _ optional.Option[workloadmeta.Component]) (module.Module, error) { + Fn: func(cfg *sysconfigtypes.Config, _ option.Option[workloadmeta.Component]) (module.Module, error) { return &complianceModule{}, nil }, NeedsEBPF: func() bool { diff --git a/cmd/system-probe/modules/crashdetect_windows.go b/cmd/system-probe/modules/crashdetect_windows.go index 4ef3becdbc6e2..d4be7604bb439 100644 --- a/cmd/system-probe/modules/crashdetect_windows.go +++ b/cmd/system-probe/modules/crashdetect_windows.go @@ -18,14 +18,14 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/collector/corechecks/system/wincrashdetect/probe" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // WinCrashProbe Factory var WinCrashProbe = module.Factory{ Name: config.WindowsCrashDetectModule, ConfigNamespaces: []string{"windows_crash_detection"}, - Fn: func(cfg *sysconfigtypes.Config, _ optional.Option[workloadmeta.Component]) (module.Module, error) { + Fn: func(cfg *sysconfigtypes.Config, _ option.Option[workloadmeta.Component]) (module.Module, error) { log.Infof("Starting the WinCrashProbe probe") cp, err := probe.NewWinCrashProbe(cfg) if err != nil { diff --git a/cmd/system-probe/modules/dynamic_instrumentation.go b/cmd/system-probe/modules/dynamic_instrumentation.go index f19db728a8457..502b327ff19ee 100644 --- a/cmd/system-probe/modules/dynamic_instrumentation.go +++ b/cmd/system-probe/modules/dynamic_instrumentation.go @@ -16,14 +16,14 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" dynamicinstrumentation "github.com/DataDog/datadog-agent/pkg/dynamicinstrumentation" "github.com/DataDog/datadog-agent/pkg/ebpf" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // DynamicInstrumentation is the dynamic instrumentation module factory var DynamicInstrumentation = module.Factory{ Name: config.DynamicInstrumentationModule, ConfigNamespaces: []string{}, - Fn: func(agentConfiguration *sysconfigtypes.Config, _ optional.Option[workloadmeta.Component]) (module.Module, error) { + Fn: func(agentConfiguration *sysconfigtypes.Config, _ option.Option[workloadmeta.Component]) (module.Module, error) { config, err := dynamicinstrumentation.NewConfig(agentConfiguration) if err != nil { return nil, fmt.Errorf("invalid dynamic instrumentation module configuration: %w", err) diff --git a/cmd/system-probe/modules/ebpf.go b/cmd/system-probe/modules/ebpf.go index 628ff1dc4dda1..81410e8414590 100644 --- a/cmd/system-probe/modules/ebpf.go +++ b/cmd/system-probe/modules/ebpf.go @@ -22,14 +22,14 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/corechecks/ebpf/probe/ebpfcheck" "github.com/DataDog/datadog-agent/pkg/ebpf" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // EBPFProbe Factory var EBPFProbe = module.Factory{ Name: config.EBPFModule, ConfigNamespaces: []string{}, - Fn: func(cfg *sysconfigtypes.Config, _ optional.Option[workloadmeta.Component]) (module.Module, error) { + Fn: func(cfg *sysconfigtypes.Config, _ option.Option[workloadmeta.Component]) (module.Module, error) { log.Infof("Starting the ebpf probe") okp, err := ebpfcheck.NewProbe(ebpf.NewConfig()) if err != nil { diff --git a/cmd/system-probe/modules/eventmonitor.go b/cmd/system-probe/modules/eventmonitor.go index 2028eec66eb75..74771cbe3786a 100644 --- a/cmd/system-probe/modules/eventmonitor.go +++ b/cmd/system-probe/modules/eventmonitor.go @@ -18,12 +18,12 @@ import ( secconfig "github.com/DataDog/datadog-agent/pkg/security/config" secmodule "github.com/DataDog/datadog-agent/pkg/security/module" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) var eventMonitorModuleConfigNamespaces = []string{"event_monitoring_config", "runtime_security_config"} -func createEventMonitorModule(_ *sysconfigtypes.Config, wmeta optional.Option[workloadmeta.Component]) (module.Module, error) { +func createEventMonitorModule(_ *sysconfigtypes.Config, wmeta option.Option[workloadmeta.Component]) (module.Module, error) { emconfig := emconfig.NewConfig() secconfig, err := secconfig.NewConfig() diff --git a/cmd/system-probe/modules/language_detection.go b/cmd/system-probe/modules/language_detection.go index 09f2a6f31af1f..d093f39f0929b 100644 --- a/cmd/system-probe/modules/language_detection.go +++ b/cmd/system-probe/modules/language_detection.go @@ -22,14 +22,14 @@ import ( "github.com/DataDog/datadog-agent/pkg/languagedetection/privileged" languageDetectionProto "github.com/DataDog/datadog-agent/pkg/proto/pbgo/languagedetection" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // LanguageDetectionModule is the language detection module factory var LanguageDetectionModule = module.Factory{ Name: config.LanguageDetectionModule, ConfigNamespaces: []string{"language_detection"}, - Fn: func(cfg *sysconfigtypes.Config, _ optional.Option[workloadmeta.Component]) (module.Module, error) { + Fn: func(cfg *sysconfigtypes.Config, _ option.Option[workloadmeta.Component]) (module.Module, error) { return &languageDetectionModule{ languageDetector: privileged.NewLanguageDetector(), }, nil diff --git a/cmd/system-probe/modules/network_tracer.go b/cmd/system-probe/modules/network_tracer.go index 192f70226107b..89ee19e85b14f 100644 --- a/cmd/system-probe/modules/network_tracer.go +++ b/cmd/system-probe/modules/network_tracer.go @@ -35,7 +35,7 @@ import ( usm "github.com/DataDog/datadog-agent/pkg/network/usm/utils" "github.com/DataDog/datadog-agent/pkg/process/statsd" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // ErrSysprobeUnsupported is the unsupported error prefix, for error-class matching from callers @@ -46,7 +46,7 @@ const inactivityRestartDuration = 20 * time.Minute var networkTracerModuleConfigNamespaces = []string{"network_config", "service_monitoring_config"} -func createNetworkTracerModule(cfg *sysconfigtypes.Config, _ optional.Option[workloadmeta.Component]) (module.Module, error) { +func createNetworkTracerModule(cfg *sysconfigtypes.Config, _ option.Option[workloadmeta.Component]) (module.Module, error) { ncfg := networkconfig.New() // Checking whether the current OS + kernel version is supported by the tracer diff --git a/cmd/system-probe/modules/oom_kill_probe.go b/cmd/system-probe/modules/oom_kill_probe.go index 0e4df82108958..7dde04069a635 100644 --- a/cmd/system-probe/modules/oom_kill_probe.go +++ b/cmd/system-probe/modules/oom_kill_probe.go @@ -22,14 +22,14 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/corechecks/ebpf/probe/oomkill" "github.com/DataDog/datadog-agent/pkg/ebpf" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // OOMKillProbe Factory var OOMKillProbe = module.Factory{ Name: config.OOMKillProbeModule, ConfigNamespaces: []string{}, - Fn: func(cfg *sysconfigtypes.Config, _ optional.Option[workloadmeta.Component]) (module.Module, error) { + Fn: func(cfg *sysconfigtypes.Config, _ option.Option[workloadmeta.Component]) (module.Module, error) { log.Infof("Starting the OOM Kill probe") okp, err := oomkill.NewProbe(ebpf.NewConfig()) if err != nil { diff --git a/cmd/system-probe/modules/ping.go b/cmd/system-probe/modules/ping.go index 37e571e32b288..e89331018d9d8 100644 --- a/cmd/system-probe/modules/ping.go +++ b/cmd/system-probe/modules/ping.go @@ -13,15 +13,16 @@ import ( "strconv" "time" + "github.com/gorilla/mux" + "go.uber.org/atomic" + "github.com/DataDog/datadog-agent/cmd/system-probe/api/module" "github.com/DataDog/datadog-agent/cmd/system-probe/config" sysconfigtypes "github.com/DataDog/datadog-agent/cmd/system-probe/config/types" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" pingcheck "github.com/DataDog/datadog-agent/pkg/networkdevice/pinger" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "github.com/gorilla/mux" - "go.uber.org/atomic" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -36,7 +37,7 @@ type pinger struct{} var Pinger = module.Factory{ Name: config.PingModule, ConfigNamespaces: []string{"ping"}, - Fn: func(cfg *sysconfigtypes.Config, _ optional.Option[workloadmeta.Component]) (module.Module, error) { + Fn: func(cfg *sysconfigtypes.Config, _ option.Option[workloadmeta.Component]) (module.Module, error) { return &pinger{}, nil }, NeedsEBPF: func() bool { diff --git a/cmd/system-probe/modules/process.go b/cmd/system-probe/modules/process.go index b74e437f7f912..e926f187d9c9b 100644 --- a/cmd/system-probe/modules/process.go +++ b/cmd/system-probe/modules/process.go @@ -28,7 +28,7 @@ import ( reqEncoding "github.com/DataDog/datadog-agent/pkg/process/encoding/request" "github.com/DataDog/datadog-agent/pkg/process/procutil" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // ErrProcessUnsupported is an error type indicating that the process module is not support in the running environment @@ -38,7 +38,7 @@ var ErrProcessUnsupported = errors.New("process module unsupported") var Process = module.Factory{ Name: config.ProcessModule, ConfigNamespaces: []string{}, - Fn: func(cfg *sysconfigtypes.Config, _ optional.Option[workloadmeta.Component]) (module.Module, error) { + Fn: func(cfg *sysconfigtypes.Config, _ option.Option[workloadmeta.Component]) (module.Module, error) { log.Infof("Creating process module for: %s", filepath.Base(os.Args[0])) // we disable returning zero values for stats to reduce parsing work on process-agent side diff --git a/cmd/system-probe/modules/tcp_queue_tracer.go b/cmd/system-probe/modules/tcp_queue_tracer.go index 44b486214e945..30d9af38a6d1a 100644 --- a/cmd/system-probe/modules/tcp_queue_tracer.go +++ b/cmd/system-probe/modules/tcp_queue_tracer.go @@ -21,14 +21,14 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/collector/corechecks/ebpf/probe/tcpqueuelength" "github.com/DataDog/datadog-agent/pkg/ebpf" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // TCPQueueLength Factory var TCPQueueLength = module.Factory{ Name: config.TCPQueueLengthTracerModule, ConfigNamespaces: []string{}, - Fn: func(cfg *sysconfigtypes.Config, _ optional.Option[workloadmeta.Component]) (module.Module, error) { + Fn: func(cfg *sysconfigtypes.Config, _ option.Option[workloadmeta.Component]) (module.Module, error) { t, err := tcpqueuelength.NewTracer(ebpf.NewConfig()) if err != nil { return nil, fmt.Errorf("unable to start the TCP queue length tracer: %w", err) diff --git a/cmd/system-probe/modules/traceroute.go b/cmd/system-probe/modules/traceroute.go index b21dc379f0f56..1bc4a4e71ea45 100644 --- a/cmd/system-probe/modules/traceroute.go +++ b/cmd/system-probe/modules/traceroute.go @@ -14,15 +14,16 @@ import ( "strconv" "time" + "github.com/gorilla/mux" + "go.uber.org/atomic" + "google.golang.org/grpc" + "github.com/DataDog/datadog-agent/cmd/system-probe/api/module" sysconfigtypes "github.com/DataDog/datadog-agent/cmd/system-probe/config/types" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" tracerouteutil "github.com/DataDog/datadog-agent/pkg/networkpath/traceroute" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "github.com/gorilla/mux" - "go.uber.org/atomic" - "google.golang.org/grpc" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type traceroute struct{} @@ -33,7 +34,7 @@ var ( tracerouteConfigNamespaces = []string{"traceroute"} ) -func createTracerouteModule(_ *sysconfigtypes.Config, _ optional.Option[workloadmeta.Component]) (module.Module, error) { +func createTracerouteModule(_ *sysconfigtypes.Config, _ option.Option[workloadmeta.Component]) (module.Module, error) { return &traceroute{}, nil } diff --git a/cmd/system-probe/subcommands/run/command.go b/cmd/system-probe/subcommands/run/command.go index 9ed039a63d930..ce55cdc43b718 100644 --- a/cmd/system-probe/subcommands/run/command.go +++ b/cmd/system-probe/subcommands/run/command.go @@ -49,7 +49,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util" "github.com/DataDog/datadog-agent/pkg/util/fxutil" pkglog "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/profiling" "github.com/DataDog/datadog-agent/pkg/version" ) @@ -98,7 +98,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command { } // run starts the main loop. -func run(log log.Component, _ config.Component, statsd compstatsd.Component, telemetry telemetry.Component, sysprobeconfig sysprobeconfig.Component, rcclient rcclient.Component, cliParams *cliParams, wmeta optional.Option[workloadmeta.Component]) error { +func run(log log.Component, _ config.Component, statsd compstatsd.Component, telemetry telemetry.Component, sysprobeconfig sysprobeconfig.Component, rcclient rcclient.Component, cliParams *cliParams, wmeta option.Option[workloadmeta.Component]) error { defer func() { stopSystemProbe(cliParams) }() @@ -184,7 +184,7 @@ func StartSystemProbeWithDefaults(ctxChan <-chan context.Context) (<-chan error, func runSystemProbe(ctxChan <-chan context.Context, errChan chan error) error { return fxutil.OneShot( - func(log log.Component, config config.Component, statsd compstatsd.Component, telemetry telemetry.Component, sysprobeconfig sysprobeconfig.Component, rcclient rcclient.Component, wmeta optional.Option[workloadmeta.Component]) error { + func(log log.Component, config config.Component, statsd compstatsd.Component, telemetry telemetry.Component, sysprobeconfig sysprobeconfig.Component, rcclient rcclient.Component, wmeta option.Option[workloadmeta.Component]) error { defer StopSystemProbeWithDefaults() err := startSystemProbe(&cliParams{GlobalParams: &command.GlobalParams{}}, log, statsd, telemetry, sysprobeconfig, rcclient, wmeta) if err != nil { @@ -231,7 +231,7 @@ func StopSystemProbeWithDefaults() { } // startSystemProbe Initializes the system-probe process -func startSystemProbe(cliParams *cliParams, log log.Component, statsd compstatsd.Component, telemetry telemetry.Component, sysprobeconfig sysprobeconfig.Component, rcclient rcclient.Component, wmeta optional.Option[workloadmeta.Component]) error { +func startSystemProbe(cliParams *cliParams, log log.Component, statsd compstatsd.Component, telemetry telemetry.Component, sysprobeconfig sysprobeconfig.Component, rcclient rcclient.Component, wmeta option.Option[workloadmeta.Component]) error { var err error var ctx context.Context ctx, common.MainCtxCancel = context.WithCancel(context.Background()) diff --git a/cmd/systray/command/command.go b/cmd/systray/command/command.go index 8ea59cd8db573..1c918d574e7ef 100644 --- a/cmd/systray/command/command.go +++ b/cmd/systray/command/command.go @@ -33,7 +33,7 @@ import ( "github.com/DataDog/datadog-agent/comp/systray/systray/systrayimpl" "github.com/DataDog/datadog-agent/pkg/serializer" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/winutil" ) diff --git a/cmd/trace-agent/subcommands/run/command.go b/cmd/trace-agent/subcommands/run/command.go index 28c10c92591e8..62836cc4b4f91 100644 --- a/cmd/trace-agent/subcommands/run/command.go +++ b/cmd/trace-agent/subcommands/run/command.go @@ -32,7 +32,7 @@ import ( "github.com/DataDog/datadog-agent/comp/trace/config" "github.com/DataDog/datadog-agent/pkg/trace/telemetry" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // MakeCommand returns the run subcommand for the 'trace-agent' command. @@ -107,7 +107,7 @@ func runTraceAgentProcess(ctx context.Context, cliParams *Params, defaultConfPat fetchonlyimpl.Module(), configsyncimpl.OptionalModule(), // Force the instantiation of the components - fx.Invoke(func(_ agent.Component, _ optional.Option[configsync.Component]) {}), + fx.Invoke(func(_ agent.Component, _ option.Option[configsync.Component]) {}), ) if err != nil && errors.Is(err, agent.ErrAgentDisabled) { return nil diff --git a/comp/aggregator/demultiplexer/demultiplexerimpl/test_agent_demultiplexer.go b/comp/aggregator/demultiplexer/demultiplexerimpl/test_agent_demultiplexer.go index 917270149e090..fe31bde2ef5f8 100644 --- a/comp/aggregator/demultiplexer/demultiplexerimpl/test_agent_demultiplexer.go +++ b/comp/aggregator/demultiplexer/demultiplexerimpl/test_agent_demultiplexer.go @@ -23,7 +23,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/metrics" "github.com/DataDog/datadog-agent/pkg/metrics/event" "github.com/DataDog/datadog-agent/pkg/metrics/servicecheck" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // TestAgentDemultiplexer is an implementation of the Demultiplexer which is sending @@ -181,8 +181,8 @@ func initTestAgentDemultiplexerWithFlushInterval(log log.Component, hostname hos sharedForwarderOptions := defaultforwarder.NewOptions(config.Datadog, log, nil) sharedForwarder := defaultforwarder.NewDefaultForwarder(config.Datadog, log, sharedForwarderOptions) - orchestratorForwarder := optional.NewOption[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) - eventPlatformForwarder := optional.NewOptionPtr[eventplatform.Forwarder](eventplatformimpl.NewNoopEventPlatformForwarder(hostname)) + orchestratorForwarder := option.New[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) + eventPlatformForwarder := option.NewPtr[eventplatform.Forwarder](eventplatformimpl.NewNoopEventPlatformForwarder(hostname)) demux := aggregator.InitAndStartAgentDemultiplexer(log, sharedForwarder, &orchestratorForwarder, opts, eventPlatformForwarder, "hostname") return NewTestAgentDemultiplexer(demux) } diff --git a/comp/aggregator/diagnosesendermanager/diagnosesendermanagerimpl/sendermanager.go b/comp/aggregator/diagnosesendermanager/diagnosesendermanagerimpl/sendermanager.go index a862ffa9f8f6d..d32eeeded9a37 100644 --- a/comp/aggregator/diagnosesendermanager/diagnosesendermanagerimpl/sendermanager.go +++ b/comp/aggregator/diagnosesendermanager/diagnosesendermanagerimpl/sendermanager.go @@ -9,6 +9,8 @@ package diagnosesendermanagerimpl import ( "context" + "go.uber.org/fx" + "github.com/DataDog/datadog-agent/comp/aggregator/diagnosesendermanager" "github.com/DataDog/datadog-agent/comp/core/config" "github.com/DataDog/datadog-agent/comp/core/hostname" @@ -19,8 +21,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/aggregator" "github.com/DataDog/datadog-agent/pkg/aggregator/sender" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "go.uber.org/fx" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Module defines the fx options for this component. @@ -37,7 +38,7 @@ type dependencies struct { } type diagnoseSenderManager struct { - senderManager optional.Option[sender.SenderManager] + senderManager option.Option[sender.SenderManager] deps dependencies } @@ -65,8 +66,8 @@ func (sender *diagnoseSenderManager) LazyGetSenderManager() (sender.SenderManage log := sender.deps.Log config := sender.deps.Config forwarder := defaultforwarder.NewDefaultForwarder(config, log, defaultforwarder.NewOptions(config, log, nil)) - orchestratorForwarder := optional.NewOptionPtr[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) - eventPlatformForwarder := optional.NewOptionPtr[eventplatform.Forwarder](eventplatformimpl.NewNoopEventPlatformForwarder(sender.deps.Hostname)) + orchestratorForwarder := option.NewPtr[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) + eventPlatformForwarder := option.NewPtr[eventplatform.Forwarder](eventplatformimpl.NewNoopEventPlatformForwarder(sender.deps.Hostname)) senderManager = aggregator.InitAndStartAgentDemultiplexer( log, forwarder, diff --git a/comp/api/api/apiimpl/api.go b/comp/api/api/apiimpl/api.go index 32be07cd013ee..fbbab183a00d8 100644 --- a/comp/api/api/apiimpl/api.go +++ b/comp/api/api/apiimpl/api.go @@ -35,7 +35,7 @@ import ( "github.com/DataDog/datadog-agent/comp/remote-config/rcserviceha" "github.com/DataDog/datadog-agent/pkg/aggregator/sender" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Module defines the fx options for this component. @@ -58,8 +58,8 @@ type apiServer struct { pkgSigning packagesigning.Component statusComponent status.Component eventPlatformReceiver eventplatformreceiver.Component - rcService optional.Option[rcservice.Component] - rcServiceHA optional.Option[rcserviceha.Component] + rcService option.Option[rcservice.Component] + rcServiceHA option.Option[rcserviceha.Component] authToken authtoken.Component } @@ -79,8 +79,8 @@ type dependencies struct { PkgSigning packagesigning.Component StatusComponent status.Component EventPlatformReceiver eventplatformreceiver.Component - RcService optional.Option[rcservice.Component] - RcServiceHA optional.Option[rcserviceha.Component] + RcService option.Option[rcservice.Component] + RcServiceHA option.Option[rcserviceha.Component] AuthToken authtoken.Component } @@ -112,9 +112,9 @@ func (server *apiServer) StartServer( wmeta workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, - logsAgent optional.Option[logsAgent.Component], + logsAgent option.Option[logsAgent.Component], senderManager sender.DiagnoseSenderManager, - collector optional.Option[collector.Component], + collector option.Option[collector.Component], ) error { return StartServers(server.rcService, server.rcServiceHA, diff --git a/comp/api/api/apiimpl/api_mock.go b/comp/api/api/apiimpl/api_mock.go index fa0ffd8c3feec..35288e3e797d4 100644 --- a/comp/api/api/apiimpl/api_mock.go +++ b/comp/api/api/apiimpl/api_mock.go @@ -20,7 +20,7 @@ import ( logsAgent "github.com/DataDog/datadog-agent/comp/logs/agent" "github.com/DataDog/datadog-agent/pkg/aggregator/sender" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type mockAPIServer struct { @@ -43,9 +43,9 @@ func (mock *mockAPIServer) StartServer( _ workloadmeta.Component, _ tagger.Component, _ autodiscovery.Component, - _ optional.Option[logsAgent.Component], + _ option.Option[logsAgent.Component], _ sender.DiagnoseSenderManager, - _ optional.Option[collector.Component], + _ option.Option[collector.Component], ) error { return nil } diff --git a/comp/api/api/apiimpl/grpc.go b/comp/api/api/apiimpl/grpc.go index 6fce0fafae006..74fa187523630 100644 --- a/comp/api/api/apiimpl/grpc.go +++ b/comp/api/api/apiimpl/grpc.go @@ -8,17 +8,19 @@ package apiimpl import ( "context" "fmt" + "time" + "github.com/DataDog/datadog-agent/comp/remote-config/rcservice" "github.com/DataDog/datadog-agent/comp/remote-config/rcserviceha" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "time" + "github.com/DataDog/datadog-agent/pkg/util/option" - workloadmetaServer "github.com/DataDog/datadog-agent/comp/core/workloadmeta/server" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" + workloadmetaServer "github.com/DataDog/datadog-agent/comp/core/workloadmeta/server" + "github.com/DataDog/datadog-agent/comp/core/tagger" "github.com/DataDog/datadog-agent/comp/core/tagger/replay" taggerserver "github.com/DataDog/datadog-agent/comp/core/tagger/server" @@ -38,8 +40,8 @@ type serverSecure struct { pb.UnimplementedAgentSecureServer taggerServer *taggerserver.Server workloadmetaServer *workloadmetaServer.Server - configService optional.Option[rcservice.Component] - configServiceHA optional.Option[rcserviceha.Component] + configService option.Option[rcservice.Component] + configServiceHA option.Option[rcserviceha.Component] dogstatsdServer dogstatsdServer.Component capture dsdReplay.Component } diff --git a/comp/api/api/apiimpl/internal/agent/agent.go b/comp/api/api/apiimpl/internal/agent/agent.go index ecfc4b74a6fa5..4a7e22af7a17a 100644 --- a/comp/api/api/apiimpl/internal/agent/agent.go +++ b/comp/api/api/apiimpl/internal/agent/agent.go @@ -58,7 +58,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/grpc" "github.com/DataDog/datadog-agent/pkg/util/hostname" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/scrubber" ) @@ -74,7 +74,7 @@ func SetupHandlers( server dogstatsdServer.Component, serverDebug dogstatsddebug.Component, wmeta workloadmeta.Component, - logsAgent optional.Option[logsAgent.Component], + logsAgent option.Option[logsAgent.Component], senderManager sender.DiagnoseSenderManager, hostMetadata host.Component, invAgent inventoryagent.Component, @@ -84,7 +84,7 @@ func SetupHandlers( invChecks inventorychecks.Component, pkgSigning packagesigning.Component, statusComponent status.Component, - collector optional.Option[collector.Component], + collector option.Option[collector.Component], eventPlatformReceiver eventplatformreceiver.Component, ac autodiscovery.Component, ) *mux.Router { @@ -120,7 +120,7 @@ func SetupHandlers( r.HandleFunc("/metadata/inventory-host", func(w http.ResponseWriter, r *http.Request) { metadataPayloadInvHost(w, r, invHost) }).Methods("GET") r.HandleFunc("/metadata/package-signing", func(w http.ResponseWriter, r *http.Request) { metadataPayloadPkgSigning(w, r, pkgSigning) }).Methods("GET") r.HandleFunc("/diagnose", func(w http.ResponseWriter, r *http.Request) { - diagnoseDeps := diagnose.NewSuitesDeps(senderManager, collector, secretResolver, optional.NewOption(wmeta), optional.NewOption[autodiscovery.Component](ac)) + diagnoseDeps := diagnose.NewSuitesDeps(senderManager, collector, secretResolver, option.New(wmeta), option.New[autodiscovery.Component](ac)) getDiagnose(w, r, diagnoseDeps) }).Methods("POST") diff --git a/comp/api/api/apiimpl/server.go b/comp/api/api/apiimpl/server.go index a44fabb64778d..485ae1085a793 100644 --- a/comp/api/api/apiimpl/server.go +++ b/comp/api/api/apiimpl/server.go @@ -37,7 +37,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/aggregator/sender" "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) func startServer(listener net.Listener, srv *http.Server, name string) { @@ -65,15 +65,15 @@ func stopServer(listener net.Listener, name string) { // StartServers creates certificates and starts API servers func StartServers( - configService optional.Option[rcservice.Component], - configServiceHA optional.Option[rcserviceha.Component], + configService option.Option[rcservice.Component], + configServiceHA option.Option[rcserviceha.Component], flare flare.Component, dogstatsdServer dogstatsdServer.Component, capture replay.Component, serverDebug dogstatsddebug.Component, wmeta workloadmeta.Component, taggerComp tagger.Component, - logsAgent optional.Option[logsAgent.Component], + logsAgent option.Option[logsAgent.Component], senderManager sender.DiagnoseSenderManager, hostMetadata host.Component, invAgent inventoryagent.Component, @@ -83,7 +83,7 @@ func StartServers( invChecks inventorychecks.Component, pkgSigning packagesigning.Component, statusComponent status.Component, - collector optional.Option[collector.Component], + collector option.Option[collector.Component], eventPlatformReceiver eventplatformreceiver.Component, ac autodiscovery.Component, ) error { diff --git a/comp/api/api/apiimpl/server_cmd.go b/comp/api/api/apiimpl/server_cmd.go index b3f4c53846d82..a62a7d5294708 100644 --- a/comp/api/api/apiimpl/server_cmd.go +++ b/comp/api/api/apiimpl/server_cmd.go @@ -49,7 +49,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/config" pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/core" grpcutil "github.com/DataDog/datadog-agent/pkg/util/grpc" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const cmdServerName string = "CMD API Server" @@ -60,15 +60,15 @@ func startCMDServer( cmdAddr string, tlsConfig *tls.Config, tlsCertPool *x509.CertPool, - configService optional.Option[rcservice.Component], - configServiceHA optional.Option[rcserviceha.Component], + configService option.Option[rcservice.Component], + configServiceHA option.Option[rcserviceha.Component], flare flare.Component, dogstatsdServer dogstatsdServer.Component, capture replay.Component, serverDebug dogstatsddebug.Component, wmeta workloadmeta.Component, taggerComp tagger.Component, - logsAgent optional.Option[logsAgent.Component], + logsAgent option.Option[logsAgent.Component], senderManager sender.DiagnoseSenderManager, hostMetadata host.Component, invAgent inventoryagent.Component, @@ -78,7 +78,7 @@ func startCMDServer( invChecks inventorychecks.Component, pkgSigning packagesigning.Component, statusComponent status.Component, - collector optional.Option[collector.Component], + collector option.Option[collector.Component], eventPlatformReceiver eventplatformreceiver.Component, ac autodiscovery.Component, ) (err error) { diff --git a/comp/api/api/component.go b/comp/api/api/component.go index 4e8c93d6332eb..7c330467c1f3d 100644 --- a/comp/api/api/component.go +++ b/comp/api/api/component.go @@ -15,7 +15,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" logsAgent "github.com/DataDog/datadog-agent/comp/logs/agent" "github.com/DataDog/datadog-agent/pkg/aggregator/sender" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // team: agent-shared-components @@ -31,9 +31,9 @@ type Component interface { wmeta workloadmeta.Component, tagger tagger.Component, ac autodiscovery.Component, - logsAgent optional.Option[logsAgent.Component], + logsAgent option.Option[logsAgent.Component], senderManager sender.DiagnoseSenderManager, - collector optional.Option[collector.Component], + collector option.Option[collector.Component], ) error StopServer() ServerAddress() *net.TCPAddr diff --git a/comp/api/authtoken/component.go b/comp/api/authtoken/component.go index 2aae4096f392d..a22d1cb96ed32 100644 --- a/comp/api/authtoken/component.go +++ b/comp/api/authtoken/component.go @@ -9,9 +9,10 @@ package authtoken import ( - "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" "go.uber.org/fx" + + "github.com/DataDog/datadog-agent/pkg/util/fxutil" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // team: agent-shared-components @@ -26,7 +27,7 @@ type Component interface { // This helper allows code that needs a disabled Optional type for authtoken to get it. The helper is split from // the implementation to avoid linking with the dependencies from sysprobeconfig. func NoneModule() fxutil.Module { - return fxutil.Component(fx.Provide(func() optional.Option[Component] { + return fxutil.Component(fx.Provide(func() option.Option[Component] { return optional.NewNoneOption[Component]() })) } diff --git a/comp/api/authtoken/createandfetchimpl/authtoken.go b/comp/api/authtoken/createandfetchimpl/authtoken.go index 609028883687f..5ad38488622fd 100644 --- a/comp/api/authtoken/createandfetchimpl/authtoken.go +++ b/comp/api/authtoken/createandfetchimpl/authtoken.go @@ -15,15 +15,15 @@ import ( "github.com/DataDog/datadog-agent/comp/core/log" "github.com/DataDog/datadog-agent/pkg/api/util" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Module defines the fx options for this component. func Module() fxutil.Module { return fxutil.Component( fx.Provide(newAuthToken), - fx.Provide(func(authToken authtoken.Component) optional.Option[authtoken.Component] { - return optional.NewOption[authtoken.Component](authToken) + fx.Provide(func(authToken authtoken.Component) option.Option[authtoken.Component] { + return option.New[authtoken.Component](authToken) }), ) } diff --git a/comp/api/authtoken/fetchonlyimpl/authtoken.go b/comp/api/authtoken/fetchonlyimpl/authtoken.go index 7301b0054be06..b78400e4a484e 100644 --- a/comp/api/authtoken/fetchonlyimpl/authtoken.go +++ b/comp/api/authtoken/fetchonlyimpl/authtoken.go @@ -15,15 +15,15 @@ import ( "github.com/DataDog/datadog-agent/comp/core/log" "github.com/DataDog/datadog-agent/pkg/api/util" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Module defines the fx options for this component. func Module() fxutil.Module { return fxutil.Component( fx.Provide(newAuthToken), - fx.Provide(func(authToken authtoken.Component) optional.Option[authtoken.Component] { - return optional.NewOption[authtoken.Component](authToken) + fx.Provide(func(authToken authtoken.Component) option.Option[authtoken.Component] { + return option.New[authtoken.Component](authToken) }), ) } diff --git a/comp/checks/agentcrashdetect/agentcrashdetectimpl/agentcrashdetect.go b/comp/checks/agentcrashdetect/agentcrashdetectimpl/agentcrashdetect.go index b11fc1894781d..21f05e3a362b7 100644 --- a/comp/checks/agentcrashdetect/agentcrashdetectimpl/agentcrashdetect.go +++ b/comp/checks/agentcrashdetect/agentcrashdetectimpl/agentcrashdetect.go @@ -30,7 +30,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/crashreport" "github.com/DataDog/datadog-agent/pkg/util/fxutil" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -178,7 +178,7 @@ func newAgentCrashComponent(deps dependencies) agentcrashdetect.Component { instance.tconfig = deps.TConfig.Object() deps.Lifecycle.Append(fx.Hook{ OnStart: func(ctx context.Context) error { - core.RegisterCheck(CheckName, optional.NewOption(func() check.Check { + core.RegisterCheck(CheckName, option.New(func() check.Check { checkInstance := &AgentCrashDetect{ CheckBase: core.NewCheckBase(CheckName), instance: &WinCrashConfig{}, diff --git a/comp/checks/winregistry/impl/winregistryimpl.go b/comp/checks/winregistry/impl/winregistryimpl.go index 7912dfb5bbcf6..03356ffd96360 100644 --- a/comp/checks/winregistry/impl/winregistryimpl.go +++ b/comp/checks/winregistry/impl/winregistryimpl.go @@ -17,6 +17,13 @@ import ( "strconv" "strings" + yy "github.com/ghodss/yaml" + "github.com/swaggest/jsonschema-go" + "github.com/xeipuuv/gojsonschema" + "go.uber.org/fx" + "golang.org/x/sys/windows/registry" + "gopkg.in/yaml.v2" + "github.com/DataDog/datadog-agent/comp/checks/winregistry" "github.com/DataDog/datadog-agent/comp/core/autodiscovery/integration" "github.com/DataDog/datadog-agent/comp/core/log" @@ -30,13 +37,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/metrics" "github.com/DataDog/datadog-agent/pkg/util/fxutil" agentLog "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" - yy "github.com/ghodss/yaml" - "github.com/swaggest/jsonschema-go" - "github.com/xeipuuv/gojsonschema" - "go.uber.org/fx" - "golang.org/x/sys/windows/registry" - "gopkg.in/yaml.v2" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -55,7 +56,7 @@ type dependencies struct { // Logs Agent component, used to send integration logs // It is optional because the Logs Agent can be disabled - LogsComponent optional.Option[agent.Component] + LogsComponent option.Option[agent.Component] // Datadog Agent logs component, used to log to the Agent logs Log log.Component @@ -63,9 +64,9 @@ type dependencies struct { } type registryValueCfg struct { - Name string `json:"name" yaml:"name" required:"true"` // The metric name of the registry value - DefaultValue optional.Option[float64] `json:"default_value" yaml:"default_value"` - Mappings []map[string]float64 `json:"mapping" yaml:"mapping"` + Name string `json:"name" yaml:"name" required:"true"` // The metric name of the registry value + DefaultValue option.Option[float64] `json:"default_value" yaml:"default_value"` + Mappings []map[string]float64 `json:"mapping" yaml:"mapping"` } type registryKeyCfg struct { @@ -76,12 +77,12 @@ type registryKeyCfg struct { // checkCfg is the config that is specific to each check instance type checkCfg struct { RegistryKeys map[string]registryKeyCfg `json:"registry_keys" yaml:"registry_keys" nullable:"false" required:"true"` - SendOnStart optional.Option[bool] `json:"send_on_start" yaml:"send_on_start"` + SendOnStart option.Option[bool] `json:"send_on_start" yaml:"send_on_start"` } // checkInitCfg is the config that is common to all check instances type checkInitCfg struct { - SendOnStart optional.Option[bool] `yaml:"send_on_start"` + SendOnStart option.Option[bool] `yaml:"send_on_start"` } // registryKey is the in-memory representation of the key to monitor @@ -112,7 +113,7 @@ type WindowsRegistryCheck struct { func createOptionMapping[T any](reflector *jsonschema.Reflector, sourceType jsonschema.SimpleType) { option := jsonschema.Schema{} option.AddType(sourceType) - reflector.AddTypeMapping(optional.Option[T]{}, option) + reflector.AddTypeMapping(option.Option[T]{}, option) } func createSchema() ([]byte, error) { @@ -359,7 +360,7 @@ func (c *WindowsRegistryCheck) Run() error { func newWindowsRegistryComponent(deps dependencies) winregistry.Component { deps.Lifecycle.Append(fx.Hook{ OnStart: func(ctx context.Context) error { - core.RegisterCheck(checkName, optional.NewOption(func() check.Check { + core.RegisterCheck(checkName, option.New(func() check.Check { integrationLogs, _ := deps.LogsComponent.Get() return &WindowsRegistryCheck{ CheckBase: core.NewCheckBase(checkName), diff --git a/comp/collector/collector/collectorimpl/collector.go b/comp/collector/collector/collectorimpl/collector.go index 5ce2027b446f4..cb382581e1914 100644 --- a/comp/collector/collector/collectorimpl/collector.go +++ b/comp/collector/collector/collectorimpl/collector.go @@ -30,7 +30,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/scheduler" collectorStatus "github.com/DataDog/datadog-agent/pkg/status/collector" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -78,8 +78,8 @@ type provides struct { func Module() fxutil.Module { return fxutil.Component( fx.Provide(newProvides), - fx.Provide(func(c collector.Component) optional.Option[collector.Component] { - return optional.NewOption[collector.Component](c) + fx.Provide(func(c collector.Component) option.Option[collector.Component] { + return option.New[collector.Component](c) }), ) } diff --git a/comp/collector/collector/collectorimpl/collector_mock.go b/comp/collector/collector/collectorimpl/collector_mock.go index 38e89f9074b60..3b0947085e020 100644 --- a/comp/collector/collector/collectorimpl/collector_mock.go +++ b/comp/collector/collector/collectorimpl/collector_mock.go @@ -15,7 +15,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/check" checkid "github.com/DataDog/datadog-agent/pkg/collector/check/id" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // MockModule defines the fx options for the mock component. @@ -23,8 +23,8 @@ func MockModule() fxutil.Module { return fxutil.Component( fx.Supply(MockParams{}), fx.Provide(newMock), - fx.Provide(func(collector collector.Component) optional.Option[collector.Component] { - return optional.NewOption(collector) + fx.Provide(func(collector collector.Component) option.Option[collector.Component] { + return option.New(collector) }), ) } diff --git a/comp/collector/collector/component.go b/comp/collector/collector/component.go index 0e0dafbdcc3f9..fb711247b8be6 100644 --- a/comp/collector/collector/component.go +++ b/comp/collector/collector/component.go @@ -7,11 +7,12 @@ package collector import ( + "go.uber.org/fx" + "github.com/DataDog/datadog-agent/pkg/collector/check" checkid "github.com/DataDog/datadog-agent/pkg/collector/check/id" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "go.uber.org/fx" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // team: agent-metrics-logs @@ -53,7 +54,7 @@ type Component interface { // the implementation to avoid linking with the implementation. func NoneModule() fxutil.Module { return fxutil.Component( - fx.Provide(func() optional.Option[Component] { + fx.Provide(func() option.Option[Component] { return optional.NewNoneOption[Component]() }), ) diff --git a/comp/core/autodiscovery/autodiscoveryimpl/autoconfig.go b/comp/core/autodiscovery/autodiscoveryimpl/autoconfig.go index 9ec6df521fb49..523216b153c5b 100644 --- a/comp/core/autodiscovery/autodiscoveryimpl/autoconfig.go +++ b/comp/core/autodiscovery/autodiscoveryimpl/autoconfig.go @@ -33,7 +33,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/status/health" "github.com/DataDog/datadog-agent/pkg/util/fxutil" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/retry" ) @@ -47,7 +47,7 @@ type dependencies struct { Log logComp.Component TaggerComp tagger.Component Secrets secrets.Component - WMeta optional.Option[workloadmeta.Component] + WMeta option.Option[workloadmeta.Component] } // AutoConfig implements the agent's autodiscovery mechanism. It is @@ -69,7 +69,7 @@ type AutoConfig struct { serviceListenerFactories map[string]listeners.ServiceListenerFactory providerCatalog map[string]providers.ConfigProviderFactory started bool - wmeta optional.Option[workloadmeta.Component] + wmeta option.Option[workloadmeta.Component] // m covers the `configPollers`, `listenerCandidates`, `listeners`, and `listenerRetryStop`, but // not the values they point to. @@ -130,7 +130,7 @@ func newAutoConfig(deps dependencies) autodiscovery.Component { } // createNewAutoConfig creates an AutoConfig instance (without starting). -func createNewAutoConfig(scheduler *scheduler.MetaScheduler, secretResolver secrets.Component, wmeta optional.Option[workloadmeta.Component]) *AutoConfig { +func createNewAutoConfig(scheduler *scheduler.MetaScheduler, secretResolver secrets.Component, wmeta option.Option[workloadmeta.Component]) *AutoConfig { cfgMgr := newReconcilingConfigManager(secretResolver) ac := &AutoConfig{ configPollers: make([]*configPoller, 0, 9), @@ -602,9 +602,9 @@ type optionalModuleDeps struct { Lc fx.Lifecycle Config configComponent.Component Log logComp.Component - TaggerComp optional.Option[tagger.Component] + TaggerComp option.Option[tagger.Component] Secrets secrets.Component - WMeta optional.Option[workloadmeta.Component] + WMeta option.Option[workloadmeta.Component] } // OptionalModule defines the fx options when ac should be used as an optional and not started @@ -616,11 +616,11 @@ func OptionalModule() fxutil.Module { } // newOptionalAutoConfig creates an optional AutoConfig instance if tagger is available -func newOptionalAutoConfig(deps optionalModuleDeps) optional.Option[autodiscovery.Component] { +func newOptionalAutoConfig(deps optionalModuleDeps) option.Option[autodiscovery.Component] { _, ok := deps.TaggerComp.Get() if !ok { return optional.NewNoneOption[autodiscovery.Component]() } - return optional.NewOption[autodiscovery.Component]( + return option.New[autodiscovery.Component]( createNewAutoConfig(scheduler.NewMetaScheduler(), deps.Secrets, deps.WMeta)) } diff --git a/comp/core/autodiscovery/autodiscoveryimpl/autoconfig_mock.go b/comp/core/autodiscovery/autodiscoveryimpl/autoconfig_mock.go index 17fdc1732c460..6e0de330f28ef 100644 --- a/comp/core/autodiscovery/autodiscoveryimpl/autoconfig_mock.go +++ b/comp/core/autodiscovery/autodiscoveryimpl/autoconfig_mock.go @@ -10,12 +10,13 @@ package autodiscoveryimpl import ( "testing" + "go.uber.org/fx" + "github.com/DataDog/datadog-agent/comp/core/autodiscovery" "github.com/DataDog/datadog-agent/comp/core/autodiscovery/scheduler" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "go.uber.org/fx" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // MockParams defines the parameters for the mock component. @@ -25,7 +26,7 @@ type MockParams struct { type mockdependencies struct { fx.In - WMeta optional.Option[workloadmeta.Component] + WMeta option.Option[workloadmeta.Component] Params MockParams } diff --git a/comp/core/autodiscovery/autodiscoveryimpl/autoconfig_test.go b/comp/core/autodiscovery/autodiscoveryimpl/autoconfig_test.go index 9ea2d52036f46..599d6adb591c2 100644 --- a/comp/core/autodiscovery/autodiscoveryimpl/autoconfig_test.go +++ b/comp/core/autodiscovery/autodiscoveryimpl/autoconfig_test.go @@ -28,7 +28,7 @@ import ( checkid "github.com/DataDog/datadog-agent/pkg/collector/check/id" "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/retry" ) @@ -168,7 +168,7 @@ func (suite *AutoConfigTestSuite) SetupTest() { suite.deps = createDeps(suite.T()) } -func getAutoConfig(scheduler *scheduler.MetaScheduler, secretResolver secrets.Component, wmeta optional.Option[workloadmeta.Component]) *AutoConfig { +func getAutoConfig(scheduler *scheduler.MetaScheduler, secretResolver secrets.Component, wmeta option.Option[workloadmeta.Component]) *AutoConfig { ac := createNewAutoConfig(scheduler, secretResolver, wmeta) go ac.serviceListening() return ac @@ -517,7 +517,7 @@ func TestProcessClusterCheckConfigWithSecrets(t *testing.T) { type Deps struct { fx.In - WMeta optional.Option[workloadmeta.Component] + WMeta option.Option[workloadmeta.Component] } func createDeps(t *testing.T) Deps { diff --git a/comp/core/autodiscovery/listeners/container.go b/comp/core/autodiscovery/listeners/container.go index 8903242b9db5f..fa5292f926db3 100644 --- a/comp/core/autodiscovery/listeners/container.go +++ b/comp/core/autodiscovery/listeners/container.go @@ -19,7 +19,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/containers" "github.com/DataDog/datadog-agent/pkg/util/docker" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -34,7 +34,7 @@ type ContainerListener struct { } // NewContainerListener returns a new ContainerListener. -func NewContainerListener(_ Config, wmeta optional.Option[workloadmeta.Component]) (ServiceListener, error) { +func NewContainerListener(_ Config, wmeta option.Option[workloadmeta.Component]) (ServiceListener, error) { const name = "ad-containerlistener" l := &ContainerListener{} filterParams := workloadmeta.FilterParams{ diff --git a/comp/core/autodiscovery/listeners/kubelet.go b/comp/core/autodiscovery/listeners/kubelet.go index 89410f5c43d9d..ce6bf83914f4d 100644 --- a/comp/core/autodiscovery/listeners/kubelet.go +++ b/comp/core/autodiscovery/listeners/kubelet.go @@ -18,7 +18,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/containers" "github.com/DataDog/datadog-agent/pkg/util/kubernetes/kubelet" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // KubeletListener listens to pod creation through a subscription @@ -28,7 +28,7 @@ type KubeletListener struct { } // NewKubeletListener returns a new KubeletListener. -func NewKubeletListener(_ Config, wmeta optional.Option[workloadmeta.Component]) (ServiceListener, error) { +func NewKubeletListener(_ Config, wmeta option.Option[workloadmeta.Component]) (ServiceListener, error) { const name = "ad-kubeletlistener" l := &KubeletListener{} diff --git a/comp/core/autodiscovery/listeners/listeners.go b/comp/core/autodiscovery/listeners/listeners.go index 041d98f232bd0..be1527be3f3e2 100644 --- a/comp/core/autodiscovery/listeners/listeners.go +++ b/comp/core/autodiscovery/listeners/listeners.go @@ -8,7 +8,7 @@ package listeners import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -24,7 +24,7 @@ const ( ) // RegisterListeners registers the available autodiscovery listerners. -func RegisterListeners(serviceListenerFactories map[string]ServiceListenerFactory, wmeta optional.Option[workloadmeta.Component]) { +func RegisterListeners(serviceListenerFactories map[string]ServiceListenerFactory, wmeta option.Option[workloadmeta.Component]) { // register the available listeners Register(cloudFoundryBBSListenerName, NewCloudFoundryListener, serviceListenerFactories) Register(containerListenerName, func(config Config) (ServiceListener, error) { return NewContainerListener(config, wmeta) }, serviceListenerFactories) diff --git a/comp/core/config/go.mod b/comp/core/config/go.mod index e54bb1c0f334f..ada88f4718444 100644 --- a/comp/core/config/go.mod +++ b/comp/core/config/go.mod @@ -17,7 +17,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../pkg/util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../../pkg/util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../../pkg/util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../../pkg/util/optional/ + github.com/DataDog/datadog-agent/pkg/util/option => ../../../pkg/util/option/ github.com/DataDog/datadog-agent/pkg/util/pointer => ../../../pkg/util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../pkg/util/scrubber/ github.com/DataDog/datadog-agent/pkg/util/system => ../../../pkg/util/system @@ -48,7 +48,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.2 // indirect diff --git a/comp/core/configsync/configsyncimpl/module.go b/comp/core/configsync/configsyncimpl/module.go index 3832cf0c5ce12..04b911592197a 100644 --- a/comp/core/configsync/configsyncimpl/module.go +++ b/comp/core/configsync/configsyncimpl/module.go @@ -22,7 +22,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/log" apiutil "github.com/DataDog/datadog-agent/pkg/api/util" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type dependencies struct { @@ -51,8 +51,8 @@ type configSync struct { ctx context.Context } -// newOptionalConfigSync checks if the component was enabled as per the config, and returns an optional.Option -func newOptionalConfigSync(deps dependencies) optional.Option[configsync.Component] { +// newOptionalConfigSync checks if the component was enabled as per the config, and returns an option.Option +func newOptionalConfigSync(deps dependencies) option.Option[configsync.Component] { agentIPCPort := deps.Config.GetInt("agent_ipc.port") configRefreshIntervalSec := deps.Config.GetInt("agent_ipc.config_refresh_interval") @@ -61,7 +61,7 @@ func newOptionalConfigSync(deps dependencies) optional.Option[configsync.Compone } configSync := newConfigSync(deps, agentIPCPort, configRefreshIntervalSec) - return optional.NewOption(configSync) + return option.New(configSync) } // newConfigSync creates a new configSync component. diff --git a/comp/core/configsync/configsyncimpl/module_integration_test.go b/comp/core/configsync/configsyncimpl/module_integration_test.go index 0f582d4c21648..0ea966c0076de 100644 --- a/comp/core/configsync/configsyncimpl/module_integration_test.go +++ b/comp/core/configsync/configsyncimpl/module_integration_test.go @@ -22,7 +22,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/config" "github.com/DataDog/datadog-agent/comp/core/configsync" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) func TestOptionalModule(t *testing.T) { @@ -44,7 +44,7 @@ func TestOptionalModule(t *testing.T) { "agent_ipc.port": port, "agent_ipc.config_refresh_interval": 1, } - csopt := fxutil.Test[optional.Option[configsync.Component]](t, fx.Options( + csopt := fxutil.Test[option.Option[configsync.Component]](t, fx.Options( core.MockBundle(), fetchonlyimpl.Module(), OptionalModule(), diff --git a/comp/core/flare/flare.go b/comp/core/flare/flare.go index f9198c29ef709..d8836b6079c00 100644 --- a/comp/core/flare/flare.go +++ b/comp/core/flare/flare.go @@ -27,7 +27,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/diagnose" pkgFlare "github.com/DataDog/datadog-agent/pkg/flare" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // ProfileData maps (pprof) profile names to the profile data. @@ -41,10 +41,10 @@ type dependencies struct { Diagnosesendermanager diagnosesendermanager.Component Params Params Providers []types.FlareCallback `group:"flare"` - Collector optional.Option[collector.Component] - WMeta optional.Option[workloadmeta.Component] + Collector option.Option[collector.Component] + WMeta option.Option[workloadmeta.Component] Secrets secrets.Component - AC optional.Option[autodiscovery.Component] + AC option.Option[autodiscovery.Component] } type flare struct { diff --git a/comp/core/flare/flare_test.go b/comp/core/flare/flare_test.go index 9a1c5e0d5e732..2f1a0335ac63d 100644 --- a/comp/core/flare/flare_test.go +++ b/comp/core/flare/flare_test.go @@ -8,6 +8,9 @@ package flare import ( "testing" + "github.com/stretchr/testify/assert" + "go.uber.org/fx" + "github.com/DataDog/datadog-agent/comp/aggregator/diagnosesendermanager" "github.com/DataDog/datadog-agent/comp/collector/collector" "github.com/DataDog/datadog-agent/comp/core/autodiscovery" @@ -18,9 +21,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/secrets/secretsimpl" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "github.com/stretchr/testify/assert" - "go.uber.org/fx" + "github.com/DataDog/datadog-agent/pkg/util/option" ) func TestFlareCreation(t *testing.T) { diff --git a/comp/core/log/go.mod b/comp/core/log/go.mod index 10569d17de2d7..77166bf8c69bd 100644 --- a/comp/core/log/go.mod +++ b/comp/core/log/go.mod @@ -23,7 +23,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../pkg/util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../../pkg/util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../../pkg/util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../../pkg/util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../../pkg/util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../../pkg/util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../pkg/util/scrubber/ github.com/DataDog/datadog-agent/pkg/util/system => ../../../pkg/util/system @@ -55,7 +55,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.2 // indirect diff --git a/comp/core/status/statusimpl/go.mod b/comp/core/status/statusimpl/go.mod index b6c7842e634ef..31ce95da2e47c 100644 --- a/comp/core/status/statusimpl/go.mod +++ b/comp/core/status/statusimpl/go.mod @@ -20,7 +20,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../../pkg/util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../../../pkg/util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../../../pkg/util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../../../pkg/util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../../../pkg/util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../../../pkg/util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../../pkg/util/scrubber github.com/DataDog/datadog-agent/pkg/util/system => ../../../../pkg/util/system @@ -52,7 +52,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.2 // indirect diff --git a/comp/core/sysprobeconfig/component.go b/comp/core/sysprobeconfig/component.go index 4d195db685a76..80cbf604e2b36 100644 --- a/comp/core/sysprobeconfig/component.go +++ b/comp/core/sysprobeconfig/component.go @@ -16,11 +16,12 @@ package sysprobeconfig import ( + "go.uber.org/fx" + sysconfigtypes "github.com/DataDog/datadog-agent/cmd/system-probe/config/types" "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "go.uber.org/fx" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // team: ebpf-platform @@ -41,7 +42,7 @@ type Component interface { // This helper allows code that needs a disabled Optional type for sysprobeconfig to get it. The helper is split from // the implementation to avoid linking with the dependencies from sysprobeconfig. func NoneModule() fxutil.Module { - return fxutil.Component(fx.Provide(func() optional.Option[Component] { + return fxutil.Component(fx.Provide(func() option.Option[Component] { return optional.NewNoneOption[Component]() })) } diff --git a/comp/core/sysprobeconfig/sysprobeconfigimpl/config.go b/comp/core/sysprobeconfig/sysprobeconfigimpl/config.go index 5bd4d5a532c91..1cf464e74114b 100644 --- a/comp/core/sysprobeconfig/sysprobeconfigimpl/config.go +++ b/comp/core/sysprobeconfig/sysprobeconfigimpl/config.go @@ -15,15 +15,15 @@ import ( "github.com/DataDog/datadog-agent/comp/core/sysprobeconfig" "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Module defines the fx options for this component. func Module() fxutil.Module { return fxutil.Component( fx.Provide(newConfig), - fx.Provide(func(syscfg sysprobeconfig.Component) optional.Option[sysprobeconfig.Component] { - return optional.NewOption[sysprobeconfig.Component](syscfg) + fx.Provide(func(syscfg sysprobeconfig.Component) option.Option[sysprobeconfig.Component] { + return option.New[sysprobeconfig.Component](syscfg) }), ) } diff --git a/comp/core/sysprobeconfig/sysprobeconfigimpl/config_mock.go b/comp/core/sysprobeconfig/sysprobeconfigimpl/config_mock.go index bbbf79999d3e7..482860352be52 100644 --- a/comp/core/sysprobeconfig/sysprobeconfigimpl/config_mock.go +++ b/comp/core/sysprobeconfig/sysprobeconfigimpl/config_mock.go @@ -12,11 +12,12 @@ import ( "strings" "testing" + "go.uber.org/fx" + "github.com/DataDog/datadog-agent/comp/core/sysprobeconfig" "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "go.uber.org/fx" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type mockDependencies struct { @@ -34,8 +35,8 @@ func (m mockDependencies) getParams() *Params { func MockModule() fxutil.Module { return fxutil.Component( fx.Provide(newMock), - fx.Provide(func(syscfg sysprobeconfig.Component) optional.Option[sysprobeconfig.Component] { - return optional.NewOption[sysprobeconfig.Component](syscfg) + fx.Provide(func(syscfg sysprobeconfig.Component) option.Option[sysprobeconfig.Component] { + return option.New[sysprobeconfig.Component](syscfg) }), fx.Supply(MockParams{})) } diff --git a/comp/core/tagger/tagger.go b/comp/core/tagger/tagger.go index f598df92acc20..95dd74bc55cfa 100644 --- a/comp/core/tagger/tagger.go +++ b/comp/core/tagger/tagger.go @@ -10,6 +10,8 @@ import ( "reflect" "sync" + "go.uber.org/fx" + configComponent "github.com/DataDog/datadog-agent/comp/core/config" logComp "github.com/DataDog/datadog-agent/comp/core/log" tagger_api "github.com/DataDog/datadog-agent/comp/core/tagger/api" @@ -28,8 +30,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/containers/metrics" "github.com/DataDog/datadog-agent/pkg/util/fxutil" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "go.uber.org/fx" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type dependencies struct { @@ -276,7 +277,7 @@ func (t *TaggerClient) Standard(entity string) ([]string, error) { // AgentTags returns the agent tags // It relies on the container provider utils to get the Agent container ID func (t *TaggerClient) AgentTags(cardinality collectors.TagCardinality) ([]string, error) { - ctrID, err := metrics.GetProvider(optional.NewOption(t.wmeta)).GetMetaCollector().GetSelfContainerID() + ctrID, err := metrics.GetProvider(option.New(t.wmeta)).GetMetaCollector().GetSelfContainerID() if err != nil { return nil, err } @@ -396,7 +397,7 @@ type optionalTaggerDeps struct { Lc fx.Lifecycle Config configComponent.Component Log logComp.Component - Wmeta optional.Option[workloadmeta.Component] + Wmeta option.Option[workloadmeta.Component] } // OptionalModule defines the fx options when tagger should be used as an optional @@ -409,12 +410,12 @@ func OptionalModule() fxutil.Module { } // NewOptionalTagger returns a tagger component if workloadmeta is available -func NewOptionalTagger(deps optionalTaggerDeps) optional.Option[Component] { +func NewOptionalTagger(deps optionalTaggerDeps) option.Option[Component] { w, ok := deps.Wmeta.Get() if !ok { return optional.NewNoneOption[Component]() } - return optional.NewOption[Component](newTaggerClient(dependencies{ + return option.New[Component](newTaggerClient(dependencies{ In: deps.In, Lc: deps.Lc, Config: deps.Config, diff --git a/comp/core/workloadmeta/component.go b/comp/core/workloadmeta/component.go index e6bf899211fa1..11390bd96b85a 100644 --- a/comp/core/workloadmeta/component.go +++ b/comp/core/workloadmeta/component.go @@ -10,7 +10,7 @@ import ( "go.uber.org/fx" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // team: container-platform @@ -134,8 +134,8 @@ func Module() fxutil.Module { fx.Provide( newWorkloadMeta, ), - fx.Provide(func(wmeta Component) optional.Option[Component] { - return optional.NewOption(wmeta) + fx.Provide(func(wmeta Component) option.Option[Component] { + return option.New(wmeta) }), ) } diff --git a/comp/core/workloadmeta/component_mock.go b/comp/core/workloadmeta/component_mock.go index 4f0fbbb1cf75e..12c317ed9d063 100644 --- a/comp/core/workloadmeta/component_mock.go +++ b/comp/core/workloadmeta/component_mock.go @@ -14,7 +14,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // team: container-integrations @@ -45,7 +45,7 @@ func MockModule() fxutil.Module { return fxutil.Component( fx.Provide(newWorkloadMetaMock), fx.Provide(func(mock Mock) Component { return mock }), - fx.Provide(func(mock Mock) optional.Option[Component] { return optional.NewOption[Component](mock) }), + fx.Provide(func(mock Mock) option.Option[Component] { return optional.NewOption[Component](mock) }), ) } @@ -58,6 +58,6 @@ func MockModuleV2() fxutil.Module { return fxutil.Component( fx.Provide(newWorkloadMetaMockV2), fx.Provide(func(mock Mock) Component { return mock }), - fx.Provide(func(mock Mock) optional.Option[Component] { return optional.NewOption[Component](mock) }), + fx.Provide(func(mock Mock) option.Option[Component] { return optional.NewOption[Component](mock) }), ) } diff --git a/comp/core/workloadmeta/workloadmeta.go b/comp/core/workloadmeta/workloadmeta.go index 9f3144f67e562..7f46796c66bf3 100644 --- a/comp/core/workloadmeta/workloadmeta.go +++ b/comp/core/workloadmeta/workloadmeta.go @@ -17,7 +17,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/log" "github.com/DataDog/datadog-agent/pkg/util/common" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // store is a central storage of metadata about workloads. A workload is any @@ -70,7 +70,7 @@ type provider struct { type optionalProvider struct { fx.Out - Comp optional.Option[Component] + Comp option.Option[Component] FlareProvider flaretypes.Provider } @@ -131,7 +131,7 @@ func newWorkloadMetaOptional(deps dependencies) optionalProvider { c := newWorkloadMeta(deps) return optionalProvider{ - Comp: optional.NewOption(c.Comp), + Comp: option.New(c.Comp), FlareProvider: c.FlareProvider, } } diff --git a/comp/dogstatsd/listeners/uds_common.go b/comp/dogstatsd/listeners/uds_common.go index 9b9f20aa74f07..033e62bec5d1b 100644 --- a/comp/dogstatsd/listeners/uds_common.go +++ b/comp/dogstatsd/listeners/uds_common.go @@ -24,7 +24,7 @@ import ( "github.com/DataDog/datadog-agent/comp/dogstatsd/replay" "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) var ( @@ -54,7 +54,7 @@ type UDSListener struct { OriginDetection bool config config.Reader - wmeta optional.Option[workloadmeta.Component] + wmeta option.Option[workloadmeta.Component] transport string @@ -130,7 +130,7 @@ func NewUDSOobPoolManager() *packets.PoolManager { } // NewUDSListener returns an idle UDS Statsd listener -func NewUDSListener(packetOut chan packets.Packets, sharedPacketPoolManager *packets.PoolManager, sharedOobPacketPoolManager *packets.PoolManager, cfg config.Reader, capture replay.Component, transport string, wmeta optional.Option[workloadmeta.Component]) (*UDSListener, error) { +func NewUDSListener(packetOut chan packets.Packets, sharedPacketPoolManager *packets.PoolManager, sharedOobPacketPoolManager *packets.PoolManager, cfg config.Reader, capture replay.Component, transport string, wmeta option.Option[workloadmeta.Component]) (*UDSListener, error) { originDetection := cfg.GetBool("dogstatsd_origin_detection") listener := &UDSListener{ diff --git a/comp/dogstatsd/listeners/uds_datagram.go b/comp/dogstatsd/listeners/uds_datagram.go index f20a701e8868e..996a462a2d4b2 100644 --- a/comp/dogstatsd/listeners/uds_datagram.go +++ b/comp/dogstatsd/listeners/uds_datagram.go @@ -14,7 +14,7 @@ import ( "github.com/DataDog/datadog-agent/comp/dogstatsd/replay" "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // UDSDatagramListener implements the StatsdListener interface for Unix Domain (datagrams) @@ -25,7 +25,7 @@ type UDSDatagramListener struct { } // NewUDSDatagramListener returns an idle UDS datagram Statsd listener -func NewUDSDatagramListener(packetOut chan packets.Packets, sharedPacketPoolManager *packets.PoolManager, sharedOobPoolManager *packets.PoolManager, cfg config.Reader, capture replay.Component, wmeta optional.Option[workloadmeta.Component]) (*UDSDatagramListener, error) { +func NewUDSDatagramListener(packetOut chan packets.Packets, sharedPacketPoolManager *packets.PoolManager, sharedOobPoolManager *packets.PoolManager, cfg config.Reader, capture replay.Component, wmeta option.Option[workloadmeta.Component]) (*UDSDatagramListener, error) { socketPath := cfg.GetString("dogstatsd_socket") transport := "unixgram" diff --git a/comp/dogstatsd/listeners/uds_datagram_test.go b/comp/dogstatsd/listeners/uds_datagram_test.go index d55c264f93766..991a9decb855f 100644 --- a/comp/dogstatsd/listeners/uds_datagram_test.go +++ b/comp/dogstatsd/listeners/uds_datagram_test.go @@ -19,7 +19,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/config" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/comp/dogstatsd/packets" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) func udsDatagramListenerFactory(packetOut chan packets.Packets, manager *packets.PoolManager, cfg config.Component) (StatsdListener, error) { diff --git a/comp/dogstatsd/listeners/uds_linux.go b/comp/dogstatsd/listeners/uds_linux.go index 5d65ef787fb9b..4f63012d04d94 100644 --- a/comp/dogstatsd/listeners/uds_linux.go +++ b/comp/dogstatsd/listeners/uds_linux.go @@ -20,7 +20,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/cache" "github.com/DataDog/datadog-agent/pkg/util/containers" "github.com/DataDog/datadog-agent/pkg/util/containers/metrics" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -61,7 +61,7 @@ func enableUDSPassCred(conn *net.UnixConn) error { // source, and an error if any. // PID is added to ancillary data by the Linux kernel if we added the // SO_PASSCRED to the socket, see enableUDSPassCred. -func processUDSOrigin(ancillary []byte, wmeta optional.Option[workloadmeta.Component]) (int, string, error) { +func processUDSOrigin(ancillary []byte, wmeta option.Option[workloadmeta.Component]) (int, string, error) { messages, err := unix.ParseSocketControlMessage(ancillary) if err != nil { return 0, packets.NoOrigin, err @@ -97,7 +97,7 @@ func processUDSOrigin(ancillary []byte, wmeta optional.Option[workloadmeta.Compo // getEntityForPID returns the container entity name and caches the value for future lookups // As the result is cached and the lookup is really fast (parsing local files), it can be // called from the intake goroutine. -func getEntityForPID(pid int32, capture bool, wmeta optional.Option[workloadmeta.Component]) (string, error) { +func getEntityForPID(pid int32, capture bool, wmeta option.Option[workloadmeta.Component]) (string, error) { key := cache.BuildAgentKey(pidToEntityCacheKeyPrefix, strconv.Itoa(int(pid))) if x, found := cache.Cache.Get(key); found { return x.(string), nil @@ -123,7 +123,7 @@ func getEntityForPID(pid int32, capture bool, wmeta optional.Option[workloadmeta // entityForPID returns the entity ID for a given PID. It can return // errNoContainerMatch if no match is found for the PID. -func entityForPID(pid int32, capture bool, wmeta optional.Option[workloadmeta.Component]) (string, error) { +func entityForPID(pid int32, capture bool, wmeta option.Option[workloadmeta.Component]) (string, error) { if capture { return replay.ContainerIDForPID(pid) } diff --git a/comp/dogstatsd/listeners/uds_linux_test.go b/comp/dogstatsd/listeners/uds_linux_test.go index 62dd4aeb12521..06a7fbf9274a0 100644 --- a/comp/dogstatsd/listeners/uds_linux_test.go +++ b/comp/dogstatsd/listeners/uds_linux_test.go @@ -23,7 +23,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/comp/dogstatsd/packets" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) func TestUDSPassCred(t *testing.T) { diff --git a/comp/dogstatsd/listeners/uds_nolinux.go b/comp/dogstatsd/listeners/uds_nolinux.go index 6dd8a3356cf9a..26fa5fd34400c 100644 --- a/comp/dogstatsd/listeners/uds_nolinux.go +++ b/comp/dogstatsd/listeners/uds_nolinux.go @@ -13,7 +13,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/comp/dogstatsd/packets" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // ErrLinuxOnly is emitted on non-linux platforms @@ -34,6 +34,6 @@ func enableUDSPassCred(conn *net.UnixConn) error { // processUDSOrigin returns a "not implemented" error on non-linux hosts // //nolint:revive // TODO(AML) Fix revive linter -func processUDSOrigin(oob []byte, wmeta optional.Option[workloadmeta.Component]) (int, string, error) { +func processUDSOrigin(oob []byte, wmeta option.Option[workloadmeta.Component]) (int, string, error) { return 0, packets.NoOrigin, ErrLinuxOnly } diff --git a/comp/dogstatsd/listeners/uds_stream.go b/comp/dogstatsd/listeners/uds_stream.go index 35bbcf9beacaa..8ea2c208034c9 100644 --- a/comp/dogstatsd/listeners/uds_stream.go +++ b/comp/dogstatsd/listeners/uds_stream.go @@ -16,7 +16,7 @@ import ( "github.com/DataDog/datadog-agent/comp/dogstatsd/replay" "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // UDSStreamListener implements the StatsdListener interface for Unix Domain (streams) @@ -27,7 +27,7 @@ type UDSStreamListener struct { } // NewUDSStreamListener returns an idle UDS datagram Statsd listener -func NewUDSStreamListener(packetOut chan packets.Packets, sharedPacketPoolManager *packets.PoolManager, sharedOobPacketPoolManager *packets.PoolManager, cfg config.Reader, capture replay.Component, wmeta optional.Option[workloadmeta.Component]) (*UDSStreamListener, error) { +func NewUDSStreamListener(packetOut chan packets.Packets, sharedPacketPoolManager *packets.PoolManager, sharedOobPacketPoolManager *packets.PoolManager, cfg config.Reader, capture replay.Component, wmeta option.Option[workloadmeta.Component]) (*UDSStreamListener, error) { socketPath := cfg.GetString("dogstatsd_stream_socket") transport := "unix" diff --git a/comp/dogstatsd/listeners/uds_stream_test.go b/comp/dogstatsd/listeners/uds_stream_test.go index 1860380d1380c..df2b4f866b17a 100644 --- a/comp/dogstatsd/listeners/uds_stream_test.go +++ b/comp/dogstatsd/listeners/uds_stream_test.go @@ -20,7 +20,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/config" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/comp/dogstatsd/packets" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) func udsStreamListenerFactory(packetOut chan packets.Packets, manager *packets.PoolManager, cfg config.Component) (StatsdListener, error) { diff --git a/comp/dogstatsd/server/convert_bench_test.go b/comp/dogstatsd/server/convert_bench_test.go index 22003455704dd..bce8450c6069c 100644 --- a/comp/dogstatsd/server/convert_bench_test.go +++ b/comp/dogstatsd/server/convert_bench_test.go @@ -9,13 +9,14 @@ import ( "fmt" "testing" + "go.uber.org/fx" + "github.com/DataDog/datadog-agent/comp/core" "github.com/DataDog/datadog-agent/comp/core/config" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/metrics" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "go.uber.org/fx" + "github.com/DataDog/datadog-agent/pkg/util/option" ) func buildRawSample(tagCount int, multipleValues bool) []byte { @@ -74,7 +75,7 @@ func BenchmarkParseMultipleMetric(b *testing.B) { type ServerDeps struct { fx.In Config config.Component - WMeta optional.Option[workloadmeta.Component] + WMeta option.Option[workloadmeta.Component] } func newServerDeps(t testing.TB, options ...fx.Option) ServerDeps { diff --git a/comp/dogstatsd/server/parse.go b/comp/dogstatsd/server/parse.go index cf842d40378f6..11f9a019847c0 100644 --- a/comp/dogstatsd/server/parse.go +++ b/comp/dogstatsd/server/parse.go @@ -16,7 +16,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/containers/metrics/provider" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type messageType int @@ -61,7 +61,7 @@ type parser struct { provider provider.Provider } -func newParser(cfg config.Reader, float64List *float64ListPool, workerNum int, wmeta optional.Option[workloadmeta.Component]) *parser { +func newParser(cfg config.Reader, float64List *float64ListPool, workerNum int, wmeta option.Option[workloadmeta.Component]) *parser { stringInternerCacheSize := cfg.GetInt("dogstatsd_string_interner_size") readTimestamps := cfg.GetBool("dogstatsd_no_aggregation_pipeline") diff --git a/comp/dogstatsd/server/server.go b/comp/dogstatsd/server/server.go index 3dfa5eb58f3f7..5968730a0edbd 100644 --- a/comp/dogstatsd/server/server.go +++ b/comp/dogstatsd/server/server.go @@ -34,7 +34,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/telemetry" "github.com/DataDog/datadog-agent/pkg/util" "github.com/DataDog/datadog-agent/pkg/util/hostname" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) var ( @@ -76,7 +76,7 @@ type dependencies struct { Debug serverdebug.Component Replay replay.Component Params Params - WMeta optional.Option[workloadmeta.Component] + WMeta option.Option[workloadmeta.Component] } // When the internal telemetry is enabled, used to tag the origin @@ -149,7 +149,7 @@ type server struct { enrichConfig enrichConfig - wmeta optional.Option[workloadmeta.Component] + wmeta option.Option[workloadmeta.Component] } func initTelemetry(cfg config.Reader, logger logComponent.Component) { @@ -209,7 +209,7 @@ func newServer(deps dependencies) Component { } -func newServerCompat(cfg config.Reader, log logComponent.Component, capture replay.Component, debug serverdebug.Component, serverless bool, demux aggregator.Demultiplexer, wmeta optional.Option[workloadmeta.Component]) *server { +func newServerCompat(cfg config.Reader, log logComponent.Component, capture replay.Component, debug serverdebug.Component, serverless bool, demux aggregator.Demultiplexer, wmeta option.Option[workloadmeta.Component]) *server { // This needs to be done after the configuration is loaded once.Do(func() { initTelemetry(cfg, log) }) diff --git a/comp/dogstatsd/server/server_test.go b/comp/dogstatsd/server/server_test.go index baf7cb5a82663..6bc56059de29c 100644 --- a/comp/dogstatsd/server/server_test.go +++ b/comp/dogstatsd/server/server_test.go @@ -33,7 +33,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/metrics" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type serverDeps struct { @@ -44,7 +44,7 @@ type serverDeps struct { Demultiplexer demultiplexer.FakeSamplerMock Replay replay.Component Debug serverdebug.Component - WMeta optional.Option[workloadmeta.Component] + WMeta option.Option[workloadmeta.Component] Server Component } diff --git a/comp/dogstatsd/server/server_worker.go b/comp/dogstatsd/server/server_worker.go index add0e83e50570..eddd940e73c3f 100644 --- a/comp/dogstatsd/server/server_worker.go +++ b/comp/dogstatsd/server/server_worker.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-agent/comp/dogstatsd/packets" "github.com/DataDog/datadog-agent/pkg/aggregator" "github.com/DataDog/datadog-agent/pkg/metrics" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) var ( @@ -34,7 +34,7 @@ type worker struct { samples metrics.MetricSampleBatch } -func newWorker(s *server, workerNum int, wmeta optional.Option[workloadmeta.Component]) *worker { +func newWorker(s *server, workerNum int, wmeta option.Option[workloadmeta.Component]) *worker { var batcher *batcher if s.ServerlessMode { batcher = newServerlessBatcher(s.demultiplexer) diff --git a/comp/dogstatsd/server/serverless.go b/comp/dogstatsd/server/serverless.go index a6347d0b661e2..3a75c25768928 100644 --- a/comp/dogstatsd/server/serverless.go +++ b/comp/dogstatsd/server/serverless.go @@ -15,7 +15,7 @@ import ( "github.com/DataDog/datadog-agent/comp/dogstatsd/serverDebug/serverdebugimpl" "github.com/DataDog/datadog-agent/pkg/aggregator" "github.com/DataDog/datadog-agent/pkg/config" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // team: agent-metrics-logs diff --git a/comp/forwarder/defaultforwarder/go.mod b/comp/forwarder/defaultforwarder/go.mod index 0e63ec879d3de..93a18c01cce56 100644 --- a/comp/forwarder/defaultforwarder/go.mod +++ b/comp/forwarder/defaultforwarder/go.mod @@ -32,7 +32,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../../pkg/util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/http => ../../../pkg/util/http github.com/DataDog/datadog-agent/pkg/util/log => ../../../pkg/util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../../pkg/util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../../pkg/util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../../pkg/util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../pkg/util/scrubber github.com/DataDog/datadog-agent/pkg/util/system => ../../../pkg/util/system @@ -76,7 +76,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/system/socket v0.53.2-rc.2 // indirect diff --git a/comp/forwarder/eventplatform/eventplatformimpl/epforwarder.go b/comp/forwarder/eventplatform/eventplatformimpl/epforwarder.go index 37e7419b8451d..9761ee750668e 100644 --- a/comp/forwarder/eventplatform/eventplatformimpl/epforwarder.go +++ b/comp/forwarder/eventplatform/eventplatformimpl/epforwarder.go @@ -28,7 +28,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/logs/sender" "github.com/DataDog/datadog-agent/pkg/util/fxutil" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/startstop" ) @@ -485,9 +485,9 @@ func newEventPlatformForwarder(deps dependencies) eventplatform.Component { forwarder = newDefaultEventPlatformForwarder(deps.Config, deps.EventPlatformReceiver) } if forwarder == nil { - return optional.NewNoneOptionPtr[eventplatform.Forwarder]() + return option.NonePtr[eventplatform.Forwarder]() } - return optional.NewOptionPtr[eventplatform.Forwarder](forwarder) + return option.NewPtr[eventplatform.Forwarder](forwarder) } // NewNoopEventPlatformForwarder returns the standard event platform forwarder with sending disabled, meaning events diff --git a/comp/forwarder/eventplatform/eventplatformimpl/epforwarder_mock.go b/comp/forwarder/eventplatform/eventplatformimpl/epforwarder_mock.go index 2d4d6d296ca7e..7500c657a187c 100644 --- a/comp/forwarder/eventplatform/eventplatformimpl/epforwarder_mock.go +++ b/comp/forwarder/eventplatform/eventplatformimpl/epforwarder_mock.go @@ -8,11 +8,12 @@ package eventplatformimpl import ( + "go.uber.org/fx" + "github.com/DataDog/datadog-agent/comp/core/hostname" "github.com/DataDog/datadog-agent/comp/forwarder/eventplatform" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "go.uber.org/fx" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // MockModule defines the fx options for the mock component. @@ -23,5 +24,5 @@ func MockModule() fxutil.Module { } func newMockComponent(hostname hostname.Component) eventplatform.Component { - return optional.NewOptionPtr[eventplatform.Forwarder](NewNoopEventPlatformForwarder(hostname)) + return option.NewPtr[eventplatform.Forwarder](NewNoopEventPlatformForwarder(hostname)) } diff --git a/comp/forwarder/orchestrator/orchestratorimpl/forwarder_no_orchestrator.go b/comp/forwarder/orchestrator/orchestratorimpl/forwarder_no_orchestrator.go index 2ba0eac66dde5..c8a766cacc388 100644 --- a/comp/forwarder/orchestrator/orchestratorimpl/forwarder_no_orchestrator.go +++ b/comp/forwarder/orchestrator/orchestratorimpl/forwarder_no_orchestrator.go @@ -16,7 +16,7 @@ import ( "github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder" "github.com/DataDog/datadog-agent/comp/forwarder/orchestrator" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Module defines the fx options for this component. diff --git a/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator.go b/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator.go index a36219d0db301..6452e80cc2b28 100644 --- a/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator.go +++ b/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator.go @@ -19,7 +19,7 @@ import ( orchestratorconfig "github.com/DataDog/datadog-agent/pkg/orchestrator/config" apicfg "github.com/DataDog/datadog-agent/pkg/process/util/api/config" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Module defines the fx options for this component. diff --git a/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator_mock.go b/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator_mock.go index 4e3c1e698ec69..224673c5a5d95 100644 --- a/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator_mock.go +++ b/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator_mock.go @@ -13,7 +13,7 @@ import ( "github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder" "github.com/DataDog/datadog-agent/comp/forwarder/orchestrator" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // MockModule defines the fx options for this mock component. diff --git a/comp/forwarder/orchestrator/orchestratorinterface/go.mod b/comp/forwarder/orchestrator/orchestratorinterface/go.mod index 777b64c34647b..37bc6656cb95b 100644 --- a/comp/forwarder/orchestrator/orchestratorinterface/go.mod +++ b/comp/forwarder/orchestrator/orchestratorinterface/go.mod @@ -34,7 +34,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../../../pkg/util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/http => ../../../../pkg/util/http github.com/DataDog/datadog-agent/pkg/util/log => ../../../../pkg/util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../../../pkg/util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../../../pkg/util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../../../pkg/util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../../pkg/util/scrubber github.com/DataDog/datadog-agent/pkg/util/sort => ../../../../pkg/util/sort @@ -78,7 +78,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.2 // indirect diff --git a/comp/languagedetection/client/clientimpl/client.go b/comp/languagedetection/client/clientimpl/client.go index ef8ffbfb37a06..47017e7d18fb7 100644 --- a/comp/languagedetection/client/clientimpl/client.go +++ b/comp/languagedetection/client/clientimpl/client.go @@ -22,7 +22,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/clusteragent" "github.com/DataDog/datadog-agent/pkg/util/fxutil" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "go.uber.org/fx" ) diff --git a/comp/languagedetection/client/clientimpl/client_test.go b/comp/languagedetection/client/clientimpl/client_test.go index a44a1f80821db..c71d2229b2a27 100644 --- a/comp/languagedetection/client/clientimpl/client_test.go +++ b/comp/languagedetection/client/clientimpl/client_test.go @@ -26,7 +26,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/languagedetection/languagemodels" pbgo "github.com/DataDog/datadog-agent/pkg/proto/pbgo/process" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" langUtil "github.com/DataDog/datadog-agent/pkg/languagedetection/util" ) @@ -58,7 +58,7 @@ func newTestClient(t *testing.T) (*client, chan *pbgo.ParentLanguageAnnotationRe workloadmeta.MockModuleV2(), )) - optComponent := newClient(deps).(optional.Option[clientComp.Component]) + optComponent := newClient(deps).(option.Option[clientComp.Component]) comp, _ := optComponent.Get() client := comp.(*client) client.langDetectionCl = mockDCAClient @@ -103,7 +103,7 @@ func TestClientEnabled(t *testing.T) { workloadmeta.MockModuleV2(), )) - optionalCl := newClient(deps).(optional.Option[clientComp.Component]) + optionalCl := newClient(deps).(option.Option[clientComp.Component]) _, ok := optionalCl.Get() assert.Equal(t, testCase.isSet, ok) }) diff --git a/comp/logs/agent/agent.go b/comp/logs/agent/agent.go index 06bfd7f287666..5925c1711d609 100644 --- a/comp/logs/agent/agent.go +++ b/comp/logs/agent/agent.go @@ -37,7 +37,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/logs/tailers" "github.com/DataDog/datadog-agent/pkg/status/health" "github.com/DataDog/datadog-agent/pkg/util" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/startstop" ) @@ -62,13 +62,13 @@ type dependencies struct { Config configComponent.Component InventoryAgent inventoryagent.Component Hostname hostname.Component - WMeta optional.Option[workloadmeta.Component] + WMeta option.Option[workloadmeta.Component] } type provides struct { fx.Out - Comp optional.Option[Component] + Comp option.Option[Component] FlareProvider flaretypes.Provider StatusProvider statusComponent.InformationProvider } @@ -94,7 +94,7 @@ type agent struct { health *health.Handle diagnosticMessageReceiver *diagnostic.BufferedMessageReceiver flarecontroller *flareController.FlareController - wmeta optional.Option[workloadmeta.Component] + wmeta option.Option[workloadmeta.Component] // started is true if the logs agent is running started *atomic.Bool @@ -125,7 +125,7 @@ func newLogsAgent(deps dependencies) provides { }) return provides{ - Comp: optional.NewOption[Component](logsAgent), + Comp: option.New[Component](logsAgent), StatusProvider: statusComponent.NewInformationProvider(NewStatusProvider()), FlareProvider: flaretypes.NewProvider(logsAgent.flarecontroller.FillFlare), } diff --git a/comp/logs/agent/agent_core_init.go b/comp/logs/agent/agent_core_init.go index c1821c71254e5..216fdcd4248f0 100644 --- a/comp/logs/agent/agent_core_init.go +++ b/comp/logs/agent/agent_core_init.go @@ -26,11 +26,11 @@ import ( "github.com/DataDog/datadog-agent/pkg/logs/pipeline" "github.com/DataDog/datadog-agent/pkg/logs/schedulers" "github.com/DataDog/datadog-agent/pkg/status/health" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // NewAgent returns a new Logs Agent -func (a *agent) SetupPipeline(processingRules []*config.ProcessingRule, wmeta optional.Option[workloadmeta.Component]) { +func (a *agent) SetupPipeline(processingRules []*config.ProcessingRule, wmeta option.Option[workloadmeta.Component]) { health := health.RegisterLiveness("logs-agent") // setup the auditor diff --git a/comp/logs/agent/agent_serverless_init.go b/comp/logs/agent/agent_serverless_init.go index 9a305e2ea5138..74f415dbc5f1f 100644 --- a/comp/logs/agent/agent_serverless_init.go +++ b/comp/logs/agent/agent_serverless_init.go @@ -19,7 +19,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/logs/pipeline" "github.com/DataDog/datadog-agent/pkg/logs/schedulers" "github.com/DataDog/datadog-agent/pkg/status/health" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Note: Building the logs-agent for serverless separately removes the @@ -31,7 +31,7 @@ import ( // It is using a NullAuditor because we've nothing to do after having sent the logs to the intake. func (a *agent) SetupPipeline( processingRules []*config.ProcessingRule, - _ optional.Option[workloadmeta.Component], + _ option.Option[workloadmeta.Component], ) { health := health.RegisterLiveness("logs-agent") diff --git a/comp/logs/agent/config/go.mod b/comp/logs/agent/config/go.mod index 985804a591585..ee2879a5e190f 100644 --- a/comp/logs/agent/config/go.mod +++ b/comp/logs/agent/config/go.mod @@ -19,7 +19,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../../pkg/util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../../../pkg/util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../../../pkg/util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../../../pkg/util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../../../pkg/util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../../../pkg/util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../../pkg/util/scrubber github.com/DataDog/datadog-agent/pkg/util/system => ../../../../pkg/util/system @@ -49,7 +49,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/system/socket v0.53.2-rc.2 // indirect diff --git a/comp/logs/agent/mock.go b/comp/logs/agent/mock.go index 7fed52e93c5d1..2fd3a822e64a8 100644 --- a/comp/logs/agent/mock.go +++ b/comp/logs/agent/mock.go @@ -9,12 +9,13 @@ import ( "context" "time" + "go.uber.org/fx" + "github.com/DataDog/datadog-agent/pkg/logs/diagnostic" "github.com/DataDog/datadog-agent/pkg/logs/pipeline" "github.com/DataDog/datadog-agent/pkg/logs/schedulers" "github.com/DataDog/datadog-agent/pkg/logs/sources" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "go.uber.org/fx" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type mockLogsAgent struct { @@ -25,7 +26,7 @@ type mockLogsAgent struct { logSources *sources.LogSources } -func newMock(deps dependencies) optional.Option[Mock] { +func newMock(deps dependencies) option.Option[Mock] { logsAgent := &mockLogsAgent{ hasFlushed: false, addedSchedulers: make([]schedulers.Scheduler, 0), @@ -36,7 +37,7 @@ func newMock(deps dependencies) optional.Option[Mock] { OnStart: logsAgent.start, OnStop: logsAgent.stop, }) - return optional.NewOption[Mock](logsAgent) + return option.New[Mock](logsAgent) } func (a *mockLogsAgent) start(context.Context) error { diff --git a/comp/metadata/bundle_test.go b/comp/metadata/bundle_test.go index 61861f356b775..39fc9bb4b4cda 100644 --- a/comp/metadata/bundle_test.go +++ b/comp/metadata/bundle_test.go @@ -17,7 +17,7 @@ import ( "github.com/DataDog/datadog-agent/comp/metadata/runner/runnerimpl" "github.com/DataDog/datadog-agent/pkg/serializer" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) func TestBundleDependencies(t *testing.T) { @@ -25,7 +25,7 @@ func TestBundleDependencies(t *testing.T) { fx.Supply(optional.NewNoneOption[runnerimpl.MetadataProvider]()), fx.Provide(func() serializer.MetricSerializer { return nil }), collectorimpl.MockModule(), - fx.Provide(func() optional.Option[agent.Component] { + fx.Provide(func() option.Option[agent.Component] { return optional.NewNoneOption[agent.Component]() }), authtokenimpl.Module(), diff --git a/comp/metadata/inventoryagent/inventoryagentimpl/inventoryagent.go b/comp/metadata/inventoryagent/inventoryagentimpl/inventoryagent.go index 7d3810f575150..dd49d9b4daeb2 100644 --- a/comp/metadata/inventoryagent/inventoryagentimpl/inventoryagent.go +++ b/comp/metadata/inventoryagent/inventoryagentimpl/inventoryagent.go @@ -38,7 +38,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" "github.com/DataDog/datadog-agent/pkg/util/hostname" "github.com/DataDog/datadog-agent/pkg/util/installinfo" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/scrubber" "github.com/DataDog/datadog-agent/pkg/util/uuid" "github.com/DataDog/datadog-agent/pkg/version" @@ -87,7 +87,7 @@ type inventoryagent struct { log log.Component conf config.Component - sysprobeConf optional.Option[sysprobeconfig.Component] + sysprobeConf option.Option[sysprobeconfig.Component] m sync.Mutex data agentMetadata hostname string @@ -99,7 +99,7 @@ type dependencies struct { Log log.Component Config config.Component - SysProbeConfig optional.Option[sysprobeconfig.Component] + SysProbeConfig option.Option[sysprobeconfig.Component] Serializer serializer.MetricSerializer AuthToken authtoken.Component } diff --git a/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks.go b/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks.go index 9f655e45c2a7c..4251851dd8d87 100644 --- a/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks.go +++ b/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks.go @@ -31,7 +31,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/serializer/marshaler" "github.com/DataDog/datadog-agent/pkg/util/fxutil" "github.com/DataDog/datadog-agent/pkg/util/hostname" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/uuid" ) @@ -82,8 +82,8 @@ type inventorychecksImpl struct { log log.Component conf config.Component - coll optional.Option[collector.Component] - sources optional.Option[*sources.LogSources] + coll option.Option[collector.Component] + sources option.Option[*sources.LogSources] hostname string } @@ -93,8 +93,8 @@ type dependencies struct { Log log.Component Config config.Component Serializer serializer.MetricSerializer - Coll optional.Option[collector.Component] - LogAgent optional.Option[logagent.Component] + Coll option.Option[collector.Component] + LogAgent option.Option[logagent.Component] } type provides struct { diff --git a/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks_test.go b/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks_test.go index 32f7277fd622c..0654055d65eee 100644 --- a/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks_test.go +++ b/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks_test.go @@ -26,10 +26,10 @@ import ( "github.com/DataDog/datadog-agent/pkg/logs/sources" "github.com/DataDog/datadog-agent/pkg/serializer" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) -func getTestInventoryChecks(t *testing.T, coll optional.Option[collector.Component], logAgent optional.Option[logagent.Component], overrides map[string]any) *inventorychecksImpl { +func getTestInventoryChecks(t *testing.T, coll option.Option[collector.Component], logAgent option.Option[logagent.Component], overrides map[string]any) *inventorychecksImpl { p := newInventoryChecksProvider( fxutil.Test[dependencies]( t, @@ -37,10 +37,10 @@ func getTestInventoryChecks(t *testing.T, coll optional.Option[collector.Compone config.MockModule(), fx.Replace(config.MockParams{Overrides: overrides}), fx.Provide(func() serializer.MetricSerializer { return &serializer.MockSerializer{} }), - fx.Provide(func() optional.Option[collector.Component] { + fx.Provide(func() option.Option[collector.Component] { return coll }), - fx.Provide(func() optional.Option[logagent.Component] { + fx.Provide(func() option.Option[logagent.Component] { return logAgent }), ), @@ -50,7 +50,7 @@ func getTestInventoryChecks(t *testing.T, coll optional.Option[collector.Compone func TestSet(t *testing.T) { ic := getTestInventoryChecks( - t, optional.NewNoneOption[collector.Component](), optional.Option[logagent.Component]{}, nil, + t, optional.NewNoneOption[collector.Component](), option.Option[logagent.Component]{}, nil, ) ic.Set("instance_1", "key", "value") @@ -69,7 +69,7 @@ func TestSet(t *testing.T) { func TestSetEmptyInstance(t *testing.T) { ic := getTestInventoryChecks( - t, optional.NewNoneOption[collector.Component](), optional.Option[logagent.Component]{}, nil, + t, optional.NewNoneOption[collector.Component](), option.Option[logagent.Component]{}, nil, ) ic.Set("", "key", "value") @@ -79,7 +79,7 @@ func TestSetEmptyInstance(t *testing.T) { func TestGetInstanceMetadata(t *testing.T) { ic := getTestInventoryChecks( - t, optional.NewNoneOption[collector.Component](), optional.Option[logagent.Component]{}, nil, + t, optional.NewNoneOption[collector.Component](), option.Option[logagent.Component]{}, nil, ) ic.Set("instance_1", "key1", "value1") @@ -146,7 +146,7 @@ func TestGetPayload(t *testing.T) { // Register an error src.Status.Error(fmt.Errorf("No such file or directory")) logSources.AddSource(src) - mockLogAgent := fxutil.Test[optional.Option[logagent.Mock]]( + mockLogAgent := fxutil.Test[option.Option[logagent.Mock]]( t, logagent.MockModule(), core.MockBundle(), inventoryagentimpl.MockModule(), workloadmeta.MockModule(), fx.Supply(workloadmeta.NewParams()), ) logsAgent, _ := mockLogAgent.Get() @@ -160,8 +160,8 @@ func TestGetPayload(t *testing.T) { } ic := getTestInventoryChecks(t, - optional.NewOption[collector.Component](mockColl), - optional.NewOption[logagent.Component](logsAgent), + option.New[collector.Component](mockColl), + option.New[logagent.Component](logsAgent), overrides, ) @@ -242,7 +242,7 @@ func TestGetPayload(t *testing.T) { func TestFlareProviderFilename(t *testing.T) { ic := getTestInventoryChecks( - t, optional.NewNoneOption[collector.Component](), optional.Option[logagent.Component]{}, nil, + t, optional.NewNoneOption[collector.Component](), option.Option[logagent.Component]{}, nil, ) assert.Equal(t, "checks.json", ic.FlareFileName) } diff --git a/comp/metadata/runner/runnerimpl/runner.go b/comp/metadata/runner/runnerimpl/runner.go index 21438ac45ab2f..3baa22d738aac 100644 --- a/comp/metadata/runner/runnerimpl/runner.go +++ b/comp/metadata/runner/runnerimpl/runner.go @@ -10,12 +10,13 @@ import ( "sync" "time" + "go.uber.org/fx" + "github.com/DataDog/datadog-agent/comp/core/config" "github.com/DataDog/datadog-agent/comp/core/log" "github.com/DataDog/datadog-agent/comp/metadata/runner" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "go.uber.org/fx" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Module defines the fx options for this component. @@ -43,20 +44,20 @@ type dependencies struct { Log log.Component Config config.Component - Providers []optional.Option[MetadataProvider] `group:"metadata_provider"` + Providers []option.Option[MetadataProvider] `group:"metadata_provider"` } // Provider represents the callback from a metada provider. This is returned by 'NewProvider' helper. type Provider struct { fx.Out - Callback optional.Option[MetadataProvider] `group:"metadata_provider"` + Callback option.Option[MetadataProvider] `group:"metadata_provider"` } // NewProvider registers a new metadata provider by adding a callback to the runner. func NewProvider(callback MetadataProvider) Provider { return Provider{ - Callback: optional.NewOption[MetadataProvider](callback), + Callback: option.New[MetadataProvider](callback), } } diff --git a/comp/otelcol/collector/pipeline.go b/comp/otelcol/collector/pipeline.go index 9a3a7133f28c5..afb94a3bfd1f9 100644 --- a/comp/otelcol/collector/pipeline.go +++ b/comp/otelcol/collector/pipeline.go @@ -20,7 +20,7 @@ import ( "github.com/DataDog/datadog-agent/comp/otelcol/otlp" "github.com/DataDog/datadog-agent/pkg/logs/message" "github.com/DataDog/datadog-agent/pkg/serializer" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -47,7 +47,7 @@ type dependencies struct { Serializer serializer.MetricSerializer // LogsAgent specifies a logs agent - LogsAgent optional.Option[logsagent.Component] + LogsAgent option.Option[logsagent.Component] // InventoryAgent require the inventory metadata payload, allowing otelcol to add data to it. InventoryAgent inventoryagent.Component diff --git a/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod b/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod index 88e50a015af21..2fce929b8bdca 100644 --- a/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod +++ b/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod @@ -40,7 +40,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/http => ../../../../../../pkg/util/http/ github.com/DataDog/datadog-agent/pkg/util/json => ../../../../../../pkg/util/json/ github.com/DataDog/datadog-agent/pkg/util/log => ../../../../../../pkg/util/log/ - github.com/DataDog/datadog-agent/pkg/util/optional => ../../../../../../pkg/util/optional/ + github.com/DataDog/datadog-agent/pkg/util/option => ../../../../../../pkg/util/option/ github.com/DataDog/datadog-agent/pkg/util/pointer => ../../../../../../pkg/util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../../../../pkg/util/scrubber/ github.com/DataDog/datadog-agent/pkg/util/sort => ../../../../../../pkg/util/sort/ @@ -108,7 +108,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/json v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/sort v0.53.2-rc.2 // indirect diff --git a/comp/remote-config/rcclient/component.go b/comp/remote-config/rcclient/component.go index 0b8eb9c63782c..2ee24f50bea92 100644 --- a/comp/remote-config/rcclient/component.go +++ b/comp/remote-config/rcclient/component.go @@ -11,7 +11,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/config/remote/data" "github.com/DataDog/datadog-agent/pkg/remoteconfig/state" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // team: remote-config @@ -36,7 +36,7 @@ type Component interface { // This helper allows code that needs a disabled Optional type for rcclient to get it. The helper is split from // the implementation to avoid linking with the dependencies from rcclient. func NoneModule() fxutil.Module { - return fxutil.Component(fx.Provide(func() optional.Option[Component] { + return fxutil.Component(fx.Provide(func() option.Option[Component] { return optional.NewNoneOption[Component]() })) } diff --git a/comp/remote-config/rcclient/rcclientimpl/rcclient.go b/comp/remote-config/rcclient/rcclientimpl/rcclient.go index 9b7a295ee4a6b..46e3685b4c6d9 100644 --- a/comp/remote-config/rcclient/rcclientimpl/rcclient.go +++ b/comp/remote-config/rcclient/rcclientimpl/rcclient.go @@ -26,7 +26,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/remoteconfig/state" "github.com/DataDog/datadog-agent/pkg/util/fxutil" pkglog "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/version" ) @@ -34,8 +34,8 @@ import ( func Module() fxutil.Module { return fxutil.Component( fx.Provide(newRemoteConfigClient), - fx.Provide(func(c rcclient.Component) optional.Option[rcclient.Component] { - return optional.NewOption[rcclient.Component](c) + fx.Provide(func(c rcclient.Component) option.Option[rcclient.Component] { + return option.New[rcclient.Component](c) }), ) } diff --git a/comp/remote-config/rcservice/rcserviceimpl/rcservice.go b/comp/remote-config/rcservice/rcserviceimpl/rcservice.go index f3e734c72088c..ea178d0cf07e9 100644 --- a/comp/remote-config/rcservice/rcserviceimpl/rcservice.go +++ b/comp/remote-config/rcservice/rcserviceimpl/rcservice.go @@ -11,7 +11,7 @@ import ( "fmt" "github.com/DataDog/datadog-agent/comp/core/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" cfgcomp "github.com/DataDog/datadog-agent/comp/core/config" "github.com/DataDog/datadog-agent/comp/core/hostname" @@ -46,7 +46,7 @@ type dependencies struct { } // newRemoteConfigServiceOptional conditionally creates and configures a new remote config service, based on whether RC is enabled. -func newRemoteConfigServiceOptional(deps dependencies) optional.Option[rcservice.Component] { +func newRemoteConfigServiceOptional(deps dependencies) option.Option[rcservice.Component] { none := optional.NewNoneOption[rcservice.Component]() if !config.IsRemoteConfigEnabled(deps.Cfg) { return none @@ -58,7 +58,7 @@ func newRemoteConfigServiceOptional(deps dependencies) optional.Option[rcservice return none } - return optional.NewOption[rcservice.Component](configService) + return option.New[rcservice.Component](configService) } // newRemoteConfigServiceOptional creates and configures a new remote config service diff --git a/comp/remote-config/rcserviceha/rcservicehaimpl/rcserviceha.go b/comp/remote-config/rcserviceha/rcservicehaimpl/rcserviceha.go index ba03eadc9172c..c9bf563b4e26e 100644 --- a/comp/remote-config/rcserviceha/rcservicehaimpl/rcserviceha.go +++ b/comp/remote-config/rcserviceha/rcservicehaimpl/rcserviceha.go @@ -20,7 +20,7 @@ import ( remoteconfig "github.com/DataDog/datadog-agent/pkg/config/remote/service" configUtils "github.com/DataDog/datadog-agent/pkg/config/utils" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/version" "go.uber.org/fx" @@ -45,7 +45,7 @@ type dependencies struct { } // newHaRemoteConfigServiceOptional conditionally creates and configures a new HA remote config service, based on whether RC is enabled. -func newHaRemoteConfigServiceOptional(deps dependencies) optional.Option[rcserviceha.Component] { +func newHaRemoteConfigServiceOptional(deps dependencies) option.Option[rcserviceha.Component] { none := optional.NewNoneOption[rcserviceha.Component]() if !config.IsRemoteConfigEnabled(deps.Cfg) || !deps.Cfg.GetBool("ha.enabled") { return none @@ -57,7 +57,7 @@ func newHaRemoteConfigServiceOptional(deps dependencies) optional.Option[rcservi return none } - return optional.NewOption[rcserviceha.Component](haConfigService) + return option.New[rcserviceha.Component](haConfigService) } // newHaRemoteConfigServiceOptional creates and configures a new service that receives remote config updates from the configured DD failover DC diff --git a/comp/updater/updater/updaterimpl/updater.go b/comp/updater/updater/updaterimpl/updater.go index 1e96c8607c601..e4e8ef704f991 100644 --- a/comp/updater/updater/updaterimpl/updater.go +++ b/comp/updater/updater/updaterimpl/updater.go @@ -18,7 +18,7 @@ import ( updatercomp "github.com/DataDog/datadog-agent/comp/updater/updater" "github.com/DataDog/datadog-agent/pkg/updater" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) var ( @@ -38,7 +38,7 @@ type dependencies struct { Log log.Component Config config.Component - RemoteConfig optional.Option[rcservice.Component] + RemoteConfig option.Option[rcservice.Component] } func newUpdaterComponent(lc fx.Lifecycle, dependencies dependencies) (updatercomp.Component, error) { diff --git a/comp/updater/updater/updaterimpl/updater_test.go b/comp/updater/updater/updaterimpl/updater_test.go index 09dee5e100d0e..020fb4a9d9b96 100644 --- a/comp/updater/updater/updaterimpl/updater_test.go +++ b/comp/updater/updater/updaterimpl/updater_test.go @@ -15,7 +15,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core" "github.com/DataDog/datadog-agent/comp/remote-config/rcservice" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type testDependencies struct { diff --git a/go.mod b/go.mod index c414aab4e7277..a504d28f21ad7 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/http => ./pkg/util/http/ github.com/DataDog/datadog-agent/pkg/util/json => ./pkg/util/json github.com/DataDog/datadog-agent/pkg/util/log => ./pkg/util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ./pkg/util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ./pkg/util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ./pkg/util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ./pkg/util/scrubber github.com/DataDog/datadog-agent/pkg/util/sort => ./pkg/util/sort/ @@ -650,7 +650,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 github.com/DataDog/datadog-agent/pkg/util/http v0.53.2-rc.2 github.com/DataDog/datadog-agent/pkg/util/json v0.53.2-rc.2 - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 github.com/DataDog/datadog-agent/pkg/util/sort v0.53.2-rc.2 github.com/DataDog/datadog-agent/pkg/util/startstop v0.53.2-rc.2 github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.2 diff --git a/modules.yml b/modules.yml index 810a8f8da299c..e023743c3bd96 100644 --- a/modules.yml +++ b/modules.yml @@ -114,7 +114,7 @@ modules: pkg/util/json: default pkg/util/log: used_by_otel: true - pkg/util/optional: default + pkg/util/option: default pkg/util/pointer: used_by_otel: true pkg/util/scrubber: diff --git a/pkg/aggregator/check_sampler_bench_test.go b/pkg/aggregator/check_sampler_bench_test.go index d4999aa4ef6fd..7121cbf5e1afe 100644 --- a/pkg/aggregator/check_sampler_bench_test.go +++ b/pkg/aggregator/check_sampler_bench_test.go @@ -25,7 +25,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/metrics" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type benchmarkDeps struct { @@ -44,8 +44,8 @@ func benchmarkAddBucket(bucketValue int64, b *testing.B) { options := DefaultAgentDemultiplexerOptions() options.DontStartForwarders = true sharedForwarder := forwarder.NewDefaultForwarder(config.Datadog, deps.Log, forwarderOpts) - orchestratorForwarder := optional.NewOption[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) - eventPlatformForwarder := optional.NewOptionPtr[eventplatform.Forwarder](eventplatformimpl.NewNoopEventPlatformForwarder(deps.Hostname)) + orchestratorForwarder := option.New[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) + eventPlatformForwarder := option.NewPtr[eventplatform.Forwarder](eventplatformimpl.NewNoopEventPlatformForwarder(deps.Hostname)) demux := InitAndStartAgentDemultiplexer(deps.Log, sharedForwarder, &orchestratorForwarder, options, eventPlatformForwarder, "hostname") defer demux.Stop(true) diff --git a/pkg/aggregator/demultiplexer_mock.go b/pkg/aggregator/demultiplexer_mock.go index d0738e6aba0be..555e06e895c2f 100644 --- a/pkg/aggregator/demultiplexer_mock.go +++ b/pkg/aggregator/demultiplexer_mock.go @@ -15,7 +15,7 @@ import ( "github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder" "github.com/DataDog/datadog-agent/comp/forwarder/eventplatform" "github.com/DataDog/datadog-agent/comp/forwarder/eventplatform/eventplatformimpl" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // TestDeps contains dependencies for InitAndStartAgentDemultiplexerForTest @@ -28,7 +28,7 @@ type TestDeps struct { // InitAndStartAgentDemultiplexerForTest initializes an aggregator for tests. func InitAndStartAgentDemultiplexerForTest(deps TestDeps, options AgentDemultiplexerOptions, hostname string) *AgentDemultiplexer { - orchestratorForwarder := optional.NewOption[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) - eventPlatformForwarder := optional.NewOptionPtr[eventplatform.Forwarder](eventplatformimpl.NewNoopEventPlatformForwarder(deps.Hostname)) + orchestratorForwarder := option.New[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) + eventPlatformForwarder := option.NewPtr[eventplatform.Forwarder](eventplatformimpl.NewNoopEventPlatformForwarder(deps.Hostname)) return InitAndStartAgentDemultiplexer(deps.Log, deps.SharedForwarder, &orchestratorForwarder, options, eventPlatformForwarder, hostname) } diff --git a/pkg/aggregator/mocksender/mocksender.go b/pkg/aggregator/mocksender/mocksender.go index fc688318eda5b..314ccba026522 100644 --- a/pkg/aggregator/mocksender/mocksender.go +++ b/pkg/aggregator/mocksender/mocksender.go @@ -24,7 +24,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/aggregator/sender" checkid "github.com/DataDog/datadog-agent/pkg/collector/check/id" "github.com/DataDog/datadog-agent/pkg/config" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // NewMockSender initiates the aggregator and returns a @@ -40,8 +40,8 @@ func CreateDefaultDemultiplexer() *aggregator.AgentDemultiplexer { opts.DontStartForwarders = true log := logimpl.NewTemporaryLoggerWithoutInit() sharedForwarder := forwarder.NewDefaultForwarder(config.Datadog, log, forwarder.NewOptions(config.Datadog, log, nil)) - orchestratorForwarder := optional.NewOption[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) - eventPlatformForwarder := optional.NewOptionPtr[eventplatform.Forwarder](eventplatformimpl.NewNoopEventPlatformForwarder(hostnameimpl.NewHostnameService())) + orchestratorForwarder := option.New[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) + eventPlatformForwarder := option.NewPtr[eventplatform.Forwarder](eventplatformimpl.NewNoopEventPlatformForwarder(hostnameimpl.NewHostnameService())) return aggregator.InitAndStartAgentDemultiplexer(log, sharedForwarder, &orchestratorForwarder, opts, eventPlatformForwarder, "") } diff --git a/pkg/aggregator/sender_test.go b/pkg/aggregator/sender_test.go index 3e65f405fb4e5..f489f50e70c7a 100644 --- a/pkg/aggregator/sender_test.go +++ b/pkg/aggregator/sender_test.go @@ -27,7 +27,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/metrics/event" "github.com/DataDog/datadog-agent/pkg/metrics/servicecheck" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type senderWithChans struct { @@ -54,8 +54,8 @@ func initSender(id checkid.ID, defaultHostname string) (s senderWithChans) { func testDemux(log log.Component, hostname hostname.Component) *AgentDemultiplexer { opts := DefaultAgentDemultiplexerOptions() opts.DontStartForwarders = true - orchestratorForwarder := optional.NewOption[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) - eventPlatformForwarder := optional.NewOptionPtr[eventplatform.Forwarder](eventplatformimpl.NewNoopEventPlatformForwarder(hostname)) + orchestratorForwarder := option.New[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) + eventPlatformForwarder := option.NewPtr[eventplatform.Forwarder](eventplatformimpl.NewNoopEventPlatformForwarder(hostname)) demux := initAgentDemultiplexer(log, NewForwarderTest(log), &orchestratorForwarder, opts, eventPlatformForwarder, defaultHostname) return demux } diff --git a/pkg/api/go.mod b/pkg/api/go.mod index ac1da675aea8d..77e4b6aaae68c 100644 --- a/pkg/api/go.mod +++ b/pkg/api/go.mod @@ -21,7 +21,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../util/optional github.com/DataDog/datadog-agent/pkg/util/pointer => ../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../util/scrubber github.com/DataDog/datadog-agent/pkg/util/system => ../util/system @@ -51,7 +51,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/system/socket v0.53.2-rc.2 // indirect diff --git a/pkg/cli/standalone/jmx.go b/pkg/cli/standalone/jmx.go index 35ab820ffe2b9..f7359ccae2b74 100644 --- a/pkg/cli/standalone/jmx.go +++ b/pkg/cli/standalone/jmx.go @@ -23,13 +23,13 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/corechecks/embed/jmx" "github.com/DataDog/datadog-agent/pkg/jmxfetch" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // ExecJMXCommandConsole runs the provided JMX command name on the selected checks, and // reports with the ConsoleReporter to the agent's `log.Info`. // The common utils, including AutoConfig, must have already been initialized. -func ExecJMXCommandConsole(command string, selectedChecks []string, logLevel string, configs []integration.Config, wmeta workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, agentAPI internalAPI.Component, collector optional.Option[collector.Component]) error { +func ExecJMXCommandConsole(command string, selectedChecks []string, logLevel string, configs []integration.Config, wmeta workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, agentAPI internalAPI.Component, collector option.Option[collector.Component]) error { return execJmxCommand(command, selectedChecks, jmxfetch.ReporterConsole, log.JMXInfo, logLevel, configs, wmeta, taggerComp, ac, senderManager, agentAPI, collector) } @@ -37,7 +37,7 @@ func ExecJMXCommandConsole(command string, selectedChecks []string, logLevel str // the data as a JSON on the console. It is used by the `check jmx` cli command // of the Agent. // The common utils, including AutoConfig, must have already been initialized. -func ExecJmxListWithMetricsJSON(selectedChecks []string, logLevel string, configs []integration.Config, wmeta workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, agentAPI internalAPI.Component, collector optional.Option[collector.Component]) error { +func ExecJmxListWithMetricsJSON(selectedChecks []string, logLevel string, configs []integration.Config, wmeta workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, agentAPI internalAPI.Component, collector option.Option[collector.Component]) error { // don't pollute the JSON with the log pattern. out := func(a ...interface{}) { fmt.Println(a...) @@ -49,7 +49,7 @@ func ExecJmxListWithMetricsJSON(selectedChecks []string, logLevel string, config // the data as a JSON on the console. It is used by the `check jmx --rate` cli command // of the Agent. // The common utils, including AutoConfig, must have already been initialized. -func ExecJmxListWithRateMetricsJSON(selectedChecks []string, logLevel string, configs []integration.Config, wmeta workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, agentAPI internalAPI.Component, collector optional.Option[collector.Component]) error { +func ExecJmxListWithRateMetricsJSON(selectedChecks []string, logLevel string, configs []integration.Config, wmeta workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, agentAPI internalAPI.Component, collector option.Option[collector.Component]) error { // don't pollute the JSON with the log pattern. out := func(a ...interface{}) { fmt.Println(a...) @@ -70,9 +70,9 @@ func execJmxCommand(command string, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, agentAPI internalAPI.Component, - collector optional.Option[collector.Component]) error { + collector option.Option[collector.Component]) error { // start the cmd HTTP server - if err := agentAPI.StartServer(wmeta, taggerComp, ac, optional.NewNoneOption[logsAgent.Component](), senderManager, collector); err != nil { + if err := agentAPI.StartServer(wmeta, taggerComp, ac, option.None[logsAgent.Component](), senderManager, collector); err != nil { return fmt.Errorf("Error while starting api server, exiting: %v", err) } diff --git a/pkg/cli/standalone/jmx_nojmx.go b/pkg/cli/standalone/jmx_nojmx.go index eb0cf73f3a183..a364c3364454b 100644 --- a/pkg/cli/standalone/jmx_nojmx.go +++ b/pkg/cli/standalone/jmx_nojmx.go @@ -17,20 +17,20 @@ import ( "github.com/DataDog/datadog-agent/comp/core/tagger" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/aggregator/sender" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // ExecJMXCommandConsole is not supported when the 'jmx' build tag isn't included -func ExecJMXCommandConsole(command string, selectedChecks []string, logLevel string, configs []integration.Config, wmeta workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, agentAPI internalAPI.Component, collector optional.Option[collector.Component]) error { //nolint:revive // TODO fix revive unused-parameter +func ExecJMXCommandConsole(command string, selectedChecks []string, logLevel string, configs []integration.Config, wmeta workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, agentAPI internalAPI.Component, collector option.Option[collector.Component]) error { //nolint:revive // TODO fix revive unused-parameter return fmt.Errorf("not supported: the Agent is compiled without the 'jmx' build tag") } // ExecJmxListWithMetricsJSON is not supported when the 'jmx' build tag isn't included -func ExecJmxListWithMetricsJSON(selectedChecks []string, logLevel string, configs []integration.Config, wmeta workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, agentAPI internalAPI.Component, collector optional.Option[collector.Component]) error { //nolint:revive // TODO fix revive unused-parameter +func ExecJmxListWithMetricsJSON(selectedChecks []string, logLevel string, configs []integration.Config, wmeta workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, agentAPI internalAPI.Component, collector option.Option[collector.Component]) error { //nolint:revive // TODO fix revive unused-parameter return fmt.Errorf("not supported: the Agent is compiled without the 'jmx' build tag") } // ExecJmxListWithRateMetricsJSON is not supported when the 'jmx' build tag isn't included -func ExecJmxListWithRateMetricsJSON(selectedChecks []string, logLevel string, configs []integration.Config, wmeta workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, agentAPI internalAPI.Component, collector optional.Option[collector.Component]) error { //nolint:revive // TODO fix revive unused-parameter +func ExecJmxListWithRateMetricsJSON(selectedChecks []string, logLevel string, configs []integration.Config, wmeta workloadmeta.Component, taggerComp tagger.Component, ac autodiscovery.Component, senderManager sender.DiagnoseSenderManager, agentAPI internalAPI.Component, collector option.Option[collector.Component]) error { //nolint:revive // TODO fix revive unused-parameter return fmt.Errorf("not supported: the Agent is compiled without the 'jmx' build tag") } diff --git a/pkg/cli/subcommands/check/command.go b/pkg/cli/subcommands/check/command.go index b4ebdfa7e20e0..b214df8cce43d 100644 --- a/pkg/cli/subcommands/check/command.go +++ b/pkg/cli/subcommands/check/command.go @@ -76,7 +76,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/serializer" statuscollector "github.com/DataDog/datadog-agent/pkg/status/collector" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/scrubber" ) @@ -172,7 +172,7 @@ func MakeCommand(globalParamsGetter func() GlobalParams) *cobra.Command { // Here we just want to collect metadata to be displayed, so we don't need a collector. collector.NoneModule(), fx.Supply(status.NewInformationProvider(statuscollector.Provider{})), - fx.Provide(func() optional.Option[logagent.Component] { + fx.Provide(func() option.Option[logagent.Component] { return optional.NewNoneOption[logagent.Component]() }), @@ -213,8 +213,8 @@ func MakeCommand(globalParamsGetter func() GlobalParams) *cobra.Command { fx.Provide(func() inventoryagent.Component { return nil }), fx.Provide(func() inventoryhost.Component { return nil }), fx.Provide(func() packagesigning.Component { return nil }), - fx.Provide(func() optional.Option[rcservice.Component] { return optional.NewNoneOption[rcservice.Component]() }), - fx.Provide(func() optional.Option[rcserviceha.Component] { return optional.NewNoneOption[rcserviceha.Component]() }), + fx.Provide(func() option.Option[rcservice.Component] { return optional.NewNoneOption[rcservice.Component]() }), + fx.Provide(func() option.Option[rcserviceha.Component] { return optional.NewNoneOption[rcserviceha.Component]() }), getPlatformModules(), ) @@ -268,7 +268,7 @@ func run( agentAPI internalAPI.Component, invChecks inventorychecks.Component, statusComponent status.Component, - collector optional.Option[collector.Component], + collector option.Option[collector.Component], ) error { previousIntegrationTracing := false previousIntegrationTracingExhaustive := false diff --git a/pkg/cli/subcommands/dcaflare/command.go b/pkg/cli/subcommands/dcaflare/command.go index bdf605a08bf8d..26eecdcf85a2e 100644 --- a/pkg/cli/subcommands/dcaflare/command.go +++ b/pkg/cli/subcommands/dcaflare/command.go @@ -34,7 +34,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/flare" "github.com/DataDog/datadog-agent/pkg/util/fxutil" "github.com/DataDog/datadog-agent/pkg/util/input" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type cliParams struct { @@ -93,10 +93,10 @@ func MakeCommand(globalParamsGetter func() GlobalParams) *cobra.Command { SecretParams: secrets.NewEnabledParams(), LogParams: logimpl.ForOneShot(LoggerName, DefaultLogLevel, true), }), - fx.Supply(optional.NewNoneOption[collector.Component]()), + fx.Supply(option.None[collector.Component]()), core.Bundle(), diagnosesendermanagerimpl.Module(), - fx.Supply(optional.NewNoneOption[autodiscovery.Component]()), + fx.Supply(option.None[autodiscovery.Component]()), ) }, } @@ -159,9 +159,9 @@ func readProfileData(seconds int) (flare.ProfileData, error) { func run(cliParams *cliParams, diagnoseSenderManager diagnosesendermanager.Component, - collector optional.Option[collector.Component], + collector option.Option[collector.Component], secretResolver secrets.Component, - ac optional.Option[autodiscovery.Component]) error { + ac option.Option[autodiscovery.Component]) error { fmt.Fprintln(color.Output, color.BlueString("Asking the Cluster Agent to build the flare archive.")) var ( profile flare.ProfileData @@ -220,7 +220,7 @@ func run(cliParams *cliParams, fmt.Fprintln(color.Output, color.RedString("The agent was unable to make a full flare: %s.", e.Error())) } fmt.Fprintln(color.Output, color.YellowString("Initiating flare locally, some logs will be missing.")) - diagnoseDeps := diagnose.NewSuitesDeps(diagnoseSenderManager, collector, secretResolver, optional.NewNoneOption[workloadmeta.Component](), ac) + diagnoseDeps := diagnose.NewSuitesDeps(diagnoseSenderManager, collector, secretResolver, option.None[workloadmeta.Component](), ac) filePath, e = flare.CreateDCAArchive(true, path.GetDistPath(), logFile, profile, diagnoseDeps, nil) if e != nil { fmt.Printf("The flare zipfile failed to be created: %s\n", e) diff --git a/pkg/collector/corechecks/cluster/helm/helm.go b/pkg/collector/corechecks/cluster/helm/helm.go index 34d7fe95ccc07..d0b3408d531e6 100644 --- a/pkg/collector/corechecks/cluster/helm/helm.go +++ b/pkg/collector/corechecks/cluster/helm/helm.go @@ -31,7 +31,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/metrics/servicecheck" "github.com/DataDog/datadog-agent/pkg/util/kubernetes/apiserver" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/pointer" ) @@ -86,8 +86,8 @@ func (cc *checkConfig) Parse(data []byte) error { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/cluster/helm/stub.go b/pkg/collector/corechecks/cluster/helm/stub.go index 2c708f1e39455..79c17d902a103 100644 --- a/pkg/collector/corechecks/cluster/helm/stub.go +++ b/pkg/collector/corechecks/cluster/helm/stub.go @@ -10,7 +10,7 @@ package helm import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/cluster/ksm/kubernetes_state.go b/pkg/collector/corechecks/cluster/ksm/kubernetes_state.go index 3965ce7dd8fb1..40750a24a5e53 100644 --- a/pkg/collector/corechecks/cluster/ksm/kubernetes_state.go +++ b/pkg/collector/corechecks/cluster/ksm/kubernetes_state.go @@ -35,7 +35,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/kubernetes/apiserver" "github.com/DataDog/datadog-agent/pkg/util/kubernetes/clustername" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "gopkg.in/yaml.v2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -837,8 +837,8 @@ func (k *KSMCheck) sendTelemetry(s sender.Sender) { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/cluster/ksm/stub.go b/pkg/collector/corechecks/cluster/ksm/stub.go index 3fed778c1e1e0..be7edb21a2946 100644 --- a/pkg/collector/corechecks/cluster/ksm/stub.go +++ b/pkg/collector/corechecks/cluster/ksm/stub.go @@ -10,7 +10,7 @@ package ksm import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/cluster/kubernetesapiserver/kubernetes_apiserver.go b/pkg/collector/corechecks/cluster/kubernetesapiserver/kubernetes_apiserver.go index 5635803a5354c..dcbc45dfbb0b9 100644 --- a/pkg/collector/corechecks/cluster/kubernetesapiserver/kubernetes_apiserver.go +++ b/pkg/collector/corechecks/cluster/kubernetesapiserver/kubernetes_apiserver.go @@ -33,7 +33,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/kubernetes/apiserver" "github.com/DataDog/datadog-agent/pkg/util/kubernetes/clustername" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Covers the Control Plane service check and the in memory pod metadata. @@ -134,8 +134,8 @@ func NewKubeASCheck(base core.CheckBase, instance *KubeASConfig) *KubeASCheck { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/cluster/kubernetesapiserver/stub.go b/pkg/collector/corechecks/cluster/kubernetesapiserver/stub.go index 8e34be6187ced..dd020d817a27f 100644 --- a/pkg/collector/corechecks/cluster/kubernetesapiserver/stub.go +++ b/pkg/collector/corechecks/cluster/kubernetesapiserver/stub.go @@ -10,7 +10,7 @@ package kubernetesapiserver import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/cluster/orchestrator/orchestrator.go b/pkg/collector/corechecks/cluster/orchestrator/orchestrator.go index 3324bc85dc6bc..ee3874354e979 100644 --- a/pkg/collector/corechecks/cluster/orchestrator/orchestrator.go +++ b/pkg/collector/corechecks/cluster/orchestrator/orchestrator.go @@ -26,7 +26,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/kubernetes/apiserver" "github.com/DataDog/datadog-agent/pkg/util/kubernetes/clustername" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "go.uber.org/atomic" "gopkg.in/yaml.v2" @@ -94,8 +94,8 @@ func newOrchestratorCheck(base core.CheckBase, instance *OrchestratorInstance) * } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/cluster/orchestrator/stub.go b/pkg/collector/corechecks/cluster/orchestrator/stub.go index 4859575faf067..030c5bc8bc3f6 100644 --- a/pkg/collector/corechecks/cluster/orchestrator/stub.go +++ b/pkg/collector/corechecks/cluster/orchestrator/stub.go @@ -10,7 +10,7 @@ package orchestrator import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/containerimage/check.go b/pkg/collector/corechecks/containerimage/check.go index 228d93dc20870..d39b250a388df 100644 --- a/pkg/collector/corechecks/containerimage/check.go +++ b/pkg/collector/corechecks/containerimage/check.go @@ -19,7 +19,7 @@ import ( core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" ddConfig "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -93,8 +93,8 @@ type Check struct { } // Factory returns a new check factory -func Factory(store workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewOption(func() check.Check { +func Factory(store workloadmeta.Component) option.Option[func() check.Check] { + return option.New(func() check.Check { return core.NewLongRunningCheckWrapper(&Check{ CheckBase: core.NewCheckBase(CheckName), workloadmetaStore: store, diff --git a/pkg/collector/corechecks/containerlifecycle/check.go b/pkg/collector/corechecks/containerlifecycle/check.go index 6f328eb42a0e1..a8dea5a7cd0e7 100644 --- a/pkg/collector/corechecks/containerlifecycle/check.go +++ b/pkg/collector/corechecks/containerlifecycle/check.go @@ -20,7 +20,7 @@ import ( core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" ddConfig "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -168,8 +168,8 @@ func (c *Check) Cancel() { close(c.stopCh) } func (c *Check) Interval() time.Duration { return 0 } // Factory returns a new check factory -func Factory(store workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewOption(func() check.Check { +func Factory(store workloadmeta.Component) option.Option[func() check.Check] { + return option.New(func() check.Check { return core.NewLongRunningCheckWrapper(&Check{ CheckBase: core.NewCheckBase(CheckName), workloadmetaStore: store, diff --git a/pkg/collector/corechecks/containers/containerd/check.go b/pkg/collector/corechecks/containers/containerd/check.go index 306f3792b87c5..2e952cb19e854 100644 --- a/pkg/collector/corechecks/containers/containerd/check.go +++ b/pkg/collector/corechecks/containers/containerd/check.go @@ -29,7 +29,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/containers" "github.com/DataDog/datadog-agent/pkg/util/containers/metrics" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/prometheus" ) @@ -62,8 +62,8 @@ type ContainerdConfig struct { } // Factory is used to create register the check and initialize it. -func Factory(store workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewOption(func() check.Check { +func Factory(store workloadmeta.Component) option.Option[func() check.Check] { + return option.New(func() check.Check { return &ContainerdCheck{ CheckBase: corechecks.NewCheckBase(CheckName), instance: &ContainerdConfig{}, @@ -99,7 +99,7 @@ func (c *ContainerdCheck) Configure(senderManager sender.SenderManager, integrat } c.httpClient = http.Client{Timeout: time.Duration(1) * time.Second} - c.processor = generic.NewProcessor(metrics.GetProvider(optional.NewOption(c.store)), generic.NewMetadataContainerAccessor(c.store), metricsAdapter{}, getProcessorFilter(c.containerFilter, c.store)) + c.processor = generic.NewProcessor(metrics.GetProvider(option.New(c.store)), generic.NewMetadataContainerAccessor(c.store), metricsAdapter{}, getProcessorFilter(c.containerFilter, c.store)) c.processor.RegisterExtension("containerd-custom-metrics", &containerdCustomMetricsExtension{}) c.subscriber = createEventSubscriber("ContainerdCheck", c.client, cutil.FiltersWithNamespaces(c.instance.ContainerdFilters)) diff --git a/pkg/collector/corechecks/containers/containerd/stub.go b/pkg/collector/corechecks/containers/containerd/stub.go index 1272779be4f46..f376138d9051b 100644 --- a/pkg/collector/corechecks/containers/containerd/stub.go +++ b/pkg/collector/corechecks/containers/containerd/stub.go @@ -11,7 +11,7 @@ package containerd import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -20,6 +20,6 @@ const ( ) // Factory is used to create register the check and initialize it. -func Factory(store workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory(store workloadmeta.Component) option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/containers/cri/check.go b/pkg/collector/corechecks/containers/cri/check.go index 06fb71d9db28a..fdb54c8929e4a 100644 --- a/pkg/collector/corechecks/containers/cri/check.go +++ b/pkg/collector/corechecks/containers/cri/check.go @@ -24,7 +24,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/containers/metrics" "github.com/DataDog/datadog-agent/pkg/util/kubernetes" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -47,8 +47,8 @@ type CRICheck struct { } // Factory is exported for integration testing -func Factory(store workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewOption(func() check.Check { +func Factory(store workloadmeta.Component) option.Option[func() check.Check] { + return option.New(func() check.Check { return &CRICheck{ CheckBase: core.NewCheckBase(CheckName), instance: &CRIConfig{}, @@ -81,7 +81,7 @@ func (c *CRICheck) Configure(senderManager sender.SenderManager, integrationConf log.Warnf("Can't get container include/exclude filter, no filtering will be applied: %v", err) } - c.processor = generic.NewProcessor(metrics.GetProvider(optional.NewOption(c.store)), generic.NewMetadataContainerAccessor(c.store), metricsAdapter{}, getProcessorFilter(containerFilter, c.store)) + c.processor = generic.NewProcessor(metrics.GetProvider(option.New(c.store)), generic.NewMetadataContainerAccessor(c.store), metricsAdapter{}, getProcessorFilter(containerFilter, c.store)) if c.instance.CollectDisk { c.processor.RegisterExtension("cri-custom-metrics", &criCustomMetricsExtension{criGetter: func() (cri.CRIClient, error) { return cri.GetUtil() diff --git a/pkg/collector/corechecks/containers/cri/stub.go b/pkg/collector/corechecks/containers/cri/stub.go index 4e7d53828f099..ef3553cc57de1 100644 --- a/pkg/collector/corechecks/containers/cri/stub.go +++ b/pkg/collector/corechecks/containers/cri/stub.go @@ -11,7 +11,7 @@ package cri import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -20,6 +20,6 @@ const ( ) // Factory creates a new check instance -func Factory(store workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory(store workloadmeta.Component) option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/containers/docker/check.go b/pkg/collector/corechecks/containers/docker/check.go index d607bfa1a6dc1..23017f620f158 100644 --- a/pkg/collector/corechecks/containers/docker/check.go +++ b/pkg/collector/corechecks/containers/docker/check.go @@ -18,6 +18,8 @@ import ( dockerTypes "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/container" + "github.com/DataDog/datadog-agent/comp/core/autodiscovery/integration" "github.com/DataDog/datadog-agent/comp/core/tagger" "github.com/DataDog/datadog-agent/comp/core/tagger/collectors" @@ -34,8 +36,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/hostname" "github.com/DataDog/datadog-agent/pkg/util/kubernetes" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "github.com/docker/docker/api/types/container" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -66,8 +67,8 @@ type DockerCheck struct { } // Factory returns a new docker corecheck factory -func Factory(store workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewOption(func() check.Check { +func Factory(store workloadmeta.Component) option.Option[func() check.Check] { + return option.New(func() check.Check { return &DockerCheck{ CheckBase: core.NewCheckBase(CheckName), instance: &DockerConfig{}, @@ -114,7 +115,7 @@ func (d *DockerCheck) Configure(senderManager sender.SenderManager, integrationC log.Warnf("Can't get container include/exclude filter, no filtering will be applied: %v", err) } - d.processor = generic.NewProcessor(metrics.GetProvider(optional.NewOption(d.store)), generic.NewMetadataContainerAccessor(d.store), metricsAdapter{}, getProcessorFilter(d.containerFilter, d.store)) + d.processor = generic.NewProcessor(metrics.GetProvider(option.New(d.store)), generic.NewMetadataContainerAccessor(d.store), metricsAdapter{}, getProcessorFilter(d.containerFilter, d.store)) d.processor.RegisterExtension("docker-custom-metrics", &dockerCustomMetricsExtension{}) d.configureNetworkProcessor(&d.processor) d.setOkExitCodes() diff --git a/pkg/collector/corechecks/containers/docker/stub.go b/pkg/collector/corechecks/containers/docker/stub.go index 76243bbaf9e28..4f31634832d0d 100644 --- a/pkg/collector/corechecks/containers/docker/stub.go +++ b/pkg/collector/corechecks/containers/docker/stub.go @@ -11,7 +11,7 @@ package docker import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( CheckName = "docker" ) -func Factory(_ workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory(_ workloadmeta.Component) option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/containers/generic/check.go b/pkg/collector/corechecks/containers/generic/check.go index 218bb76c79685..ffec234a09957 100644 --- a/pkg/collector/corechecks/containers/generic/check.go +++ b/pkg/collector/corechecks/containers/generic/check.go @@ -18,7 +18,7 @@ import ( core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/util/containers" "github.com/DataDog/datadog-agent/pkg/util/containers/metrics" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -44,8 +44,8 @@ type ContainerCheck struct { } // Factory returns a new check factory -func Factory(store workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewOption(func() check.Check { +func Factory(store workloadmeta.Component) option.Option[func() check.Check] { + return option.New(func() check.Check { return &ContainerCheck{ CheckBase: core.NewCheckBase(CheckName), instance: &ContainerConfig{}, @@ -65,7 +65,7 @@ func (c *ContainerCheck) Configure(senderManager sender.SenderManager, integrati if err != nil { return err } - c.processor = NewProcessor(metrics.GetProvider(optional.NewOption(c.store)), NewMetadataContainerAccessor(c.store), GenericMetricsAdapter{}, LegacyContainerFilter{OldFilter: filter, Store: c.store}) + c.processor = NewProcessor(metrics.GetProvider(option.New(c.store)), NewMetadataContainerAccessor(c.store), GenericMetricsAdapter{}, LegacyContainerFilter{OldFilter: filter, Store: c.store}) return c.instance.Parse(config) } diff --git a/pkg/collector/corechecks/containers/kubelet/kubelet.go b/pkg/collector/corechecks/containers/kubelet/kubelet.go index c399af290b721..6422ef5bac161 100644 --- a/pkg/collector/corechecks/containers/kubelet/kubelet.go +++ b/pkg/collector/corechecks/containers/kubelet/kubelet.go @@ -26,7 +26,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/containers" "github.com/DataDog/datadog-agent/pkg/util/kubernetes/kubelet" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -99,8 +99,8 @@ func initProviders(filter *containers.Filter, config *common.KubeletConfig, podU } // Factory returns a new KubeletCheck factory -func Factory(store workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewOption(func() check.Check { +func Factory(store workloadmeta.Component) option.Option[func() check.Check] { + return option.New(func() check.Check { return NewKubeletCheck(core.NewCheckBase(CheckName), &common.KubeletConfig{}, store) }) } diff --git a/pkg/collector/corechecks/containers/kubelet/stub.go b/pkg/collector/corechecks/containers/kubelet/stub.go index 58f2474348fff..f80ef314a87b6 100644 --- a/pkg/collector/corechecks/containers/kubelet/stub.go +++ b/pkg/collector/corechecks/containers/kubelet/stub.go @@ -11,7 +11,7 @@ package kubelet import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( CheckName = "kubelet" ) -func Factory(store workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory(store workloadmeta.Component) option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/ebpf/ebpf.go b/pkg/collector/corechecks/ebpf/ebpf.go index 6c58fdd9ed6bc..59c42753ead65 100644 --- a/pkg/collector/corechecks/ebpf/ebpf.go +++ b/pkg/collector/corechecks/ebpf/ebpf.go @@ -24,7 +24,7 @@ import ( ddconfig "github.com/DataDog/datadog-agent/pkg/config" processnet "github.com/DataDog/datadog-agent/pkg/process/net" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -44,8 +44,8 @@ type EBPFCheck struct { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/ebpf/oomkill/oom_kill.go b/pkg/collector/corechecks/ebpf/oomkill/oom_kill.go index b838a341fcfe7..a26bb39e455bd 100644 --- a/pkg/collector/corechecks/ebpf/oomkill/oom_kill.go +++ b/pkg/collector/corechecks/ebpf/oomkill/oom_kill.go @@ -31,7 +31,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/cgroups" "github.com/DataDog/datadog-agent/pkg/util/containers" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -51,8 +51,8 @@ type OOMKillCheck struct { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/ebpf/oomkill/stub.go b/pkg/collector/corechecks/ebpf/oomkill/stub.go index d94449b1b2b15..740be8fc78775 100644 --- a/pkg/collector/corechecks/ebpf/oomkill/stub.go +++ b/pkg/collector/corechecks/ebpf/oomkill/stub.go @@ -10,7 +10,7 @@ package oomkill import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/ebpf/stub.go b/pkg/collector/corechecks/ebpf/stub.go index 178d250e5e91f..fe5c28128bd2b 100644 --- a/pkg/collector/corechecks/ebpf/stub.go +++ b/pkg/collector/corechecks/ebpf/stub.go @@ -10,7 +10,7 @@ package ebpf import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/ebpf/tcpqueuelength/stub.go b/pkg/collector/corechecks/ebpf/tcpqueuelength/stub.go index 65552c3c8d83b..77412b646d3d9 100644 --- a/pkg/collector/corechecks/ebpf/tcpqueuelength/stub.go +++ b/pkg/collector/corechecks/ebpf/tcpqueuelength/stub.go @@ -10,7 +10,7 @@ package tcpqueuelength import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/ebpf/tcpqueuelength/tcp_queue_length.go b/pkg/collector/corechecks/ebpf/tcpqueuelength/tcp_queue_length.go index 2b8dd2485d348..12eb00bbd0f51 100644 --- a/pkg/collector/corechecks/ebpf/tcpqueuelength/tcp_queue_length.go +++ b/pkg/collector/corechecks/ebpf/tcpqueuelength/tcp_queue_length.go @@ -28,7 +28,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/cgroups" "github.com/DataDog/datadog-agent/pkg/util/containers" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -48,8 +48,8 @@ type TCPQueueLengthCheck struct { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/embed/apm/apm.go b/pkg/collector/corechecks/embed/apm/apm.go index 9f419f5c0b22b..f99a4bb5930a3 100644 --- a/pkg/collector/corechecks/embed/apm/apm.go +++ b/pkg/collector/corechecks/embed/apm/apm.go @@ -30,7 +30,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/diagnose/diagnosis" "github.com/DataDog/datadog-agent/pkg/util/hostname" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -248,8 +248,8 @@ func (c *APMCheck) GetDiagnoses() ([]diagnosis.Diagnosis, error) { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/embed/apm/stub.go b/pkg/collector/corechecks/embed/apm/stub.go index b4c5ea584872b..adb93158cae82 100644 --- a/pkg/collector/corechecks/embed/apm/stub.go +++ b/pkg/collector/corechecks/embed/apm/stub.go @@ -10,7 +10,7 @@ package apm import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/embed/process/process_agent.go b/pkg/collector/corechecks/embed/process/process_agent.go index 18784f36a255e..788eed3b83e6f 100644 --- a/pkg/collector/corechecks/embed/process/process_agent.go +++ b/pkg/collector/corechecks/embed/process/process_agent.go @@ -30,7 +30,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/diagnose/diagnosis" "github.com/DataDog/datadog-agent/pkg/util/executable" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -242,8 +242,8 @@ func (c *ProcessAgentCheck) GetDiagnoses() ([]diagnosis.Diagnosis, error) { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/embed/process/stub.go b/pkg/collector/corechecks/embed/process/stub.go index 1faeaac1b12a6..debb1c623a87a 100644 --- a/pkg/collector/corechecks/embed/process/stub.go +++ b/pkg/collector/corechecks/embed/process/stub.go @@ -10,7 +10,7 @@ package process import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/loader.go b/pkg/collector/corechecks/loader.go index 5215789425147..6ab18300b906d 100644 --- a/pkg/collector/corechecks/loader.go +++ b/pkg/collector/corechecks/loader.go @@ -14,7 +14,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/check" "github.com/DataDog/datadog-agent/pkg/collector/loaders" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // CheckFactory factory function type to instantiate checks @@ -24,7 +24,7 @@ type CheckFactory func() check.Check var catalog = make(map[string]CheckFactory) // RegisterCheck adds a check to the catalog -func RegisterCheck(name string, checkFactory optional.Option[func() check.Check]) { +func RegisterCheck(name string, checkFactory option.Option[func() check.Check]) { if v, ok := checkFactory.Get(); ok { catalog[name] = v } diff --git a/pkg/collector/corechecks/loader_test.go b/pkg/collector/corechecks/loader_test.go index 0d3e78ce1efea..745e57d120622 100644 --- a/pkg/collector/corechecks/loader_test.go +++ b/pkg/collector/corechecks/loader_test.go @@ -15,7 +15,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/aggregator/sender" "github.com/DataDog/datadog-agent/pkg/collector/check" "github.com/DataDog/datadog-agent/pkg/collector/check/stub" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // FIXTURE @@ -40,8 +40,8 @@ func TestNewGoCheckLoader(t *testing.T) { } } -func testCheckNew() optional.Option[func() check.Check] { - return optional.NewOption(func() check.Check { +func testCheckNew() option.Option[func() check.Check] { + return option.New(func() check.Check { return &TestCheck{} }) } diff --git a/pkg/collector/corechecks/net/network/network.go b/pkg/collector/corechecks/net/network/network.go index f47ad89ac85a9..96b93eb0f2347 100644 --- a/pkg/collector/corechecks/net/network/network.go +++ b/pkg/collector/corechecks/net/network/network.go @@ -25,7 +25,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -308,8 +308,8 @@ func (c *NetworkCheck) Configure(senderManager sender.SenderManager, integration } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/net/network/stub.go b/pkg/collector/corechecks/net/network/stub.go index 2f9b81170f3dc..bff033509075e 100644 --- a/pkg/collector/corechecks/net/network/stub.go +++ b/pkg/collector/corechecks/net/network/stub.go @@ -10,7 +10,7 @@ package network import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/net/ntp/ntp.go b/pkg/collector/corechecks/net/ntp/ntp.go index 2029e7ccdcb71..10483f8ecc9bf 100644 --- a/pkg/collector/corechecks/net/ntp/ntp.go +++ b/pkg/collector/corechecks/net/ntp/ntp.go @@ -25,7 +25,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/telemetry" "github.com/DataDog/datadog-agent/pkg/util/cloudproviders" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -244,8 +244,8 @@ func (c *NTPCheck) queryOffset() (float64, error) { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/networkpath/networkpath.go b/pkg/collector/corechecks/networkpath/networkpath.go index 8ec7c9def55a9..4bfeceffe672e 100644 --- a/pkg/collector/corechecks/networkpath/networkpath.go +++ b/pkg/collector/corechecks/networkpath/networkpath.go @@ -21,7 +21,7 @@ import ( core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/util/hostname" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/networkdevice/utils" "github.com/DataDog/datadog-agent/pkg/networkpath/traceroute" @@ -150,8 +150,8 @@ func (c *Check) Configure(senderManager sender.SenderManager, integrationConfigD } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/nvidia/jetson/jetson.go b/pkg/collector/corechecks/nvidia/jetson/jetson.go index 6aac521af3c1e..06bc2640c13e5 100644 --- a/pkg/collector/corechecks/nvidia/jetson/jetson.go +++ b/pkg/collector/corechecks/nvidia/jetson/jetson.go @@ -23,7 +23,7 @@ import ( core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/metrics" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -201,8 +201,8 @@ func (c *JetsonCheck) Configure(senderManager sender.SenderManager, integrationC } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/nvidia/jetson/stub.go b/pkg/collector/corechecks/nvidia/jetson/stub.go index 18f9a1eca80b8..d356331df2ba3 100644 --- a/pkg/collector/corechecks/nvidia/jetson/stub.go +++ b/pkg/collector/corechecks/nvidia/jetson/stub.go @@ -9,7 +9,7 @@ package nvidia import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -18,6 +18,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/oracle/oracle.go b/pkg/collector/corechecks/oracle/oracle.go index f69860ed70881..9fcc752c3532e 100644 --- a/pkg/collector/corechecks/oracle/oracle.go +++ b/pkg/collector/corechecks/oracle/oracle.go @@ -25,7 +25,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/obfuscate" "github.com/DataDog/datadog-agent/pkg/util/hostname" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/version" //nolint:revive // TODO(DBM) Fix revive linter @@ -417,8 +417,8 @@ func (c *Check) Configure(senderManager sender.SenderManager, integrationConfigD } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/oracle/stub.go b/pkg/collector/corechecks/oracle/stub.go index eecc138c0a375..aa96b458b0359 100644 --- a/pkg/collector/corechecks/oracle/stub.go +++ b/pkg/collector/corechecks/oracle/stub.go @@ -9,7 +9,7 @@ package oracle import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -20,6 +20,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/orchestrator/ecs/ecs.go b/pkg/collector/corechecks/orchestrator/ecs/ecs.go index 510f34c84fd40..af92f803b26cf 100644 --- a/pkg/collector/corechecks/orchestrator/ecs/ecs.go +++ b/pkg/collector/corechecks/orchestrator/ecs/ecs.go @@ -30,7 +30,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/orchestrator" oconfig "github.com/DataDog/datadog-agent/pkg/orchestrator/config" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // CheckName is the name of the check @@ -52,8 +52,8 @@ type Check struct { } // Factory creates a new check factory -func Factory(store workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewOption(func() check.Check { return newCheck(store) }) +func Factory(store workloadmeta.Component) option.Option[func() check.Check] { + return option.New(func() check.Check { return newCheck(store) }) } func newCheck(store workloadmeta.Component) check.Check { diff --git a/pkg/collector/corechecks/orchestrator/ecs/stub.go b/pkg/collector/corechecks/orchestrator/ecs/stub.go index dc52cc45572ad..b31e299ecb0cf 100644 --- a/pkg/collector/corechecks/orchestrator/ecs/stub.go +++ b/pkg/collector/corechecks/orchestrator/ecs/stub.go @@ -11,7 +11,7 @@ package ecs import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -20,6 +20,6 @@ const ( ) // Factory creates a new check factory -func Factory(_ workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory(_ workloadmeta.Component) option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/orchestrator/pod/pod.go b/pkg/collector/corechecks/orchestrator/pod/pod.go index e8b43f030b8f7..0fdcb96add594 100644 --- a/pkg/collector/corechecks/orchestrator/pod/pod.go +++ b/pkg/collector/corechecks/orchestrator/pod/pod.go @@ -26,7 +26,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/kubernetes/clustername" "github.com/DataDog/datadog-agent/pkg/util/kubernetes/kubelet" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // CheckName is the name of the check @@ -50,8 +50,8 @@ type Check struct { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/orchestrator/pod/stub.go b/pkg/collector/corechecks/orchestrator/pod/stub.go index 4c09908ab0b66..3131582afaa94 100644 --- a/pkg/collector/corechecks/orchestrator/pod/stub.go +++ b/pkg/collector/corechecks/orchestrator/pod/stub.go @@ -10,7 +10,7 @@ package pod import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/sbom/check.go b/pkg/collector/corechecks/sbom/check.go index 448b55aa41156..d92b9c0238967 100644 --- a/pkg/collector/corechecks/sbom/check.go +++ b/pkg/collector/corechecks/sbom/check.go @@ -22,7 +22,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/sbom" "github.com/DataDog/datadog-agent/pkg/sbom/collectors" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -114,8 +114,8 @@ type Check struct { } // Factory returns a new check factory -func Factory(store workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewOption(func() check.Check { +func Factory(store workloadmeta.Component) option.Option[func() check.Check] { + return option.New(func() check.Check { return core.NewLongRunningCheckWrapper(&Check{ CheckBase: core.NewCheckBase(CheckName), workloadmetaStore: store, diff --git a/pkg/collector/corechecks/sbom/check_no_trivy.go b/pkg/collector/corechecks/sbom/check_no_trivy.go index 2d86e8147fa5a..98b4245ebddad 100644 --- a/pkg/collector/corechecks/sbom/check_no_trivy.go +++ b/pkg/collector/corechecks/sbom/check_no_trivy.go @@ -10,7 +10,7 @@ package sbom import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory returns a new check factory -func Factory(_ workloadmeta.Component) optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory(_ workloadmeta.Component) option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/sbom/processor_test.go b/pkg/collector/corechecks/sbom/processor_test.go index 519b4ca8cff3d..ded2c657df125 100644 --- a/pkg/collector/corechecks/sbom/processor_test.go +++ b/pkg/collector/corechecks/sbom/processor_test.go @@ -34,7 +34,7 @@ import ( sbomscanner "github.com/DataDog/datadog-agent/pkg/sbom/scanner" "github.com/DataDog/datadog-agent/pkg/util/fxutil" "github.com/DataDog/datadog-agent/pkg/util/hostname" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/pointer" ) @@ -597,7 +597,7 @@ func TestProcessEvents(t *testing.T) { defer os.RemoveAll(cacheDir) cfg.SetWithoutSource("sbom.cache_directory", cacheDir) cfg.SetWithoutSource("sbom.container_image.enabled", true) - wmeta := fxutil.Test[optional.Option[workloadmeta.Component]](t, fx.Options( + wmeta := fxutil.Test[option.Option[workloadmeta.Component]](t, fx.Options( core.MockBundle(), fx.Supply(workloadmeta.NewParams()), workloadmeta.MockModule(), diff --git a/pkg/collector/corechecks/snmp/snmp.go b/pkg/collector/corechecks/snmp/snmp.go index 0cc5f70ac74c3..022083019e2b5 100644 --- a/pkg/collector/corechecks/snmp/snmp.go +++ b/pkg/collector/corechecks/snmp/snmp.go @@ -18,7 +18,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/collector/corechecks/snmp/internal/checkconfig" "github.com/DataDog/datadog-agent/pkg/collector/corechecks/snmp/internal/common" @@ -196,8 +196,8 @@ func (c *Check) GetDiagnoses() ([]diagnosis.Diagnosis, error) { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/system/cpu/cpu/cpu.go b/pkg/collector/corechecks/system/cpu/cpu/cpu.go index a8e8408f38368..94054853f965d 100644 --- a/pkg/collector/corechecks/system/cpu/cpu/cpu.go +++ b/pkg/collector/corechecks/system/cpu/cpu/cpu.go @@ -17,7 +17,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const CheckName = "cpu" @@ -114,8 +114,8 @@ func (c *Check) Configure(senderManager sender.SenderManager, integrationConfigD } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/system/cpu/cpu/cpu_windows.go b/pkg/collector/corechecks/system/cpu/cpu/cpu_windows.go index fea92164c5267..b11c6904c2f3f 100644 --- a/pkg/collector/corechecks/system/cpu/cpu/cpu_windows.go +++ b/pkg/collector/corechecks/system/cpu/cpu/cpu_windows.go @@ -22,7 +22,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/pdhutil" ) @@ -175,8 +175,8 @@ func (c *Check) Configure(senderManager sender.SenderManager, integrationConfigD } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/system/cpu/load/load.go b/pkg/collector/corechecks/system/cpu/load/load.go index 89819d9570ac0..ca6825fa4024d 100644 --- a/pkg/collector/corechecks/system/cpu/load/load.go +++ b/pkg/collector/corechecks/system/cpu/load/load.go @@ -18,7 +18,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -86,8 +86,8 @@ func (c *LoadCheck) Configure(senderManager sender.SenderManager, integrationCon } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/system/cpu/load/stub.go b/pkg/collector/corechecks/system/cpu/load/stub.go index d6fd598c2f2c0..3f87fcb23b315 100644 --- a/pkg/collector/corechecks/system/cpu/load/stub.go +++ b/pkg/collector/corechecks/system/cpu/load/stub.go @@ -9,7 +9,7 @@ package load import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -18,6 +18,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/system/disk/disk/disk.go b/pkg/collector/corechecks/system/disk/disk/disk.go index 0aa49da6b1a11..fdbb4eaecea22 100644 --- a/pkg/collector/corechecks/system/disk/disk/disk.go +++ b/pkg/collector/corechecks/system/disk/disk/disk.go @@ -16,7 +16,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/autodiscovery/integration" "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -175,8 +175,8 @@ func (c *Check) applyDeviceTags(device, mountpoint string, tags []string) []stri } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/system/disk/disk/stub.go b/pkg/collector/corechecks/system/disk/disk/stub.go index 4f1126ef39787..615b201dfa84c 100644 --- a/pkg/collector/corechecks/system/disk/disk/stub.go +++ b/pkg/collector/corechecks/system/disk/disk/stub.go @@ -9,7 +9,7 @@ package disk import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -18,6 +18,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/system/disk/io/iostats.go b/pkg/collector/corechecks/system/disk/io/iostats.go index eab9ced70f75b..d0bdb5ec0d870 100644 --- a/pkg/collector/corechecks/system/disk/io/iostats.go +++ b/pkg/collector/corechecks/system/disk/io/iostats.go @@ -16,7 +16,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -64,8 +64,8 @@ func (c *IOCheck) commonConfigure(senderManager sender.SenderManager, integratio } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/system/filehandles/file_handles.go b/pkg/collector/corechecks/system/filehandles/file_handles.go index 567e99338469a..66b1ee125bbdf 100644 --- a/pkg/collector/corechecks/system/filehandles/file_handles.go +++ b/pkg/collector/corechecks/system/filehandles/file_handles.go @@ -15,7 +15,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // CheckName is the name of the check @@ -89,8 +89,8 @@ func (c *fhCheck) Run() error { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/system/filehandles/file_handles_bsd.go b/pkg/collector/corechecks/system/filehandles/file_handles_bsd.go index ac69d9c9bfb85..43bcdcbe73b6c 100644 --- a/pkg/collector/corechecks/system/filehandles/file_handles_bsd.go +++ b/pkg/collector/corechecks/system/filehandles/file_handles_bsd.go @@ -14,7 +14,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // For testing purpose @@ -63,8 +63,8 @@ func (c *fhCheck) Configure(senderManager sender.SenderManager, integrationConfi } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/system/filehandles/file_handles_windows.go b/pkg/collector/corechecks/system/filehandles/file_handles_windows.go index ec5174784e81f..83a0953985c88 100644 --- a/pkg/collector/corechecks/system/filehandles/file_handles_windows.go +++ b/pkg/collector/corechecks/system/filehandles/file_handles_windows.go @@ -11,7 +11,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/aggregator/sender" "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/pdhutil" ) @@ -74,8 +74,8 @@ func (c *fhCheck) Configure(senderManager sender.SenderManager, integrationConfi } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/system/memory/memory.go b/pkg/collector/corechecks/system/memory/memory.go index 589f80bdbc26a..35653633964ea 100644 --- a/pkg/collector/corechecks/system/memory/memory.go +++ b/pkg/collector/corechecks/system/memory/memory.go @@ -9,15 +9,15 @@ package memory import ( "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // CheckName is the name of the check const CheckName = "memory" // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/system/uptime/uptime.go b/pkg/collector/corechecks/system/uptime/uptime.go index 441394031ec73..cfeb004868071 100644 --- a/pkg/collector/corechecks/system/uptime/uptime.go +++ b/pkg/collector/corechecks/system/uptime/uptime.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // CheckName is the name of the check @@ -41,8 +41,8 @@ func (c *Check) Run() error { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/system/wincrashdetect/stub.go b/pkg/collector/corechecks/system/wincrashdetect/stub.go index f6473062aa6b7..21876eda6760b 100644 --- a/pkg/collector/corechecks/system/wincrashdetect/stub.go +++ b/pkg/collector/corechecks/system/wincrashdetect/stub.go @@ -10,7 +10,7 @@ package wincrashdetect import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/system/wincrashdetect/wincrashdetect.go b/pkg/collector/corechecks/system/wincrashdetect/wincrashdetect.go index d806295b2aa09..63b1b0f59717e 100644 --- a/pkg/collector/corechecks/system/wincrashdetect/wincrashdetect.go +++ b/pkg/collector/corechecks/system/wincrashdetect/wincrashdetect.go @@ -22,7 +22,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/metrics/event" "github.com/DataDog/datadog-agent/pkg/util/crashreport" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -51,8 +51,8 @@ type WinCrashDetect struct { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/system/winkmem/stub.go b/pkg/collector/corechecks/system/winkmem/stub.go index 7b95dfdf5a4a0..ae720722b75c5 100644 --- a/pkg/collector/corechecks/system/winkmem/stub.go +++ b/pkg/collector/corechecks/system/winkmem/stub.go @@ -10,7 +10,7 @@ package winkmem import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/system/winkmem/winkmem.go b/pkg/collector/corechecks/system/winkmem/winkmem.go index bd429cdceb84e..35a542ef499ca 100644 --- a/pkg/collector/corechecks/system/winkmem/winkmem.go +++ b/pkg/collector/corechecks/system/winkmem/winkmem.go @@ -20,7 +20,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "golang.org/x/sys/windows" ) @@ -60,8 +60,8 @@ type KMemCheck struct { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/system/winproc/stub.go b/pkg/collector/corechecks/system/winproc/stub.go index 2e1f88a9485ec..ddc26f2581d87 100644 --- a/pkg/collector/corechecks/system/winproc/stub.go +++ b/pkg/collector/corechecks/system/winproc/stub.go @@ -10,7 +10,7 @@ package winproc import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/system/winproc/winproc_windows.go b/pkg/collector/corechecks/system/winproc/winproc_windows.go index 1ccc38b872e21..722b8ae7c2d74 100644 --- a/pkg/collector/corechecks/system/winproc/winproc_windows.go +++ b/pkg/collector/corechecks/system/winproc/winproc_windows.go @@ -12,7 +12,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/aggregator/sender" "github.com/DataDog/datadog-agent/pkg/collector/check" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/pdhutil" ) @@ -77,8 +77,8 @@ func (c *processChk) Configure(senderManager sender.SenderManager, integrationCo } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/systemd/stub.go b/pkg/collector/corechecks/systemd/stub.go index a1e7ab65e166c..bb1b52170eb58 100644 --- a/pkg/collector/corechecks/systemd/stub.go +++ b/pkg/collector/corechecks/systemd/stub.go @@ -9,7 +9,7 @@ package systemd import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -18,6 +18,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/corechecks/systemd/systemd.go b/pkg/collector/corechecks/systemd/systemd.go index 722c0ee1e24a2..2f94679a12c25 100644 --- a/pkg/collector/corechecks/systemd/systemd.go +++ b/pkg/collector/corechecks/systemd/systemd.go @@ -23,7 +23,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/metrics/servicecheck" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" ) @@ -569,8 +569,8 @@ func (c *SystemdCheck) Configure(senderManager sender.SenderManager, integration } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/telemetry/check.go b/pkg/collector/corechecks/telemetry/check.go index 016c10ed0b784..c411f4f34357a 100644 --- a/pkg/collector/corechecks/telemetry/check.go +++ b/pkg/collector/corechecks/telemetry/check.go @@ -18,7 +18,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/check" "github.com/DataDog/datadog-agent/pkg/collector/corechecks" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -106,8 +106,8 @@ func (c *checkImpl) buildTags(lps []*dto.LabelPair) []string { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(newCheck) +func Factory() option.Option[func() check.Check] { + return option.New(newCheck) } func newCheck() check.Check { diff --git a/pkg/collector/corechecks/windows_event_log/check.go b/pkg/collector/corechecks/windows_event_log/check.go index 65f736e8da09e..6af03143fabcb 100644 --- a/pkg/collector/corechecks/windows_event_log/check.go +++ b/pkg/collector/corechecks/windows_event_log/check.go @@ -19,7 +19,7 @@ import ( core "github.com/DataDog/datadog-agent/pkg/collector/corechecks" agentEvent "github.com/DataDog/datadog-agent/pkg/metrics/event" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" evtapi "github.com/DataDog/datadog-agent/pkg/util/winutil/eventlog/api" winevtapi "github.com/DataDog/datadog-agent/pkg/util/winutil/eventlog/api/windows" evtsession "github.com/DataDog/datadog-agent/pkg/util/winutil/eventlog/session" @@ -291,8 +291,8 @@ func (c *Check) Cancel() { } // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewOption(func() check.Check { +func Factory() option.Option[func() check.Check] { + return option.New(func() check.Check { return &Check{ CheckBase: core.NewCheckBase(CheckName), evtapi: winevtapi.New(), diff --git a/pkg/collector/corechecks/windows_event_log/config.go b/pkg/collector/corechecks/windows_event_log/config.go index 6d605aed9fde5..72d82f5612362 100644 --- a/pkg/collector/corechecks/windows_event_log/config.go +++ b/pkg/collector/corechecks/windows_event_log/config.go @@ -11,7 +11,7 @@ import ( "fmt" "github.com/DataDog/datadog-agent/comp/core/autodiscovery/integration" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" yaml "gopkg.in/yaml.v2" ) @@ -37,26 +37,26 @@ type Config struct { } type instanceConfig struct { - ChannelPath optional.Option[string] `yaml:"path"` - Query optional.Option[string] `yaml:"query"` - Start optional.Option[string] `yaml:"start"` - Timeout optional.Option[int] `yaml:"timeout"` - PayloadSize optional.Option[int] `yaml:"payload_size"` - BookmarkFrequency optional.Option[int] `yaml:"bookmark_frequency"` - LegacyMode optional.Option[bool] `yaml:"legacy_mode"` - LegacyModeV2 optional.Option[bool] `yaml:"legacy_mode_v2"` - EventPriority optional.Option[string] `yaml:"event_priority"` - TagEventID optional.Option[bool] `yaml:"tag_event_id"` - TagSID optional.Option[bool] `yaml:"tag_sid"` - Filters optional.Option[filtersConfig] `yaml:"filters"` - IncludedMessages optional.Option[[]string] `yaml:"included_messages"` - ExcludedMessages optional.Option[[]string] `yaml:"excluded_messages"` - AuthType optional.Option[string] `yaml:"auth_type"` - Server optional.Option[string] `yaml:"server"` - User optional.Option[string] `yaml:"user"` - Domain optional.Option[string] `yaml:"domain"` - Password optional.Option[string] `yaml:"password"` - InterpretMessages optional.Option[bool] `yaml:"interpret_messages"` + ChannelPath option.Option[string] `yaml:"path"` + Query option.Option[string] `yaml:"query"` + Start option.Option[string] `yaml:"start"` + Timeout option.Option[int] `yaml:"timeout"` + PayloadSize option.Option[int] `yaml:"payload_size"` + BookmarkFrequency option.Option[int] `yaml:"bookmark_frequency"` + LegacyMode option.Option[bool] `yaml:"legacy_mode"` + LegacyModeV2 option.Option[bool] `yaml:"legacy_mode_v2"` + EventPriority option.Option[string] `yaml:"event_priority"` + TagEventID option.Option[bool] `yaml:"tag_event_id"` + TagSID option.Option[bool] `yaml:"tag_sid"` + Filters option.Option[filtersConfig] `yaml:"filters"` + IncludedMessages option.Option[[]string] `yaml:"included_messages"` + ExcludedMessages option.Option[[]string] `yaml:"excluded_messages"` + AuthType option.Option[string] `yaml:"auth_type"` + Server option.Option[string] `yaml:"server"` + User option.Option[string] `yaml:"user"` + Domain option.Option[string] `yaml:"domain"` + Password option.Option[string] `yaml:"password"` + InterpretMessages option.Option[bool] `yaml:"interpret_messages"` } type filtersConfig struct { @@ -66,12 +66,12 @@ type filtersConfig struct { } type initConfig struct { - TagEventID optional.Option[bool] `yaml:"tag_event_id"` - TagSID optional.Option[bool] `yaml:"tag_sid"` - EventPriority optional.Option[string] `yaml:"event_priority"` - InterpretMessages optional.Option[bool] `yaml:"interpret_messages"` - LegacyMode optional.Option[bool] `yaml:"legacy_mode"` - LegacyModeV2 optional.Option[bool] `yaml:"legacy_mode_v2"` + TagEventID option.Option[bool] `yaml:"tag_event_id"` + TagSID option.Option[bool] `yaml:"tag_sid"` + EventPriority option.Option[string] `yaml:"event_priority"` + InterpretMessages option.Option[bool] `yaml:"interpret_messages"` + LegacyMode option.Option[bool] `yaml:"legacy_mode"` + LegacyModeV2 option.Option[bool] `yaml:"legacy_mode_v2"` } func (f *filtersConfig) Sources() []string { @@ -132,11 +132,11 @@ func (c *Config) genQuery() error { return nil } -func setOptionalDefault[T any](optional *optional.Option[T], def T) { +func setOptionalDefault[T any](optional *option.Option[T], def T) { optional.SetIfNone(def) } -func setOptionalDefaultWithInitConfig[T any](instance *optional.Option[T], shared optional.Option[T], def T) { +func setOptionalDefaultWithInitConfig[T any](instance *option.Option[T], shared option.Option[T], def T) { instance.SetOptionIfNone(shared) instance.SetIfNone(def) } diff --git a/pkg/collector/corechecks/windows_event_log/config_helpers.go b/pkg/collector/corechecks/windows_event_log/config_helpers.go index befbf63ac24e4..7ea22cbdd43ca 100644 --- a/pkg/collector/corechecks/windows_event_log/config_helpers.go +++ b/pkg/collector/corechecks/windows_event_log/config_helpers.go @@ -12,7 +12,7 @@ import ( "regexp" agentEvent "github.com/DataDog/datadog-agent/pkg/metrics/event" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" evtapi "github.com/DataDog/datadog-agent/pkg/util/winutil/eventlog/api" ) @@ -28,7 +28,7 @@ func compileRegexPatterns(patterns []string) ([]*regexp.Regexp, error) { return res, nil } -func serverIsLocal(server optional.Option[string]) bool { +func serverIsLocal(server option.Option[string]) bool { val, isSet := server.Get() return !isSet || len(val) == 0 || @@ -52,7 +52,7 @@ func evtRPCFlagsFromString(flags string) (uint, error) { } } -func evtRPCFlagsFromOption(authType optional.Option[string]) (uint, error) { +func evtRPCFlagsFromOption(authType option.Option[string]) (uint, error) { val, isSet := authType.Get() if !isSet { return 0, fmt.Errorf("option is not set") @@ -60,12 +60,12 @@ func evtRPCFlagsFromOption(authType optional.Option[string]) (uint, error) { return evtRPCFlagsFromString(val) } -func isaffirmative(o optional.Option[bool]) bool { +func isaffirmative(o option.Option[bool]) bool { val, isSet := o.Get() return isSet && val } -func getEventPriorityFromOption(o optional.Option[string]) (agentEvent.EventPriority, error) { +func getEventPriorityFromOption(o option.Option[string]) (agentEvent.EventPriority, error) { val, isSet := o.Get() if !isSet { return "", fmt.Errorf("option is not set") diff --git a/pkg/collector/corechecks/windows_event_log/config_test.go b/pkg/collector/corechecks/windows_event_log/config_test.go index cafbce692979e..9ef14872454d4 100644 --- a/pkg/collector/corechecks/windows_event_log/config_test.go +++ b/pkg/collector/corechecks/windows_event_log/config_test.go @@ -11,11 +11,12 @@ import ( "fmt" "testing" - "github.com/DataDog/datadog-agent/pkg/util/optional" "github.com/stretchr/testify/assert" + + "github.com/DataDog/datadog-agent/pkg/util/option" ) -func assertOptionalValue[T any](t *testing.T, assertCompare assert.ComparisonAssertionFunc, o optional.Option[T], expected T) bool { +func assertOptionalValue[T any](t *testing.T, assertCompare assert.ComparisonAssertionFunc, o option.Option[T], expected T) bool { actual, isSet := o.Get() return assert.True(t, isSet, fmt.Sprintf("%v is not set", o)) && assertCompare(t, expected, actual, fmt.Sprintf("%v does not match expcted value", o)) diff --git a/pkg/collector/corechecks/windows_event_log/unsupported_platforms.go b/pkg/collector/corechecks/windows_event_log/unsupported_platforms.go index b4e5851722097..826085f832c9b 100644 --- a/pkg/collector/corechecks/windows_event_log/unsupported_platforms.go +++ b/pkg/collector/corechecks/windows_event_log/unsupported_platforms.go @@ -10,7 +10,7 @@ package evtlog import ( "github.com/DataDog/datadog-agent/pkg/collector/check" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -19,6 +19,6 @@ const ( ) // Factory creates a new check factory -func Factory() optional.Option[func() check.Check] { - return optional.NewNoneOption[func() check.Check]() +func Factory() option.Option[func() check.Check] { + return option.None[func() check.Check]() } diff --git a/pkg/collector/scheduler.go b/pkg/collector/scheduler.go index ba97a03b96e73..b204884c8e65b 100644 --- a/pkg/collector/scheduler.go +++ b/pkg/collector/scheduler.go @@ -23,7 +23,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/collector/loaders" "github.com/DataDog/datadog-agent/pkg/util/containers" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" yaml "gopkg.in/yaml.v2" ) @@ -56,13 +56,13 @@ func init() { type CheckScheduler struct { configToChecks map[string][]checkid.ID // cache the ID of checks we load for each config loaders []check.Loader - collector optional.Option[collector.Component] + collector option.Option[collector.Component] senderManager sender.SenderManager m sync.RWMutex } // InitCheckScheduler creates and returns a check scheduler -func InitCheckScheduler(collector optional.Option[collector.Component], senderManager sender.SenderManager) *CheckScheduler { +func InitCheckScheduler(collector option.Option[collector.Component], senderManager sender.SenderManager) *CheckScheduler { checkScheduler = &CheckScheduler{ collector: collector, senderManager: senderManager, diff --git a/pkg/config/aliases.go b/pkg/config/aliases.go index 6b0bb1950cb5a..535367964beff 100644 --- a/pkg/config/aliases.go +++ b/pkg/config/aliases.go @@ -16,7 +16,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/config/logs" "github.com/DataDog/datadog-agent/pkg/config/model" pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Aliases to conf package @@ -197,12 +197,12 @@ func GetObsPipelineURL(datatype pkgconfigsetup.DataType) (string, error) { } // LoadCustom Alias -func LoadCustom(config model.Config, origin string, secretResolver optional.Option[secrets.Component], additionalKnownEnvVars []string) (*model.Warnings, error) { +func LoadCustom(config model.Config, origin string, secretResolver option.Option[secrets.Component], additionalKnownEnvVars []string) (*model.Warnings, error) { return pkgconfigsetup.LoadCustom(config, origin, secretResolver, additionalKnownEnvVars) } // LoadDatadogCustom Alias -func LoadDatadogCustom(config model.Config, origin string, secretResolver optional.Option[secrets.Component], additionalKnownEnvVars []string) (*model.Warnings, error) { +func LoadDatadogCustom(config model.Config, origin string, secretResolver option.Option[secrets.Component], additionalKnownEnvVars []string) (*model.Warnings, error) { return pkgconfigsetup.LoadDatadogCustom(config, origin, secretResolver, additionalKnownEnvVars) } diff --git a/pkg/config/setup/config.go b/pkg/config/setup/config.go index af586b0a712bf..7c231e31d3e0b 100644 --- a/pkg/config/setup/config.go +++ b/pkg/config/setup/config.go @@ -29,7 +29,7 @@ import ( pkgconfigmodel "github.com/DataDog/datadog-agent/pkg/config/model" "github.com/DataDog/datadog-agent/pkg/util/hostname/validate" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/system" ) @@ -1437,7 +1437,7 @@ func LoadWithoutSecret(config pkgconfigmodel.Config, additionalEnvVars []string) // LoadWithSecret reads config files and initializes config with decrypted secrets func LoadWithSecret(config pkgconfigmodel.Config, secretResolver secrets.Component, additionalEnvVars []string) (*pkgconfigmodel.Warnings, error) { - return LoadDatadogCustom(config, "datadog.yaml", optional.NewOption[secrets.Component](secretResolver), additionalEnvVars) + return LoadDatadogCustom(config, "datadog.yaml", option.New[secrets.Component](secretResolver), additionalEnvVars) } // Merge will merge additional configuration into an existing configuration @@ -1618,7 +1618,7 @@ func checkConflictingOptions(config pkgconfigmodel.Config) error { } // LoadDatadogCustom loads the datadog config in the given config -func LoadDatadogCustom(config pkgconfigmodel.Config, origin string, secretResolver optional.Option[secrets.Component], additionalKnownEnvVars []string) (*pkgconfigmodel.Warnings, error) { +func LoadDatadogCustom(config pkgconfigmodel.Config, origin string, secretResolver option.Option[secrets.Component], additionalKnownEnvVars []string) (*pkgconfigmodel.Warnings, error) { // Feature detection running in a defer func as it always need to run (whether config load has been successful or not) // Because some Agents (e.g. trace-agent) will run even if config file does not exist defer func() { @@ -1663,7 +1663,7 @@ func LoadDatadogCustom(config pkgconfigmodel.Config, origin string, secretResolv } // LoadCustom reads config into the provided config object -func LoadCustom(config pkgconfigmodel.Config, origin string, secretResolver optional.Option[secrets.Component], additionalKnownEnvVars []string) (*pkgconfigmodel.Warnings, error) { +func LoadCustom(config pkgconfigmodel.Config, origin string, secretResolver option.Option[secrets.Component], additionalKnownEnvVars []string) (*pkgconfigmodel.Warnings, error) { warnings := pkgconfigmodel.Warnings{} if err := config.ReadInConfig(); err != nil { diff --git a/pkg/config/setup/config_secret_test.go b/pkg/config/setup/config_secret_test.go index ee590ba4dabe4..4e2d1287636f4 100644 --- a/pkg/config/setup/config_secret_test.go +++ b/pkg/config/setup/config_secret_test.go @@ -10,12 +10,13 @@ import ( "path/filepath" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/DataDog/datadog-agent/comp/core/secrets" "github.com/DataDog/datadog-agent/comp/core/secrets/secretsimpl" pkgconfigmodel "github.com/DataDog/datadog-agent/pkg/config/model" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/DataDog/datadog-agent/pkg/util/option" ) var testAdditionalEndpointsConf = []byte(` @@ -170,7 +171,7 @@ func TestProxyWithSecret(t *testing.T) { c.setup(t, config, configPath, resolver) } - _, err := LoadCustom(config, "unit_test", optional.NewOption[secrets.Component](resolver), nil) + _, err := LoadCustom(config, "unit_test", option.New[secrets.Component](resolver), nil) require.NoError(t, err) c.tests(t, config) diff --git a/pkg/config/setup/config_test.go b/pkg/config/setup/config_test.go index 8c54106900436..29c6207ea8766 100644 --- a/pkg/config/setup/config_test.go +++ b/pkg/config/setup/config_test.go @@ -23,7 +23,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/secrets" "github.com/DataDog/datadog-agent/comp/core/secrets/secretsimpl" pkgconfigmodel "github.com/DataDog/datadog-agent/pkg/config/model" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) func unsetEnvForTest(t *testing.T, env string) { @@ -436,7 +436,7 @@ func TestProxy(t *testing.T) { c.setup(t, config) } - _, err := LoadCustom(config, "unit_test", optional.NewOption[secrets.Component](resolver), nil) + _, err := LoadCustom(config, "unit_test", option.New[secrets.Component](resolver), nil) require.NoError(t, err) c.tests(t, config) @@ -538,7 +538,7 @@ func TestDatabaseMonitoringAurora(t *testing.T) { c.setup(t, config) } - _, err := LoadCustom(config, "unit_test", optional.NewOption[secrets.Component](resolver), nil) + _, err := LoadCustom(config, "unit_test", option.New[secrets.Component](resolver), nil) require.NoError(t, err) c.tests(t, config) @@ -1356,7 +1356,7 @@ use_proxy_for_cloud_metadata: true }, nil }) - _, err := LoadCustom(config, "unit_test", optional.NewOption[secrets.Component](resolver), nil) + _, err := LoadCustom(config, "unit_test", option.New[secrets.Component](resolver), nil) assert.NoError(t, err) yamlConf, err := yaml.Marshal(config.AllSettingsWithoutDefault()) diff --git a/pkg/config/setup/go.mod b/pkg/config/setup/go.mod index 2483c8436cbe3..5c23258fc0d45 100644 --- a/pkg/config/setup/go.mod +++ b/pkg/config/setup/go.mod @@ -15,7 +15,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/system => ../../util/system @@ -35,7 +35,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.2 github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.2 - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.2 github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.2-rc.2 github.com/stretchr/testify v1.10.0 diff --git a/pkg/config/utils/endpoints_test.go b/pkg/config/utils/endpoints_test.go index 6efb5c9284613..0d2f71aa8ba62 100644 --- a/pkg/config/utils/endpoints_test.go +++ b/pkg/config/utils/endpoints_test.go @@ -6,13 +6,15 @@ package utils import ( - pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup" "testing" - "github.com/DataDog/datadog-agent/comp/core/secrets" - "github.com/DataDog/datadog-agent/pkg/util/optional" + pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup" + "github.com/DataDog/datadog-agent/pkg/util/option" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/DataDog/datadog-agent/comp/core/secrets" ) // TestSecretBackendWithMultipleEndpoints tests an edge case of `viper.AllSettings()` when a config diff --git a/pkg/config/utils/go.mod b/pkg/config/utils/go.mod index fbe9e3614ccc6..05f453a9e30ac 100644 --- a/pkg/config/utils/go.mod +++ b/pkg/config/utils/go.mod @@ -16,7 +16,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/system => ../../util/system @@ -31,7 +31,7 @@ require ( github.com/DataDog/datadog-agent/pkg/config/model v0.53.2-rc.2 github.com/DataDog/datadog-agent/pkg/config/setup v0.53.2-rc.2 github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.2 - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 github.com/DataDog/datadog-agent/pkg/version v0.53.2-rc.2 github.com/stretchr/testify v1.10.0 ) diff --git a/pkg/diagnose/check.go b/pkg/diagnose/check.go index ff773e37dd680..90b4a09a850ee 100644 --- a/pkg/diagnose/check.go +++ b/pkg/diagnose/check.go @@ -22,10 +22,10 @@ import ( pkgconfig "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/diagnose/diagnosis" pkglog "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) -func getDiagnose(diagCfg diagnosis.Config, senderManager sender.DiagnoseSenderManager, collector optional.Option[collector.Component], secretResolver secrets.Component, wmeta optional.Option[workloadmeta.Component], acOpt optional.Option[autodiscovery.Component]) []diagnosis.Diagnosis { +func getDiagnose(diagCfg diagnosis.Config, senderManager sender.DiagnoseSenderManager, collector option.Option[collector.Component], secretResolver secrets.Component, wmeta option.Option[workloadmeta.Component], acOpt option.Option[autodiscovery.Component]) []diagnosis.Diagnosis { if coll, ok := collector.Get(); diagCfg.RunningInAgentProcess && ok { return diagnoseChecksInAgentProcess(coll) } @@ -90,7 +90,7 @@ func diagnoseChecksInAgentProcess(collector collector.Component) []diagnosis.Dia return diagnoses } -func diagnoseChecksInCLIProcess(diagCfg diagnosis.Config, senderManager diagnosesendermanager.Component, secretResolver secrets.Component, wmeta optional.Option[workloadmeta.Component], ac autodiscovery.Component) []diagnosis.Diagnosis { //nolint:revive // TODO fix revive unused-parameter +func diagnoseChecksInCLIProcess(diagCfg diagnosis.Config, senderManager diagnosesendermanager.Component, secretResolver secrets.Component, wmeta option.Option[workloadmeta.Component], ac autodiscovery.Component) []diagnosis.Diagnosis { //nolint:revive // TODO fix revive unused-parameter // other choices // run() github.com\DataDog\datadog-agent\pkg\cli\subcommands\check\command.go // runCheck() github.com\DataDog\datadog-agent\cmd\agent\gui\checks.go @@ -126,7 +126,7 @@ func diagnoseChecksInCLIProcess(diagCfg diagnosis.Config, senderManager diagnose // Create the CheckScheduler, but do not attach it to // AutoDiscovery. - pkgcollector.InitCheckScheduler(optional.NewNoneOption[collector.Component](), senderManagerInstance) + pkgcollector.InitCheckScheduler(option.None[collector.Component](), senderManagerInstance) // Load matching configurations (should we use common.AC.GetAllConfigs()) waitCtx, cancelTimeout := context.WithTimeout(context.Background(), time.Duration(5*time.Second)) diff --git a/pkg/diagnose/runner.go b/pkg/diagnose/runner.go index f62b516ff2408..0f98905d39358 100644 --- a/pkg/diagnose/runner.go +++ b/pkg/diagnose/runner.go @@ -21,12 +21,13 @@ import ( "github.com/DataDog/datadog-agent/comp/forwarder/eventplatform/eventplatformimpl" "github.com/DataDog/datadog-agent/pkg/aggregator/sender" "github.com/DataDog/datadog-agent/pkg/api/util" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" + + "github.com/fatih/color" pkgconfig "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/diagnose/connectivity" "github.com/DataDog/datadog-agent/pkg/diagnose/diagnosis" - "github.com/fatih/color" ) // Overall running statistics @@ -410,23 +411,23 @@ func RunStdOut(w io.Writer, diagCfg diagnosis.Config, deps SuitesDeps) error { // SuitesDeps stores the dependencies for the diagnose suites. type SuitesDeps struct { senderManager sender.DiagnoseSenderManager - collector optional.Option[collector.Component] + collector option.Option[collector.Component] secretResolver secrets.Component - wmeta optional.Option[workloadmeta.Component] - AC optional.Option[autodiscovery.Component] + wmeta option.Option[workloadmeta.Component] + AC option.Option[autodiscovery.Component] } // GetWMeta returns the workload metadata instance -func (s *SuitesDeps) GetWMeta() optional.Option[workloadmeta.Component] { +func (s *SuitesDeps) GetWMeta() option.Option[workloadmeta.Component] { return s.wmeta } // NewSuitesDeps returns a new SuitesDeps. func NewSuitesDeps( senderManager sender.DiagnoseSenderManager, - collector optional.Option[collector.Component], + collector option.Option[collector.Component], secretResolver secrets.Component, - wmeta optional.Option[workloadmeta.Component], ac optional.Option[autodiscovery.Component]) SuitesDeps { + wmeta option.Option[workloadmeta.Component], ac option.Option[autodiscovery.Component]) SuitesDeps { return SuitesDeps{ senderManager: senderManager, collector: collector, diff --git a/pkg/eventmonitor/eventmonitor.go b/pkg/eventmonitor/eventmonitor.go index c64190a7b1322..412b5e3d4e8e0 100644 --- a/pkg/eventmonitor/eventmonitor.go +++ b/pkg/eventmonitor/eventmonitor.go @@ -29,7 +29,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/security/secl/model" "github.com/DataDog/datadog-agent/pkg/security/seclog" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) var ( @@ -249,7 +249,7 @@ func (m *EventMonitor) GetStats() map[string]interface{} { } // NewEventMonitor instantiates an event monitoring system-probe module -func NewEventMonitor(config *config.Config, secconfig *secconfig.Config, opts Opts, wmeta optional.Option[workloadmeta.Component]) (*EventMonitor, error) { +func NewEventMonitor(config *config.Config, secconfig *secconfig.Config, opts Opts, wmeta option.Option[workloadmeta.Component]) (*EventMonitor, error) { if opts.StatsdClient == nil { opts.StatsdClient = procstatsd.Client } diff --git a/pkg/flare/archive_docker.go b/pkg/flare/archive_docker.go index c3c3f6e178f5b..e5e73f8e5e45b 100644 --- a/pkg/flare/archive_docker.go +++ b/pkg/flare/archive_docker.go @@ -16,18 +16,19 @@ import ( "strings" "text/tabwriter" + "github.com/docker/docker/api/types/container" + "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/containers/metrics" "github.com/DataDog/datadog-agent/pkg/util/docker" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" - "github.com/docker/docker/api/types/container" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const dockerCommandMaxLength = 29 -func getDockerSelfInspect(wmeta optional.Option[workloadmeta.Component]) ([]byte, error) { +func getDockerSelfInspect(wmeta option.Option[workloadmeta.Component]) ([]byte, error) { if !config.IsContainerized() { return nil, fmt.Errorf("The Agent is not containerized") } diff --git a/pkg/flare/archive_nodocker.go b/pkg/flare/archive_nodocker.go index 2a805243383a0..4b3798c8415fb 100644 --- a/pkg/flare/archive_nodocker.go +++ b/pkg/flare/archive_nodocker.go @@ -9,10 +9,10 @@ package flare import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) -func getDockerSelfInspect(_ optional.Option[workloadmeta.Component]) ([]byte, error) { +func getDockerSelfInspect(_ option.Option[workloadmeta.Component]) ([]byte, error) { return nil, nil } diff --git a/pkg/logs/auditor/go.mod b/pkg/logs/auditor/go.mod index d769aeab9b5d6..af689cb4674f0 100644 --- a/pkg/logs/auditor/go.mod +++ b/pkg/logs/auditor/go.mod @@ -23,7 +23,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker @@ -54,7 +54,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.2 // indirect diff --git a/pkg/logs/client/go.mod b/pkg/logs/client/go.mod index 34ff213a0b2db..a31a7f8bbf141 100644 --- a/pkg/logs/client/go.mod +++ b/pkg/logs/client/go.mod @@ -29,7 +29,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/http => ../../util/http github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker @@ -69,7 +69,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.2 // indirect diff --git a/pkg/logs/diagnostic/go.mod b/pkg/logs/diagnostic/go.mod index 2090e161e1060..e3bbc96f17e12 100644 --- a/pkg/logs/diagnostic/go.mod +++ b/pkg/logs/diagnostic/go.mod @@ -25,7 +25,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker @@ -57,7 +57,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.2 // indirect diff --git a/pkg/logs/launchers/container/launcher.go b/pkg/logs/launchers/container/launcher.go index f718e65b53b37..7e3b5a20117da 100644 --- a/pkg/logs/launchers/container/launcher.go +++ b/pkg/logs/launchers/container/launcher.go @@ -22,7 +22,7 @@ import ( sourcesPkg "github.com/DataDog/datadog-agent/pkg/logs/sources" "github.com/DataDog/datadog-agent/pkg/logs/tailers" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/startstop" ) @@ -59,11 +59,11 @@ type Launcher struct { // tailers contains the tailer for each source tailers map[*sourcesPkg.LogSource]tailerfactory.Tailer - wmeta optional.Option[workloadmeta.Component] + wmeta option.Option[workloadmeta.Component] } // NewLauncher returns a new launcher -func NewLauncher(sources *sourcesPkg.LogSources, wmeta optional.Option[workloadmeta.Component]) *Launcher { +func NewLauncher(sources *sourcesPkg.LogSources, wmeta option.Option[workloadmeta.Component]) *Launcher { launcher := &Launcher{ sources: sources, tailers: make(map[*sourcesPkg.LogSource]tailerfactory.Tailer), diff --git a/pkg/logs/launchers/container/launcher_nodocker.go b/pkg/logs/launchers/container/launcher_nodocker.go index c74727d175131..bcc834f303e38 100644 --- a/pkg/logs/launchers/container/launcher_nodocker.go +++ b/pkg/logs/launchers/container/launcher_nodocker.go @@ -15,7 +15,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/logs/pipeline" sourcesPkg "github.com/DataDog/datadog-agent/pkg/logs/sources" "github.com/DataDog/datadog-agent/pkg/logs/tailers" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // A Launcher starts and stops new tailers for every new containers discovered by autodiscovery. @@ -24,7 +24,7 @@ import ( type Launcher struct{} // NewLauncher returns a new launcher -func NewLauncher(sources *sourcesPkg.LogSources, wmeta optional.Option[workloadmeta.Component]) *Launcher { +func NewLauncher(sources *sourcesPkg.LogSources, wmeta option.Option[workloadmeta.Component]) *Launcher { return &Launcher{} } diff --git a/pkg/logs/launchers/container/launcher_test.go b/pkg/logs/launchers/container/launcher_test.go index 33e60e14e3de0..8ce2dff0ae9a0 100644 --- a/pkg/logs/launchers/container/launcher_test.go +++ b/pkg/logs/launchers/container/launcher_test.go @@ -22,7 +22,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/logs/pipeline" "github.com/DataDog/datadog-agent/pkg/logs/sources" "github.com/DataDog/datadog-agent/pkg/logs/tailers" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // testFactory is a test implementation of tailerfactory.Factory. @@ -36,7 +36,7 @@ func (tf *testFactory) MakeTailer(source *sources.LogSource) (tailerfactory.Tail } func TestStartStop(t *testing.T) { - l := NewLauncher(nil, optional.NewNoneOption[workloadmeta.Component]()) + l := NewLauncher(nil, option.None[workloadmeta.Component]()) sp := launchers.NewMockSourceProvider() pl := pipeline.NewMockProvider() @@ -54,7 +54,7 @@ func TestStartStop(t *testing.T) { } func TestAddsRemovesSource(t *testing.T) { - l := NewLauncher(nil, optional.NewNoneOption[workloadmeta.Component]()) + l := NewLauncher(nil, option.None[workloadmeta.Component]()) l.tailerFactory = &testFactory{ makeTailer: func(source *sources.LogSource) (tailerfactory.Tailer, error) { return &tailerfactory.TestTailer{Name: source.Name}, nil @@ -83,7 +83,7 @@ func TestAddsRemovesSource(t *testing.T) { } func TestCannotMakeTailer(t *testing.T) { - l := NewLauncher(nil, optional.NewNoneOption[workloadmeta.Component]()) + l := NewLauncher(nil, option.None[workloadmeta.Component]()) l.tailerFactory = &testFactory{ makeTailer: func(source *sources.LogSource) (tailerfactory.Tailer, error) { return nil, errors.New("uhoh") @@ -104,7 +104,7 @@ func TestCannotMakeTailer(t *testing.T) { } func TestCannotStartTailer(t *testing.T) { - l := NewLauncher(nil, optional.NewNoneOption[workloadmeta.Component]()) + l := NewLauncher(nil, option.None[workloadmeta.Component]()) l.tailerFactory = &testFactory{ makeTailer: func(source *sources.LogSource) (tailerfactory.Tailer, error) { return &tailerfactory.TestTailer{Name: source.Name, StartError: true}, nil diff --git a/pkg/logs/launchers/container/tailerfactory/factory.go b/pkg/logs/launchers/container/tailerfactory/factory.go index 0eba56798fd08..db2513b3243bf 100644 --- a/pkg/logs/launchers/container/tailerfactory/factory.go +++ b/pkg/logs/launchers/container/tailerfactory/factory.go @@ -17,7 +17,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/logs/sources" dockerutilPkg "github.com/DataDog/datadog-agent/pkg/util/docker" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Factory supports making new tailers. @@ -42,7 +42,7 @@ type factory struct { // workloadmetaStore is the global WLM store containing information about // containers and pods. - workloadmetaStore optional.Option[workloadmeta.Component] + workloadmetaStore option.Option[workloadmeta.Component] // cop allows the factory to determine whether the agent is logging // containers or pods. @@ -55,7 +55,7 @@ type factory struct { var _ Factory = (*factory)(nil) // New creates a new Factory. -func New(sources *sources.LogSources, pipelineProvider pipeline.Provider, registry auditor.Registry, workloadmetaStore optional.Option[workloadmeta.Component]) Factory { +func New(sources *sources.LogSources, pipelineProvider pipeline.Provider, registry auditor.Registry, workloadmetaStore option.Option[workloadmeta.Component]) Factory { return &factory{ sources: sources, pipelineProvider: pipelineProvider, diff --git a/pkg/logs/launchers/container/tailerfactory/file_test.go b/pkg/logs/launchers/container/tailerfactory/file_test.go index be7713e82740d..c3846309d8a1b 100644 --- a/pkg/logs/launchers/container/tailerfactory/file_test.go +++ b/pkg/logs/launchers/container/tailerfactory/file_test.go @@ -27,7 +27,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/logs/sources" dockerutilPkg "github.com/DataDog/datadog-agent/pkg/util/docker" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/pointer" ) @@ -209,7 +209,7 @@ func TestMakeK8sSource(t *testing.T) { tf := &factory{ pipelineProvider: pipeline.NewMockProvider(), cop: containersorpods.NewDecidedChooser(containersorpods.LogPods), - workloadmetaStore: optional.NewOption[workloadmeta.Component](store), + workloadmetaStore: option.New[workloadmeta.Component](store), } for _, sourceConfigType := range []string{"docker", "containerd"} { t.Run("source.Config.Type="+sourceConfigType, func(t *testing.T) { @@ -252,7 +252,7 @@ func TestMakeK8sSource_pod_not_found(t *testing.T) { require.NoError(t, os.MkdirAll(filepath.Dir(p), 0o777)) require.NoError(t, os.WriteFile(p, []byte("{}"), 0o666)) - workloadmetaStore := fxutil.Test[optional.Option[workloadmeta.Component]](t, fx.Options( + workloadmetaStore := fxutil.Test[option.Option[workloadmeta.Component]](t, fx.Options( logimpl.MockModule(), compConfig.MockModule(), fx.Supply(context.Background()), diff --git a/pkg/logs/message/go.mod b/pkg/logs/message/go.mod index c0d8e01e85f10..79640032bc128 100644 --- a/pkg/logs/message/go.mod +++ b/pkg/logs/message/go.mod @@ -21,7 +21,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker @@ -50,7 +50,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.2 // indirect diff --git a/pkg/logs/pipeline/go.mod b/pkg/logs/pipeline/go.mod index a9c986cb8556c..d07627690943a 100644 --- a/pkg/logs/pipeline/go.mod +++ b/pkg/logs/pipeline/go.mod @@ -35,7 +35,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/http => ../../util/http github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/startstop => ../../util/startstop @@ -83,7 +83,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.2 // indirect diff --git a/pkg/logs/processor/go.mod b/pkg/logs/processor/go.mod index d241e0a3b6e0c..f7f407b845251 100644 --- a/pkg/logs/processor/go.mod +++ b/pkg/logs/processor/go.mod @@ -27,7 +27,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker @@ -64,7 +64,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.2 // indirect diff --git a/pkg/logs/sender/go.mod b/pkg/logs/sender/go.mod index 83569a736364e..f0e34d92d9c93 100644 --- a/pkg/logs/sender/go.mod +++ b/pkg/logs/sender/go.mod @@ -30,7 +30,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/http => ../../util/http github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker @@ -69,7 +69,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.2 // indirect diff --git a/pkg/logs/sources/go.mod b/pkg/logs/sources/go.mod index a1c78cd283f7f..6ea4958be6d60 100644 --- a/pkg/logs/sources/go.mod +++ b/pkg/logs/sources/go.mod @@ -20,7 +20,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker @@ -49,7 +49,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.2 // indirect diff --git a/pkg/logs/util/testutils/go.mod b/pkg/logs/util/testutils/go.mod index 6f0dbf258d076..097e035d0125a 100644 --- a/pkg/logs/util/testutils/go.mod +++ b/pkg/logs/util/testutils/go.mod @@ -23,7 +23,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../../util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../../util/optional github.com/DataDog/datadog-agent/pkg/util/pointer => ../../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../../util/statstracker @@ -49,7 +49,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.2 // indirect diff --git a/pkg/network/config/config_bpf_linux_test.go b/pkg/network/config/config_bpf_linux_test.go index 4355998956468..e01406ee1bd31 100644 --- a/pkg/network/config/config_bpf_linux_test.go +++ b/pkg/network/config/config_bpf_linux_test.go @@ -20,7 +20,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/eventmonitor" emconfig "github.com/DataDog/datadog-agent/pkg/eventmonitor/config" secconfig "github.com/DataDog/datadog-agent/pkg/security/config" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) func newSystemProbeConfig(t *testing.T) { @@ -47,7 +47,7 @@ func TestEventStreamEnabledForSupportedKernelsLinux(t *testing.T) { require.NoError(t, err) opts := eventmonitor.Opts{} - evm, err := eventmonitor.NewEventMonitor(emconfig, secconfig, opts, optional.NewNoneOption[workloadmeta.Component]()) + evm, err := eventmonitor.NewEventMonitor(emconfig, secconfig, opts, option.None[workloadmeta.Component]()) require.NoError(t, err) require.NoError(t, evm.Init()) } else { diff --git a/pkg/process/util/containers/containers.go b/pkg/process/util/containers/containers.go index d40cb4dbebd19..c840cff16c937 100644 --- a/pkg/process/util/containers/containers.go +++ b/pkg/process/util/containers/containers.go @@ -20,7 +20,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/containers/metrics/provider" "github.com/DataDog/datadog-agent/pkg/util/kubernetes" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -93,7 +93,7 @@ func NewDefaultContainerProvider(wmeta workloadmeta.Component) ContainerProvider } // TODO(components): stop relying on globals and use injected components instead whenever possible. - return NewContainerProvider(metrics.GetProvider(optional.NewOption(wmeta)), wmeta, containerFilter) + return NewContainerProvider(metrics.GetProvider(option.New(wmeta)), wmeta, containerFilter) } // GetContainers returns containers found on the machine diff --git a/pkg/sbom/collectors/collectors.go b/pkg/sbom/collectors/collectors.go index 4ca43c2f2f153..9fa4955227047 100644 --- a/pkg/sbom/collectors/collectors.go +++ b/pkg/sbom/collectors/collectors.go @@ -12,7 +12,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/sbom" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // ScanType defines the scan type of the collector @@ -38,7 +38,7 @@ type Collector interface { // CleanCache cleans the collector cache CleanCache() error // Init initializes the collector - Init(config.Config, optional.Option[workloadmeta.Component]) error + Init(config.Config, option.Option[workloadmeta.Component]) error // Scan performs a scan Scan(context.Context, sbom.ScanRequest) sbom.ScanResult // Channel returns the channel to send scan results diff --git a/pkg/sbom/collectors/containerd/containerd.go b/pkg/sbom/collectors/containerd/containerd.go index 4aa60eda6764d..f7e8fd0c205e5 100644 --- a/pkg/sbom/collectors/containerd/containerd.go +++ b/pkg/sbom/collectors/containerd/containerd.go @@ -19,7 +19,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/sbom/collectors" cutil "github.com/DataDog/datadog-agent/pkg/util/containerd" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/trivy" ) @@ -57,7 +57,7 @@ type Collector struct { resChan chan sbom.ScanResult opts sbom.ScanOptions containerdClient cutil.ContainerdItf - wmeta optional.Option[workloadmeta.Component] + wmeta option.Option[workloadmeta.Component] fromFileSystem bool closed bool @@ -69,7 +69,7 @@ func (c *Collector) CleanCache() error { } // Init initializes the collector -func (c *Collector) Init(cfg config.Config, wmeta optional.Option[workloadmeta.Component]) error { +func (c *Collector) Init(cfg config.Config, wmeta option.Option[workloadmeta.Component]) error { trivyCollector, err := trivy.GetGlobalCollector(cfg, wmeta) if err != nil { return err diff --git a/pkg/sbom/collectors/docker/docker.go b/pkg/sbom/collectors/docker/docker.go index 5f9b2d5d1ffd4..f3a4bb9c252ed 100644 --- a/pkg/sbom/collectors/docker/docker.go +++ b/pkg/sbom/collectors/docker/docker.go @@ -17,7 +17,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/sbom" "github.com/DataDog/datadog-agent/pkg/sbom/collectors" "github.com/DataDog/datadog-agent/pkg/util/docker" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/trivy" "github.com/docker/docker/client" @@ -54,7 +54,7 @@ type Collector struct { resChan chan sbom.ScanResult opts sbom.ScanOptions cl client.ImageAPIClient - wmeta optional.Option[workloadmeta.Component] + wmeta option.Option[workloadmeta.Component] closed bool } @@ -65,7 +65,7 @@ func (c *Collector) CleanCache() error { } // Init initializes the collector -func (c *Collector) Init(cfg config.Config, wmeta optional.Option[workloadmeta.Component]) error { +func (c *Collector) Init(cfg config.Config, wmeta option.Option[workloadmeta.Component]) error { trivyCollector, err := trivy.GetGlobalCollector(cfg, wmeta) if err != nil { return err diff --git a/pkg/sbom/collectors/host/host.go b/pkg/sbom/collectors/host/host.go index b112c674d2bcc..b4f01c9783fb3 100644 --- a/pkg/sbom/collectors/host/host.go +++ b/pkg/sbom/collectors/host/host.go @@ -18,7 +18,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/sbom/collectors" "github.com/DataDog/datadog-agent/pkg/util/flavor" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/trivy" ) @@ -63,7 +63,7 @@ func (c *Collector) CleanCache() error { } // Init initialize the host collector -func (c *Collector) Init(cfg config.Config, wmeta optional.Option[workloadmeta.Component]) error { +func (c *Collector) Init(cfg config.Config, wmeta option.Option[workloadmeta.Component]) error { trivyCollector, err := trivy.GetGlobalCollector(cfg, wmeta) if err != nil { return err diff --git a/pkg/sbom/scanner/scanner.go b/pkg/sbom/scanner/scanner.go index ec7bb5a719fc4..d2e2674da1fe7 100644 --- a/pkg/sbom/scanner/scanner.go +++ b/pkg/sbom/scanner/scanner.go @@ -22,7 +22,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/sbom/telemetry" "github.com/DataDog/datadog-agent/pkg/util/filesystem" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -45,12 +45,12 @@ type Scanner struct { // It cannot be cleaned when a scan is running cacheMutex sync.Mutex - wmeta optional.Option[workloadmeta.Component] + wmeta option.Option[workloadmeta.Component] } // NewScanner creates a new SBOM scanner. Call Start to start the store and its // collectors. -func NewScanner(cfg config.Config, wmeta optional.Option[workloadmeta.Component]) *Scanner { +func NewScanner(cfg config.Config, wmeta option.Option[workloadmeta.Component]) *Scanner { return &Scanner{ scanQueue: workqueue.NewRateLimitingQueueWithConfig( workqueue.NewItemExponentialFailureRateLimiter( @@ -70,7 +70,7 @@ func NewScanner(cfg config.Config, wmeta optional.Option[workloadmeta.Component] // CreateGlobalScanner creates a SBOM scanner, sets it as the default // global one, and returns it. Start() needs to be called before any data // collection happens. -func CreateGlobalScanner(cfg config.Config, wmeta optional.Option[workloadmeta.Component]) (*Scanner, error) { +func CreateGlobalScanner(cfg config.Config, wmeta option.Option[workloadmeta.Component]) (*Scanner, error) { if !cfg.GetBool("sbom.host.enabled") && !cfg.GetBool("sbom.container_image.enabled") && !cfg.GetBool("runtime_security_config.sbom.enabled") { return nil, nil } diff --git a/pkg/security/probe/probe_ebpf.go b/pkg/security/probe/probe_ebpf.go index 409dbd3bfc968..0162e21658a7f 100644 --- a/pkg/security/probe/probe_ebpf.go +++ b/pkg/security/probe/probe_ebpf.go @@ -63,7 +63,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/security/serializers" "github.com/DataDog/datadog-agent/pkg/security/utils" utilkernel "github.com/DataDog/datadog-agent/pkg/util/kernel" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // EventStream describes the interface implemented by reordered perf maps or ring buffers @@ -1466,7 +1466,7 @@ func (p *EBPFProbe) DumpProcessCache(withArgs bool) (string, error) { } // NewEBPFProbe instantiates a new runtime security agent probe -func NewEBPFProbe(probe *Probe, config *config.Config, opts Opts, wmeta optional.Option[workloadmeta.Component]) (*EBPFProbe, error) { +func NewEBPFProbe(probe *Probe, config *config.Config, opts Opts, wmeta option.Option[workloadmeta.Component]) (*EBPFProbe, error) { nerpc, err := erpc.NewERPC() if err != nil { return nil, err diff --git a/pkg/security/probe/probe_linux.go b/pkg/security/probe/probe_linux.go index 11264b307dc38..d1211b0a046fe 100644 --- a/pkg/security/probe/probe_linux.go +++ b/pkg/security/probe/probe_linux.go @@ -11,7 +11,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/security/config" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -24,7 +24,7 @@ const ( ) // NewProbe instantiates a new runtime security agent probe -func NewProbe(config *config.Config, opts Opts, wmeta optional.Option[workloadmeta.Component]) (*Probe, error) { +func NewProbe(config *config.Config, opts Opts, wmeta option.Option[workloadmeta.Component]) (*Probe, error) { opts.normalize() p := &Probe{ diff --git a/pkg/security/probe/probe_windows.go b/pkg/security/probe/probe_windows.go index 71c61572cb157..a07da62177441 100644 --- a/pkg/security/probe/probe_windows.go +++ b/pkg/security/probe/probe_windows.go @@ -14,6 +14,9 @@ import ( "sync" "time" + "github.com/DataDog/datadog-go/v5/statsd" + "github.com/cenkalti/backoff" + "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/comp/etw" etwimpl "github.com/DataDog/datadog-agent/comp/etw/impl" @@ -26,10 +29,8 @@ import ( "github.com/DataDog/datadog-agent/pkg/security/secl/rules" "github.com/DataDog/datadog-agent/pkg/security/serializers" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/windowsdriver/procmon" - "github.com/DataDog/datadog-go/v5/statsd" - "github.com/cenkalti/backoff" "golang.org/x/sys/windows" ) @@ -628,7 +629,7 @@ func (p *Probe) Origin() string { } // NewProbe instantiates a new runtime security agent probe -func NewProbe(config *config.Config, opts Opts, _ optional.Option[workloadmeta.Component]) (*Probe, error) { +func NewProbe(config *config.Config, opts Opts, _ option.Option[workloadmeta.Component]) (*Probe, error) { opts.normalize() p := &Probe{ diff --git a/pkg/security/resolvers/resolvers_ebpf.go b/pkg/security/resolvers/resolvers_ebpf.go index 0266728200f61..0f755472f4651 100644 --- a/pkg/security/resolvers/resolvers_ebpf.go +++ b/pkg/security/resolvers/resolvers_ebpf.go @@ -39,7 +39,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/security/resolvers/usersessions" "github.com/DataDog/datadog-agent/pkg/security/utils" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // EBPFResolvers holds the list of the event attribute resolvers @@ -62,7 +62,7 @@ type EBPFResolvers struct { } // NewEBPFResolvers creates a new instance of EBPFResolvers -func NewEBPFResolvers(config *config.Config, manager *manager.Manager, statsdClient statsd.ClientInterface, scrubber *procutil.DataScrubber, eRPC *erpc.ERPC, opts Opts, wmeta optional.Option[workloadmeta.Component]) (*EBPFResolvers, error) { +func NewEBPFResolvers(config *config.Config, manager *manager.Manager, statsdClient statsd.ClientInterface, scrubber *procutil.DataScrubber, eRPC *erpc.ERPC, opts Opts, wmeta option.Option[workloadmeta.Component]) (*EBPFResolvers, error) { dentryResolver, err := dentry.NewResolver(config.Probe, statsdClient, eRPC) if err != nil { return nil, err diff --git a/pkg/security/resolvers/sbom/resolver.go b/pkg/security/resolvers/sbom/resolver.go index 9f7ed24a786f4..78c780a963d90 100644 --- a/pkg/security/resolvers/sbom/resolver.go +++ b/pkg/security/resolvers/sbom/resolver.go @@ -36,7 +36,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/security/secl/model" "github.com/DataDog/datadog-agent/pkg/security/seclog" "github.com/DataDog/datadog-agent/pkg/security/utils" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/trivy" ) @@ -120,7 +120,7 @@ type Resolver struct { } // NewSBOMResolver returns a new instance of Resolver -func NewSBOMResolver(c *config.RuntimeSecurityConfig, statsdClient statsd.ClientInterface, wmeta optional.Option[workloadmeta.Component]) (*Resolver, error) { +func NewSBOMResolver(c *config.RuntimeSecurityConfig, statsdClient statsd.ClientInterface, wmeta option.Option[workloadmeta.Component]) (*Resolver, error) { sbomScanner, err := sbomscanner.CreateGlobalScanner(coreconfig.SystemProbe, wmeta) if err != nil { return nil, err diff --git a/pkg/security/resolvers/sbom/resolver_unsupported.go b/pkg/security/resolvers/sbom/resolver_unsupported.go index f61d05ee1cd48..3a142d238312e 100644 --- a/pkg/security/resolvers/sbom/resolver_unsupported.go +++ b/pkg/security/resolvers/sbom/resolver_unsupported.go @@ -17,7 +17,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/security/config" cgroupModel "github.com/DataDog/datadog-agent/pkg/security/resolvers/cgroup/model" "github.com/DataDog/datadog-agent/pkg/security/secl/model" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) // Resolver is the Software Bill-Of-material resolver @@ -25,7 +25,7 @@ type Resolver struct { } // NewSBOMResolver returns a new instance of Resolver -func NewSBOMResolver(_ *config.RuntimeSecurityConfig, _ statsd.ClientInterface, _ optional.Option[workloadmeta.Component]) (*Resolver, error) { +func NewSBOMResolver(_ *config.RuntimeSecurityConfig, _ statsd.ClientInterface, _ option.Option[workloadmeta.Component]) (*Resolver, error) { return &Resolver{}, nil } diff --git a/pkg/security/tests/module_tester_linux.go b/pkg/security/tests/module_tester_linux.go index 0e9a83e3798b5..67b62a5408fcc 100644 --- a/pkg/security/tests/module_tester_linux.go +++ b/pkg/security/tests/module_tester_linux.go @@ -56,7 +56,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/security/utils" utilkernel "github.com/DataDog/datadog-agent/pkg/util/kernel" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) var ( diff --git a/pkg/security/tests/module_tester_windows.go b/pkg/security/tests/module_tester_windows.go index d984306500ba0..5fb154dfff23d 100644 --- a/pkg/security/tests/module_tester_windows.go +++ b/pkg/security/tests/module_tester_windows.go @@ -30,7 +30,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/security/secl/rules" "github.com/DataDog/datadog-agent/pkg/security/tests/statsdclient" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) var ( diff --git a/pkg/serializer/go.mod b/pkg/serializer/go.mod index e96fc1061d8c8..4c2976b5eb7f9 100644 --- a/pkg/serializer/go.mod +++ b/pkg/serializer/go.mod @@ -39,7 +39,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/http => ../util/http github.com/DataDog/datadog-agent/pkg/util/json => ../util/json github.com/DataDog/datadog-agent/pkg/util/log => ../util/log - github.com/DataDog/datadog-agent/pkg/util/optional => ../util/optional/ + github.com/DataDog/datadog-agent/pkg/util/option => ../util/optional/ github.com/DataDog/datadog-agent/pkg/util/pointer => ../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../util/scrubber/ github.com/DataDog/datadog-agent/pkg/util/sort => ../util/sort/ @@ -94,7 +94,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/sort v0.53.2-rc.2 // indirect diff --git a/pkg/util/containers/metrics/containerd/collector.go b/pkg/util/containers/metrics/containerd/collector.go index ff21a109563f7..2f78b00c79e37 100644 --- a/pkg/util/containers/metrics/containerd/collector.go +++ b/pkg/util/containers/metrics/containerd/collector.go @@ -20,7 +20,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/containerd" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" //nolint:revive // TODO(CINT) Fix revive linter cutil "github.com/DataDog/datadog-agent/pkg/util/containerd" @@ -39,7 +39,7 @@ const ( func init() { provider.RegisterCollector(provider.CollectorFactory{ ID: collectorID, - Constructor: func(cache *provider.Cache, _ optional.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { + Constructor: func(cache *provider.Cache, _ option.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { return newContainerdCollector(cache) }, }) diff --git a/pkg/util/containers/metrics/cri/collector.go b/pkg/util/containers/metrics/cri/collector.go index d17478e4c7935..a628080160dff 100644 --- a/pkg/util/containers/metrics/cri/collector.go +++ b/pkg/util/containers/metrics/cri/collector.go @@ -16,7 +16,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/containers/cri" "github.com/DataDog/datadog-agent/pkg/util/containers/metrics/provider" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/pointer" ) @@ -28,7 +28,7 @@ const ( func init() { provider.RegisterCollector(provider.CollectorFactory{ ID: collectorID, - Constructor: func(cache *provider.Cache, _ optional.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { + Constructor: func(cache *provider.Cache, _ option.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { return newCRICollector(cache) }, }) diff --git a/pkg/util/containers/metrics/docker/collector.go b/pkg/util/containers/metrics/docker/collector.go index fc7ecadba521d..99f78dc39ab6c 100644 --- a/pkg/util/containers/metrics/docker/collector.go +++ b/pkg/util/containers/metrics/docker/collector.go @@ -22,7 +22,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/containers/metrics/provider" "github.com/DataDog/datadog-agent/pkg/util/docker" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/pointer" ) @@ -37,7 +37,7 @@ const ( func init() { provider.RegisterCollector(provider.CollectorFactory{ ID: collectorID, - Constructor: func(cache *provider.Cache, wmeta optional.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { + Constructor: func(cache *provider.Cache, wmeta option.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { return newDockerCollector(cache, wmeta) }, }) @@ -46,10 +46,10 @@ func init() { type dockerCollector struct { du *docker.DockerUtil pidCache *provider.Cache - metadataStore optional.Option[workloadmeta.Component] + metadataStore option.Option[workloadmeta.Component] } -func newDockerCollector(cache *provider.Cache, wmeta optional.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { +func newDockerCollector(cache *provider.Cache, wmeta option.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { var collectorMetadata provider.CollectorMetadata if !config.IsFeaturePresent(config.Docker) { diff --git a/pkg/util/containers/metrics/docker/collector_test.go b/pkg/util/containers/metrics/docker/collector_test.go index af248a23b342c..1bf50e50a4c7a 100644 --- a/pkg/util/containers/metrics/docker/collector_test.go +++ b/pkg/util/containers/metrics/docker/collector_test.go @@ -23,7 +23,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta/collectors" "github.com/DataDog/datadog-agent/pkg/util/containers/metrics/provider" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/pointer" ) @@ -94,7 +94,7 @@ func TestGetContainerIDForPID(t *testing.T) { collector := dockerCollector{ pidCache: provider.NewCache(pidCacheGCInterval), - metadataStore: optional.NewOption[workloadmeta.Component](mockStore), + metadataStore: option.New[workloadmeta.Component](mockStore), } mockStore.Set(&workloadmeta.Container{ diff --git a/pkg/util/containers/metrics/ecsfargate/collector.go b/pkg/util/containers/metrics/ecsfargate/collector.go index 7970973a85a92..74f0313eff19f 100644 --- a/pkg/util/containers/metrics/ecsfargate/collector.go +++ b/pkg/util/containers/metrics/ecsfargate/collector.go @@ -20,7 +20,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/ecs/metadata" v2 "github.com/DataDog/datadog-agent/pkg/util/ecs/metadata/v2" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/pointer" ) @@ -40,7 +40,7 @@ var ecsUnsetMemoryLimit = uint64(math.Pow(2, 62)) func init() { provider.RegisterCollector(provider.CollectorFactory{ ID: collectorID, - Constructor: func(cache *provider.Cache, _ optional.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { + Constructor: func(cache *provider.Cache, _ option.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { return newEcsFargateCollector(cache) }, }) diff --git a/pkg/util/containers/metrics/kubelet/collector.go b/pkg/util/containers/metrics/kubelet/collector.go index dab4e843723ad..b7cc19a923bc0 100644 --- a/pkg/util/containers/metrics/kubelet/collector.go +++ b/pkg/util/containers/metrics/kubelet/collector.go @@ -20,7 +20,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/containers/metrics/provider" kutil "github.com/DataDog/datadog-agent/pkg/util/kubernetes/kubelet" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/pointer" "k8s.io/kubelet/pkg/apis/stats/v1alpha1" @@ -41,7 +41,7 @@ const ( func init() { provider.RegisterCollector(provider.CollectorFactory{ ID: collectorID, - Constructor: func(cache *provider.Cache, wmeta optional.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { + Constructor: func(cache *provider.Cache, wmeta option.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { instance, ok := wmeta.Get() if !ok { return provider.CollectorMetadata{}, errors.New("missing workloadmeta component") diff --git a/pkg/util/containers/metrics/provider/provider.go b/pkg/util/containers/metrics/provider/provider.go index c34dde1f0cace..0f3dc27d81e06 100644 --- a/pkg/util/containers/metrics/provider/provider.go +++ b/pkg/util/containers/metrics/provider/provider.go @@ -14,7 +14,7 @@ import ( "sync" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/retry" ) @@ -118,7 +118,7 @@ type GenericProvider struct { } // GetProvider returns the metrics provider singleton -func GetProvider(wmeta optional.Option[workloadmeta.Component]) Provider { +func GetProvider(wmeta option.Option[workloadmeta.Component]) Provider { initMetricsProvider.Do(func() { metricsProvider = newProvider(wmeta) }) @@ -126,7 +126,7 @@ func GetProvider(wmeta optional.Option[workloadmeta.Component]) Provider { return metricsProvider } -func newProvider(wmeta optional.Option[workloadmeta.Component]) *GenericProvider { +func newProvider(wmeta option.Option[workloadmeta.Component]) *GenericProvider { provider := &GenericProvider{ cache: NewCache(cacheGCInterval), metaCollector: newMetaCollector(), diff --git a/pkg/util/containers/metrics/provider/provider_test.go b/pkg/util/containers/metrics/provider/provider_test.go index 80f96fae24d96..dc7422853d58e 100644 --- a/pkg/util/containers/metrics/provider/provider_test.go +++ b/pkg/util/containers/metrics/provider/provider_test.go @@ -8,10 +8,11 @@ package provider import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/DataDog/datadog-agent/comp/core/workloadmeta" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/pointer" - "github.com/stretchr/testify/assert" ) func TestRuntimeMetadataString(t *testing.T) { diff --git a/pkg/util/containers/metrics/provider/registry.go b/pkg/util/containers/metrics/provider/registry.go index a62d0b0e773a1..b67133859a896 100644 --- a/pkg/util/containers/metrics/provider/registry.go +++ b/pkg/util/containers/metrics/provider/registry.go @@ -16,7 +16,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) const ( @@ -52,7 +52,7 @@ type CollectorMetadata struct { // CollectorFactory allows to register a factory to dynamically create Collector at startup type CollectorFactory struct { ID string - Constructor func(*Cache, optional.Option[workloadmeta.Component]) (CollectorMetadata, error) + Constructor func(*Cache, option.Option[workloadmeta.Component]) (CollectorMetadata, error) } // GenericProvider offers an interface to retrieve a metrics collector @@ -77,7 +77,7 @@ func newCollectorRegistry() *collectorRegistry { } // catalogUpdatedCallback : blocking call in the retryCollectors() function (background goroutine) -func (cr *collectorRegistry) run(c context.Context, cache *Cache, wmeta optional.Option[workloadmeta.Component], catalogUpdatedCallback func(CollectorCatalog)) { +func (cr *collectorRegistry) run(c context.Context, cache *Cache, wmeta option.Option[workloadmeta.Component], catalogUpdatedCallback func(CollectorCatalog)) { cr.discoveryOnce.Do(func() { cr.catalogUpdatedCallback = catalogUpdatedCallback @@ -89,7 +89,7 @@ func (cr *collectorRegistry) run(c context.Context, cache *Cache, wmeta optional }) } -func (cr *collectorRegistry) collectorDiscovery(c context.Context, cache *Cache, wmeta optional.Option[workloadmeta.Component]) { +func (cr *collectorRegistry) collectorDiscovery(c context.Context, cache *Cache, wmeta option.Option[workloadmeta.Component]) { ticker := time.NewTicker(minRetryInterval) for { select { @@ -114,7 +114,7 @@ func (cr *collectorRegistry) registerCollector(collectorFactory CollectorFactory } // retryCollectors is not thread safe on purpose. It's only called by a single goroutine from `cr.run` -func (cr *collectorRegistry) retryCollectors(cache *Cache, wmeta optional.Option[workloadmeta.Component]) int { +func (cr *collectorRegistry) retryCollectors(cache *Cache, wmeta option.Option[workloadmeta.Component]) int { cr.registeredCollectorsLock.Lock() defer cr.registeredCollectorsLock.Unlock() diff --git a/pkg/util/containers/metrics/provider/registry_test.go b/pkg/util/containers/metrics/provider/registry_test.go index 0949e04a794d0..957a1f4be6214 100644 --- a/pkg/util/containers/metrics/provider/registry_test.go +++ b/pkg/util/containers/metrics/provider/registry_test.go @@ -9,9 +9,10 @@ import ( "fmt" "testing" - "github.com/DataDog/datadog-agent/comp/core/workloadmeta" - "github.com/DataDog/datadog-agent/pkg/util/optional" "github.com/stretchr/testify/assert" + + "github.com/DataDog/datadog-agent/comp/core/workloadmeta" + "github.com/DataDog/datadog-agent/pkg/util/option" ) func TestCollectorRegistry(t *testing.T) { @@ -26,7 +27,7 @@ func TestCollectorRegistry(t *testing.T) { c.registerCollector( CollectorFactory{ ID: "dummy1", - Constructor: func(*Cache, optional.Option[workloadmeta.Component]) (CollectorMetadata, error) { + Constructor: func(*Cache, option.Option[workloadmeta.Component]) (CollectorMetadata, error) { collector := dummyCollector{ id: "dummy1", selfContainerID: "dummy1", @@ -44,7 +45,7 @@ func TestCollectorRegistry(t *testing.T) { c.registerCollector( CollectorFactory{ ID: "dummy2", - Constructor: func(*Cache, optional.Option[workloadmeta.Component]) (CollectorMetadata, error) { + Constructor: func(*Cache, option.Option[workloadmeta.Component]) (CollectorMetadata, error) { return CollectorMetadata{}, ErrPermaFail }, }, @@ -54,7 +55,7 @@ func TestCollectorRegistry(t *testing.T) { c.registerCollector( CollectorFactory{ ID: "dummy3", - Constructor: func(*Cache, optional.Option[workloadmeta.Component]) (CollectorMetadata, error) { + Constructor: func(*Cache, option.Option[workloadmeta.Component]) (CollectorMetadata, error) { if dummy3Retries < 2 { dummy3Retries++ return CollectorMetadata{}, fmt.Errorf("not yet okay") @@ -121,7 +122,7 @@ func TestCollectorRegistry(t *testing.T) { c.registerCollector( CollectorFactory{ ID: "dummy4", - Constructor: func(*Cache, optional.Option[workloadmeta.Component]) (CollectorMetadata, error) { + Constructor: func(*Cache, option.Option[workloadmeta.Component]) (CollectorMetadata, error) { collector := dummyCollector{ id: "dummy4", selfContainerID: "dummy4", diff --git a/pkg/util/containers/metrics/system/collector_linux.go b/pkg/util/containers/metrics/system/collector_linux.go index ed5f5409d4d18..9007169cca68a 100644 --- a/pkg/util/containers/metrics/system/collector_linux.go +++ b/pkg/util/containers/metrics/system/collector_linux.go @@ -21,7 +21,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/cgroups" "github.com/DataDog/datadog-agent/pkg/util/containers/metrics/provider" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/pkg/util/pointer" systemutils "github.com/DataDog/datadog-agent/pkg/util/system" ) @@ -36,7 +36,7 @@ const ( func init() { provider.RegisterCollector(provider.CollectorFactory{ ID: systemCollectorID, - Constructor: func(cache *provider.Cache, _ optional.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { + Constructor: func(cache *provider.Cache, _ option.Option[workloadmeta.Component]) (provider.CollectorMetadata, error) { return newSystemCollector(cache) }, }) diff --git a/pkg/util/flavor/go.mod b/pkg/util/flavor/go.mod index 5a4f3acd30bda..75b46e10b70ec 100644 --- a/pkg/util/flavor/go.mod +++ b/pkg/util/flavor/go.mod @@ -16,7 +16,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../log - github.com/DataDog/datadog-agent/pkg/util/optional => ../optional + github.com/DataDog/datadog-agent/pkg/util/option => ../optional github.com/DataDog/datadog-agent/pkg/util/pointer => ../pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber github.com/DataDog/datadog-agent/pkg/util/system => ../system @@ -39,7 +39,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.2 // indirect diff --git a/pkg/util/optional/go.mod b/pkg/util/option/go.mod similarity index 77% rename from pkg/util/optional/go.mod rename to pkg/util/option/go.mod index ef32debdfd509..b5874487e00b8 100644 --- a/pkg/util/optional/go.mod +++ b/pkg/util/option/go.mod @@ -1,4 +1,4 @@ -module github.com/DataDog/datadog-agent/pkg/util/optional +module github.com/DataDog/datadog-agent/pkg/util/option go 1.21.9 diff --git a/pkg/util/optional/go.sum b/pkg/util/option/go.sum similarity index 100% rename from pkg/util/optional/go.sum rename to pkg/util/option/go.sum diff --git a/pkg/util/optional/optional.go b/pkg/util/option/option.go similarity index 67% rename from pkg/util/optional/optional.go rename to pkg/util/option/option.go index aa0437139dd1a..f7791246e7f79 100644 --- a/pkg/util/optional/optional.go +++ b/pkg/util/option/option.go @@ -3,8 +3,8 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2016-present Datadog, Inc. -// Package optional has optional types and functions used by Agent. -package optional +// Package option has optional types and functions used by Agent. +package option // Option represents an optional type. // By default, no value is set and a call to Get() returns (T{}, false) @@ -13,28 +13,28 @@ type Option[T any] struct { set bool } -// NewOption creates a new instance of Option[T] with a value set. A call to Get() will returns (value, true) -func NewOption[T any](value T) Option[T] { +// New creates a new instance of Option[T] with a value set. A call to Get() will returns (value, true) +func New[T any](value T) Option[T] { return Option[T]{ value: value, set: true, } } -// NewOptionPtr creates a new instance of Option[T] with a value set. A call to Get() will returns (value, true) -func NewOptionPtr[T any](value T) *Option[T] { - option := NewOption[T](value) +// NewPtr creates a new instance of Option[T] with a value set. A call to Get() will returns (value, true) +func NewPtr[T any](value T) *Option[T] { + option := New[T](value) return &option } -// NewNoneOption creates a new instance of Option[T] without any value set. -func NewNoneOption[T any]() Option[T] { +// None creates a new instance of Option[T] without any value set. +func None[T any]() Option[T] { return Option[T]{} } -// NewNoneOptionPtr creates a new instance of Option[T] without any value set. -func NewNoneOptionPtr[T any]() *Option[T] { - option := NewNoneOption[T]() +// NonePtr creates a new instance of Option[T] without any value set. +func NonePtr[T any]() *Option[T] { + option := None[T]() return &option } @@ -58,9 +58,9 @@ func (o *Option[T]) Reset() { func MapOption[T1 any, T2 any](optional Option[T1], fct func(T1) T2) Option[T2] { value, ok := optional.Get() if !ok { - return NewNoneOption[T2]() + return None[T2]() } - return NewOption(fct(value)) + return New(fct(value)) } // UnmarshalYAML unmarshals an Option[T] from YAML @@ -68,10 +68,10 @@ func (o *Option[T]) UnmarshalYAML(unmarshal func(interface{}) error) error { var v T err := unmarshal(&v) if err != nil { - *o = NewNoneOption[T]() + *o = None[T]() return err } - *o = NewOption[T](v) + *o = New[T](v) return nil } diff --git a/pkg/util/optional/optional_test.go b/pkg/util/option/option_test.go similarity index 82% rename from pkg/util/optional/optional_test.go rename to pkg/util/option/option_test.go index 86cafca52f7f1..6b0f72f084431 100644 --- a/pkg/util/optional/optional_test.go +++ b/pkg/util/option/option_test.go @@ -3,7 +3,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2016-present Datadog, Inc. -package optional +package option import ( "testing" @@ -12,18 +12,18 @@ import ( ) func TestOptionConstructors(t *testing.T) { - optional := NewOption(42) + optional := New(42) v, ok := optional.Get() require.True(t, ok) require.Equal(t, 42, v) - optional = NewNoneOption[int]() + optional = None[int]() _, ok = optional.Get() require.False(t, ok) } func TestOptionSetReset(t *testing.T) { - optional := NewOption(0) + optional := New(0) optional.Set(42) v, ok := optional.Get() require.True(t, ok) @@ -38,14 +38,14 @@ func TestMapOption(t *testing.T) { return len(v) } - optionalStr := NewOption("hello") + optionalStr := New("hello") optionalInt := MapOption(optionalStr, getLen) v, ok := optionalInt.Get() require.True(t, ok) require.Equal(t, 5, v) - optionalStr = NewNoneOption[string]() + optionalStr = None[string]() optionalInt = MapOption(optionalStr, getLen) _, ok = optionalInt.Get() @@ -53,7 +53,7 @@ func TestMapOption(t *testing.T) { } func TestSetIfNone(t *testing.T) { - optional := NewOption(42) + optional := New(42) optional.SetIfNone(10) v, ok := optional.Get() @@ -68,15 +68,15 @@ func TestSetIfNone(t *testing.T) { } func TestSetOptionIfNone(t *testing.T) { - optional := NewOption(42) + optional := New(42) - optional.SetOptionIfNone(NewOption(10)) + optional.SetOptionIfNone(New(10)) v, ok := optional.Get() require.Equal(t, 42, v) require.True(t, ok) optional.Reset() - optional.SetOptionIfNone(NewOption(10)) + optional.SetOptionIfNone(New(10)) v, ok = optional.Get() require.Equal(t, 10, v) require.True(t, ok) diff --git a/pkg/util/trivy/cache.go b/pkg/util/trivy/cache.go index 01a8432aedb09..4468fff1272db 100644 --- a/pkg/util/trivy/cache.go +++ b/pkg/util/trivy/cache.go @@ -20,7 +20,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/sbom/telemetry" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/aquasecurity/trivy/pkg/fanal/cache" "github.com/aquasecurity/trivy/pkg/fanal/types" @@ -44,7 +44,7 @@ func defaultCacheDir() string { // NewCustomBoltCache returns a BoltDB cache using an LRU algorithm with a // maximum disk size and garbage collection of unused images with its custom cleaner. -func NewCustomBoltCache(wmeta optional.Option[workloadmeta.Component], cacheDir string, maxDiskSize int) (CacheWithCleaner, error) { +func NewCustomBoltCache(wmeta option.Option[workloadmeta.Component], cacheDir string, maxDiskSize int) (CacheWithCleaner, error) { if cacheDir == "" { cacheDir = defaultCacheDir() } @@ -108,7 +108,7 @@ type ScannerCache struct { cache *persistentCache cachedKeysForEntity map[string][]string - wmeta optional.Option[workloadmeta.Component] + wmeta option.Option[workloadmeta.Component] } // clean removes entries of deleted images from the cache. diff --git a/pkg/util/trivy/cache_test.go b/pkg/util/trivy/cache_test.go index ede7c11f5ad1d..0a1728159c690 100644 --- a/pkg/util/trivy/cache_test.go +++ b/pkg/util/trivy/cache_test.go @@ -19,7 +19,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/log/logimpl" "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/stretchr/testify/require" @@ -264,7 +264,7 @@ func TestCustomBoltCache_GarbageCollector(t *testing.T) { workloadmetaStore.Reset([]workloadmeta.Entity{image1, image2, image3}, workloadmeta.SourceAll) - cache, err := NewCustomBoltCache(optional.NewOption[workloadmeta.Component](workloadmetaStore), t.TempDir(), defaultDiskSize) + cache, err := NewCustomBoltCache(option.New[workloadmeta.Component](workloadmetaStore), t.TempDir(), defaultDiskSize) require.NoError(t, err) defer func() { require.NoError(t, cache.Close()) @@ -389,7 +389,7 @@ func newTestBlobInfo() types.BlobInfo { type cacheDeps struct { fx.In - WMeta optional.Option[workloadmeta.Component] + WMeta option.Option[workloadmeta.Component] } func createCacheDeps(t *testing.T) cacheDeps { diff --git a/pkg/util/trivy/trivy.go b/pkg/util/trivy/trivy.go index afd82f769fab0..eff10ccc4519a 100644 --- a/pkg/util/trivy/trivy.go +++ b/pkg/util/trivy/trivy.go @@ -23,7 +23,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/sbom" cutil "github.com/DataDog/datadog-agent/pkg/util/containerd" "github.com/DataDog/datadog-agent/pkg/util/log" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/aquasecurity/trivy-db/pkg/db" "github.com/aquasecurity/trivy/pkg/fanal/analyzer" @@ -76,7 +76,7 @@ type Collector struct { langScanner langpkg.Scanner vulnClient vulnerability.Client marshaler cyclonedx.Marshaler - wmeta optional.Option[workloadmeta.Component] + wmeta option.Option[workloadmeta.Component] } var globalCollector *Collector @@ -169,7 +169,7 @@ func DefaultDisabledHandlers() []ftypes.HandlerType { } // NewCollector returns a new collector -func NewCollector(cfg config.Config, wmeta optional.Option[workloadmeta.Component]) (*Collector, error) { +func NewCollector(cfg config.Config, wmeta option.Option[workloadmeta.Component]) (*Collector, error) { conf := defaultCollectorConfig() conf.ClearCacheOnClose = cfg.GetBool("sbom.clear_cache_on_exit") @@ -184,7 +184,7 @@ func NewCollector(cfg config.Config, wmeta optional.Option[workloadmeta.Componen } // GetGlobalCollector gets the global collector -func GetGlobalCollector(cfg config.Config, wmeta optional.Option[workloadmeta.Component]) (*Collector, error) { +func GetGlobalCollector(cfg config.Config, wmeta option.Option[workloadmeta.Component]) (*Collector, error) { if globalCollector != nil { return globalCollector, nil } diff --git a/rtloader/test/helpers/helpers.go b/rtloader/test/helpers/helpers.go index 2579e8ca940e5..019bd316ad0cd 100644 --- a/rtloader/test/helpers/helpers.go +++ b/rtloader/test/helpers/helpers.go @@ -24,6 +24,7 @@ var ( ) // TestMemoryTracker is the method exposed to the RTLoader for memory tracking +// //export TestMemoryTracker func TestMemoryTracker(ptr unsafe.Pointer, sz C.size_t, op C.rtloader_mem_ops_t) { switch op { diff --git a/test/integration/dogstatsd/origin_detection.go b/test/integration/dogstatsd/origin_detection.go index 3ea669bd029df..6df1084beee3b 100644 --- a/test/integration/dogstatsd/origin_detection.go +++ b/test/integration/dogstatsd/origin_detection.go @@ -25,7 +25,7 @@ import ( "github.com/DataDog/datadog-agent/comp/dogstatsd/packets" coreConfig "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/test/integration/utils" ) diff --git a/test/integration/listeners/docker/docker_listener_test.go b/test/integration/listeners/docker/docker_listener_test.go index 0dd12971681f7..93ca80a144e2d 100644 --- a/test/integration/listeners/docker/docker_listener_test.go +++ b/test/integration/listeners/docker/docker_listener_test.go @@ -31,7 +31,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/containers" "github.com/DataDog/datadog-agent/pkg/util/docker" "github.com/DataDog/datadog-agent/pkg/util/fxutil" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" "github.com/DataDog/datadog-agent/test/integration/utils" ) diff --git a/test/integration/utils/compose.go b/test/integration/utils/compose.go index c3b631aa31f3c..d5edcbde9200d 100644 --- a/test/integration/utils/compose.go +++ b/test/integration/utils/compose.go @@ -19,7 +19,7 @@ import ( "github.com/DataDog/datadog-agent/comp/core/workloadmeta" "github.com/DataDog/datadog-agent/pkg/util/containers/metrics" "github.com/DataDog/datadog-agent/pkg/util/docker" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) type ComposeConf struct { diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index b9f89e1f5878f..be2d462d9b65c 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -10,7 +10,7 @@ toolchain go1.22.8 replace ( github.com/DataDog/datadog-agent/pkg/proto => ../../pkg/proto - github.com/DataDog/datadog-agent/pkg/util/optional => ../../pkg/util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../pkg/util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../pkg/util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../pkg/util/scrubber github.com/DataDog/datadog-agent/pkg/util/testutil => ../../pkg/util/testutil @@ -239,7 +239,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/optional v0.55.2 + github.com/DataDog/datadog-agent/pkg/util/option v0.55.2 github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.2 github.com/pulumi/pulumi-aws/sdk/v6 v6.66.2 github.com/pulumi/pulumi-awsx/sdk/v2 v2.19.0 diff --git a/test/new-e2e/tests/agent-shared-components/secretsutils/helpers.go b/test/new-e2e/tests/agent-shared-components/secretsutils/helpers.go index 8a25157050c10..6c337f6032e06 100644 --- a/test/new-e2e/tests/agent-shared-components/secretsutils/helpers.go +++ b/test/new-e2e/tests/agent-shared-components/secretsutils/helpers.go @@ -16,7 +16,7 @@ import ( "github.com/DataDog/test-infra-definitions/components/datadog/agentparams" perms "github.com/DataDog/test-infra-definitions/components/datadog/agentparams/filepermissions" - "github.com/DataDog/datadog-agent/pkg/util/optional" + "github.com/DataDog/datadog-agent/pkg/util/option" ) //go:embed fixtures/secret-resolver.py @@ -28,7 +28,7 @@ func WithUnixSecretSetupScript(path string, allowGroupExec bool) func(*agentpara } // WithUnixSecretPermissions returns an UnixPermissions object containing correct permissions for a secret backend script. -func WithUnixSecretPermissions(allowGroupExec bool) optional.Option[perms.FilePermissions] { +func WithUnixSecretPermissions(allowGroupExec bool) option.Option[perms.FilePermissions] { if allowGroupExec { return perms.NewUnixPermissions(perms.WithPermissions("0750"), perms.WithOwner("dd-agent"), perms.WithGroup("root")) } @@ -61,7 +61,7 @@ func WithWindowsSecretSetupScript(wrapperPath string, allowGroupExec bool) []fun } // WithWindowsSecretPermissions returns a WindowsPermissions object containing correct permissions for a secret backend script. -func WithWindowsSecretPermissions(allowGroupExec bool) optional.Option[perms.FilePermissions] { +func WithWindowsSecretPermissions(allowGroupExec bool) option.Option[perms.FilePermissions] { icaclsCmd := `/grant "ddagentuser:(RX)"` if allowGroupExec { icaclsCmd += ` "Administrators:(RX)"` From 1471917c92824526943c119ee978d4e1f64983d6 Mon Sep 17 00:00:00 2001 From: Celian Raimbault Date: Mon, 24 Feb 2025 15:36:46 +0100 Subject: [PATCH 3/9] [bump-test-infra-agent6] More replaces --- pkg/api/go.mod | 2 +- pkg/config/setup/go.mod | 2 +- pkg/config/utils/go.mod | 2 +- pkg/logs/auditor/go.mod | 2 +- pkg/logs/client/go.mod | 2 +- pkg/logs/diagnostic/go.mod | 2 +- pkg/logs/message/go.mod | 2 +- pkg/logs/pipeline/go.mod | 2 +- pkg/logs/processor/go.mod | 2 +- pkg/logs/sender/go.mod | 2 +- pkg/logs/sources/go.mod | 2 +- pkg/logs/util/testutils/go.mod | 2 +- pkg/serializer/go.mod | 2 +- pkg/util/flavor/go.mod | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/api/go.mod b/pkg/api/go.mod index 77e4b6aaae68c..f9fd87cddae5a 100644 --- a/pkg/api/go.mod +++ b/pkg/api/go.mod @@ -21,7 +21,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../util/log - github.com/DataDog/datadog-agent/pkg/util/option => ../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../util/scrubber github.com/DataDog/datadog-agent/pkg/util/system => ../util/system diff --git a/pkg/config/setup/go.mod b/pkg/config/setup/go.mod index 5c23258fc0d45..6b1991c5569f6 100644 --- a/pkg/config/setup/go.mod +++ b/pkg/config/setup/go.mod @@ -15,7 +15,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/system => ../../util/system diff --git a/pkg/config/utils/go.mod b/pkg/config/utils/go.mod index 05f453a9e30ac..bd508938ca870 100644 --- a/pkg/config/utils/go.mod +++ b/pkg/config/utils/go.mod @@ -16,7 +16,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/system => ../../util/system diff --git a/pkg/logs/auditor/go.mod b/pkg/logs/auditor/go.mod index af689cb4674f0..98fae0985c4b2 100644 --- a/pkg/logs/auditor/go.mod +++ b/pkg/logs/auditor/go.mod @@ -23,7 +23,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker diff --git a/pkg/logs/client/go.mod b/pkg/logs/client/go.mod index a31a7f8bbf141..da9ce8dec32c8 100644 --- a/pkg/logs/client/go.mod +++ b/pkg/logs/client/go.mod @@ -29,7 +29,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/http => ../../util/http github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker diff --git a/pkg/logs/diagnostic/go.mod b/pkg/logs/diagnostic/go.mod index e3bbc96f17e12..c2a7ac1d8b0bf 100644 --- a/pkg/logs/diagnostic/go.mod +++ b/pkg/logs/diagnostic/go.mod @@ -25,7 +25,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker diff --git a/pkg/logs/message/go.mod b/pkg/logs/message/go.mod index 79640032bc128..22929b20e3ce3 100644 --- a/pkg/logs/message/go.mod +++ b/pkg/logs/message/go.mod @@ -21,7 +21,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker diff --git a/pkg/logs/pipeline/go.mod b/pkg/logs/pipeline/go.mod index d07627690943a..05bc78610a77f 100644 --- a/pkg/logs/pipeline/go.mod +++ b/pkg/logs/pipeline/go.mod @@ -35,7 +35,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/http => ../../util/http github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/startstop => ../../util/startstop diff --git a/pkg/logs/processor/go.mod b/pkg/logs/processor/go.mod index f7f407b845251..6c86ce7d5ea6c 100644 --- a/pkg/logs/processor/go.mod +++ b/pkg/logs/processor/go.mod @@ -27,7 +27,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker diff --git a/pkg/logs/sender/go.mod b/pkg/logs/sender/go.mod index f0e34d92d9c93..fad04d793710c 100644 --- a/pkg/logs/sender/go.mod +++ b/pkg/logs/sender/go.mod @@ -30,7 +30,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/http => ../../util/http github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker diff --git a/pkg/logs/sources/go.mod b/pkg/logs/sources/go.mod index 6ea4958be6d60..65dc4af0ac90b 100644 --- a/pkg/logs/sources/go.mod +++ b/pkg/logs/sources/go.mod @@ -20,7 +20,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../util/log - github.com/DataDog/datadog-agent/pkg/util/option => ../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../util/statstracker diff --git a/pkg/logs/util/testutils/go.mod b/pkg/logs/util/testutils/go.mod index 097e035d0125a..c25e152ea46ee 100644 --- a/pkg/logs/util/testutils/go.mod +++ b/pkg/logs/util/testutils/go.mod @@ -23,7 +23,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../util/fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../../util/hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../../../util/log - github.com/DataDog/datadog-agent/pkg/util/option => ../../../util/optional + github.com/DataDog/datadog-agent/pkg/util/option => ../../../util/option github.com/DataDog/datadog-agent/pkg/util/pointer => ../../../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../util/scrubber github.com/DataDog/datadog-agent/pkg/util/statstracker => ../../../util/statstracker diff --git a/pkg/serializer/go.mod b/pkg/serializer/go.mod index 4c2976b5eb7f9..ef8d8419668b0 100644 --- a/pkg/serializer/go.mod +++ b/pkg/serializer/go.mod @@ -39,7 +39,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/http => ../util/http github.com/DataDog/datadog-agent/pkg/util/json => ../util/json github.com/DataDog/datadog-agent/pkg/util/log => ../util/log - github.com/DataDog/datadog-agent/pkg/util/option => ../util/optional/ + github.com/DataDog/datadog-agent/pkg/util/option => ../util/option/ github.com/DataDog/datadog-agent/pkg/util/pointer => ../util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../util/scrubber/ github.com/DataDog/datadog-agent/pkg/util/sort => ../util/sort/ diff --git a/pkg/util/flavor/go.mod b/pkg/util/flavor/go.mod index 75b46e10b70ec..a16bdffbac0f0 100644 --- a/pkg/util/flavor/go.mod +++ b/pkg/util/flavor/go.mod @@ -16,7 +16,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../fxutil github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../hostname/validate github.com/DataDog/datadog-agent/pkg/util/log => ../log - github.com/DataDog/datadog-agent/pkg/util/option => ../optional + github.com/DataDog/datadog-agent/pkg/util/option => ../option github.com/DataDog/datadog-agent/pkg/util/pointer => ../pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber github.com/DataDog/datadog-agent/pkg/util/system => ../system From 8bf17bc0ae2fa6a770b42bfd83ec2f5ec1be753c Mon Sep 17 00:00:00 2001 From: Celian Raimbault Date: Mon, 24 Feb 2025 17:09:42 +0100 Subject: [PATCH 4/9] [bump-test-infra-agent6] Mod tidy --- test/new-e2e/go.mod | 1 - test/new-e2e/go.sum | 2 -- 2 files changed, 3 deletions(-) diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index be2d462d9b65c..bb6ee0dda2a4d 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -248,7 +248,6 @@ require ( require ( github.com/BurntSushi/toml v1.2.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.38.1 // indirect github.com/iwdgo/sigintwindows v0.2.2 // indirect diff --git a/test/new-e2e/go.sum b/test/new-e2e/go.sum index ee8e01bc1d640..eecf5c3dc1696 100644 --- a/test/new-e2e/go.sum +++ b/test/new-e2e/go.sum @@ -8,8 +8,6 @@ github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/DataDog/agent-payload/v5 v5.0.106 h1:A3dGX+JYoL7OJe2crpxznW7hWxLxhOk/17WbYskRWVk= github.com/DataDog/agent-payload/v5 v5.0.106/go.mod h1:COngtbYYCncpIPiE5D93QlXDH/3VAKk10jDNwGHcMRE= -github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd h1:kam3LA9L/VuBRPQLqW4CBnelpxF1KY4WGbb/W2UHn2g= -github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd/go.mod h1:BECd5pnMX9MEnARCAV+S7M0Sk/gYwopL7QlhCFdXSI0= github.com/DataDog/datadog-api-client-go v1.16.0 h1:5jOZv1m98criCvYTa3qpW8Hzv301nbZX3K9yJtwGyWY= github.com/DataDog/datadog-api-client-go v1.16.0/go.mod h1:PgrP2ABuJWL3Auw2iEkemAJ/r72ghG4DQQmb5sgnKW4= github.com/DataDog/datadog-api-client-go/v2 v2.19.0 h1:Wvz/63/q39EpVwSH1T8jVyRvPcMfEABenU7sD3dO2Lc= From b8f140cabbdaf3f92b299a84d1e5e16fa013c86a Mon Sep 17 00:00:00 2001 From: Celian Raimbault Date: Tue, 25 Feb 2025 10:48:59 +0100 Subject: [PATCH 5/9] [bump-test-infra-agent6] Fixed --- pkg/config/setup/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/config/setup/config.go b/pkg/config/setup/config.go index 7c231e31d3e0b..f11c5fd513121 100644 --- a/pkg/config/setup/config.go +++ b/pkg/config/setup/config.go @@ -1432,7 +1432,7 @@ func LoadProxyFromEnv(config pkgconfigmodel.Config) { // LoadWithoutSecret reads configs files, initializes the config module without decrypting any secrets func LoadWithoutSecret(config pkgconfigmodel.Config, additionalEnvVars []string) (*pkgconfigmodel.Warnings, error) { - return LoadDatadogCustom(config, "datadog.yaml", optional.NewNoneOption[secrets.Component](), additionalEnvVars) + return LoadDatadogCustom(config, "datadog.yaml", option.None[secrets.Component](), additionalEnvVars) } // LoadWithSecret reads config files and initializes config with decrypted secrets From 85036193464a39abc4944be95f9a4c1ef79ad299 Mon Sep 17 00:00:00 2001 From: Celian Raimbault Date: Tue, 25 Feb 2025 10:51:23 +0100 Subject: [PATCH 6/9] [bump-test-infra-agent6] Fixed nss_failover_test --- .../agent-shared-components/forwarder/nss_failover_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/new-e2e/tests/agent-shared-components/forwarder/nss_failover_test.go b/test/new-e2e/tests/agent-shared-components/forwarder/nss_failover_test.go index 373bd61ce39af..e96cf413b0894 100644 --- a/test/new-e2e/tests/agent-shared-components/forwarder/nss_failover_test.go +++ b/test/new-e2e/tests/agent-shared-components/forwarder/nss_failover_test.go @@ -160,7 +160,7 @@ func (v *multiFakeIntakeSuite) TestNSSFailover() { agentOptions := []agentparams.Option{ agentparams.WithAgentConfig(agentConfig), agentparams.WithLogs(), - agentparams.WithIntakeHostname(intakeName), + agentparams.WithIntakeHostname(v.Env().Fakeintake1.Scheme, intakeName), agentparams.WithIntegration("custom_logs.d", customLogsConfig), } v.UpdateEnv(multiFakeIntakeAWS(agentOptions...)) From 60942c77011e084791fcb32e4a019aa339e97f6a Mon Sep 17 00:00:00 2001 From: Celian Raimbault Date: Tue, 25 Feb 2025 15:48:09 +0100 Subject: [PATCH 7/9] [bump-test-infra-agent6] Additional sed --- cmd/agent/common/test_helpers.go | 2 +- cmd/agent/subcommands/diagnose/command.go | 2 +- cmd/agent/subcommands/flare/command.go | 2 +- cmd/agent/subcommands/jmx/command.go | 6 +++--- cmd/cluster-agent/subcommands/diagnose/command.go | 2 +- cmd/system-probe/config/config.go | 4 ++-- cmd/system-probe/subcommands/run/command.go | 4 ++-- cmd/systray/command/command.go | 6 +++--- comp/api/authtoken/component.go | 2 +- comp/collector/collector/component.go | 2 +- comp/core/autodiscovery/autodiscoveryimpl/autoconfig.go | 2 +- comp/core/configsync/configsyncimpl/module.go | 2 +- comp/core/flare/flare_test.go | 4 ++-- comp/core/sysprobeconfig/component.go | 2 +- comp/core/tagger/tagger.go | 2 +- comp/core/workloadmeta/component_mock.go | 4 ++-- comp/core/workloadmeta/workloadmeta.go | 2 +- comp/dogstatsd/listeners/uds_datagram_test.go | 2 +- comp/dogstatsd/listeners/uds_linux_test.go | 2 +- comp/dogstatsd/listeners/uds_stream_test.go | 2 +- comp/dogstatsd/server/serverless.go | 2 +- .../orchestratorimpl/forwarder_no_orchestrator.go | 4 ++-- .../orchestratorimpl/forwarder_orchestrator.go | 6 +++--- .../orchestratorimpl/forwarder_orchestrator_mock.go | 2 +- comp/languagedetection/client/clientimpl/client.go | 4 ++-- comp/logs/agent/agent.go | 2 +- comp/metadata/bundle_test.go | 4 ++-- .../inventorychecksimpl/inventorychecks.go | 2 +- .../inventorychecksimpl/inventorychecks_test.go | 8 ++++---- comp/metadata/runner/runnerimpl/runner.go | 2 +- comp/remote-config/rcclient/component.go | 2 +- comp/remote-config/rcservice/rcserviceimpl/rcservice.go | 2 +- .../rcserviceha/rcservicehaimpl/rcserviceha.go | 2 +- comp/updater/updater/updaterimpl/updater_test.go | 2 +- pkg/cli/subcommands/check/command.go | 6 +++--- pkg/collector/corechecks/windows_event_log/config.go | 2 +- pkg/config/aliases.go | 2 +- pkg/config/setup/config_test.go | 6 +++--- pkg/config/utils/endpoints_test.go | 2 +- pkg/security/tests/module_tester_linux.go | 2 +- pkg/security/tests/module_tester_windows.go | 2 +- pkg/util/containers/metrics/provider/provider_test.go | 2 +- pkg/util/containers/metrics/provider/registry_test.go | 4 ++-- test/integration/dogstatsd/origin_detection.go | 4 ++-- test/integration/listeners/docker/docker_listener_test.go | 2 +- test/integration/utils/compose.go | 2 +- 46 files changed, 68 insertions(+), 68 deletions(-) diff --git a/cmd/agent/common/test_helpers.go b/cmd/agent/common/test_helpers.go index aa9598bf81b67..ca2d3ec13d404 100644 --- a/cmd/agent/common/test_helpers.go +++ b/cmd/agent/common/test_helpers.go @@ -36,7 +36,7 @@ func SetupConfigForTest(confFilePath string) (*config.Warnings, error) { } cfg.AddConfigPath(path.DefaultConfPath) // load the configuration - warnings, err := config.LoadDatadogCustom(cfg, origin, optional.NewNoneOption[secrets.Component](), nil) + warnings, err := config.LoadDatadogCustom(cfg, origin, option.None[secrets.Component](), nil) if err != nil { // special-case permission-denied with a clearer error message if errors.Is(err, fs.ErrPermission) { diff --git a/cmd/agent/subcommands/diagnose/command.go b/cmd/agent/subcommands/diagnose/command.go index 363933ebb406b..e72f629f44831 100644 --- a/cmd/agent/subcommands/diagnose/command.go +++ b/cmd/agent/subcommands/diagnose/command.go @@ -99,7 +99,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command { NoInstance: !cliParams.runLocal, } }), - fx.Supply(optional.NewNoneOption[collector.Component]()), + fx.Supply(option.None[collector.Component]()), workloadmeta.Module(), tagger.Module(), fx.Provide(func(config config.Component) tagger.Params { return tagger.NewTaggerParamsForCoreAgent(config) }), diff --git a/cmd/agent/subcommands/flare/command.go b/cmd/agent/subcommands/flare/command.go index 973fe23408308..58f93d07ddf26 100644 --- a/cmd/agent/subcommands/flare/command.go +++ b/cmd/agent/subcommands/flare/command.go @@ -116,7 +116,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command { tagger.OptionalModule(), autodiscoveryimpl.OptionalModule(), // if forceLocal is true, we will start autodiscovery (loadComponents) later flare.Module(), - fx.Supply(optional.NewNoneOption[collector.Component]()), + fx.Supply(option.None[collector.Component]()), diagnosesendermanagerimpl.Module(), // We need inventoryagent to fill the status page generated by the flare. inventoryagentimpl.Module(), diff --git a/cmd/agent/subcommands/jmx/command.go b/cmd/agent/subcommands/jmx/command.go index c3cf7cb86ac24..d9a08bfdbf052 100644 --- a/cmd/agent/subcommands/jmx/command.go +++ b/cmd/agent/subcommands/jmx/command.go @@ -147,11 +147,11 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command { fx.Provide(func() demultiplexer.Component { return nil }), fx.Provide(func() inventorychecks.Component { return nil }), fx.Provide(func() packagesigning.Component { return nil }), - fx.Provide(func() option.Option[rcservice.Component] { return optional.NewNoneOption[rcservice.Component]() }), - fx.Provide(func() option.Option[rcserviceha.Component] { return optional.NewNoneOption[rcserviceha.Component]() }), + fx.Provide(func() option.Option[rcservice.Component] { return option.None[rcservice.Component]() }), + fx.Provide(func() option.Option[rcserviceha.Component] { return option.None[rcserviceha.Component]() }), fx.Provide(func() status.Component { return nil }), fx.Provide(func() eventplatformreceiver.Component { return nil }), - fx.Provide(func() option.Option[collector.Component] { return optional.NewNoneOption[collector.Component]() }), + fx.Provide(func() option.Option[collector.Component] { return option.None[collector.Component]() }), fx.Provide(tagger.NewTaggerParamsForCoreAgent), tagger.Module(), autodiscoveryimpl.Module(), diff --git a/cmd/cluster-agent/subcommands/diagnose/command.go b/cmd/cluster-agent/subcommands/diagnose/command.go index 487052b27604d..79976282c3926 100644 --- a/cmd/cluster-agent/subcommands/diagnose/command.go +++ b/cmd/cluster-agent/subcommands/diagnose/command.go @@ -64,7 +64,7 @@ func run(diagnoseSenderManager diagnosesendermanager.Component, secretResolver s RunLocal: true, // do not attept to run in actual runnin agent (may need to implement it in future) Include: []string{"connectivity-datadog-autodiscovery"}, } - diagnoseDeps := diagnose.NewSuitesDeps(diagnoseSenderManager, optional.NewNoneOption[collector.Component](), secretResolver, optional.NewNoneOption[workloadmeta.Component](), optional.NewNoneOption[autodiscovery.Component]()) + diagnoseDeps := diagnose.NewSuitesDeps(diagnoseSenderManager, option.None[collector.Component](), secretResolver, option.None[workloadmeta.Component](), option.None[autodiscovery.Component]()) return diagnose.RunStdOut(color.Output, diagCfg, diagnoseDeps) } diff --git a/cmd/system-probe/config/config.go b/cmd/system-probe/config/config.go index 49f101d70d7eb..d1d8f6ffde58b 100644 --- a/cmd/system-probe/config/config.go +++ b/cmd/system-probe/config/config.go @@ -64,7 +64,7 @@ func newSysprobeConfig(configPath string) (*types.Config, error) { aconfig.SystemProbe.AddConfigPath(defaultConfigDir) } // load the configuration - _, err := aconfig.LoadCustom(aconfig.SystemProbe, "system-probe", optional.NewNoneOption[secrets.Component](), aconfig.Datadog.GetEnvVars()) + _, err := aconfig.LoadCustom(aconfig.SystemProbe, "system-probe", option.None[secrets.Component](), aconfig.Datadog.GetEnvVars()) if err != nil { if errors.Is(err, fs.ErrPermission) { // special-case permission-denied with a clearer error message @@ -169,7 +169,7 @@ func SetupOptionalDatadogConfigWithDir(configDir, configFile string) error { aconfig.Datadog.SetConfigFile(configFile) } // load the configuration - _, err := aconfig.LoadDatadogCustom(aconfig.Datadog, "datadog.yaml", optional.NewNoneOption[secrets.Component](), aconfig.SystemProbe.GetEnvVars()) + _, err := aconfig.LoadDatadogCustom(aconfig.Datadog, "datadog.yaml", option.None[secrets.Component](), aconfig.SystemProbe.GetEnvVars()) // If `!failOnMissingFile`, do not issue an error if we cannot find the default config file. var e viper.ConfigFileNotFoundError if err != nil && !errors.As(err, &e) { diff --git a/cmd/system-probe/subcommands/run/command.go b/cmd/system-probe/subcommands/run/command.go index ce55cdc43b718..a70a2f1208567 100644 --- a/cmd/system-probe/subcommands/run/command.go +++ b/cmd/system-probe/subcommands/run/command.go @@ -88,7 +88,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command { fx.Provide(func(lc fx.Lifecycle, params logimpl.Params, sysprobeconfig sysprobeconfig.Component) (log.Component, error) { return logimpl.NewLogger(lc, params, sysprobeconfig) }), - fx.Supply(optional.NewNoneOption[workloadmeta.Component]()), + fx.Supply(option.None[workloadmeta.Component]()), ) }, } @@ -217,7 +217,7 @@ func runSystemProbe(ctxChan <-chan context.Context, errChan chan error) error { telemetry.Module(), compstatsd.Module(), sysprobeconfigimpl.Module(), - fx.Supply(optional.NewNoneOption[workloadmeta.Component]()), + fx.Supply(option.None[workloadmeta.Component]()), // use system-probe config instead of agent config for logging fx.Provide(func(lc fx.Lifecycle, params logimpl.Params, sysprobeconfig sysprobeconfig.Component) (log.Component, error) { return logimpl.NewLogger(lc, params, sysprobeconfig) diff --git a/cmd/systray/command/command.go b/cmd/systray/command/command.go index 1c918d574e7ef..9207eab049fba 100644 --- a/cmd/systray/command/command.go +++ b/cmd/systray/command/command.go @@ -104,10 +104,10 @@ func MakeCommand() *cobra.Command { path.DefaultJmxLogFile, path.DefaultDogstatsDLogFile, )), - fx.Supply(optional.NewNoneOption[autodiscovery.Component]()), + fx.Supply(option.None[autodiscovery.Component]()), flare.Module(), - fx.Supply(optional.NewNoneOption[workloadmeta.Component]()), - fx.Supply(optional.NewNoneOption[collector.Component]()), + fx.Supply(option.None[workloadmeta.Component]()), + fx.Supply(option.None[collector.Component]()), diagnosesendermanagerimpl.Module(), authtokenimpl.Module(), // We need inventoryagent to fill the status page generated by the flare. diff --git a/comp/api/authtoken/component.go b/comp/api/authtoken/component.go index a22d1cb96ed32..046c709aa773b 100644 --- a/comp/api/authtoken/component.go +++ b/comp/api/authtoken/component.go @@ -28,6 +28,6 @@ type Component interface { // the implementation to avoid linking with the dependencies from sysprobeconfig. func NoneModule() fxutil.Module { return fxutil.Component(fx.Provide(func() option.Option[Component] { - return optional.NewNoneOption[Component]() + return option.None[Component]() })) } diff --git a/comp/collector/collector/component.go b/comp/collector/collector/component.go index fb711247b8be6..81fdf0b7639d0 100644 --- a/comp/collector/collector/component.go +++ b/comp/collector/collector/component.go @@ -55,7 +55,7 @@ type Component interface { func NoneModule() fxutil.Module { return fxutil.Component( fx.Provide(func() option.Option[Component] { - return optional.NewNoneOption[Component]() + return option.None[Component]() }), ) } diff --git a/comp/core/autodiscovery/autodiscoveryimpl/autoconfig.go b/comp/core/autodiscovery/autodiscoveryimpl/autoconfig.go index 523216b153c5b..4ff4d9478d230 100644 --- a/comp/core/autodiscovery/autodiscoveryimpl/autoconfig.go +++ b/comp/core/autodiscovery/autodiscoveryimpl/autoconfig.go @@ -619,7 +619,7 @@ func OptionalModule() fxutil.Module { func newOptionalAutoConfig(deps optionalModuleDeps) option.Option[autodiscovery.Component] { _, ok := deps.TaggerComp.Get() if !ok { - return optional.NewNoneOption[autodiscovery.Component]() + return option.None[autodiscovery.Component]() } return option.New[autodiscovery.Component]( createNewAutoConfig(scheduler.NewMetaScheduler(), deps.Secrets, deps.WMeta)) diff --git a/comp/core/configsync/configsyncimpl/module.go b/comp/core/configsync/configsyncimpl/module.go index 04b911592197a..fff0482bbd431 100644 --- a/comp/core/configsync/configsyncimpl/module.go +++ b/comp/core/configsync/configsyncimpl/module.go @@ -57,7 +57,7 @@ func newOptionalConfigSync(deps dependencies) option.Option[configsync.Component configRefreshIntervalSec := deps.Config.GetInt("agent_ipc.config_refresh_interval") if agentIPCPort <= 0 || configRefreshIntervalSec <= 0 { - return optional.NewNoneOption[configsync.Component]() + return option.None[configsync.Component]() } configSync := newConfigSync(deps, agentIPCPort, configRefreshIntervalSec) diff --git a/comp/core/flare/flare_test.go b/comp/core/flare/flare_test.go index 2f1a0335ac63d..d06d3fc01ec01 100644 --- a/comp/core/flare/flare_test.go +++ b/comp/core/flare/flare_test.go @@ -40,8 +40,8 @@ func TestFlareCreation(t *testing.T) { fx.Provide(func() diagnosesendermanager.Component { return nil }), fx.Provide(func() Params { return Params{} }), collector.NoneModule(), - fx.Supply(optional.NewNoneOption[workloadmeta.Component]()), - fx.Supply(optional.NewNoneOption[autodiscovery.Component]()), + fx.Supply(option.None[workloadmeta.Component]()), + fx.Supply(option.None[autodiscovery.Component]()), // provider a nil FlareCallback fx.Provide(fx.Annotate( func() types.FlareCallback { return nil }, diff --git a/comp/core/sysprobeconfig/component.go b/comp/core/sysprobeconfig/component.go index 80cbf604e2b36..cdd5adc3cc49d 100644 --- a/comp/core/sysprobeconfig/component.go +++ b/comp/core/sysprobeconfig/component.go @@ -43,6 +43,6 @@ type Component interface { // the implementation to avoid linking with the dependencies from sysprobeconfig. func NoneModule() fxutil.Module { return fxutil.Component(fx.Provide(func() option.Option[Component] { - return optional.NewNoneOption[Component]() + return option.None[Component]() })) } diff --git a/comp/core/tagger/tagger.go b/comp/core/tagger/tagger.go index 95dd74bc55cfa..97299f96fba12 100644 --- a/comp/core/tagger/tagger.go +++ b/comp/core/tagger/tagger.go @@ -413,7 +413,7 @@ func OptionalModule() fxutil.Module { func NewOptionalTagger(deps optionalTaggerDeps) option.Option[Component] { w, ok := deps.Wmeta.Get() if !ok { - return optional.NewNoneOption[Component]() + return option.None[Component]() } return option.New[Component](newTaggerClient(dependencies{ In: deps.In, diff --git a/comp/core/workloadmeta/component_mock.go b/comp/core/workloadmeta/component_mock.go index 12c317ed9d063..97e83dc983ae4 100644 --- a/comp/core/workloadmeta/component_mock.go +++ b/comp/core/workloadmeta/component_mock.go @@ -45,7 +45,7 @@ func MockModule() fxutil.Module { return fxutil.Component( fx.Provide(newWorkloadMetaMock), fx.Provide(func(mock Mock) Component { return mock }), - fx.Provide(func(mock Mock) option.Option[Component] { return optional.NewOption[Component](mock) }), + fx.Provide(func(mock Mock) option.Option[Component] { return option.New[Component](mock) }), ) } @@ -58,6 +58,6 @@ func MockModuleV2() fxutil.Module { return fxutil.Component( fx.Provide(newWorkloadMetaMockV2), fx.Provide(func(mock Mock) Component { return mock }), - fx.Provide(func(mock Mock) option.Option[Component] { return optional.NewOption[Component](mock) }), + fx.Provide(func(mock Mock) option.Option[Component] { return option.New[Component](mock) }), ) } diff --git a/comp/core/workloadmeta/workloadmeta.go b/comp/core/workloadmeta/workloadmeta.go index 7f46796c66bf3..d197a6a7af862 100644 --- a/comp/core/workloadmeta/workloadmeta.go +++ b/comp/core/workloadmeta/workloadmeta.go @@ -125,7 +125,7 @@ func newWorkloadMeta(deps dependencies) provider { func newWorkloadMetaOptional(deps dependencies) optionalProvider { if deps.Params.NoInstance { return optionalProvider{ - Comp: optional.NewNoneOption[Component](), + Comp: option.None[Component](), } } c := newWorkloadMeta(deps) diff --git a/comp/dogstatsd/listeners/uds_datagram_test.go b/comp/dogstatsd/listeners/uds_datagram_test.go index 991a9decb855f..a9d3fd3a9eb44 100644 --- a/comp/dogstatsd/listeners/uds_datagram_test.go +++ b/comp/dogstatsd/listeners/uds_datagram_test.go @@ -23,7 +23,7 @@ import ( ) func udsDatagramListenerFactory(packetOut chan packets.Packets, manager *packets.PoolManager, cfg config.Component) (StatsdListener, error) { - return NewUDSDatagramListener(packetOut, manager, nil, cfg, nil, optional.NewNoneOption[workloadmeta.Component]()) + return NewUDSDatagramListener(packetOut, manager, nil, cfg, nil, option.None[workloadmeta.Component]()) } func TestNewUDSDatagramListener(t *testing.T) { diff --git a/comp/dogstatsd/listeners/uds_linux_test.go b/comp/dogstatsd/listeners/uds_linux_test.go index 06a7fbf9274a0..dbcb37d7c0d31 100644 --- a/comp/dogstatsd/listeners/uds_linux_test.go +++ b/comp/dogstatsd/listeners/uds_linux_test.go @@ -37,7 +37,7 @@ func TestUDSPassCred(t *testing.T) { pool := packets.NewPool(512) poolManager := packets.NewPoolManager(pool) config := fulfillDepsWithConfig(t, cfg) - s, err := NewUDSDatagramListener(nil, poolManager, nil, config, nil, optional.NewNoneOption[workloadmeta.Component]()) + s, err := NewUDSDatagramListener(nil, poolManager, nil, config, nil, option.None[workloadmeta.Component]()) defer s.Stop() assert.Nil(t, err) diff --git a/comp/dogstatsd/listeners/uds_stream_test.go b/comp/dogstatsd/listeners/uds_stream_test.go index df2b4f866b17a..dcecf0bbda868 100644 --- a/comp/dogstatsd/listeners/uds_stream_test.go +++ b/comp/dogstatsd/listeners/uds_stream_test.go @@ -24,7 +24,7 @@ import ( ) func udsStreamListenerFactory(packetOut chan packets.Packets, manager *packets.PoolManager, cfg config.Component) (StatsdListener, error) { - return NewUDSStreamListener(packetOut, manager, nil, cfg, nil, optional.NewNoneOption[workloadmeta.Component]()) + return NewUDSStreamListener(packetOut, manager, nil, cfg, nil, option.None[workloadmeta.Component]()) } func TestNewUDSStreamListener(t *testing.T) { diff --git a/comp/dogstatsd/server/serverless.go b/comp/dogstatsd/server/serverless.go index 3a75c25768928..3ab6b808f1507 100644 --- a/comp/dogstatsd/server/serverless.go +++ b/comp/dogstatsd/server/serverless.go @@ -28,7 +28,7 @@ type ServerlessDogstatsd interface { //nolint:revive // TODO(AML) Fix revive linter func NewServerlessServer(demux aggregator.Demultiplexer) (ServerlessDogstatsd, error) { - wmeta := optional.NewNoneOption[workloadmeta.Component]() + wmeta := option.None[workloadmeta.Component]() s := newServerCompat(config.Datadog, logComponentImpl.NewTemporaryLoggerWithoutInit(), replay.NewServerlessTrafficCapture(), serverdebugimpl.NewServerlessServerDebug(), true, demux, wmeta) err := s.start(context.TODO()) diff --git a/comp/forwarder/orchestrator/orchestratorimpl/forwarder_no_orchestrator.go b/comp/forwarder/orchestrator/orchestratorimpl/forwarder_no_orchestrator.go index c8a766cacc388..9abb4ccf20918 100644 --- a/comp/forwarder/orchestrator/orchestratorimpl/forwarder_no_orchestrator.go +++ b/comp/forwarder/orchestrator/orchestratorimpl/forwarder_no_orchestrator.go @@ -30,9 +30,9 @@ func Module() fxutil.Module { // dependencies (k8s, several MBs) while building binaries not needing these. func newOrchestratorForwarder(_ log.Component, _ config.Component, params Params) orchestrator.Component { if params.useNoopOrchestratorForwarder { - forwarder := optional.NewOption[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) + forwarder := option.New[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) return &forwarder } - forwarder := optional.NewNoneOption[defaultforwarder.Forwarder]() + forwarder := option.None[defaultforwarder.Forwarder]() return &forwarder } diff --git a/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator.go b/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator.go index 6452e80cc2b28..1fa6cb96fe296 100644 --- a/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator.go +++ b/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator.go @@ -36,7 +36,7 @@ func newOrchestratorForwarder(log log.Component, config config.Component, params } if params.useOrchestratorForwarder { if !config.GetBool(orchestratorconfig.OrchestratorNSKey("enabled")) { - forwarder := optional.NewNoneOption[defaultforwarder.Forwarder]() + forwarder := option.None[defaultforwarder.Forwarder]() return &forwarder } orchestratorCfg := orchestratorconfig.NewDefaultOrchestratorConfig() @@ -50,11 +50,11 @@ func newOrchestratorForwarder(log log.Component, config config.Component, params return createComponent(defaultforwarder.NewDefaultForwarder(config, log, orchestratorForwarderOpts)) } - forwarder := optional.NewNoneOption[defaultforwarder.Forwarder]() + forwarder := option.None[defaultforwarder.Forwarder]() return &forwarder } func createComponent(forwarder defaultforwarder.Forwarder) orchestrator.Component { - o := optional.NewOption(forwarder) + o := option.New(forwarder) return &o } diff --git a/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator_mock.go b/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator_mock.go index 224673c5a5d95..3555e68ded9f7 100644 --- a/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator_mock.go +++ b/comp/forwarder/orchestrator/orchestratorimpl/forwarder_orchestrator_mock.go @@ -24,6 +24,6 @@ func MockModule() fxutil.Module { // NewMockOrchestratorForwarder returns an orchestratorForwarder func NewMockOrchestratorForwarder() orchestrator.Component { - forwarder := optional.NewOption[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) + forwarder := option.New[defaultforwarder.Forwarder](defaultforwarder.NoopForwarder{}) return &forwarder } diff --git a/comp/languagedetection/client/clientimpl/client.go b/comp/languagedetection/client/clientimpl/client.go index 47017e7d18fb7..dcc83dc938011 100644 --- a/comp/languagedetection/client/clientimpl/client.go +++ b/comp/languagedetection/client/clientimpl/client.go @@ -104,7 +104,7 @@ func newClient( deps dependencies, ) clientComp.Component { if !deps.Config.GetBool("language_detection.reporting.enabled") || !deps.Config.GetBool("language_detection.enabled") || !deps.Config.GetBool("cluster_agent.enabled") { - return optional.NewNoneOption[clientComp.Component]() + return option.None[clientComp.Component]() } ctx := context.Background() @@ -130,7 +130,7 @@ func newClient( OnStop: cl.stop, }) - return optional.NewOption[clientComp.Component](cl) + return option.New[clientComp.Component](cl) } // start starts streaming languages to the Cluster-Agent diff --git a/comp/logs/agent/agent.go b/comp/logs/agent/agent.go index 5925c1711d609..14ae0698d632b 100644 --- a/comp/logs/agent/agent.go +++ b/comp/logs/agent/agent.go @@ -133,7 +133,7 @@ func newLogsAgent(deps dependencies) provides { deps.Log.Info("logs-agent disabled") return provides{ - Comp: optional.NewNoneOption[Component](), + Comp: option.None[Component](), StatusProvider: statusComponent.NewInformationProvider(NewStatusProvider()), } } diff --git a/comp/metadata/bundle_test.go b/comp/metadata/bundle_test.go index 39fc9bb4b4cda..9d848f436bcb5 100644 --- a/comp/metadata/bundle_test.go +++ b/comp/metadata/bundle_test.go @@ -22,11 +22,11 @@ import ( func TestBundleDependencies(t *testing.T) { fxutil.TestBundle(t, Bundle(), core.MockBundle(), - fx.Supply(optional.NewNoneOption[runnerimpl.MetadataProvider]()), + fx.Supply(option.None[runnerimpl.MetadataProvider]()), fx.Provide(func() serializer.MetricSerializer { return nil }), collectorimpl.MockModule(), fx.Provide(func() option.Option[agent.Component] { - return optional.NewNoneOption[agent.Component]() + return option.None[agent.Component]() }), authtokenimpl.Module(), ) diff --git a/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks.go b/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks.go index 4251851dd8d87..5d6e16b2e9e7d 100644 --- a/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks.go +++ b/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks.go @@ -111,7 +111,7 @@ func newInventoryChecksProvider(deps dependencies) provides { conf: deps.Config, log: deps.Log, coll: deps.Coll, - sources: optional.NewNoneOption[*sources.LogSources](), + sources: option.None[*sources.LogSources](), hostname: hname, data: map[string]instanceMetadata{}, } diff --git a/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks_test.go b/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks_test.go index 0654055d65eee..f0c4be84747b8 100644 --- a/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks_test.go +++ b/comp/metadata/inventorychecks/inventorychecksimpl/inventorychecks_test.go @@ -50,7 +50,7 @@ func getTestInventoryChecks(t *testing.T, coll option.Option[collector.Component func TestSet(t *testing.T) { ic := getTestInventoryChecks( - t, optional.NewNoneOption[collector.Component](), option.Option[logagent.Component]{}, nil, + t, option.None[collector.Component](), option.Option[logagent.Component]{}, nil, ) ic.Set("instance_1", "key", "value") @@ -69,7 +69,7 @@ func TestSet(t *testing.T) { func TestSetEmptyInstance(t *testing.T) { ic := getTestInventoryChecks( - t, optional.NewNoneOption[collector.Component](), option.Option[logagent.Component]{}, nil, + t, option.None[collector.Component](), option.Option[logagent.Component]{}, nil, ) ic.Set("", "key", "value") @@ -79,7 +79,7 @@ func TestSetEmptyInstance(t *testing.T) { func TestGetInstanceMetadata(t *testing.T) { ic := getTestInventoryChecks( - t, optional.NewNoneOption[collector.Component](), option.Option[logagent.Component]{}, nil, + t, option.None[collector.Component](), option.Option[logagent.Component]{}, nil, ) ic.Set("instance_1", "key1", "value1") @@ -242,7 +242,7 @@ func TestGetPayload(t *testing.T) { func TestFlareProviderFilename(t *testing.T) { ic := getTestInventoryChecks( - t, optional.NewNoneOption[collector.Component](), option.Option[logagent.Component]{}, nil, + t, option.None[collector.Component](), option.Option[logagent.Component]{}, nil, ) assert.Equal(t, "checks.json", ic.FlareFileName) } diff --git a/comp/metadata/runner/runnerimpl/runner.go b/comp/metadata/runner/runnerimpl/runner.go index 3baa22d738aac..e3a0ef59fb4dd 100644 --- a/comp/metadata/runner/runnerimpl/runner.go +++ b/comp/metadata/runner/runnerimpl/runner.go @@ -65,7 +65,7 @@ func NewProvider(callback MetadataProvider) Provider { // can be enabled/disabled through configuration. func NewEmptyProvider() Provider { return Provider{ - Callback: optional.NewNoneOption[MetadataProvider](), + Callback: option.None[MetadataProvider](), } } diff --git a/comp/remote-config/rcclient/component.go b/comp/remote-config/rcclient/component.go index 2ee24f50bea92..3ec820c73b1f6 100644 --- a/comp/remote-config/rcclient/component.go +++ b/comp/remote-config/rcclient/component.go @@ -37,6 +37,6 @@ type Component interface { // the implementation to avoid linking with the dependencies from rcclient. func NoneModule() fxutil.Module { return fxutil.Component(fx.Provide(func() option.Option[Component] { - return optional.NewNoneOption[Component]() + return option.None[Component]() })) } diff --git a/comp/remote-config/rcservice/rcserviceimpl/rcservice.go b/comp/remote-config/rcservice/rcserviceimpl/rcservice.go index ea178d0cf07e9..613f2160dabb7 100644 --- a/comp/remote-config/rcservice/rcserviceimpl/rcservice.go +++ b/comp/remote-config/rcservice/rcserviceimpl/rcservice.go @@ -47,7 +47,7 @@ type dependencies struct { // newRemoteConfigServiceOptional conditionally creates and configures a new remote config service, based on whether RC is enabled. func newRemoteConfigServiceOptional(deps dependencies) option.Option[rcservice.Component] { - none := optional.NewNoneOption[rcservice.Component]() + none := option.None[rcservice.Component]() if !config.IsRemoteConfigEnabled(deps.Cfg) { return none } diff --git a/comp/remote-config/rcserviceha/rcservicehaimpl/rcserviceha.go b/comp/remote-config/rcserviceha/rcservicehaimpl/rcserviceha.go index c9bf563b4e26e..f804c1c1768a5 100644 --- a/comp/remote-config/rcserviceha/rcservicehaimpl/rcserviceha.go +++ b/comp/remote-config/rcserviceha/rcservicehaimpl/rcserviceha.go @@ -46,7 +46,7 @@ type dependencies struct { // newHaRemoteConfigServiceOptional conditionally creates and configures a new HA remote config service, based on whether RC is enabled. func newHaRemoteConfigServiceOptional(deps dependencies) option.Option[rcserviceha.Component] { - none := optional.NewNoneOption[rcserviceha.Component]() + none := option.None[rcserviceha.Component]() if !config.IsRemoteConfigEnabled(deps.Cfg) || !deps.Cfg.GetBool("ha.enabled") { return none } diff --git a/comp/updater/updater/updaterimpl/updater_test.go b/comp/updater/updater/updaterimpl/updater_test.go index 020fb4a9d9b96..4232495111938 100644 --- a/comp/updater/updater/updaterimpl/updater_test.go +++ b/comp/updater/updater/updaterimpl/updater_test.go @@ -32,7 +32,7 @@ func TestUpdaterWithoutRemoteConfig(t *testing.T) { deps := fxutil.Test[testDependencies](t, fx.Options( core.MockBundle(), fx.Supply(core.BundleParams{}), - fx.Supply(optional.NewNoneOption[rcservice.Component]()), + fx.Supply(option.None[rcservice.Component]()), Module(), )) _, err := newUpdaterComponent(&mockLifecycle{}, deps.Dependencies) diff --git a/pkg/cli/subcommands/check/command.go b/pkg/cli/subcommands/check/command.go index b214df8cce43d..081e6a4756e58 100644 --- a/pkg/cli/subcommands/check/command.go +++ b/pkg/cli/subcommands/check/command.go @@ -173,7 +173,7 @@ func MakeCommand(globalParamsGetter func() GlobalParams) *cobra.Command { collector.NoneModule(), fx.Supply(status.NewInformationProvider(statuscollector.Provider{})), fx.Provide(func() option.Option[logagent.Component] { - return optional.NewNoneOption[logagent.Component]() + return option.None[logagent.Component]() }), fx.Provide(func() serializer.MetricSerializer { return nil }), @@ -213,8 +213,8 @@ func MakeCommand(globalParamsGetter func() GlobalParams) *cobra.Command { fx.Provide(func() inventoryagent.Component { return nil }), fx.Provide(func() inventoryhost.Component { return nil }), fx.Provide(func() packagesigning.Component { return nil }), - fx.Provide(func() option.Option[rcservice.Component] { return optional.NewNoneOption[rcservice.Component]() }), - fx.Provide(func() option.Option[rcserviceha.Component] { return optional.NewNoneOption[rcserviceha.Component]() }), + fx.Provide(func() option.Option[rcservice.Component] { return option.None[rcservice.Component]() }), + fx.Provide(func() option.Option[rcserviceha.Component] { return option.None[rcserviceha.Component]() }), getPlatformModules(), ) diff --git a/pkg/collector/corechecks/windows_event_log/config.go b/pkg/collector/corechecks/windows_event_log/config.go index 72d82f5612362..5f736244a8da0 100644 --- a/pkg/collector/corechecks/windows_event_log/config.go +++ b/pkg/collector/corechecks/windows_event_log/config.go @@ -133,7 +133,7 @@ func (c *Config) genQuery() error { } func setOptionalDefault[T any](optional *option.Option[T], def T) { - optional.SetIfNone(def) + option.SetIfNone(def) } func setOptionalDefaultWithInitConfig[T any](instance *option.Option[T], shared option.Option[T], def T) { diff --git a/pkg/config/aliases.go b/pkg/config/aliases.go index 535367964beff..6a6d33ebd47cd 100644 --- a/pkg/config/aliases.go +++ b/pkg/config/aliases.go @@ -256,7 +256,7 @@ var ( // LoadWithoutSecret Alias using Datadog config func LoadWithoutSecret() (*model.Warnings, error) { - return pkgconfigsetup.LoadDatadogCustom(Datadog, "datadog.yaml", optional.NewNoneOption[secrets.Component](), SystemProbe.GetEnvVars()) + return pkgconfigsetup.LoadDatadogCustom(Datadog, "datadog.yaml", option.None[secrets.Component](), SystemProbe.GetEnvVars()) } // GetProcessAPIAddressPort Alias using Datadog config diff --git a/pkg/config/setup/config_test.go b/pkg/config/setup/config_test.go index 29c6207ea8766..8fadc6f923236 100644 --- a/pkg/config/setup/config_test.go +++ b/pkg/config/setup/config_test.go @@ -1241,7 +1241,7 @@ func TestConfigAssignAtPath(t *testing.T) { os.WriteFile(configPath, testExampleConf, 0600) config.SetConfigFile(configPath) - _, err := LoadCustom(config, "unit_test", optional.NewNoneOption[secrets.Component](), nil) + _, err := LoadCustom(config, "unit_test", option.None[secrets.Component](), nil) assert.NoError(t, err) err = configAssignAtPath(config, []string{"secret_backend_command"}, "different") @@ -1298,7 +1298,7 @@ func TestConfigAssignAtPathSimple(t *testing.T) { os.WriteFile(configPath, testSimpleConf, 0600) config.SetConfigFile(configPath) - _, err := LoadCustom(config, "unit_test", optional.NewNoneOption[secrets.Component](), nil) + _, err := LoadCustom(config, "unit_test", option.None[secrets.Component](), nil) assert.NoError(t, err) err = configAssignAtPath(config, []string{"secret_backend_arguments", "0"}, "password1") @@ -1402,7 +1402,7 @@ additional_endpoints: os.WriteFile(configPath, testIntKeysConf, 0600) config.SetConfigFile(configPath) - _, err := LoadCustom(config, "unit_test", optional.NewNoneOption[secrets.Component](), nil) + _, err := LoadCustom(config, "unit_test", option.None[secrets.Component](), nil) assert.NoError(t, err) err = configAssignAtPath(config, []string{"additional_endpoints", "2"}, "cherry") diff --git a/pkg/config/utils/endpoints_test.go b/pkg/config/utils/endpoints_test.go index 0d2f71aa8ba62..3b62b908d4f12 100644 --- a/pkg/config/utils/endpoints_test.go +++ b/pkg/config/utils/endpoints_test.go @@ -25,7 +25,7 @@ func TestSecretBackendWithMultipleEndpoints(t *testing.T) { conf := pkgconfigsetup.Conf() conf.SetConfigFile("./tests/datadog_secrets.yaml") // load the configuration - _, err := pkgconfigsetup.LoadDatadogCustom(conf, "datadog_secrets.yaml", optional.NewNoneOption[secrets.Component](), nil) + _, err := pkgconfigsetup.LoadDatadogCustom(conf, "datadog_secrets.yaml", option.None[secrets.Component](), nil) assert.NoError(t, err) expectedKeysPerDomain := map[string][]string{ diff --git a/pkg/security/tests/module_tester_linux.go b/pkg/security/tests/module_tester_linux.go index 67b62a5408fcc..514ab1eb8c9c5 100644 --- a/pkg/security/tests/module_tester_linux.go +++ b/pkg/security/tests/module_tester_linux.go @@ -716,7 +716,7 @@ func newTestModule(t testing.TB, macroDefs []*rules.MacroDefinition, ruleDefs [] } else { emopts.ProbeOpts.TagsResolver = NewFakeResolverDifferentImageNames() } - testMod.eventMonitor, err = eventmonitor.NewEventMonitor(emconfig, secconfig, emopts, optional.NewNoneOption[workloadmeta.Component]()) + testMod.eventMonitor, err = eventmonitor.NewEventMonitor(emconfig, secconfig, emopts, option.None[workloadmeta.Component]()) if err != nil { return nil, err } diff --git a/pkg/security/tests/module_tester_windows.go b/pkg/security/tests/module_tester_windows.go index 5fb154dfff23d..2859645a2683c 100644 --- a/pkg/security/tests/module_tester_windows.go +++ b/pkg/security/tests/module_tester_windows.go @@ -261,7 +261,7 @@ func newTestModule(t testing.TB, macroDefs []*rules.MacroDefinition, ruleDefs [] StatsdClient: statsdClient, }, } - testMod.eventMonitor, err = eventmonitor.NewEventMonitor(emconfig, secconfig, emopts, optional.NewNoneOption[workloadmeta.Component]()) + testMod.eventMonitor, err = eventmonitor.NewEventMonitor(emconfig, secconfig, emopts, option.None[workloadmeta.Component]()) if err != nil { return nil, err } diff --git a/pkg/util/containers/metrics/provider/provider_test.go b/pkg/util/containers/metrics/provider/provider_test.go index dc7422853d58e..44230a509fc48 100644 --- a/pkg/util/containers/metrics/provider/provider_test.go +++ b/pkg/util/containers/metrics/provider/provider_test.go @@ -49,7 +49,7 @@ func TestRuntimeMetadataString(t *testing.T) { } func TestGenericProvider(t *testing.T) { - provider := newProvider(optional.NewNoneOption[workloadmeta.Component]()) + provider := newProvider(option.None[workloadmeta.Component]()) // First collector is going to be priority 1 on stats and 2 on network statsCollector := &dummyCollector{ diff --git a/pkg/util/containers/metrics/provider/registry_test.go b/pkg/util/containers/metrics/provider/registry_test.go index 957a1f4be6214..76d301f1eb2c3 100644 --- a/pkg/util/containers/metrics/provider/registry_test.go +++ b/pkg/util/containers/metrics/provider/registry_test.go @@ -21,7 +21,7 @@ func TestCollectorRegistry(t *testing.T) { assert.Nil(t, c.effectiveCollectors[RuntimeMetadata{runtime: RuntimeNameDocker}]) // Check for collectors (none are registered, should not change output) - c.retryCollectors(nil, optional.NewNoneOption[workloadmeta.Component]()) + c.retryCollectors(nil, option.None[workloadmeta.Component]()) assert.Nil(t, c.effectiveCollectors[RuntimeMetadata{runtime: RuntimeNameDocker}]) c.registerCollector( @@ -91,7 +91,7 @@ func TestCollectorRegistry(t *testing.T) { assert.Equal(t, expected, actual) } - wmeta := optional.NewNoneOption[workloadmeta.Component]() + wmeta := option.None[workloadmeta.Component]() collectorsToRetry := c.retryCollectors(nil, wmeta) assert.Equal(t, 1, collectorsToRetry) assertCollectors(map[RuntimeMetadata]string{ diff --git a/test/integration/dogstatsd/origin_detection.go b/test/integration/dogstatsd/origin_detection.go index 6df1084beee3b..cff155ccf06e4 100644 --- a/test/integration/dogstatsd/origin_detection.go +++ b/test/integration/dogstatsd/origin_detection.go @@ -79,9 +79,9 @@ func testUDSOriginDetection(t *testing.T, network string) { var err error var s listeners.StatsdListener if network == "unixgram" { - s, err = listeners.NewUDSDatagramListener(packetsChannel, sharedPacketPoolManager, nil, confComponent, nil, optional.NewNoneOption[workloadmeta.Component]()) + s, err = listeners.NewUDSDatagramListener(packetsChannel, sharedPacketPoolManager, nil, confComponent, nil, option.None[workloadmeta.Component]()) } else if network == "unix" { - s, err = listeners.NewUDSStreamListener(packetsChannel, sharedPacketPoolManager, nil, confComponent, nil, optional.NewNoneOption[workloadmeta.Component]()) + s, err = listeners.NewUDSStreamListener(packetsChannel, sharedPacketPoolManager, nil, confComponent, nil, option.None[workloadmeta.Component]()) } require.NotNil(t, s) require.Nil(t, err) diff --git a/test/integration/listeners/docker/docker_listener_test.go b/test/integration/listeners/docker/docker_listener_test.go index 93ca80a144e2d..e4997af9e498f 100644 --- a/test/integration/listeners/docker/docker_listener_test.go +++ b/test/integration/listeners/docker/docker_listener_test.go @@ -99,7 +99,7 @@ func (suite *DockerListenerTestSuite) TearDownSuite() { } func (suite *DockerListenerTestSuite) SetupTest() { - dl, err := listeners.NewContainerListener(&config.Listeners{}, optional.NewOption(suite.wmeta)) + dl, err := listeners.NewContainerListener(&config.Listeners{}, option.New(suite.wmeta)) if err != nil { panic(err) } diff --git a/test/integration/utils/compose.go b/test/integration/utils/compose.go index d5edcbde9200d..b265eae3961aa 100644 --- a/test/integration/utils/compose.go +++ b/test/integration/utils/compose.go @@ -139,7 +139,7 @@ func getNetworkMode() (string, error) { } // Get container id if containerized - selfContainerID, err := metrics.GetProvider(optional.NewNoneOption[workloadmeta.Component]()).GetMetaCollector().GetSelfContainerID() + selfContainerID, err := metrics.GetProvider(option.None[workloadmeta.Component]()).GetMetaCollector().GetSelfContainerID() if err != nil { return "host", nil } From 11aa1461a6873687ad3a4158bae30fc06b40fe57 Mon Sep 17 00:00:00 2001 From: Celian Raimbault Date: Tue, 25 Feb 2025 16:48:05 +0100 Subject: [PATCH 8/9] [bump-test-infra-agent6] Fixes --- comp/checks/winregistry/impl/winregistryimpl.go | 6 +++--- pkg/collector/corechecks/windows_event_log/config.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/comp/checks/winregistry/impl/winregistryimpl.go b/comp/checks/winregistry/impl/winregistryimpl.go index 03356ffd96360..432fedb5d2ede 100644 --- a/comp/checks/winregistry/impl/winregistryimpl.go +++ b/comp/checks/winregistry/impl/winregistryimpl.go @@ -111,9 +111,9 @@ type WindowsRegistryCheck struct { } func createOptionMapping[T any](reflector *jsonschema.Reflector, sourceType jsonschema.SimpleType) { - option := jsonschema.Schema{} - option.AddType(sourceType) - reflector.AddTypeMapping(option.Option[T]{}, option) + optionValue := jsonschema.Schema{} + optionValue.AddType(sourceType) + reflector.AddTypeMapping(option.Option[T]{}, optionValue) } func createSchema() ([]byte, error) { diff --git a/pkg/collector/corechecks/windows_event_log/config.go b/pkg/collector/corechecks/windows_event_log/config.go index 5f736244a8da0..72d82f5612362 100644 --- a/pkg/collector/corechecks/windows_event_log/config.go +++ b/pkg/collector/corechecks/windows_event_log/config.go @@ -133,7 +133,7 @@ func (c *Config) genQuery() error { } func setOptionalDefault[T any](optional *option.Option[T], def T) { - option.SetIfNone(def) + optional.SetIfNone(def) } func setOptionalDefaultWithInitConfig[T any](instance *option.Option[T], shared option.Option[T], def T) { From 0e4d38e9f4bd2bbfc94a42998a45f2822fae5616 Mon Sep 17 00:00:00 2001 From: Celian Raimbault Date: Mon, 3 Mar 2025 16:36:02 +0100 Subject: [PATCH 9/9] [bump-test-infra-agent6] merge + renamed to optional --- comp/core/config/go.mod | 2 +- comp/core/log/go.mod | 2 +- comp/core/status/statusimpl/go.mod | 2 +- comp/forwarder/defaultforwarder/go.mod | 2 +- comp/forwarder/orchestrator/orchestratorinterface/go.mod | 2 +- comp/logs/agent/config/go.mod | 2 +- .../otlp/components/exporter/serializerexporter/go.mod | 2 +- go.mod | 2 +- pkg/api/go.mod | 2 +- pkg/config/setup/go.mod | 2 +- pkg/config/utils/go.mod | 2 +- pkg/logs/auditor/go.mod | 2 +- pkg/logs/client/go.mod | 2 +- pkg/logs/diagnostic/go.mod | 2 +- pkg/logs/message/go.mod | 2 +- pkg/logs/pipeline/go.mod | 2 +- pkg/logs/processor/go.mod | 2 +- pkg/logs/sender/go.mod | 2 +- pkg/logs/sources/go.mod | 2 +- pkg/logs/util/testutils/go.mod | 2 +- pkg/serializer/go.mod | 2 +- pkg/util/flavor/go.mod | 2 +- test/new-e2e/go.mod | 8 ++++---- 23 files changed, 26 insertions(+), 26 deletions(-) diff --git a/comp/core/config/go.mod b/comp/core/config/go.mod index 1fb711f64129c..875f5e8b9e5d3 100644 --- a/comp/core/config/go.mod +++ b/comp/core/config/go.mod @@ -48,7 +48,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.3 // indirect diff --git a/comp/core/log/go.mod b/comp/core/log/go.mod index 3530382a4fa61..48717aa192ecd 100644 --- a/comp/core/log/go.mod +++ b/comp/core/log/go.mod @@ -55,7 +55,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.3 // indirect diff --git a/comp/core/status/statusimpl/go.mod b/comp/core/status/statusimpl/go.mod index d5e2457a36ee2..d18878664bda4 100644 --- a/comp/core/status/statusimpl/go.mod +++ b/comp/core/status/statusimpl/go.mod @@ -52,7 +52,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.3 // indirect diff --git a/comp/forwarder/defaultforwarder/go.mod b/comp/forwarder/defaultforwarder/go.mod index 6e990e31c0d35..a9605b84496fd 100644 --- a/comp/forwarder/defaultforwarder/go.mod +++ b/comp/forwarder/defaultforwarder/go.mod @@ -76,7 +76,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system/socket v0.53.2-rc.3 // indirect diff --git a/comp/forwarder/orchestrator/orchestratorinterface/go.mod b/comp/forwarder/orchestrator/orchestratorinterface/go.mod index 6c8e8735f1502..10e1807f1ed39 100644 --- a/comp/forwarder/orchestrator/orchestratorinterface/go.mod +++ b/comp/forwarder/orchestrator/orchestratorinterface/go.mod @@ -78,7 +78,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.3 // indirect diff --git a/comp/logs/agent/config/go.mod b/comp/logs/agent/config/go.mod index fae3abbce89a6..42c4dd0f87fde 100644 --- a/comp/logs/agent/config/go.mod +++ b/comp/logs/agent/config/go.mod @@ -49,7 +49,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system/socket v0.53.2-rc.3 // indirect diff --git a/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod b/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod index d1240ce58d571..4b7421de1716f 100644 --- a/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod +++ b/comp/otelcol/otlp/components/exporter/serializerexporter/go.mod @@ -108,7 +108,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/json v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/sort v0.53.2-rc.3 // indirect diff --git a/go.mod b/go.mod index 56fb72cadedb5..05b26574ee80f 100644 --- a/go.mod +++ b/go.mod @@ -650,7 +650,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 github.com/DataDog/datadog-agent/pkg/util/http v0.53.2-rc.3 github.com/DataDog/datadog-agent/pkg/util/json v0.53.2-rc.3 - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 github.com/DataDog/datadog-agent/pkg/util/sort v0.53.2-rc.3 github.com/DataDog/datadog-agent/pkg/util/startstop v0.53.2-rc.3 github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.3 diff --git a/pkg/api/go.mod b/pkg/api/go.mod index a84a549423eb6..16c10a85f65ce 100644 --- a/pkg/api/go.mod +++ b/pkg/api/go.mod @@ -51,7 +51,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system/socket v0.53.2-rc.3 // indirect diff --git a/pkg/config/setup/go.mod b/pkg/config/setup/go.mod index 32908c2975a51..d03df2f24e0c5 100644 --- a/pkg/config/setup/go.mod +++ b/pkg/config/setup/go.mod @@ -35,7 +35,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.3 github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.3 - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.3 github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.2-rc.3 github.com/stretchr/testify v1.10.0 diff --git a/pkg/config/utils/go.mod b/pkg/config/utils/go.mod index ab437de436ad2..fe10502b6aa11 100644 --- a/pkg/config/utils/go.mod +++ b/pkg/config/utils/go.mod @@ -31,7 +31,7 @@ require ( github.com/DataDog/datadog-agent/pkg/config/model v0.53.2-rc.3 github.com/DataDog/datadog-agent/pkg/config/setup v0.53.2-rc.3 github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.3 - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 github.com/DataDog/datadog-agent/pkg/version v0.53.2-rc.3 github.com/stretchr/testify v1.10.0 ) diff --git a/pkg/logs/auditor/go.mod b/pkg/logs/auditor/go.mod index c4d8f5be790ec..8a1564dcceffb 100644 --- a/pkg/logs/auditor/go.mod +++ b/pkg/logs/auditor/go.mod @@ -54,7 +54,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.3 // indirect diff --git a/pkg/logs/client/go.mod b/pkg/logs/client/go.mod index 946f4cedb9a07..a3997f87c8609 100644 --- a/pkg/logs/client/go.mod +++ b/pkg/logs/client/go.mod @@ -69,7 +69,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.3 // indirect diff --git a/pkg/logs/diagnostic/go.mod b/pkg/logs/diagnostic/go.mod index 2e8249e2d130d..d776488d948a3 100644 --- a/pkg/logs/diagnostic/go.mod +++ b/pkg/logs/diagnostic/go.mod @@ -57,7 +57,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.3 // indirect diff --git a/pkg/logs/message/go.mod b/pkg/logs/message/go.mod index 38567eda11bf3..19cc4168eeeab 100644 --- a/pkg/logs/message/go.mod +++ b/pkg/logs/message/go.mod @@ -50,7 +50,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.3 // indirect diff --git a/pkg/logs/pipeline/go.mod b/pkg/logs/pipeline/go.mod index 4c04ea9f5f957..85980a10e86d8 100644 --- a/pkg/logs/pipeline/go.mod +++ b/pkg/logs/pipeline/go.mod @@ -83,7 +83,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.3 // indirect diff --git a/pkg/logs/processor/go.mod b/pkg/logs/processor/go.mod index 432e72e19d385..a2d5595567ab2 100644 --- a/pkg/logs/processor/go.mod +++ b/pkg/logs/processor/go.mod @@ -64,7 +64,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.3 // indirect diff --git a/pkg/logs/sender/go.mod b/pkg/logs/sender/go.mod index ce0e221117667..a0aba5988fc27 100644 --- a/pkg/logs/sender/go.mod +++ b/pkg/logs/sender/go.mod @@ -69,7 +69,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.3 // indirect diff --git a/pkg/logs/sources/go.mod b/pkg/logs/sources/go.mod index 65a10f3810d3e..e98b70b7d2ff1 100644 --- a/pkg/logs/sources/go.mod +++ b/pkg/logs/sources/go.mod @@ -49,7 +49,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.3 // indirect diff --git a/pkg/logs/util/testutils/go.mod b/pkg/logs/util/testutils/go.mod index 3e0c9e7ff023d..e0d0e6524f65b 100644 --- a/pkg/logs/util/testutils/go.mod +++ b/pkg/logs/util/testutils/go.mod @@ -49,7 +49,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/statstracker v0.53.2-rc.3 // indirect diff --git a/pkg/serializer/go.mod b/pkg/serializer/go.mod index da2f3a4360312..dd70475efc8d4 100644 --- a/pkg/serializer/go.mod +++ b/pkg/serializer/go.mod @@ -94,7 +94,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/sort v0.53.2-rc.3 // indirect diff --git a/pkg/util/flavor/go.mod b/pkg/util/flavor/go.mod index 6c102afa207b3..e2a91b57f3c5a 100644 --- a/pkg/util/flavor/go.mod +++ b/pkg/util/flavor/go.mod @@ -39,7 +39,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.53.2-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.53.2-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/option v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.53.2-rc.3 // indirect diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index f5ca8e88b9991..e8d222c584b8b 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -239,11 +239,11 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/optional v0.55.2 + github.com/DataDog/datadog-agent/pkg/util/option v0.55.2 github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.2-rc.3 - github.com/pulumi/pulumi-aws/sdk/v6 v6.56.1 - github.com/pulumi/pulumi-awsx/sdk/v2 v2.16.1 - github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.17.1 + github.com/pulumi/pulumi-aws/sdk/v6 v6.66.2 + github.com/pulumi/pulumi-awsx/sdk/v2 v2.19.0 + github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.19.0 ) require (