Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PoC implementation for replaying startup logs once logger is initialized #9908

Closed
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions confmap/confmaptest/provider_settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,17 @@ package confmaptest // import "go.opentelemetry.io/collector/confmap/confmaptest

import (
"go.uber.org/zap"
"go.uber.org/zap/zaptest/observer"

"go.opentelemetry.io/collector/confmap"
)

func NewNopProviderSettings() confmap.ProviderSettings {
return confmap.ProviderSettings{Logger: zap.NewNop()}
}

func NewLoggingProviderSettings() (confmap.ProviderSettings, *observer.ObservedLogs) {
core, ol := observer.New(zap.InfoLevel) // todo how do i get an appropriate logging level in here?
return confmap.ProviderSettings{Logger: zap.New(core)}, ol

}
3 changes: 3 additions & 0 deletions confmap/resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"strings"

"go.uber.org/multierr"
"go.uber.org/zap/zaptest/observer"
)

// follows drive-letter specification:
Expand Down Expand Up @@ -39,6 +40,8 @@ type ResolverSettings struct {

// MapConverters is a slice of Converter.
Converters []Converter

Ol *observer.ObservedLogs
}

// NewResolver returns a new Resolver that resolves configuration from multiple URIs.
Expand Down
4 changes: 4 additions & 0 deletions otelcol/collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@ func (col *Collector) setupConfigurationComponents(ctx context.Context) error {
if err != nil {
return err
}
logger := col.service.Logger()
for _, log := range col.set.ConfigProviderSettings.ResolverSettings.Ol.All() {
logger.Log(log.Level, log.Message)
}

if !col.set.SkipSettingGRPCLogger {
grpclog.SetLogger(col.service.Logger(), cfg.Service.Telemetry.Logs.Level)
Expand Down
3 changes: 2 additions & 1 deletion otelcol/configprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func (cm *configProvider) GetConfmap(ctx context.Context) (*confmap.Conf, error)

func newDefaultConfigProviderSettings(uris []string) ConfigProviderSettings {
converterSet := confmap.ConverterSettings{}
providerSet := confmaptest.NewNopProviderSettings()
providerSet, ol := confmaptest.NewLoggingProviderSettings()
return ConfigProviderSettings{
ResolverSettings: confmap.ResolverSettings{
URIs: uris,
Expand All @@ -146,6 +146,7 @@ func newDefaultConfigProviderSettings(uris []string) ConfigProviderSettings {
httpsprovider.NewWithSettings(providerSet),
),
Converters: []confmap.Converter{expandconverter.New(converterSet)},
Ol: ol,
},
}
}
Expand Down
Loading