Skip to content

Commit e1913a0

Browse files
twz123brian-brazil
authored andcommitted
Dropwizard: Pass on labels when no custom mapping matched (prometheus#447)
Signed-off-by: Tom Wieczorek <t.wieczorek@yieldlab.de>
1 parent 340251a commit e1913a0

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

simpleclient_dropwizard/src/main/java/io/prometheus/client/dropwizard/samplebuilder/CustomMappingSampleBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public Collector.MetricFamilySamples.Sample createSample(final String dropwizard
5858

5959
return defaultMetricSampleBuilder.createSample(
6060
dropwizardName, nameSuffix,
61-
Collections.<String>emptyList(),
62-
Collections.<String>emptyList(),
61+
additionalLabelNames,
62+
additionalLabelValues,
6363
value
6464
);
6565
}

simpleclient_dropwizard/src/test/java/io/prometheus/client/dropwizard/samplebuilder/CustomMappingSampleBuilderTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
public class CustomMappingSampleBuilderTest {
1515
@Test(expected = IllegalArgumentException.class)
16-
public void test_WHEN_EmptyConfig_THEN_ShouldReturnDefaultSample() {
16+
public void test_WHEN_EmptyConfig_THEN_Fail() {
1717
final CustomMappingSampleBuilder converter = new CustomMappingSampleBuilder(Collections.<MapperConfig>emptyList());
1818
}
1919

@@ -26,9 +26,9 @@ public void test_WHEN_NoMatches_THEN_ShouldReturnDefaultSample() {
2626
);
2727
final CustomMappingSampleBuilder converter = new CustomMappingSampleBuilder(mapperConfigs);
2828
final Collector.MetricFamilySamples.Sample result = converter.createSample(
29-
"app.okhttpclient.client.HttpClient.service.total", "", Collections.<String>emptyList(), Collections.<String>emptyList(), 0d);
29+
"app.okhttpclient.client.HttpClient.service.total", "", Collections.singletonList("quantile"), Collections.singletonList("0.99"), 0d);
3030

31-
assertEquals(new Collector.MetricFamilySamples.Sample("app_okhttpclient_client_HttpClient_service_total", Collections.<String>emptyList(), Collections.<String>emptyList(), 0d), result);
31+
assertEquals(new Collector.MetricFamilySamples.Sample("app_okhttpclient_client_HttpClient_service_total", Collections.singletonList("quantile"), Collections.singletonList("0.99"), 0d), result);
3232
}
3333

3434
@Test
@@ -178,4 +178,4 @@ public void test_WHEN_AdditionalLabels_THEN_ShouldReturnCorrectSample() {
178178

179179
assertEquals(expectedResult, result);
180180
}
181-
}
181+
}

0 commit comments

Comments
 (0)