Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 7 additions & 8 deletions cmd/collector/otelcollector.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ func makeMapProvidersMap(providers ...confmap.Provider) map[string]confmap.Provi
}

func GenerateCollectorSettings(URIs []string) *collector.CollectorSettings {
providerSet := confmap.ProviderSettings{}
buildInfo := component.BuildInfo{
Command: "observe-agent",
Description: "Observe Distribution of Opentelemetry Collector",
Expand All @@ -58,13 +57,13 @@ func GenerateCollectorSettings(URIs []string) *collector.CollectorSettings {
ConfigProviderSettings: collector.ConfigProviderSettings{
ResolverSettings: confmap.ResolverSettings{
URIs: URIs,
Providers: makeMapProvidersMap(
fileprovider.NewWithSettings(providerSet),
envprovider.NewWithSettings(providerSet),
yamlprovider.NewWithSettings(providerSet),
httpprovider.NewWithSettings(providerSet),
httpsprovider.NewWithSettings(providerSet),
),
ProviderFactories: []confmap.ProviderFactory{
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

breaking changes in a minor version 😞

fileprovider.NewFactory(),
envprovider.NewFactory(),
yamlprovider.NewFactory(),
httpprovider.NewFactory(),
httpsprovider.NewFactory(),
},
},
},
}
Expand Down
322 changes: 167 additions & 155 deletions go.mod

Large diffs are not rendered by default.

829 changes: 372 additions & 457 deletions go.sum

Large diffs are not rendered by default.

135 changes: 135 additions & 0 deletions vendor/cloud.google.com/go/auth/CHANGES.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/cloud.google.com/go/auth/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading