Skip to content

Commit da3fb17

Browse files
committed
feat: add httpsprovider
Adds the [httpsprovider](https://github.com/open-telemetry/opentelemetry-collector/tree/main/confmap/provider/httpsprovider) to also support `https://` as scheme in `OPENTELEMETRY_COLLECTOR_CONFIG_URI`.
1 parent bd1365b commit da3fb17

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

collector/go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ require (
2727
github.com/open-telemetry/opentelemetry-lambda/collector/lambdalifecycle v0.0.0-00010101000000-000000000000
2828
github.com/stretchr/testify v1.9.0
2929
go.opentelemetry.io/collector/component v0.113.0
30-
go.opentelemetry.io/collector/confmap v1.19.0
30+
go.opentelemetry.io/collector/confmap v1.20.0
3131
go.opentelemetry.io/collector/confmap/provider/envprovider v1.19.0
3232
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.19.0
3333
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.19.0
34+
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.20.0
3435
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.19.0
3536
go.opentelemetry.io/collector/otelcol v0.113.0
3637
go.uber.org/multierr v1.11.0
@@ -93,7 +94,7 @@ require (
9394
github.com/klauspost/compress v1.17.11 // indirect
9495
github.com/knadh/koanf/maps v0.1.1 // indirect
9596
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
96-
github.com/knadh/koanf/v2 v2.1.1 // indirect
97+
github.com/knadh/koanf/v2 v2.1.2 // indirect
9798
github.com/lightstep/go-expohisto v1.0.0 // indirect
9899
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
99100
github.com/magefile/mage v1.15.0 // indirect

collector/go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NI
129129
github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
130130
github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU=
131131
github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU=
132-
github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM=
133-
github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es=
132+
github.com/knadh/koanf/v2 v2.1.2 h1:I2rtLRqXRy1p01m/utEtpZSSA6dcJbgGVuE27kW2PzQ=
133+
github.com/knadh/koanf/v2 v2.1.2/go.mod h1:Gphfaen0q1Fc1HTgJgSTC4oRX9R2R5ErYMZJy8fLJBo=
134134
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
135135
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
136136
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -283,14 +283,16 @@ go.opentelemetry.io/collector/config/configtls v1.19.0 h1:GQ/cF1hgNqHVBq2oSSrOFX
283283
go.opentelemetry.io/collector/config/configtls v1.19.0/go.mod h1:1hyqnYB3JqEUlk1ME/s9HYz4oCRcxQCRxsJitFFT/cA=
284284
go.opentelemetry.io/collector/config/internal v0.113.0 h1:9RAzH8v7ItFT1npHpvP0SvUzBHcZDliCGRo9Spp6v7c=
285285
go.opentelemetry.io/collector/config/internal v0.113.0/go.mod h1:yC7E4h1Uj0SubxcFImh6OvBHFTjMh99+A5PuyIgDWqc=
286-
go.opentelemetry.io/collector/confmap v1.19.0 h1:TQ0lZpAKqgsE0EKk+u4JA+uBbPYeFRmWP3GH43w40CY=
287-
go.opentelemetry.io/collector/confmap v1.19.0/go.mod h1:GgNu1ElPGmLn9govqIfjaopvdspw4PJ9KeDtWC4E2Q4=
286+
go.opentelemetry.io/collector/confmap v1.20.0 h1:ARfOwmkKxFOud1njl03yAHQ30+uenlzqCO6LBYamDTE=
287+
go.opentelemetry.io/collector/confmap v1.20.0/go.mod h1:DMpd9Ay/ffls3JoQBQ73vWeRsz1rNuLbwjo6WtjSQus=
288288
go.opentelemetry.io/collector/confmap/provider/envprovider v1.19.0 h1:f8O/I5pVRN86Gx5mHekNx92S6fGdOS4VcooRJKWe6Bs=
289289
go.opentelemetry.io/collector/confmap/provider/envprovider v1.19.0/go.mod h1:AiaW5YW1LD0/WlZuc8eZuZPBH6PA9QqsiAYRX1iC6T0=
290290
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.19.0 h1:TYwyk4ea3U+5MYcEjrzZAaonBcLlabQu8CZeB7ekAYY=
291291
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.19.0/go.mod h1:i3mL4OSGI5JM0hnzHujhJK+LDlvO3XrJxBsuclfU/jY=
292292
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.19.0 h1:a077jcs3DVtaVdmgmCk3x4rRYuTkIqMDsoUc+VICHZk=
293293
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.19.0/go.mod h1:HjYkzhHbwUacv27nq0JLsslGpbtrXyyfU30Oc72AWLU=
294+
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.20.0 h1:0BJHAeKFb46FCT0ehOmmGs0v31cGuAh4DIic07J71NU=
295+
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.20.0/go.mod h1:gBiweuH4EDuPh9mpLCB/wPZzostdA+gKY8hABwbotQk=
294296
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.19.0 h1:oV66DKiEdAt8EMZqGSChK2iEOxjrVaWRhf4OqqmqjbM=
295297
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.19.0/go.mod h1:jtNUdO6i1k38BG7vFst+d1jk/N+c419uVR8HB4J0VjI=
296298
go.opentelemetry.io/collector/connector v0.113.0 h1:ii+s1CjsLxtglqRlFs6tv8UU/uX45dyN9lbTRbR0p8g=

collector/internal/collector/collector.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"go.opentelemetry.io/collector/confmap/provider/envprovider"
2727
"go.opentelemetry.io/collector/confmap/provider/fileprovider"
2828
"go.opentelemetry.io/collector/confmap/provider/httpprovider"
29+
"go.opentelemetry.io/collector/confmap/provider/httpsprovider"
2930
"go.opentelemetry.io/collector/confmap/provider/yamlprovider"
3031
"go.opentelemetry.io/collector/otelcol"
3132
"go.uber.org/zap"
@@ -73,7 +74,7 @@ func NewCollector(logger *zap.Logger, factories otelcol.Factories, version strin
7374
cfgSet := otelcol.ConfigProviderSettings{
7475
ResolverSettings: confmap.ResolverSettings{
7576
URIs: []string{getConfig(l)},
76-
ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory(), envprovider.NewFactory(), yamlprovider.NewFactory(), httpprovider.NewFactory(), s3provider.NewFactory(), secretsmanagerprovider.NewFactory()},
77+
ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory(), envprovider.NewFactory(), yamlprovider.NewFactory(), httpsprovider.NewFactory(), httpprovider.NewFactory(), s3provider.NewFactory(), secretsmanagerprovider.NewFactory()},
7778
ConverterFactories: []confmap.ConverterFactory{
7879
confmap.NewConverterFactory(func(set confmap.ConverterSettings) confmap.Converter {
7980
return disablequeuedretryconverter.New()

0 commit comments

Comments
 (0)