diff --git a/service/internal/builder/builder.go b/service/internal/builder/builder.go index be65afd39fe..1feac8aaeea 100644 --- a/service/internal/builder/builder.go +++ b/service/internal/builder/builder.go @@ -24,13 +24,12 @@ const ( configCfg = "config" memBallastFlag = "mem-ballast-size-mib" - kindLogKey = "component_kind" - kindLogsReceiver = "receiver" - kindLogsProcessor = "processor" - kindLogsExporter = "exporter" - kindLogExtension = "extension" - typeLogKey = "component_type" - nameLogKey = "component_name" + zapKindKey = "kind" + zapKindReceiver = "receiver" + zapKindProcessor = "processor" + zapKindLogExporter = "exporter" + zapKindExtension = "extension" + zapNameKey = "name" ) var ( diff --git a/service/internal/builder/exporters_builder.go b/service/internal/builder/exporters_builder.go index 1a33774499e..a1cefbf1784 100644 --- a/service/internal/builder/exporters_builder.go +++ b/service/internal/builder/exporters_builder.go @@ -155,7 +155,7 @@ func BuildExporters( config *config.Config, factories map[config.Type]component.ExporterFactory, ) (Exporters, error) { - eb := &exportersBuilder{logger.With(zap.String(kindLogKey, kindLogsExporter)), appInfo, config, factories} + eb := &exportersBuilder{logger.With(zap.String(zapKindKey, zapKindLogExporter)), appInfo, config, factories} // We need to calculate required input data types for each exporter so that we know // which data type must be started for each exporter. @@ -164,7 +164,7 @@ func BuildExporters( exporters := make(Exporters) // BuildExporters exporters based on configuration and required input data types. for _, cfg := range eb.config.Exporters { - componentLogger := eb.logger.With(zap.String(typeLogKey, string(cfg.Type())), zap.String(nameLogKey, cfg.Name())) + componentLogger := eb.logger.With(zap.String(zapNameKey, cfg.Name())) exp, err := eb.buildExporter(context.Background(), componentLogger, eb.appInfo, cfg, exporterInputDataTypes) if err != nil { return nil, err diff --git a/service/internal/builder/extensions_builder.go b/service/internal/builder/extensions_builder.go index 31050291857..1bca61c7d16 100644 --- a/service/internal/builder/extensions_builder.go +++ b/service/internal/builder/extensions_builder.go @@ -125,7 +125,7 @@ func BuildExtensions( config *config.Config, factories map[config.Type]component.ExtensionFactory, ) (Extensions, error) { - eb := &extensionsBuilder{logger.With(zap.String(kindLogKey, kindLogExtension)), appInfo, config, factories} + eb := &extensionsBuilder{logger.With(zap.String(zapKindKey, zapKindExtension)), appInfo, config, factories} extensions := make(Extensions) for _, extName := range eb.config.Service.Extensions { @@ -134,7 +134,7 @@ func BuildExtensions( return nil, fmt.Errorf("extension %q is not configured", extName) } - componentLogger := eb.logger.With(zap.String(typeLogKey, string(extCfg.Type())), zap.String(nameLogKey, extCfg.Name())) + componentLogger := eb.logger.With(zap.String(zapNameKey, extCfg.Name())) ext, err := eb.buildExtension(componentLogger, eb.appInfo, extCfg) if err != nil { return nil, err diff --git a/service/internal/builder/pipelines_builder.go b/service/internal/builder/pipelines_builder.go index f9725b366a8..27ab3cc25e9 100644 --- a/service/internal/builder/pipelines_builder.go +++ b/service/internal/builder/pipelines_builder.go @@ -150,7 +150,7 @@ func (pb *pipelinesBuilder) buildPipeline(ctx context.Context, pipelineCfg *conf // it becomes the next for the previous one (previous in the pipeline, // which we will build in the next loop iteration). var err error - componentLogger := pb.logger.With(zap.String(kindLogKey, kindLogsProcessor), zap.String(typeLogKey, string(procCfg.Type())), zap.String(nameLogKey, procCfg.Name())) + componentLogger := pb.logger.With(zap.String(zapKindKey, zapKindProcessor), zap.String(zapNameKey, procCfg.Name())) creationParams := component.ProcessorCreateParams{ Logger: componentLogger, ApplicationStartInfo: pb.appInfo, diff --git a/service/internal/builder/receivers_builder.go b/service/internal/builder/receivers_builder.go index 72ec3f782de..e3141b5865a 100644 --- a/service/internal/builder/receivers_builder.go +++ b/service/internal/builder/receivers_builder.go @@ -94,11 +94,11 @@ func BuildReceivers( builtPipelines BuiltPipelines, factories map[config.Type]component.ReceiverFactory, ) (Receivers, error) { - rb := &receiversBuilder{logger.With(zap.String(kindLogKey, kindLogsReceiver)), appInfo, config, builtPipelines, factories} + rb := &receiversBuilder{logger.With(zap.String(zapKindKey, zapKindReceiver)), appInfo, config, builtPipelines, factories} receivers := make(Receivers) for _, cfg := range rb.config.Receivers { - logger := rb.logger.With(zap.String(typeLogKey, string(cfg.Type())), zap.String(nameLogKey, cfg.Name())) + logger := rb.logger.With(zap.String(zapNameKey, cfg.Name())) rcv, err := rb.buildReceiver(context.Background(), logger, rb.appInfo, cfg) if err != nil { if err == errUnusedReceiver {