Files
MarioandGitHub e0354d1bed Update Prometheus to v0.307.2, OTel collector contrib to v0.138.0, OTel to v1.44.0 (#5810)
* Update Prometheus to v0.307.2

* Update otel collector

* Update OTel collector
2025-10-28 11:30:17 +01:00

109 lines
3.5 KiB
Go

// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0
package otelconftelemetry // import "go.opentelemetry.io/collector/service/telemetry/otelconftelemetry"
import (
"context"
otelconf "go.opentelemetry.io/contrib/otelconf/v0.3.0"
"go.opentelemetry.io/otel/attribute"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/internal/telemetry/componentattribute"
"go.opentelemetry.io/collector/service/telemetry"
)
// createLogger creates a Logger and a LoggerProvider from Config.
func createLogger(
ctx context.Context,
set telemetry.LoggerSettings,
componentConfig component.Config,
) (*zap.Logger, component.ShutdownFunc, error) {
cfg := componentConfig.(*Config)
res := newResource(set.Settings, cfg)
// Copied from NewProductionConfig.
ec := zap.NewProductionEncoderConfig()
ec.EncodeTime = zapcore.ISO8601TimeEncoder
zapCfg := &zap.Config{
Level: zap.NewAtomicLevelAt(cfg.Logs.Level),
Development: cfg.Logs.Development,
Encoding: cfg.Logs.Encoding,
EncoderConfig: ec,
OutputPaths: cfg.Logs.OutputPaths,
ErrorOutputPaths: cfg.Logs.ErrorOutputPaths,
DisableCaller: cfg.Logs.DisableCaller,
DisableStacktrace: cfg.Logs.DisableStacktrace,
InitialFields: cfg.Logs.InitialFields,
}
if zapCfg.Encoding == "console" {
// Human-readable timestamps for console format of logs.
zapCfg.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
}
logger, err := zapCfg.Build(set.ZapOptions...)
if err != nil {
return nil, nil, err
}
// The attributes in res.Attributes(), which are generated in telemetry.go,
// are added to logs exported through the LoggerProvider instantiated below.
// To make sure they are also exposed in logs written to stdout, we add
// them as fields to the Zap core created above using WrapCore. We do NOT
// add them to the logger using With, because that would apply to all logs,
// even ones exported through the core that wraps the LoggerProvider,
// meaning that the attributes would be exported twice.
if res != nil && len(res.Attributes()) > 0 {
logger = logger.WithOptions(zap.WrapCore(func(c zapcore.Core) zapcore.Core {
var fields []zap.Field
for _, attr := range res.Attributes() {
fields = append(fields, zap.String(string(attr.Key), attr.Value.Emit()))
}
r := zap.Dict("resource", fields...)
return c.With([]zapcore.Field{r})
}))
}
if cfg.Logs.Sampling != nil && cfg.Logs.Sampling.Enabled {
logger = logger.WithOptions(zap.WrapCore(func(core zapcore.Core) zapcore.Core {
return zapcore.NewSamplerWithOptions(
core,
cfg.Logs.Sampling.Tick,
cfg.Logs.Sampling.Initial,
cfg.Logs.Sampling.Thereafter,
)
}))
}
sdk, err := newSDK(ctx, res, otelconf.OpenTelemetryConfiguration{
LoggerProvider: &otelconf.LoggerProvider{
Processors: cfg.Logs.Processors,
},
})
if err != nil {
return nil, nil, err
}
// Wrap the zap.Logger with componentattribute so scope attributes
// can be added and removed dynamically, and tee logs to the
// LoggerProvider.
loggerProvider := sdk.LoggerProvider()
logger = logger.WithOptions(zap.WrapCore(func(core zapcore.Core) zapcore.Core {
core = componentattribute.NewConsoleCoreWithAttributes(core, attribute.NewSet())
core = componentattribute.NewOTelTeeCoreWithAttributes(
core,
loggerProvider,
"go.opentelemetry.io/collector/service",
attribute.NewSet(),
)
return core
}))
return logger, sdk.Shutdown, nil
}