From f911086c359d8829c43b45a83200a66c0879699b Mon Sep 17 00:00:00 2001 From: hkarn Date: Mon, 13 May 2024 17:54:24 -0400 Subject: [PATCH 1/3] Add secretsmanager confmap provider --- collector/go.mod | 2 ++ collector/go.sum | 4 ++++ collector/internal/collector/collector.go | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/collector/go.mod b/collector/go.mod index c5f1a830ae..ae350d13e6 100644 --- a/collector/go.mod +++ b/collector/go.mod @@ -24,6 +24,7 @@ require ( github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259 github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.99.0 + github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.99.0 github.com/open-telemetry/opentelemetry-lambda/collector/lambdacomponents v0.98.0 github.com/open-telemetry/opentelemetry-lambda/collector/lambdalifecycle v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.9.0 @@ -55,6 +56,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 // indirect diff --git a/collector/go.sum b/collector/go.sum index 8d14bcd412..444920eccd 100644 --- a/collector/go.sum +++ b/collector/go.sum @@ -255,6 +255,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 h1:f9RyWNtS8oH7cZ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5/go.mod h1:h5CoMZV2VF297/VLhRhO1WF+XYWOzXo+4HsObA4HjBQ= github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 h1:6cnno47Me9bRykw9AEv9zkXE+5or7jz8TsskTTccbgc= github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1/go.mod h1:qmdkIIAC+GCLASF7R2whgNrJADz0QZPX+Seiw/i4S3o= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6 h1:TIOEjw0i2yyhmhRry3Oeu9YtiiHWISZ6j/irS1W3gX4= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6/go.mod h1:3Ba++UwWd154xtP4FRX5pUK3Gt4up5sDHCve6kVfE+g= github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 h1:vN8hEbpRnL7+Hopy9dzmRle1xmDc7o8tmY0klsr175w= github.com/aws/aws-sdk-go-v2/service/sso v1.20.5/go.mod h1:qGzynb/msuZIE8I75DVRCUXw3o3ZyBmUvMwQ2t/BrGM= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 h1:Jux+gDDyi1Lruk+KHF91tK2KCuY61kzoCpvtvJJBtOE= @@ -417,6 +419,8 @@ github.com/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0b github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w= github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.99.0 h1:jQ+U5v7IG9tTuCl3cNfEUEsLWelBWw/XY4UlZX0PWzc= github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.99.0/go.mod h1:/J80bgLUI1ASjMrwWEb0zHl4trx+ogz1xM8HZvsaPRk= +github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.99.0 h1:w1lN0CiLVtSyaI24tmWuD5qVpGRDU0DaSA0/Dl9NhTg= +github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.99.0/go.mod h1:wyZZhLDGnIIAfsS638pAn5rZ9EPDHj7a68cmNrkwugQ= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.99.0 h1:Us+HCnULFKE0k2dN+r/K+f0c0DbKR01A4ouBPGiICY8= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.99.0/go.mod h1:m1Ip+DxFnvfozwzSCGG4FxE5ITmjxvNg6H9qpQi61IM= github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.99.0 h1:UTctoFx3O8CEPCLoFEO64HvFlzDFPHBZqsLDaUA1jqs= diff --git a/collector/internal/collector/collector.go b/collector/internal/collector/collector.go index 35aaa180de..590b7a1e9e 100644 --- a/collector/internal/collector/collector.go +++ b/collector/internal/collector/collector.go @@ -20,6 +20,7 @@ import ( "os" "github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider" + "github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/converter/expandconverter" @@ -59,7 +60,7 @@ func getConfig(logger *zap.Logger) string { func NewCollector(logger *zap.Logger, factories otelcol.Factories, version string) *Collector { l := logger.Named("NewCollector") providerSettings := confmap.ProviderSettings{Logger: l} - providers := []confmap.Provider{fileprovider.NewWithSettings(providerSettings), envprovider.NewWithSettings(providerSettings), yamlprovider.NewWithSettings(providerSettings), httpprovider.NewWithSettings(providerSettings), s3provider.New()} + providers := []confmap.Provider{fileprovider.NewWithSettings(providerSettings), envprovider.NewWithSettings(providerSettings), yamlprovider.NewWithSettings(providerSettings), httpprovider.NewWithSettings(providerSettings), s3provider.New(), secretsmanagerprovider.New()} mapProvider := make(map[string]confmap.Provider, len(providers)) for _, provider := range providers { From b3c77f1721ffcd32074e5c60d2ea0c3fb08ec86c Mon Sep 17 00:00:00 2001 From: hkarn Date: Fri, 7 Jun 2024 17:17:26 -0400 Subject: [PATCH 2/3] tidy deps --- collector/go.mod | 4 ++-- collector/go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/collector/go.mod b/collector/go.mod index e7e06a864f..562048789c 100644 --- a/collector/go.mod +++ b/collector/go.mod @@ -23,7 +23,7 @@ replace cloud.google.com/go => cloud.google.com/go v0.107.0 require ( github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259 github.com/google/go-cmp v0.6.0 - github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.101.0 + github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.101.0 github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.101.0 github.com/open-telemetry/opentelemetry-lambda/collector/lambdacomponents v0.98.0 github.com/open-telemetry/opentelemetry-lambda/collector/lambdalifecycle v0.0.0-00010101000000-000000000000 @@ -56,7 +56,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.9 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.7 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.54.3 // indirect - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.7 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.20.9 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.3 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.28.10 // indirect diff --git a/collector/go.sum b/collector/go.sum index 79efbdf0c5..3437dbe696 100644 --- a/collector/go.sum +++ b/collector/go.sum @@ -255,8 +255,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.7 h1:uO5XR6QGBcmPyo github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.7/go.mod h1:feeeAYfAcwTReM6vbwjEyDmiGho+YgBhaFULuXDW8kc= github.com/aws/aws-sdk-go-v2/service/s3 v1.54.3 h1:57NtjG+WLims0TxIQbjTqebZUKDM03DfM11ANAekW0s= github.com/aws/aws-sdk-go-v2/service/s3 v1.54.3/go.mod h1:739CllldowZiPPsDFcJHNF4FXrVxaSGVnZ9Ez9Iz9hc= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6 h1:TIOEjw0i2yyhmhRry3Oeu9YtiiHWISZ6j/irS1W3gX4= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6/go.mod h1:3Ba++UwWd154xtP4FRX5pUK3Gt4up5sDHCve6kVfE+g= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.7 h1:4cziOtpDwtgcb+wTYRzz8C+GoH1XySy0p7j4oBbqPQE= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.7/go.mod h1:3Ba++UwWd154xtP4FRX5pUK3Gt4up5sDHCve6kVfE+g= github.com/aws/aws-sdk-go-v2/service/sso v1.20.9 h1:aD7AGQhvPuAxlSUfo0CWU7s6FpkbyykMhGYMvlqTjVs= github.com/aws/aws-sdk-go-v2/service/sso v1.20.9/go.mod h1:c1qtZUWtygI6ZdvKppzCSXsDOq5I4luJPZ0Ud3juFCA= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.3 h1:Pav5q3cA260Zqez42T9UhIlsd9QeypszRPwC9LdSSsQ= @@ -419,6 +419,8 @@ github.com/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0b github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w= github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.101.0 h1:sqNm3a3rqq9hqSjda751RBn3x0hKuuHMFeklv20pTY4= github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.101.0/go.mod h1:LIXeoH+VG+YfIOQFkOffv7E9nmxrAlUbOsJm4ZfXWPU= +github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.101.0 h1:C/qvh2/bYaAk00kXIy1w2b0UrDLClpTNzMT7TTRqhpI= +github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.101.0/go.mod h1:mVrDpRkuQsca1Umn12u4pvqNjiDQS77fjHZzN2whBqw= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.101.0 h1:+wwQn1vl122nREufLWRjZ4Nes/qXyINuo5Mj3KLIFJ8= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.101.0/go.mod h1:KZGnojtoI4/oefkAZNu4ErTrB5PwOrpeD+zVJAYmL0o= github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.101.0 h1:w+ADaFJEjJPGI2IIpt8UhHw4Erhnjq9FsA8XVDNw4NM= From 7afffba3a9b261ce46231eca70a689f8ccc9bad1 Mon Sep 17 00:00:00 2001 From: hkarn Date: Tue, 11 Jun 2024 21:27:52 -0400 Subject: [PATCH 3/3] tidy deps --- collector/go.mod | 2 +- collector/go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/collector/go.mod b/collector/go.mod index 2deb3a325e..44ab8d6083 100644 --- a/collector/go.mod +++ b/collector/go.mod @@ -56,7 +56,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.11 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.9 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.55.1 // indirect - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.7 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.29.1 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.20.11 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.5 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.28.12 // indirect diff --git a/collector/go.sum b/collector/go.sum index 00543f42db..a0fb33f7c2 100644 --- a/collector/go.sum +++ b/collector/go.sum @@ -255,8 +255,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.9 h1:TE2i0A9ErH1YfR github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.9/go.mod h1:9TzXX3MehQNGPwCZ3ka4CpwQsoAMWSF48/b+De9rfVM= github.com/aws/aws-sdk-go-v2/service/s3 v1.55.1 h1:UAxBuh0/8sFJk1qOkvOKewP5sWeWaTPDknbQz0ZkDm0= github.com/aws/aws-sdk-go-v2/service/s3 v1.55.1/go.mod h1:hWjsYGjVuqCgfoveVcVFPXIWgz0aByzwaxKlN1StKcM= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.7 h1:4cziOtpDwtgcb+wTYRzz8C+GoH1XySy0p7j4oBbqPQE= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.7/go.mod h1:3Ba++UwWd154xtP4FRX5pUK3Gt4up5sDHCve6kVfE+g= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.29.1 h1:NSWsFzdHN41mJ5I/DOFzxgkKSYNHQADHn7Mu+lU/AKw= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.29.1/go.mod h1:5mMk0DgUgaHlcqtN65fNyZI0ZDX3i9Cw+nwq75HKB3U= github.com/aws/aws-sdk-go-v2/service/sso v1.20.11 h1:gEYM2GSpr4YNWc6hCd5nod4+d4kd9vWIAWrmGuLdlMw= github.com/aws/aws-sdk-go-v2/service/sso v1.20.11/go.mod h1:gVvwPdPNYehHSP9Rs7q27U1EU+3Or2ZpXvzAYJNh63w= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.5 h1:iXjh3uaH3vsVcnyZX7MqCoCfcyxIrVE9iOQruRaWPrQ= @@ -419,8 +419,8 @@ github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mL github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg= github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.102.0 h1:IhXkhX9xl3zkWe+JKuzlgmSsN0esLGLHai+tjKuzrMs= github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.102.0/go.mod h1:zzrJwGGJmMcGnyjMcmiU+5gHRZfifkW5KwxNsswrZXA= -github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.101.0 h1:C/qvh2/bYaAk00kXIy1w2b0UrDLClpTNzMT7TTRqhpI= -github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.101.0/go.mod h1:mVrDpRkuQsca1Umn12u4pvqNjiDQS77fjHZzN2whBqw= +github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.102.0 h1:l9fWmXpK0BZwfbTKu733OFTz1soH3s70wYWl2uRabvo= +github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.102.0/go.mod h1:L2Y0/PMfHqJ2KcHp1igf4qxHug5UUp2kvIfAEbRpVSk= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.102.0 h1:jyFZk2+JJNp74U+KnHVw1xyWQuTEGcJjyl918Nh1Qbc= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.102.0/go.mod h1:xR0NbceSTwHMGKmFTv7M3/9nnhHBkYH/hjcRIi67cUE= github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.102.0 h1:X9cOU9eRDcVSiptZl53Rs170Upt48DMulq9qlYl5Khk=