tracing: wire our logger into otel's logging

Signed-off-by: Stephan Renatus <stephan.renatus@gmail.com>

cmd/run.go

@@ -282,7 +282,7 @@ func initRuntime(ctx context.Context, params runCmdParams, args []string) (*runt
 		return nil, err
 	}
 
-	rt.SetDistributedTracingErrorHandler()
+	rt.SetDistributedTracingLogging()
 
 	return rt, nil
 }

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-ini/ini v1.66.2
+	github.com/go-logr/logr v1.2.1
 	github.com/gobwas/glob v0.2.3
 	github.com/golang/glog v1.0.0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect

internal/distributedtracing/distributedtracing.go

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
+	"github.com/go-logr/logr"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
@@ -124,10 +125,9 @@ func Init(ctx context.Context, raw []byte, id string) (*otlptrace.Exporter, trac
 	return traceExporter, options, nil
 }
 
-func SetErrorHandler(logger logging.Logger) {
-	otel.SetErrorHandler(&errorHandler{
-		logger: logger,
-	})
+func SetupLogging(logger logging.Logger) {
+	otel.SetErrorHandler(&errorHandler{logger: logger})
+	otel.SetLogger(logr.New(&sink{logger: logger}))
 }
 
 func parseDistributedTracingConfig(raw []byte) (*distributedTracingConfig, error) {
@@ -252,3 +252,37 @@ type errorHandler struct {
 func (e *errorHandler) Handle(err error) {
 	e.logger.Warn("Distributed tracing: " + err.Error())
 }
+
+// NOTE(sr): This adapter code is used to ensure that whatever otel logs, now or
+// in the future, will end up in "our" logs, and not go through whatever defaults
+// it has set up with its global logger. As such, it's to a full-featured
+// implementation fo the logr.LogSink interface, but a rather minimal one. Notably,
+// fields are no supported, the initial runtime time info is ignored, and there is
+// no support for different verbosity level is "info" logs: they're all printed
+// as-is.
+
+type sink struct {
+	logger logging.Logger
+}
+
+func (s *sink) Enabled(level int) bool {
+	return int(s.logger.GetLevel()) >= level
+}
+
+func (*sink) Init(logr.RuntimeInfo) {} // ignored
+
+func (s *sink) Info(_ int, msg string, _ ...interface{}) {
+	s.logger.Info(msg)
+}
+
+func (s *sink) Error(err error, msg string, _ ...interface{}) {
+	s.logger.WithFields(map[string]interface{}{"err": err}).Error(msg)
+}
+
+func (s *sink) WithName(name string) logr.LogSink {
+	return &sink{s.logger.WithFields(map[string]interface{}{"name": name})}
+}
+
+func (s *sink) WithValues(...interface{}) logr.LogSink { // ignored
+	return s
+}

runtime/runtime.go

@@ -586,9 +586,10 @@ func (rt *Runtime) StartREPL(ctx context.Context) {
 	repl.Loop(ctx)
 }
 
-// SetDistributedTracingErrorHandler configures the distributed tracing's ErrorHandler.
-func (rt *Runtime) SetDistributedTracingErrorHandler() {
-	internal_tracing.SetErrorHandler(rt.logger)
+// SetDistributedTracingLogging configures the distributed tracing's ErrorHandler,
+// and logger instances.
+func (rt *Runtime) SetDistributedTracingLogging() {
+	internal_tracing.SetupLogging(rt.logger)
 }
 
 func (rt *Runtime) checkOPAUpdate(ctx context.Context) *report.DataResponse {

vendor/modules.txt

@@ -60,6 +60,7 @@ github.com/ghodss/yaml
 ## explicit
 github.com/go-ini/ini
 # github.com/go-logr/logr v1.2.1
+## explicit
 github.com/go-logr/logr
 github.com/go-logr/logr/funcr
 # github.com/go-logr/stdr v1.2.0