Update converters with 0.99 upgrade (#755) (#756)

(cherry picked from commit 77425ec) Co-authored-by: Paulin Todev <paulin.todev@gmail.com>
grafana · Jun 6, 2024 · abf2bc0 · abf2bc0
1 parent 2687a2d
commit abf2bc0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go b/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go
@@ -146,6 +146,7 @@ func toKubernetesResolver(cfg *loadbalancingexporter.K8sSvcResolver) *loadbalanc
 	return &loadbalancing.KubernetesResolver{
 		Service: cfg.Service,
 		Ports:   cfg.Ports,
+		Timeout: cfg.Timeout,
 	}
 }
 

diff --git a/internal/converter/internal/otelcolconvert/converter_servicegraphconnector.go b/internal/converter/internal/otelcolconvert/converter_servicegraphconnector.go
@@ -57,9 +57,10 @@ func toServicegraphConnector(state *State, id component.InstanceID, cfg *service
 			MaxItems: cfg.Store.MaxItems,
 			TTL:      cfg.Store.TTL,
 		},
-		CacheLoop:            cfg.CacheLoop,
-		StoreExpirationLoop:  cfg.StoreExpirationLoop,
-		MetricsFlushInterval: cfg.MetricsFlushInterval,
+		CacheLoop:             cfg.CacheLoop,
+		StoreExpirationLoop:   cfg.StoreExpirationLoop,
+		MetricsFlushInterval:  cfg.MetricsFlushInterval,
+		DatabaseNameAttribute: cfg.DatabaseNameAttribute,
 		Output: &otelcol.ConsumerArguments{
 			Metrics: ToTokenizedConsumers(nextMetrics),
 		},

diff --git a/internal/converter/internal/otelcolconvert/converter_spanmetricsconnector.go b/internal/converter/internal/otelcolconvert/converter_spanmetricsconnector.go
@@ -99,6 +99,7 @@ func toSpanmetricsConnector(state *State, id component.InstanceID, cfg *spanmetr
 			Explicit:    explicit,
 		},
 		MetricsFlushInterval:         cfg.MetricsFlushInterval,
+		MetricsExpiration:            cfg.MetricsExpiration,
 		Namespace:                    cfg.Namespace,
 		ResourceMetricsCacheSize:     cfg.ResourceMetricsCacheSize,
 		ResourceMetricsKeyAttributes: cfg.ResourceMetricsKeyAttributes,

diff --git a/internal/converter/internal/otelcolconvert/testdata/servicegraph.alloy b/internal/converter/internal/otelcolconvert/testdata/servicegraph.alloy
@@ -30,7 +30,7 @@ otelcol.connector.servicegraph "default" {
 	}
 	cache_loop              = "2m0s"
 	store_expiration_loop   = "5s"
-	database_name_attribute = ""
+	database_name_attribute = "db_name3"
 
 	output {
 		metrics = [otelcol.exporter.otlp.default.input]

diff --git a/internal/converter/internal/otelcolconvert/testdata/servicegraph.yaml b/internal/converter/internal/otelcolconvert/testdata/servicegraph.yaml
@@ -15,6 +15,7 @@ connectors:
       max_items: 10
     cache_loop: 2m
     store_expiration_loop: 5s
+    database_name_attribute: db_name3
 
 exporters:
   otlp: