diff --git a/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go b/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go index de09d99dde22..b9420d76c26e 100644 --- a/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go +++ b/internal/converter/internal/otelcolconvert/converter_loadbalancingexporter.go @@ -145,5 +145,6 @@ 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 index 1211e6184347..422250fd2f75 100644 --- 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 index 0b6a8f6528e2..7bc5b0657b83 100644 --- 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.river b/internal/converter/internal/otelcolconvert/testdata/servicegraph.river index 97b4ecdc1504..33f3aef91f0e 100644 --- a/internal/converter/internal/otelcolconvert/testdata/servicegraph.river +++ b/internal/converter/internal/otelcolconvert/testdata/servicegraph.river @@ -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 index f033a9022d6f..d4a17744021d 100644 --- 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: