Exclude alias tag if unset from plugin internal stats (#6571)

internal/models/running_aggregator.go

@@ -24,10 +24,14 @@ type RunningAggregator struct {
 }
 
 func NewRunningAggregator(aggregator telegraf.Aggregator, config *AggregatorConfig) *RunningAggregator {
+	tags := map[string]string{"aggregator": config.Name}
+	if config.Alias != "" {
+		tags["alias"] = config.Alias
+	}
+
 	logger := &Logger{
 		Name: logName("aggregators", config.Name, config.Alias),
-		Errs: selfstat.Register("aggregate", "errors",
-			map[string]string{"input": config.Name, "alias": config.Alias}),
+		Errs: selfstat.Register("aggregate", "errors", tags),
 	}
 
 	setLogIfExist(aggregator, logger)
@@ -38,22 +42,22 @@ func NewRunningAggregator(aggregator telegraf.Aggregator, config *AggregatorConf
 		MetricsPushed: selfstat.Register(
 			"aggregate",
 			"metrics_pushed",
-			map[string]string{"aggregator": config.Name, "alias": config.Alias},
+			tags,
 		),
 		MetricsFiltered: selfstat.Register(
 			"aggregate",
 			"metrics_filtered",
-			map[string]string{"aggregator": config.Name, "alias": config.Alias},
+			tags,
 		),
 		MetricsDropped: selfstat.Register(
 			"aggregate",
 			"metrics_dropped",
-			map[string]string{"aggregator": config.Name, "alias": config.Alias},
+			tags,
 		),
 		PushTime: selfstat.Register(
 			"aggregate",
 			"push_time_ns",
-			map[string]string{"aggregator": config.Name, "alias": config.Alias},
+			tags,
 		),
 		log: logger,
 	}

internal/models/running_input.go

@@ -21,12 +21,15 @@ type RunningInput struct {
 }
 
 func NewRunningInput(input telegraf.Input, config *InputConfig) *RunningInput {
-	logger := &Logger{
-		Name: logName("inputs", config.Name, config.Alias),
-		Errs: selfstat.Register("gather", "errors",
-			map[string]string{"input": config.Name, "alias": config.Alias}),
+	tags := map[string]string{"input": config.Name}
+	if config.Alias != "" {
+		tags["alias"] = config.Alias
 	}
 
+	logger := &Logger{
+		Name: logName("inputs", config.Name, config.Alias),
+		Errs: selfstat.Register("gather", "errors", tags),
+	}
 	setLogIfExist(input, logger)
 
 	return &RunningInput{
@@ -35,12 +38,12 @@ func NewRunningInput(input telegraf.Input, config *InputConfig) *RunningInput {
 		MetricsGathered: selfstat.Register(
 			"gather",
 			"metrics_gathered",
-			map[string]string{"input": config.Name, "alias": config.Alias},
+			tags,
 		),
 		GatherTime: selfstat.RegisterTiming(
 			"gather",
 			"gather_time_ns",
-			map[string]string{"input": config.Name, "alias": config.Alias},
+			tags,
 		),
 		log: logger,
 	}

internal/models/running_output.go

@@ -57,12 +57,15 @@ func NewRunningOutput(
 	batchSize int,
 	bufferLimit int,
 ) *RunningOutput {
-	logger := &Logger{
-		Name: logName("outputs", config.Name, config.Alias),
-		Errs: selfstat.Register("write", "errors",
-			map[string]string{"output": config.Name, "alias": config.Alias}),
+	tags := map[string]string{"output": config.Name}
+	if config.Alias != "" {
+		tags["alias"] = config.Alias
 	}
 
+	logger := &Logger{
+		Name: logName("outputs", config.Name, config.Alias),
+		Errs: selfstat.Register("write", "errors", tags),
+	}
 	setLogIfExist(output, logger)
 
 	if config.MetricBufferLimit > 0 {
@@ -88,12 +91,12 @@ func NewRunningOutput(
 		MetricsFiltered: selfstat.Register(
 			"write",
 			"metrics_filtered",
-			map[string]string{"output": config.Name, "alias": config.Alias},
+			tags,
 		),
 		WriteTime: selfstat.RegisterTiming(
 			"write",
 			"write_time_ns",
-			map[string]string{"output": config.Name, "alias": config.Alias},
+			tags,
 		),
 		log: logger,
 	}

internal/models/running_processor.go

@@ -29,12 +29,15 @@ type ProcessorConfig struct {
 }
 
 func NewRunningProcessor(processor telegraf.Processor, config *ProcessorConfig) *RunningProcessor {
-	logger := &Logger{
-		Name: logName("processors", config.Name, config.Alias),
-		Errs: selfstat.Register("process", "errors",
-			map[string]string{"input": config.Name, "alias": config.Alias}),
+	tags := map[string]string{"processor": config.Name}
+	if config.Alias != "" {
+		tags["alias"] = config.Alias
 	}
 
+	logger := &Logger{
+		Name: logName("processors", config.Name, config.Alias),
+		Errs: selfstat.Register("process", "errors", tags),
+	}
 	setLogIfExist(processor, logger)
 
 	return &RunningProcessor{