Skip to content

Commit fcb2aa0

Browse files
cjihrigcjihrig
committed
drop empty scope info labels
1 parent b9ba123 commit fcb2aa0

3 files changed

Lines changed: 98 additions & 92 deletions

File tree

‎experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,18 @@ export class PrometheusSerializer {
271271
if (this._withoutScopeInfo) {
272272
additionalAttributes = this._additionalAttributes;
273273
} else {
274+
const scopeInfo: Attributes = { [ATTR_OTEL_SCOPE_NAME]: scope.name };
275+
276+
if (scope.schemaUrl) {
277+
scopeInfo[ATTR_OTEL_SCOPE_SCHEMA_URL] = scope.schemaUrl;
278+
}
279+
280+
if (scope.version) {
281+
scopeInfo[ATTR_OTEL_SCOPE_VERSION] = scope.version;
282+
}
283+
274284
additionalAttributes = Object.assign(
275-
{
276-
[ATTR_OTEL_SCOPE_NAME]: scope.name,
277-
[ATTR_OTEL_SCOPE_SCHEMA_URL]: scope.schemaUrl ?? '',
278-
[ATTR_OTEL_SCOPE_VERSION]: scope.version ?? '',
279-
},
285+
scopeInfo,
280286
this._additionalAttributes
281287
);
282288
}

‎experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ describe('PrometheusExporter', () => {
234234
...serializedDefaultResourceLines,
235235
'# HELP counter_total a test description',
236236
'# TYPE counter_total counter',
237-
'counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1"} 10',
237+
'counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1"} 10',
238238
'',
239239
]);
240240
});
@@ -264,7 +264,7 @@ describe('PrometheusExporter', () => {
264264
...serializedDefaultResourceLines,
265265
'# HELP metric_observable_gauge a test description',
266266
'# TYPE metric_observable_gauge gauge',
267-
'metric_observable_gauge{pid="123",core="1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1"} 0.999',
267+
'metric_observable_gauge{pid="123",core="1",otel_scope_name="test-prometheus",otel_scope_version="1"} 0.999',
268268
'',
269269
]);
270270
});
@@ -284,8 +284,8 @@ describe('PrometheusExporter', () => {
284284
...serializedDefaultResourceLines,
285285
'# HELP counter_total a test description',
286286
'# TYPE counter_total counter',
287-
'counter_total{counterKey1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1"} 10',
288-
'counter_total{counterKey1="attributeValue2",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1"} 20',
287+
'counter_total{counterKey1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1"} 10',
288+
'counter_total{counterKey1="attributeValue2",otel_scope_name="test-prometheus",otel_scope_version="1"} 20',
289289
'',
290290
]);
291291
});
@@ -327,7 +327,7 @@ describe('PrometheusExporter', () => {
327327
...serializedDefaultResourceLines,
328328
'# HELP counter_total description missing',
329329
'# TYPE counter_total counter',
330-
'counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1"} 10',
330+
'counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1"} 10',
331331
'',
332332
]);
333333
});
@@ -344,7 +344,7 @@ describe('PrometheusExporter', () => {
344344
...serializedDefaultResourceLines,
345345
'# HELP counter_bad_name_total description missing',
346346
'# TYPE counter_bad_name_total counter',
347-
'counter_bad_name_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1"} 10',
347+
'counter_bad_name_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1"} 10',
348348
'',
349349
]);
350350
});
@@ -362,7 +362,7 @@ describe('PrometheusExporter', () => {
362362
...serializedDefaultResourceLines,
363363
'# HELP counter a test description',
364364
'# TYPE counter gauge',
365-
'counter{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1"} 20',
365+
'counter{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1"} 20',
366366
'',
367367
]);
368368
});
@@ -391,7 +391,7 @@ describe('PrometheusExporter', () => {
391391
...serializedDefaultResourceLines,
392392
'# HELP metric_observable_counter_total a test description',
393393
'# TYPE metric_observable_counter_total counter',
394-
'metric_observable_counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1"} 20',
394+
'metric_observable_counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1"} 20',
395395
'',
396396
]);
397397
});
@@ -422,7 +422,7 @@ describe('PrometheusExporter', () => {
422422
...serializedDefaultResourceLines,
423423
'# HELP metric_observable_up_down_counter a test description',
424424
'# TYPE metric_observable_up_down_counter gauge',
425-
'metric_observable_up_down_counter{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1"} 20',
425+
'metric_observable_up_down_counter{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1"} 20',
426426
'',
427427
]);
428428
});
@@ -441,24 +441,24 @@ describe('PrometheusExporter', () => {
441441
...serializedDefaultResourceLines,
442442
'# HELP test_histogram a test description',
443443
'# TYPE test_histogram histogram',
444-
'test_histogram_count{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1"} 1',
445-
'test_histogram_sum{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1"} 20',
446-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="0"} 0',
447-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="5"} 0',
448-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="10"} 0',
449-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="25"} 1',
450-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="50"} 1',
451-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="75"} 1',
452-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="100"} 1',
453-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="250"} 1',
454-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="500"} 1',
455-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="750"} 1',
456-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="1000"} 1',
457-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="2500"} 1',
458-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="5000"} 1',
459-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="7500"} 1',
460-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="10000"} 1',
461-
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="1",le="+Inf"} 1',
444+
'test_histogram_count{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1"} 1',
445+
'test_histogram_sum{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1"} 20',
446+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="0"} 0',
447+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="5"} 0',
448+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="10"} 0',
449+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="25"} 1',
450+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="50"} 1',
451+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="75"} 1',
452+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="100"} 1',
453+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="250"} 1',
454+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="500"} 1',
455+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="750"} 1',
456+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="1000"} 1',
457+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="2500"} 1',
458+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="5000"} 1',
459+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="7500"} 1',
460+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="10000"} 1',
461+
'test_histogram_bucket{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_version="1",le="+Inf"} 1',
462462
'',
463463
]);
464464
});
@@ -496,7 +496,7 @@ describe('PrometheusExporter', () => {
496496
...serializedDefaultResourceLines,
497497
'# HELP test_prefix_counter_total description missing',
498498
'# TYPE test_prefix_counter_total counter',
499-
'test_prefix_counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version=""} 10',
499+
'test_prefix_counter_total{key1="attributeValue1",otel_scope_name="test-prometheus"} 10',
500500
'',
501501
]);
502502
});
@@ -514,7 +514,7 @@ describe('PrometheusExporter', () => {
514514
...serializedDefaultResourceLines,
515515
'# HELP counter_total description missing',
516516
'# TYPE counter_total counter',
517-
'counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version=""} 10',
517+
'counter_total{key1="attributeValue1",otel_scope_name="test-prometheus"} 10',
518518
'',
519519
]);
520520
});
@@ -532,7 +532,7 @@ describe('PrometheusExporter', () => {
532532
...serializedDefaultResourceLines,
533533
'# HELP counter_total description missing',
534534
'# TYPE counter_total counter',
535-
'counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version=""} 10',
535+
'counter_total{key1="attributeValue1",otel_scope_name="test-prometheus"} 10',
536536
'',
537537
]);
538538
});
@@ -549,7 +549,7 @@ describe('PrometheusExporter', () => {
549549
...serializedDefaultResourceLines,
550550
'# HELP counter_total description missing',
551551
'# TYPE counter_total counter',
552-
`counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version=""} 10 ${mockedHrTimeMs}`,
552+
`counter_total{key1="attributeValue1",otel_scope_name="test-prometheus"} 10 ${mockedHrTimeMs}`,
553553
'',
554554
]);
555555
});
@@ -566,7 +566,7 @@ describe('PrometheusExporter', () => {
566566
...serializedDefaultResourceLines,
567567
'# HELP counter_total description missing',
568568
'# TYPE counter_total counter',
569-
`counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="",service_name="${serviceName}",telemetry_sdk_language="${sdkLanguage}",telemetry_sdk_name="${sdkName}",telemetry_sdk_version="${sdkVersion}"} 10`,
569+
`counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",service_name="${serviceName}",telemetry_sdk_language="${sdkLanguage}",telemetry_sdk_name="${sdkName}",telemetry_sdk_version="${sdkVersion}"} 10`,
570570
'',
571571
]);
572572
});
@@ -583,7 +583,7 @@ describe('PrometheusExporter', () => {
583583
...serializedDefaultResourceLines,
584584
'# HELP counter_total description missing',
585585
'# TYPE counter_total counter',
586-
`counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",otel_scope_schema_url="",otel_scope_version="",telemetry_sdk_language="${sdkLanguage}",telemetry_sdk_name="${sdkName}"} 10`,
586+
`counter_total{key1="attributeValue1",otel_scope_name="test-prometheus",telemetry_sdk_language="${sdkLanguage}",telemetry_sdk_name="${sdkName}"} 10`,
587587
'',
588588
]);
589589
});

0 commit comments

Comments
 (0)