refactor: remove static resourceAttributes in favor of resourceAttributesProvider

The `resourceAttributes` parameter has been removed from `toOtlpPayload`, `OtlpJsonSink`, `OpenMetricsSink`, and `PrometheusSink`. Callers should now use `resourceAttributesProvider` to provide dynamic attributes based on the snapshot metadata. Tests have been updated to reflect this change.

Author: anshu7vyas

metrics/src/commonMain/kotlin/pro/respawn/flowmvi/metrics/openmetrics/OpenMetricsSink.kt

@@ -698,8 +698,7 @@ public fun OpenMetricsSink(
     includeUnit: Boolean = true,
     includeTimestamp: Boolean = false,
     surfaceVersion: MetricsSchemaVersion? = null,
-    resourceAttributes: Map<String, String> = emptyMap(),
-    resourceAttributesProvider: (Meta) -> Map<String, String> = { resourceAttributes },
+    resourceAttributesProvider: (Meta) -> Map<String, String> = { emptyMap() },
 ): MetricsSink = MappingSink(delegate) {
     val surface = MetricSurface.fromVersion(surfaceVersion ?: it.meta.schemaVersion)
     val snapshot = it.downgradeTo(surface.version)
@@ -721,8 +720,7 @@ public fun PrometheusSink(
     includeUnit: Boolean = false,
     includeTimestamp: Boolean = false,
     surfaceVersion: MetricsSchemaVersion? = null,
-    resourceAttributes: Map<String, String> = emptyMap(),
-    resourceAttributesProvider: (Meta) -> Map<String, String> = { resourceAttributes },
+    resourceAttributesProvider: (Meta) -> Map<String, String> = { emptyMap() },
 ): MetricsSink = MappingSink(delegate) {
     val surface = MetricSurface.fromVersion(surfaceVersion ?: it.meta.schemaVersion)
     val snapshot = it.downgradeTo(surface.version)

metrics/src/commonMain/kotlin/pro/respawn/flowmvi/metrics/otel/OtlpJsonSink.kt

@@ -34,8 +34,7 @@ private val DefaultJson: Json = Json {
 /** Maps a [MetricsSnapshot] to an OTLP JSON payload ready for serialization. */
 public fun MetricsSnapshot.toOtlpPayload(
     namespace: String = DEFAULT_NAMESPACE,
-    resourceAttributes: Map<String, String> = emptyMap(),
-    resourceAttributesProvider: (Meta) -> Map<String, String> = { resourceAttributes },
+    resourceAttributesProvider: (Meta) -> Map<String, String> = { emptyMap() },
     scopeName: String = DEFAULT_SCOPE,
     temporality: AggregationTemporality = AggregationTemporality.AGGREGATION_TEMPORALITY_CUMULATIVE,
     fixedTimestamp: Instant? = null,
@@ -71,16 +70,14 @@ public fun OtlpJsonMetricsSink(
     delegate: Sink<String>,
     namespace: String = DEFAULT_NAMESPACE,
     scopeName: String = DEFAULT_SCOPE,
-    resourceAttributes: Map<String, String> = emptyMap(),
-    resourceAttributesProvider: (Meta) -> Map<String, String> = { resourceAttributes },
+    resourceAttributesProvider: (Meta) -> Map<String, String> = { emptyMap() },
     temporality: AggregationTemporality = AggregationTemporality.AGGREGATION_TEMPORALITY_CUMULATIVE,
     fixedTimestamp: Instant? = null,
     surfaceVersion: MetricsSchemaVersion? = null,
     json: Json = DefaultJson,
 ): MetricsSink = MappingSink(delegate) { snapshot ->
     val payload = snapshot.toOtlpPayload(
         namespace = namespace,
-        resourceAttributes = resourceAttributes,
         resourceAttributesProvider = resourceAttributesProvider,
         scopeName = scopeName,
         temporality = temporality,

metrics/src/jvmTest/kotlin/pro/respawn/flowmvi/metrics/openmetrics/OpenMetricsSinkJvmTest.kt

@@ -152,7 +152,7 @@ class OpenMetricsSinkJvmTest : FreeSpec({
         val buffer = StringBuilder()
         val sink = OpenMetricsSink(
             delegate = AppendableStringSink(buffer),
-            resourceAttributes = mapOf("install_id" to "abc-123", "device_model" to "Pixel 9"),
+            resourceAttributesProvider = { mapOf("install_id" to "abc-123", "device_model" to "Pixel 9") },
         )
 
         sink.emit(snapshot)
@@ -162,27 +162,27 @@ class OpenMetricsSinkJvmTest : FreeSpec({
         rendered.shouldContain("device_model=\"Pixel 9\"")
     }
 
-    "resource attributes provider overrides static attributes and meta defaults" {
+    "resource attributes provider overrides meta defaults" {
         val buffer = StringBuilder()
         val sink = OpenMetricsSink(
             delegate = AppendableStringSink(buffer),
-            resourceAttributes = mapOf("env" to "staging"),
-            resourceAttributesProvider = { mapOf("env" to "production", "store" to "custom_store") },
+            resourceAttributesProvider = {
+                mapOf("env" to "production", "store" to "custom_store")
+            },
         )
 
         sink.emit(snapshot)
 
         val rendered = buffer.toString()
         rendered.shouldContain("env=\"production\"")
         rendered.shouldContain("store=\"custom_store\"")
-        rendered.shouldNotContain("env=\"staging\"")
     }
 
     "prometheus sink resource attributes are included as labels on all samples" {
         val buffer = StringBuilder()
         val sink = PrometheusSink(
             delegate = AppendableStringSink(buffer),
-            resourceAttributes = mapOf("install_id" to "abc-123", "device_model" to "Pixel 9"),
+            resourceAttributesProvider = { mapOf("install_id" to "abc-123", "device_model" to "Pixel 9") },
         )
 
         sink.emit(snapshot)
@@ -192,11 +192,10 @@ class OpenMetricsSinkJvmTest : FreeSpec({
         rendered.shouldContain("device_model=\"Pixel 9\"")
     }
 
-    "prometheus sink resource attributes provider overrides static attributes and meta defaults" {
+    "prometheus sink resource attributes provider overrides meta defaults" {
         val buffer = StringBuilder()
         val sink = PrometheusSink(
             delegate = AppendableStringSink(buffer),
-            resourceAttributes = mapOf("env" to "staging"),
             resourceAttributesProvider = { mapOf("env" to "production", "store" to "custom_store") },
         )
 
@@ -205,6 +204,5 @@ class OpenMetricsSinkJvmTest : FreeSpec({
         val rendered = buffer.toString()
         rendered.shouldContain("env=\"production\"")
         rendered.shouldContain("store=\"custom_store\"")
-        rendered.shouldNotContain("env=\"staging\"")
     }
 })

metrics/src/jvmTest/kotlin/pro/respawn/flowmvi/metrics/otel/OtlpJsonSinkTest.kt

@@ -26,7 +26,9 @@ class OtlpJsonSinkTest : FreeSpec({
 
     "resource attributes include store identity and extras" {
         val payload = snapshot.toOtlpPayload(
-            resourceAttributes = mapOf("service.name" to "demo-service"),
+            resourceAttributesProvider = {
+                mapOf("service.name" to "demo-service")
+            },
             scopeName = "flowmvi.metrics"
         )
 
@@ -281,7 +283,9 @@ class OtlpJsonSinkTest : FreeSpec({
 
     "resource attributes are sorted lexicographically after merge" {
         val payload = snapshot.toOtlpPayload(
-            resourceAttributes = mapOf("z-key" to "z", "a-key" to "a")
+            resourceAttributesProvider = {
+                mapOf("z-key" to "z", "a-key" to "a")
+            }
         )
         val keys = payload.resourceMetrics.single().resource!!.attributes.map { it.key }