prevent conflict unit

Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>
open-telemetry · Nov 17, 2022 · 0bdf0c1 · 0bdf0c1
1 parent d15e0db
commit 0bdf0c1
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/exporters/prometheus/exporter.go b/exporters/prometheus/exporter.go
@@ -387,5 +387,9 @@ func (c *collector) validateMetricInfo(m metricdata.Metrics) (bool, metricdata.M
 		m.Description = metric.Description
 	}
 
+	if metric.Unit != m.Unit {
+		m.Unit = metric.Unit
+	}
+
 	return true, m
 }
diff --git a/exporters/prometheus/exporter_test.go b/exporters/prometheus/exporter_test.go
@@ -436,14 +436,32 @@ func TestDuplicateMetrics(t *testing.T) {
 			},
 			expectedFile: "testdata/duplicate_metrics_conflict_help.txt",
 		},
+		{
+			name: "conflict_unit",
+			recordMetrics: func(ctx context.Context, meterA, meterB otelmetric.Meter) {
+				fooA, err := meterA.SyncInt64().Counter("foo",
+					instrument.WithUnit(unit.Bytes),
+					instrument.WithDescription("meter foo"))
+				assert.NoError(t, err)
+				fooA.Add(ctx, 100, attribute.String("type", "foo"))
+
+				fooB, err := meterB.SyncInt64().Counter("foo",
+					instrument.WithUnit(unit.Milliseconds),
+					instrument.WithDescription("meter foo"))
+				assert.NoError(t, err)
+				fooB.Add(ctx, 100, attribute.String("type", "foo"))
+			},
+			options:      []Option{WithoutUnits()},
+			expectedFile: "testdata/duplicate_metrics_conflict_unit.txt",
+		},
 	}
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			// initialize registry exporter
 			ctx := context.Background()
 			registry := prometheus.NewRegistry()
-			exporter, err := New(WithRegisterer(registry))
+			exporter, err := New(append(tc.options, WithRegisterer(registry))...)
 			require.NoError(t, err)
 
 			// initialize resource

diff --git a/exporters/prometheus/testdata/duplicate_metrics_conflict_unit.txt b/exporters/prometheus/testdata/duplicate_metrics_conflict_unit.txt
@@ -0,0 +1,11 @@
+# HELP foo_total meter foo
+# TYPE foo_total counter
+foo_total{otel_scope_name="ma",otel_scope_version="v0.1.0",type="foo"} 100
+foo_total{otel_scope_name="mb",otel_scope_version="v0.1.0",type="foo"} 100
+# HELP otel_scope_info Instrumentation Scope metadata
+# TYPE otel_scope_info gauge
+otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
+otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1
+# HELP target_info Target metadata
+# TYPE target_info gauge
+target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1