Minimize new surface area

djaglowski · djaglowski · commit c7eba1dcd57e · 2025-02-05T14:28:15.000-06:00
diff --git a/component/componentattribute/logger.go b/component/componentattribute/logger.go
@@ -13,42 +13,30 @@ var _ zapcore.Core = (*coreWithout)(nil)
 
 type coreWithout struct {
 	zapcore.Core
-	from  *zap.Logger
-	attrs attribute.Set
+	from   zapcore.Core
+	fields []zap.Field
 }
 
-func NewLogger(from *zap.Logger, attrs *attribute.Set) *zap.Logger {
+func NewCore(from zapcore.Core, attrs *attribute.Set) zapcore.Core {
 	fields := []zap.Field{}
 	for _, kv := range attrs.ToSlice() {
 		fields = append(fields, zap.String(string(kv.Key), kv.Value.AsString()))
 	}
-	return from.WithOptions(
-		zap.Fields(fields...),
-		zap.WrapCore(func(core zapcore.Core) zapcore.Core {
-			return &coreWithout{Core: core, from: from, attrs: *attrs}
-		}),
-	)
+	return &coreWithout{Core: from.With(fields), from: from, fields: fields}
 }
 
-func (l *coreWithout) Without(keys ...string) *zap.Logger {
+func (l *coreWithout) Without(keys ...string) zapcore.Core {
 	excludeKeys := make(map[string]struct{})
 	for _, key := range keys {
 		excludeKeys[key] = struct{}{}
 	}
 
-	newAttrs := []attribute.KeyValue{}
-	fields := []zap.Field{}
-	for _, kv := range l.attrs.ToSlice() {
-		if _, excluded := excludeKeys[string(kv.Key)]; !excluded {
-			newAttrs = append(newAttrs, kv)
-			fields = append(fields, zap.String(string(kv.Key), kv.Value.AsString()))
+	fieldsWithout := []zap.Field{}
+	for _, field := range l.fields {
+		if _, excluded := excludeKeys[field.Key]; !excluded {
+			fieldsWithout = append(fieldsWithout, field)
 		}
 	}
 
-	return l.from.WithOptions(
-		zap.Fields(fields...),
-		zap.WrapCore(func(core zapcore.Core) zapcore.Core {
-			return &coreWithout{Core: core, from: l.from, attrs: attribute.NewSet(newAttrs...)}
-		}),
-	)
+	return &coreWithout{Core: l.from.With(fieldsWithout), from: l.from, fields: fieldsWithout}
 }
diff --git a/component/componentattribute/logger_test.go b/component/componentattribute/logger_test.go
@@ -17,11 +17,10 @@ import (
 )
 
 type loggerCore interface {
-	zapcore.Core
-	Without(fields ...string) *zap.Logger
+	Without(fields ...string) zapcore.Core
 }
 
-func TestLogger(t *testing.T) {
+func TestCore(t *testing.T) {
 	core, observed := observer.New(zap.DebugLevel)
 	logger := zap.New(core).With(zap.String("preexisting", "value"))
 
@@ -30,9 +29,9 @@ func TestLogger(t *testing.T) {
 		attribute.String(componentattribute.ComponentIDKey, "filelog"),
 	)
 
-	parent := componentattribute.NewLogger(logger, &attrs)
+	parent := zap.New(componentattribute.NewCore(logger.Core(), &attrs))
 	parent.Info("test parent before child")
-	child := parent.Core().(loggerCore).Without(string(componentattribute.SignalKey))
+	child := zap.New(parent.Core().(loggerCore).Without(string(componentattribute.SignalKey)))
 	child.Info("test child")
 	parent.Info("test parent after child")
 
diff --git a/component/telemetry.go b/component/telemetry.go
@@ -29,12 +29,15 @@ type TelemetrySettings struct {
 }
 
 func (ts *TelemetrySettings) LoggerWithout(fields ...string) *zap.Logger {
-	type loggerCore interface {
-		zapcore.Core
-		Without(fields ...string) *zap.Logger
+	type coreWithout interface {
+		Without(fields ...string) zapcore.Core
 	}
-	if _, ok := ts.Logger.Core().(loggerCore); !ok {
+	if _, ok := ts.Logger.Core().(coreWithout); !ok {
 		return ts.Logger
 	}
-	return ts.Logger.Core().(loggerCore).Without(fields...)
+	return ts.Logger.WithOptions(
+		zap.WrapCore(func(from zapcore.Core) zapcore.Core {
+			return from.(coreWithout).Without(fields...)
+		}),
+	)
 }
diff --git a/processor/memorylimiterprocessor/factory_test.go b/processor/memorylimiterprocessor/factory_test.go
@@ -51,7 +51,11 @@ func TestCreateProcessor(t *testing.T) {
 		attribute.String(componentattribute.PipelineIDKey, "logs/foo"),
 	)
 	set := processortest.NewNopSettings()
-	set.Logger = componentattribute.NewLogger(zap.New(core), &attrs)
+	set.Logger = zap.New(core).WithOptions(
+		zap.WrapCore(func(from zapcore.Core) zapcore.Core {
+			return componentattribute.NewCore(from, &attrs)
+		}),
+	)
 
 	tp, err := factory.CreateTraces(context.Background(), set, cfg, consumertest.NewNop())
 	require.NoError(t, err)
diff --git a/receiver/otlpreceiver/factory_test.go b/receiver/otlpreceiver/factory_test.go
@@ -46,7 +46,11 @@ func TestCreateSameReceiver(t *testing.T) {
 		attribute.String(componentattribute.ComponentIDKey, "otlp"),
 	)
 	creationSet := receivertest.NewNopSettings()
-	creationSet.Logger = componentattribute.NewLogger(zap.New(core), &attrs)
+	creationSet.Logger = zap.New(core).WithOptions(
+		zap.WrapCore(func(from zapcore.Core) zapcore.Core {
+			return componentattribute.NewCore(from, &attrs)
+		}),
+	)
 	tReceiver, err := factory.CreateTraces(context.Background(), creationSet, cfg, consumertest.NewNop())
 	assert.NotNil(t, tReceiver)
 	require.NoError(t, err)
diff --git a/service/extensions/extensions.go b/service/extensions/extensions.go
@@ -11,6 +11,7 @@ import (
 
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componentattribute"
@@ -39,9 +40,10 @@ type Extensions struct {
 func (bes *Extensions) Start(ctx context.Context, host component.Host) error {
 	bes.telemetry.Logger.Info("Starting extensions...")
 	for _, extID := range bes.extensionIDs {
-		extLogger := componentattribute.NewLogger(
-			bes.telemetry.Logger,
-			attribute.Extension(extID).Set(),
+		extLogger := bes.telemetry.Logger.WithOptions(
+			zap.WrapCore(func(from zapcore.Core) zapcore.Core {
+				return componentattribute.NewCore(from, attribute.Extension(extID).Set())
+			}),
 		)
 		extLogger.Info("Extension is starting...")
 		instanceID := bes.instanceIDs[extID]
@@ -220,9 +222,10 @@ func New(ctx context.Context, set Settings, cfg Config, options ...Option) (*Ext
 			BuildInfo:         set.BuildInfo,
 			ModuleInfo:        set.ModuleInfo,
 		}
-		extSet.TelemetrySettings.Logger = componentattribute.NewLogger(
-			set.Telemetry.Logger,
-			attribute.Extension(extID).Set(),
+		extSet.TelemetrySettings.Logger = extSet.TelemetrySettings.Logger.WithOptions(
+			zap.WrapCore(func(from zapcore.Core) zapcore.Core {
+				return componentattribute.NewCore(from, attribute.Extension(extID).Set())
+			}),
 		)
 
 		ext, err := set.Extensions.Create(ctx, extSet)
diff --git a/service/internal/graph/connector.go b/service/internal/graph/connector.go
@@ -6,6 +6,9 @@ package graph // import "go.opentelemetry.io/collector/service/internal/graph"
 import (
 	"context"
 
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componentattribute"
 	"go.opentelemetry.io/collector/connector"
@@ -49,7 +52,11 @@ func (n *connectorNode) buildComponent(
 	builder *builders.ConnectorBuilder,
 	nexts []baseConsumer,
 ) error {
-	tel.Logger = componentattribute.NewLogger(tel.Logger, n.Attributes.Set())
+	tel.Logger = tel.Logger.WithOptions(
+		zap.WrapCore(func(from zapcore.Core) zapcore.Core {
+			return componentattribute.NewCore(from, n.Attributes.Set())
+		}),
+	)
 	set := connector.Settings{ID: n.componentID, TelemetrySettings: tel, BuildInfo: info}
 	switch n.rcvrPipelineType {
 	case pipeline.SignalTraces:
diff --git a/service/internal/graph/exporter.go b/service/internal/graph/exporter.go
@@ -7,6 +7,9 @@ import (
 	"context"
 	"fmt"
 
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componentattribute"
 	"go.opentelemetry.io/collector/exporter"
@@ -45,7 +48,11 @@ func (n *exporterNode) buildComponent(
 	info component.BuildInfo,
 	builder *builders.ExporterBuilder,
 ) error {
-	tel.Logger = componentattribute.NewLogger(tel.Logger, n.Attributes.Set())
+	tel.Logger = tel.Logger.WithOptions(
+		zap.WrapCore(func(from zapcore.Core) zapcore.Core {
+			return componentattribute.NewCore(from, n.Attributes.Set())
+		}),
+	)
 	set := exporter.Settings{ID: n.componentID, TelemetrySettings: tel, BuildInfo: info}
 	var err error
 	switch n.pipelineType {
diff --git a/service/internal/graph/processor.go b/service/internal/graph/processor.go
@@ -7,6 +7,9 @@ import (
 	"context"
 	"fmt"
 
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componentattribute"
 	"go.opentelemetry.io/collector/consumer"
@@ -47,7 +50,11 @@ func (n *processorNode) buildComponent(ctx context.Context,
 	builder *builders.ProcessorBuilder,
 	next baseConsumer,
 ) error {
-	tel.Logger = componentattribute.NewLogger(tel.Logger, n.Attributes.Set())
+	tel.Logger = tel.Logger.WithOptions(
+		zap.WrapCore(func(from zapcore.Core) zapcore.Core {
+			return componentattribute.NewCore(from, n.Attributes.Set())
+		}),
+	)
 	set := processor.Settings{ID: n.componentID, TelemetrySettings: tel, BuildInfo: info}
 	var err error
 	switch n.pipelineID.Signal() {
diff --git a/service/internal/graph/receiver.go b/service/internal/graph/receiver.go
@@ -7,6 +7,9 @@ import (
 	"context"
 	"fmt"
 
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componentattribute"
 	"go.opentelemetry.io/collector/consumer"
@@ -42,7 +45,11 @@ func (n *receiverNode) buildComponent(ctx context.Context,
 	builder *builders.ReceiverBuilder,
 	nexts []baseConsumer,
 ) error {
-	tel.Logger = componentattribute.NewLogger(tel.Logger, n.Attributes.Set())
+	tel.Logger = tel.Logger.WithOptions(
+		zap.WrapCore(func(from zapcore.Core) zapcore.Core {
+			return componentattribute.NewCore(from, n.Attributes.Set())
+		}),
+	)
 	set := receiver.Settings{ID: n.componentID, TelemetrySettings: tel, BuildInfo: info}
 	var err error
 	switch n.pipelineType {

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,15 @@ type TelemetrySettings struct {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func (ts TelemetrySettings) LoggerWithout(fields ...string) zap.Logger {`
`32`		`- type loggerCore interface {`
`33`		`- zapcore.Core`
`34`		`- Without(fields ...string) *zap.Logger`
	`32`	`+ type coreWithout interface {`
	`33`	`+ Without(fields ...string) zapcore.Core`
`35`	`34`	`}`
`36`		`- if _, ok := ts.Logger.Core().(loggerCore); !ok {`
	`35`	`+ if _, ok := ts.Logger.Core().(coreWithout); !ok {`
`37`	`36`	`return ts.Logger`
`38`	`37`	`}`
`39`		`- return ts.Logger.Core().(loggerCore).Without(fields...)`
	`38`	`+ return ts.Logger.WithOptions(`
	`39`	`+ zap.WrapCore(func(from zapcore.Core) zapcore.Core {`
	`40`	`+ return from.(coreWithout).Without(fields...)`
	`41`	`+ }),`
	`42`	`+ )`
`40`	`43`	`}`