fix default yaml values for otelcol prometheus exporter converter

grafana · Dec 13, 2024 · fb283ef · fb283ef
1 parent 1e769d5
commit fb283ef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/internal/converter/internal/staticconvert/internal/build/converter_remotewriteexporter.go b/internal/converter/internal/staticconvert/internal/build/converter_remotewriteexporter.go
@@ -91,20 +91,13 @@ func toremotewriteexporterConfig(cfg *remotewriteexporter.Config, forwardTo []st
 	defaultArgs := &prometheus.Arguments{}
 	defaultArgs.SetToDefault()
 
-	args := &prometheus.Arguments{
+	return &prometheus.Arguments{
 		IncludeTargetInfo:             defaultArgs.IncludeTargetInfo,
 		IncludeScopeInfo:              defaultArgs.IncludeScopeInfo,
 		IncludeScopeLabels:            defaultArgs.IncludeScopeLabels,
-		GCFrequency:                   defaultArgs.GCFrequency,
+		GCFrequency:                   cfg.StaleTime,
 		ForwardTo:                     forwardTo,
 		AddMetricSuffixes:             defaultArgs.AddMetricSuffixes,
 		ResourceToTelemetryConversion: defaultArgs.ResourceToTelemetryConversion,
 	}
-
-	// Override default only if > 0 because GCFrequency of 0 is not allowed
-	if cfg.StaleTime > 0 {
-		args.GCFrequency = cfg.StaleTime
-	}
-
-	return args
 }
diff --git a/internal/converter/internal/staticconvert/testdata/traces.alloy b/internal/converter/internal/staticconvert/testdata/traces.alloy
@@ -114,7 +114,8 @@ prometheus.relabel "_0_default" {
 }
 
 otelcol.exporter.prometheus "_0_default" {
-	forward_to = [prometheus.relabel._0_default.receiver]
+	gc_frequency = "15m0s"
+	forward_to   = [prometheus.relabel._0_default.receiver]
 }
 
 otelcol.exporter.loadbalancing "_0_default" {
@@ -199,7 +200,8 @@ prometheus.relabel "_1_default" {
 }
 
 otelcol.exporter.prometheus "_1_default" {
-	forward_to = [prometheus.relabel._1_default.receiver]
+	gc_frequency = "15m0s"
+	forward_to   = [prometheus.relabel._1_default.receiver]
 }
 
 otelcol.exporter.otlp "_1_0" {

diff --git a/internal/static/traces/remotewriteexporter/factory.go b/internal/static/traces/remotewriteexporter/factory.go
@@ -37,7 +37,10 @@ func NewFactory() exporter.Factory {
 }
 
 func createDefaultConfig() component.Config {
-	return &Config{}
+	return &Config{
+		StaleTime:    15 * time.Minute,
+		LoopInterval: time.Second,
+	}
 }
 
 func createMetricsExporter(