summaryrefslogtreecommitdiffstats
path: root/metrics/src/tests/metricmanagertest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'metrics/src/tests/metricmanagertest.cpp')
-rw-r--r--metrics/src/tests/metricmanagertest.cpp18
1 files changed, 15 insertions, 3 deletions
diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp
index e5e39bd9dcb..9629c63f333 100644
--- a/metrics/src/tests/metricmanagertest.cpp
+++ b/metrics/src/tests/metricmanagertest.cpp
@@ -572,7 +572,7 @@ TEST_F(MetricManagerTest, test_json_output)
// No snapshots have been taken yet, so the non-total getMetrics call should return
// the empty string (i.e. no metrics produced).
metrics::StateApiAdapter adapter(mm);
- auto json_str = adapter.getMetrics("snapper");
+ auto json_str = adapter.getMetrics("snapper", vespalib::MetricsProducer::ExpositionFormat::JSON);
EXPECT_EQ(json_str, "");
}
@@ -635,9 +635,9 @@ TEST_F(MetricManagerTest, test_json_output)
EXPECT_EQ(10.0, slime.get()["values"][10]["values"]["last"].asDouble()) << jsonData;
metrics::StateApiAdapter adapter(mm);
- vespalib::string normal = adapter.getMetrics("snapper");
+ vespalib::string normal = adapter.getMetrics("snapper", vespalib::MetricsProducer::ExpositionFormat::JSON);
EXPECT_EQ(vespalib::string(jsonData), normal);
- vespalib::string total = adapter.getTotalMetrics("snapper");
+ vespalib::string total = adapter.getTotalMetrics("snapper", vespalib::MetricsProducer::ExpositionFormat::JSON);
EXPECT_GT(total.size(), 0);
EXPECT_NE(total, normal);
}
@@ -1058,6 +1058,18 @@ TEST_F(MetricManagerTest, prometheus_output_can_emit_inf_values_verbatim) {
EXPECT_THAT(actual, HasSubstr("outer_temp_val_sum{foo=\"baz\",fancy=\"stuff\"} -Inf 1300000\n"));
}
+TEST_F(MetricManagerTest, state_adapter_can_output_prometheus_format) {
+ SameNamesTestMetricSet mset;
+ mset.set1.val.addValue(2);
+ mset.set2.val.addValue(3);
+ MetricSnapshotTestFixture fixture(*this, mset);
+ fixture.takeSnapshotsOnce();
+ metrics::StateApiAdapter adapter(fixture.manager);
+ auto metrics = adapter.getMetrics("snapper", vespalib::MetricsProducer::ExpositionFormat::Prometheus);
+ EXPECT_THAT(metrics, HasSubstr("outer_temp_val_sum{foo=\"bar\",fancy=\"stuff\"} 2 1300000\n"));
+ EXPECT_THAT(metrics, HasSubstr("outer_temp_val_sum{foo=\"baz\",fancy=\"stuff\"} 3 1300000\n"));
+}
+
struct SneakyNamesMetricSet : public MetricSet {
DoubleValueMetric val1;
DoubleValueMetric val2;