open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use getPrometheusName for Otel2PrometheusConverter map keys (#6308)

This commit is contained in:
jack-berg 2024-04-04 12:40:21 -05:00 committed by GitHub
parent d7370f3367
commit c8ca99c54e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverter.java
View File

@ -550,7 +550,7 @@ final class Otel2PrometheusConverter {
private static void putOrMerge(
Map<String, MetricSnapshot> snapshotsByName, MetricSnapshot snapshot) {
String name = snapshot.getMetadata().getName();
String name = snapshot.getMetadata().getPrometheusName();
if (snapshotsByName.containsKey(name)) {
MetricSnapshot merged = merge(snapshotsByName.get(name), snapshot);
if (merged != null) {

29
exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverterTest.java
View File

@ -7,6 +7,7 @@ package io.opentelemetry.exporter.prometheus;
import static io.opentelemetry.api.common.AttributeKey.stringKey;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
@ -108,6 +109,34 @@ class Otel2PrometheusConverterTest {
assertThat(metricLabels).isEqualTo(expectedMetricLabels);
}
@Test
void prometheusNameCollisionTest_Issue6277() {
// NOTE: Metrics with the same resolved prometheus name should merge. However,
// Otel2PrometheusConverter is not responsible for merging individual series, so the merge will
// fail if the two different metrics contain overlapping series. Users should deal with this by
// adding a view that renames one of the two metrics such that the conflict does not occur.
MetricData dotName =
createSampleMetricData(
"my.metric",
"units",
MetricDataType.LONG_SUM,
Attributes.builder().put("key", "a").build(),
Resource.create(Attributes.empty()));
MetricData underscoreName =
createSampleMetricData(
"my_metric",
"units",
MetricDataType.LONG_SUM,
Attributes.builder().put("key", "b").build(),
Resource.create(Attributes.empty()));
List<MetricData> metricData = new ArrayList<>();
metricData.add(dotName);
metricData.add(underscoreName);
assertThatCode(() -> converter.convert(metricData)).doesNotThrowAnyException();
}
private static Stream<Arguments> resourceAttributesAdditionArgs() {
List<Arguments> arguments = new ArrayList<>();