replace adapter logger with logr interface

rancher-sandbox · Oct 24, 2023 · ea68927 · ea68927
1 parent 56e93a9
commit ea68927
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 15 deletions.
diff --git a/go.mod b/go.mod
@@ -352,6 +352,7 @@ require (
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-logr/zapr v1.2.4 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect

diff --git a/go.sum b/go.sum
diff --git a/pkg/stanza/adapter/converter.go b/pkg/stanza/adapter/converter.go
@@ -15,9 +15,9 @@ import (
 	"sync"
 
 	"github.com/cespare/xxhash/v2"
+	"github.com/go-logr/logr"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/plog"
-	"go.uber.org/zap"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/entry"
 )
@@ -71,7 +71,7 @@ type Converter struct {
 	// when Stop() is called.
 	wg sync.WaitGroup
 
-	logger *zap.Logger
+	logger logr.Logger
 }
 
 type converterOption interface {
@@ -90,7 +90,7 @@ func (o workerCountOption) apply(c *Converter) {
 	c.workerCount = o.workerCount
 }
 
-func NewConverter(logger *zap.Logger, opts ...converterOption) *Converter {
+func NewConverter(logger logr.Logger, opts ...converterOption) *Converter {
 	c := &Converter{
 		workerChan:  make(chan []*entry.Entry),
 		workerCount: int(math.Max(1, float64(runtime.NumCPU()/4))),
@@ -106,7 +106,7 @@ func NewConverter(logger *zap.Logger, opts ...converterOption) *Converter {
 }
 
 func (c *Converter) Start() {
-	c.logger.Debug("Starting log converter", zap.Int("worker_count", c.workerCount))
+	c.logger.Info("Starting log converter", "worker_count", c.workerCount)
 
 	c.wg.Add(c.workerCount)
 	for i := 0; i < c.workerCount; i++ {
@@ -186,9 +186,8 @@ func (c *Converter) flushLoop() {
 
 		case pLogs := <-c.flushChan:
 			if err := c.flush(ctx, pLogs); err != nil {
-				c.logger.Debug("Problem sending log entries",
-					zap.Error(err),
-				)
+				c.logger.Info("Problem sending log entries",
+					"error", err)
 			}
 		}
 	}

diff --git a/pkg/stanza/adapter/converter_test.go b/pkg/stanza/adapter/converter_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-logr/zapr"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/pdata/pcommon"
@@ -347,7 +348,7 @@ func TestAllConvertedEntriesAreSentAndReceived(t *testing.T) {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			t.Parallel()
 
-			converter := NewConverter(zap.NewNop())
+			converter := NewConverter(zapr.NewLogger(zap.NewNop()))
 			converter.Start()
 			defer converter.Stop()
 
@@ -409,7 +410,7 @@ func TestAllConvertedEntriesAreSentAndReceived(t *testing.T) {
 }
 
 func TestConverterCancelledContextCancellsTheFlush(t *testing.T) {
-	converter := NewConverter(zap.NewNop())
+	converter := NewConverter(zapr.NewLogger(zap.NewNop()))
 	converter.Start()
 	defer converter.Stop()
 	var wg sync.WaitGroup
@@ -822,7 +823,7 @@ func BenchmarkConverter(b *testing.B) {
 		b.Run(fmt.Sprintf("worker_count=%d", wc), func(b *testing.B) {
 			for i := 0; i < b.N; i++ {
 
-				converter := NewConverter(zap.NewNop(), withWorkerCount(wc))
+				converter := NewConverter(zapr.NewLogger(zap.NewNop()), withWorkerCount(wc))
 				converter.Start()
 				defer converter.Stop()
 

diff --git a/pkg/stanza/adapter/factory.go b/pkg/stanza/adapter/factory.go
@@ -11,6 +11,7 @@ import (
 	"go.opentelemetry.io/collector/obsreport"
 	rcvr "go.opentelemetry.io/collector/receiver"
 
+	"github.com/go-logr/zapr"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/consumerretry"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/pipeline"
@@ -65,7 +66,7 @@ func createLogsReceiver(logReceiverType LogReceiverType) rcvr.CreateLogsFunc {
 		if baseCfg.numWorkers > 0 {
 			converterOpts = append(converterOpts, withWorkerCount(baseCfg.numWorkers))
 		}
-		converter := NewConverter(params.Logger, converterOpts...)
+		converter := NewConverter(zapr.NewLogger(params.Logger), converterOpts...)
 		obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{
 			ReceiverID:             params.ID,
 			ReceiverCreateSettings: params,

diff --git a/pkg/stanza/adapter/integration_test.go b/pkg/stanza/adapter/integration_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-logr/zapr"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenttest"
@@ -51,7 +52,7 @@ func createNoopReceiver(nextConsumer consumer.Logs) (*receiver, error) {
 		emitter:   emitter,
 		consumer:  nextConsumer,
 		logger:    zap.NewNop(),
-		converter: NewConverter(zap.NewNop()),
+		converter: NewConverter(zapr.NewLogger(zap.NewNop())),
 		obsrecv:   obsrecv,
 	}, nil
 }

diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod
@@ -6,6 +6,8 @@ require (
 	github.com/antonmedv/expr v1.15.0
 	github.com/bmatcuk/doublestar/v4 v4.6.0
 	github.com/cespare/xxhash/v2 v2.2.0
+	github.com/go-logr/logr v1.2.4
+	github.com/go-logr/zapr v1.2.4
 	github.com/influxdata/go-syslog/v3 v3.0.1-0.20210608084020-ac565dc76ba6
 	github.com/jpillora/backoff v1.0.0
 	github.com/json-iterator/go v1.1.12

diff --git a/pkg/stanza/go.sum b/pkg/stanza/go.sum
diff --git a/processor/logstransformprocessor/processor.go b/processor/logstransformprocessor/processor.go
@@ -16,6 +16,7 @@ import (
 	"go.opentelemetry.io/collector/pdata/plog"
 	"go.uber.org/zap"
 
+	"github.com/go-logr/zapr"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/pipeline"
@@ -88,7 +89,7 @@ func (ltp *logsTransformProcessor) Start(ctx context.Context, _ component.Host)
 
 	wkrCount := int(math.Max(1, float64(runtime.NumCPU())))
 
-	ltp.converter = adapter.NewConverter(ltp.logger)
+	ltp.converter = adapter.NewConverter(zapr.NewLogger(ltp.logger))
 	ltp.converter.Start()
 
 	ltp.fromConverter = adapter.NewFromPdataConverter(wkrCount, ltp.logger)

diff --git a/receiver/filelogreceiver/filelog_test.go b/receiver/filelogreceiver/filelog_test.go
@@ -15,6 +15,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-logr/zapr"
 	"github.com/observiq/nanojack"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -82,7 +83,7 @@ func TestReadStaticFile(t *testing.T) {
 	sink := new(consumertest.LogsSink)
 	cfg := testdataConfigYaml()
 
-	converter := adapter.NewConverter(zap.NewNop())
+	converter := adapter.NewConverter(zapr.NewLogger(zap.NewNop()))
 	converter.Start()
 	defer converter.Stop()
 
@@ -182,7 +183,7 @@ func (rt *rotationTest) Run(t *testing.T) {
 
 	// Build expected outputs
 	expectedTimestamp, _ := time.ParseInLocation("2006-01-02", "2020-08-25", time.Local)
-	converter := adapter.NewConverter(zap.NewNop())
+	converter := adapter.NewConverter(zapr.NewLogger(zap.NewNop()))
 	converter.Start()
 
 	var wg sync.WaitGroup