[bugfix] temporary fix around grpclogger (#5272)

* [bugfix] temporary fix around grpclogger Calling SetLoggerV2 isn't thread safe and should only be called before any grpc functions. See more details: https://pkg.go.dev/github.com/grpc-ecosystem/[email protected]/logging/settable#pkg-overview * add SkipSettingGRPCLogger flag This allows the InProcessCollector to prevent entering a race condition.
open-telemetry · Apr 28, 2022 · b34df3a · b34df3a
1 parent 150c1ed
commit b34df3a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/service/collector.go b/service/collector.go
@@ -201,11 +201,14 @@ func (col *Collector) setupConfigurationComponents(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("failed to get config: %w", err)
 	}
+
 	if col.logger, err = telemetrylogs.NewLogger(cfg.Service.Telemetry.Logs, col.set.LoggingOptions); err != nil {
 		return fmt.Errorf("failed to get logger: %w", err)
 	}
 
-	telemetrylogs.SetColGRPCLogger(col.logger, cfg.Service.Telemetry.Logs.Level)
+	if !col.set.SkipSettingGRPCLogger {
+		telemetrylogs.SetColGRPCLogger(col.logger, cfg.Service.Telemetry.Logs.Level)
+	}
 
 	col.service, err = newService(&svcSettings{
 		BuildInfo: col.set.BuildInfo,

diff --git a/service/settings.go b/service/settings.go
@@ -64,6 +64,9 @@ type CollectorSettings struct {
 	// LoggingOptions provides a way to change behavior of zap logging.
 	LoggingOptions []zap.Option
 
+	// SkipSettingGRPCLogger avoids setting the grpc logger
+	SkipSettingGRPCLogger bool
+
 	// For testing purpose only.
 	telemetry collectorTelemetryExporter
 }