Skip to content

Commit 23d8e5b

Browse files
committed
always set schema url
1 parent 80f5998 commit 23d8e5b

File tree

2 files changed

+122
-106
lines changed

2 files changed

+122
-106
lines changed

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServerTest.java

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ void fetchPrometheus() {
139139
.isEqualTo(
140140
"# HELP grpc_name_unit_total long_description\n"
141141
+ "# TYPE grpc_name_unit_total counter\n"
142-
+ "grpc_name_unit_total{kp=\"vp\",otel_scope_name=\"grpc\",otel_scope_version=\"version\"} 5.0\n"
142+
+ "grpc_name_unit_total{kp=\"vp\",otel_scope_name=\"grpc\",otel_scope_schema_url=\"\",otel_scope_version=\"version\"} 5.0\n"
143143
+ "# HELP http_name_unit_total double_description\n"
144144
+ "# TYPE http_name_unit_total counter\n"
145-
+ "http_name_unit_total{kp=\"vp\",otel_scope_name=\"http\",otel_scope_version=\"version\"} 3.5\n"
145+
+ "http_name_unit_total{kp=\"vp\",otel_scope_name=\"http\",otel_scope_schema_url=\"\",otel_scope_version=\"version\"} 3.5\n"
146146
+ "# TYPE target_info gauge\n"
147147
+ "target_info{kr=\"vr\"} 1\n");
148148
}
@@ -229,11 +229,11 @@ void fetchOpenMetrics() {
229229
"# TYPE grpc_name_unit counter\n"
230230
+ "# UNIT grpc_name_unit unit\n"
231231
+ "# HELP grpc_name_unit long_description\n"
232-
+ "grpc_name_unit_total{kp=\"vp\",otel_scope_name=\"grpc\",otel_scope_version=\"version\"} 5.0\n"
232+
+ "grpc_name_unit_total{kp=\"vp\",otel_scope_name=\"grpc\",otel_scope_schema_url=\"\",otel_scope_version=\"version\"} 5.0\n"
233233
+ "# TYPE http_name_unit counter\n"
234234
+ "# UNIT http_name_unit unit\n"
235235
+ "# HELP http_name_unit double_description\n"
236-
+ "http_name_unit_total{kp=\"vp\",otel_scope_name=\"http\",otel_scope_version=\"version\"} 3.5\n"
236+
+ "http_name_unit_total{kp=\"vp\",otel_scope_name=\"http\",otel_scope_schema_url=\"\",otel_scope_version=\"version\"} 3.5\n"
237237
+ "# TYPE target info\n"
238238
+ "target_info{kr=\"vr\"} 1\n"
239239
+ "# EOF\n");
@@ -255,7 +255,7 @@ void fetchFiltered() {
255255
""
256256
+ "# HELP grpc_name_unit_total long_description\n"
257257
+ "# TYPE grpc_name_unit_total counter\n"
258-
+ "grpc_name_unit_total{kp=\"vp\",otel_scope_name=\"grpc\",otel_scope_version=\"version\"} 5.0\n"
258+
+ "grpc_name_unit_total{kp=\"vp\",otel_scope_name=\"grpc\",otel_scope_schema_url=\"\",otel_scope_version=\"version\"} 5.0\n"
259259
+ "# TYPE target_info gauge\n"
260260
+ "target_info{kr=\"vr\"} 1\n");
261261
}
@@ -292,10 +292,10 @@ public Collection<MetricData> collectAllMetrics() {
292292
.isEqualTo(
293293
"# HELP grpc_name_unit_total long_description\n"
294294
+ "# TYPE grpc_name_unit_total counter\n"
295-
+ "grpc_name_unit_total{kp=\"vp\",otel_scope_name=\"grpc\",otel_scope_version=\"version\"} 5.0\n"
295+
+ "grpc_name_unit_total{kp=\"vp\",otel_scope_name=\"grpc\",otel_scope_schema_url=\"\",otel_scope_version=\"version\"} 5.0\n"
296296
+ "# HELP http_name_unit_total double_description\n"
297297
+ "# TYPE http_name_unit_total counter\n"
298-
+ "http_name_unit_total{kp=\"vp\",otel_scope_name=\"http\",otel_scope_version=\"version\"} 3.5\n"
298+
+ "http_name_unit_total{kp=\"vp\",otel_scope_name=\"http\",otel_scope_schema_url=\"\",otel_scope_version=\"version\"} 3.5\n"
299299
+ "# TYPE target_info gauge\n"
300300
+ "target_info{kr=\"vr\"} 1\n");
301301
}
@@ -320,10 +320,10 @@ void fetchPrometheusCompressed() throws IOException {
320320
.isEqualTo(
321321
"# HELP grpc_name_unit_total long_description\n"
322322
+ "# TYPE grpc_name_unit_total counter\n"
323-
+ "grpc_name_unit_total{kp=\"vp\",otel_scope_name=\"grpc\",otel_scope_version=\"version\"} 5.0\n"
323+
+ "grpc_name_unit_total{kp=\"vp\",otel_scope_name=\"grpc\",otel_scope_schema_url=\"\",otel_scope_version=\"version\"} 5.0\n"
324324
+ "# HELP http_name_unit_total double_description\n"
325325
+ "# TYPE http_name_unit_total counter\n"
326-
+ "http_name_unit_total{kp=\"vp\",otel_scope_name=\"http\",otel_scope_version=\"version\"} 3.5\n"
326+
+ "http_name_unit_total{kp=\"vp\",otel_scope_name=\"http\",otel_scope_schema_url=\"\",otel_scope_version=\"version\"} 3.5\n"
327327
+ "# TYPE target_info gauge\n"
328328
+ "target_info{kr=\"vr\"} 1\n");
329329
}
@@ -395,8 +395,8 @@ void fetch_DuplicateMetrics() {
395395
assertThat(response.contentUtf8())
396396
.isEqualTo(
397397
"# TYPE foo_unit_total counter\n"
398-
+ "foo_unit_total{otel_scope_name=\"scope1\"} 1.0\n"
399-
+ "foo_unit_total{otel_scope_name=\"scope2\"} 2.0\n"
398+
+ "foo_unit_total{otel_scope_name=\"scope1\",otel_scope_schema_url=\"\"} 1.0\n"
399+
+ "foo_unit_total{otel_scope_name=\"scope2\",otel_scope_schema_url=\"\"} 2.0\n"
400400
+ "# TYPE target_info gauge\n"
401401
+ "target_info{kr=\"vr\"} 1\n");
402402

@@ -476,12 +476,12 @@ public Collection<MetricData> collectAllMetrics() {
476476
+ "# TYPE grpc_name_unit_total counter\n"
477477

478478
// Note the added resource attributes as labels
479-
+ "grpc_name_unit_total{kp=\"vp\",kr=\"vr\",otel_scope_name=\"grpc\",otel_scope_version=\"version\"} 5.0\n"
479+
+ "grpc_name_unit_total{kp=\"vp\",kr=\"vr\",otel_scope_name=\"grpc\",otel_scope_schema_url=\"\",otel_scope_version=\"version\"} 5.0\n"
480480
+ "# HELP http_name_unit_total double_description\n"
481481
+ "# TYPE http_name_unit_total counter\n"
482482

483483
// Note the added resource attributes as labels
484-
+ "http_name_unit_total{kp=\"vp\",kr=\"vr\",otel_scope_name=\"http\",otel_scope_version=\"version\"} 3.5\n"
484+
+ "http_name_unit_total{kp=\"vp\",kr=\"vr\",otel_scope_name=\"http\",otel_scope_schema_url=\"\",otel_scope_version=\"version\"} 3.5\n"
485485
+ "# TYPE target_info gauge\n"
486486
+ "target_info{kr=\"vr\"} 1\n");
487487
}
@@ -606,6 +606,10 @@ void histogramDefaultBase2ExponentialHistogram() throws IOException {
606606
+ " name: \"otel_scope_name\"\n"
607607
+ " value: \"meter\"\n"
608608
+ " }\n"
609+
+ " label {\n"
610+
+ " name: \"otel_scope_schema_url\"\n"
611+
+ " value: \"\"\n"
612+
+ " }\n"
609613
+ " histogram {\n"
610614
+ " sample_count: 1\n"
611615
+ " sample_sum: 1.0\n"

0 commit comments

Comments
 (0)