From 16e1da5fa629bfa1c44c14e67fa84d9ed8eeb437 Mon Sep 17 00:00:00 2001 From: Arthur Silva Sens Date: Thu, 8 May 2025 14:43:09 -0300 Subject: [PATCH] wip: Replace otel_scope_info metric with labels in all metrics Signed-off-by: Arthur Silva Sens --- exporters/prometheus/exporter.go | 61 +++---------------- .../testdata/conflict_help_two_counters_1.txt | 4 -- .../testdata/conflict_help_two_counters_2.txt | 4 -- .../conflict_help_two_histograms_1.txt | 4 -- .../conflict_help_two_histograms_2.txt | 4 -- .../conflict_help_two_updowncounters_1.txt | 4 -- .../conflict_help_two_updowncounters_2.txt | 4 -- ...flict_type_counter_and_updowncounter_1.txt | 3 - ...flict_type_counter_and_updowncounter_2.txt | 3 - ...ict_type_histogram_and_updowncounter_1.txt | 3 - ...ict_type_histogram_and_updowncounter_2.txt | 3 - .../testdata/conflict_unit_two_counters.txt | 4 -- .../testdata/conflict_unit_two_histograms.txt | 4 -- .../conflict_unit_two_updowncounters.txt | 4 -- exporters/prometheus/testdata/counter.txt | 7 +-- .../testdata/counter_disabled_suffix.txt | 7 +-- .../prometheus/testdata/counter_utf8.txt | 7 +-- .../testdata/counter_with_unit_suffix.txt | 7 +-- .../prometheus/testdata/custom_resource.txt | 5 +- .../prometheus/testdata/empty_resource.txt | 5 +- .../testdata/exponential_histogram.txt | 9 +-- exporters/prometheus/testdata/gauge.txt | 5 +- exporters/prometheus/testdata/histogram.txt | 29 ++++----- .../prometheus/testdata/multi_scopes.txt | 4 -- .../testdata/no_conflict_two_counters.txt | 4 -- .../testdata/no_conflict_two_histograms.txt | 4 -- .../no_conflict_two_updowncounters.txt | 4 -- ...n_monotonic_sum_does_not_add_exemplars.txt | 7 +-- .../prometheus/testdata/sanitized_labels.txt | 5 +- .../prometheus/testdata/sanitized_names.txt | 45 +++++++------- .../with_allow_resource_attributes_filter.txt | 5 +- .../prometheus/testdata/with_namespace.txt | 5 +- .../with_resource_attributes_filter.txt | 5 +- .../testdata/without_target_info.txt | 5 +- 34 files changed, 62 insertions(+), 221 deletions(-) diff --git a/exporters/prometheus/exporter.go b/exporters/prometheus/exporter.go index e0959641caf..755bb86ef07 100644 --- a/exporters/prometheus/exporter.go +++ b/exporters/prometheus/exporter.go @@ -21,7 +21,6 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/internal/global" - "go.opentelemetry.io/otel/sdk/instrumentation" "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/resource" @@ -37,6 +36,8 @@ const ( scopeNameLabel = "otel_scope_name" scopeVersionLabel = "otel_scope_version" + scopeAttributeLabelPrefix = "otel_scope_" + traceIDExemplarKey = "trace_id" spanIDExemplarKey = "span_id" ) @@ -97,8 +98,6 @@ type collector struct { mu sync.Mutex // mu protects all members below from the concurrent access. disableTargetInfo bool targetInfo prometheus.Metric - scopeInfos map[instrumentation.Scope]prometheus.Metric - scopeInfosInvalid map[instrumentation.Scope]struct{} metricFamilies map[string]*dto.MetricFamily resourceKeyVals keyVals } @@ -122,8 +121,6 @@ func New(opts ...Option) (*Exporter, error) { withoutUnits: cfg.withoutUnits, withoutCounterSuffixes: cfg.withoutCounterSuffixes, disableScopeInfo: cfg.disableScopeInfo, - scopeInfos: make(map[instrumentation.Scope]prometheus.Metric), - scopeInfosInvalid: make(map[instrumentation.Scope]struct{}), metricFamilies: make(map[string]*dto.MetricFamily), namespace: cfg.namespace, resourceAttributesFilter: cfg.resourceAttributesFilter, @@ -201,21 +198,12 @@ func (c *collector) Collect(ch chan<- prometheus.Metric) { vals: make([]string, 0, n), } - if !c.disableScopeInfo { - scopeInfo, err := c.scopeInfo(scopeMetrics.Scope) - if errors.Is(err, errScopeInvalid) { - // Do not report the same error multiple times. - continue - } - if err != nil { - otel.Handle(err) - continue - } + kv.keys = append(kv.keys, scopeNameLabel, scopeVersionLabel) + kv.vals = append(kv.vals, scopeMetrics.Scope.Name, scopeMetrics.Scope.Version) - ch <- scopeInfo - - kv.keys = append(kv.keys, scopeNameLabel, scopeVersionLabel) - kv.vals = append(kv.vals, scopeMetrics.Scope.Name, scopeMetrics.Scope.Version) + for _, attr := range scopeMetrics.Scope.Attributes.ToSlice() { + kv.keys = append(kv.keys, scopeAttributeLabelPrefix+string(attr.Key)) + kv.vals = append(kv.vals, attr.Value.Emit()) } kv.keys = append(kv.keys, c.resourceKeyVals.keys...) @@ -440,17 +428,6 @@ func createInfoMetric(name, description string, res *resource.Resource) (prometh return prometheus.NewConstMetric(desc, prometheus.GaugeValue, float64(1), values...) } -func createScopeInfoMetric(scope instrumentation.Scope) (prometheus.Metric, error) { - attrs := make([]attribute.KeyValue, 0, scope.Attributes.Len()+2) // resource attrs + scope name + scope version - attrs = append(attrs, scope.Attributes.ToSlice()...) - attrs = append(attrs, attribute.String(scopeNameLabel, scope.Name)) - attrs = append(attrs, attribute.String(scopeVersionLabel, scope.Version)) - - keys, values := getAttrs(attribute.NewSet(attrs...)) - desc := prometheus.NewDesc(scopeInfoMetricName, scopeInfoDescription, keys, nil) - return prometheus.NewConstMetric(desc, prometheus.GaugeValue, float64(1), values...) -} - var unitSuffixes = map[string]string{ // Time "d": "days", @@ -556,30 +533,6 @@ func (c *collector) createResourceAttributes(res *resource.Resource) { c.resourceKeyVals = keyVals{keys: resourceKeys, vals: resourceValues} } -func (c *collector) scopeInfo(scope instrumentation.Scope) (prometheus.Metric, error) { - c.mu.Lock() - defer c.mu.Unlock() - - scopeInfo, ok := c.scopeInfos[scope] - if ok { - return scopeInfo, nil - } - - if _, ok := c.scopeInfosInvalid[scope]; ok { - return nil, errScopeInvalid - } - - scopeInfo, err := createScopeInfoMetric(scope) - if err != nil { - c.scopeInfosInvalid[scope] = struct{}{} - return nil, fmt.Errorf("cannot create scope info metric: %w", err) - } - - c.scopeInfos[scope] = scopeInfo - - return scopeInfo, nil -} - func (c *collector) validateMetrics(name, description string, metricType *dto.MetricType) (drop bool, help string) { c.mu.Lock() defer c.mu.Unlock() diff --git a/exporters/prometheus/testdata/conflict_help_two_counters_1.txt b/exporters/prometheus/testdata/conflict_help_two_counters_1.txt index 5424f09214d..d332f5baeff 100644 --- a/exporters/prometheus/testdata/conflict_help_two_counters_1.txt +++ b/exporters/prometheus/testdata/conflict_help_two_counters_1.txt @@ -2,10 +2,6 @@ # TYPE bar_bytes_total counter bar_bytes_total{otel_scope_name="ma",otel_scope_version="v0.1.0",type="bar"} 100 bar_bytes_total{otel_scope_name="mb",otel_scope_version="v0.1.0",type="bar"} 100 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 -otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/conflict_help_two_counters_2.txt b/exporters/prometheus/testdata/conflict_help_two_counters_2.txt index fe6c7400c5d..8a707b2e03f 100644 --- a/exporters/prometheus/testdata/conflict_help_two_counters_2.txt +++ b/exporters/prometheus/testdata/conflict_help_two_counters_2.txt @@ -2,10 +2,6 @@ # TYPE bar_bytes_total counter bar_bytes_total{otel_scope_name="ma",otel_scope_version="v0.1.0",type="bar"} 100 bar_bytes_total{otel_scope_name="mb",otel_scope_version="v0.1.0",type="bar"} 100 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 -otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/conflict_help_two_histograms_1.txt b/exporters/prometheus/testdata/conflict_help_two_histograms_1.txt index 1c22545d7b9..48487682820 100644 --- a/exporters/prometheus/testdata/conflict_help_two_histograms_1.txt +++ b/exporters/prometheus/testdata/conflict_help_two_histograms_1.txt @@ -36,10 +36,6 @@ bar_bytes_bucket{A="B",le="10000",otel_scope_name="mb",otel_scope_version="v0.1. bar_bytes_bucket{A="B",le="+Inf",otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 bar_bytes_sum{A="B",otel_scope_name="mb",otel_scope_version="v0.1.0"} 100 bar_bytes_count{A="B",otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 -otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/conflict_help_two_histograms_2.txt b/exporters/prometheus/testdata/conflict_help_two_histograms_2.txt index 85497d9f2b8..3bb22fc3ce5 100644 --- a/exporters/prometheus/testdata/conflict_help_two_histograms_2.txt +++ b/exporters/prometheus/testdata/conflict_help_two_histograms_2.txt @@ -36,10 +36,6 @@ bar_bytes_bucket{A="B",le="10000",otel_scope_name="mb",otel_scope_version="v0.1. bar_bytes_bucket{A="B",le="+Inf",otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 bar_bytes_sum{A="B",otel_scope_name="mb",otel_scope_version="v0.1.0"} 100 bar_bytes_count{A="B",otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 -otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/conflict_help_two_updowncounters_1.txt b/exporters/prometheus/testdata/conflict_help_two_updowncounters_1.txt index 0f64d584913..10fe054d4da 100644 --- a/exporters/prometheus/testdata/conflict_help_two_updowncounters_1.txt +++ b/exporters/prometheus/testdata/conflict_help_two_updowncounters_1.txt @@ -2,10 +2,6 @@ # TYPE bar_bytes gauge bar_bytes{otel_scope_name="ma",otel_scope_version="v0.1.0",type="bar"} 100 bar_bytes{otel_scope_name="mb",otel_scope_version="v0.1.0",type="bar"} 100 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 -otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/conflict_help_two_updowncounters_2.txt b/exporters/prometheus/testdata/conflict_help_two_updowncounters_2.txt index d89da4bb4f6..c59a4742574 100644 --- a/exporters/prometheus/testdata/conflict_help_two_updowncounters_2.txt +++ b/exporters/prometheus/testdata/conflict_help_two_updowncounters_2.txt @@ -2,10 +2,6 @@ # TYPE bar_bytes gauge bar_bytes{otel_scope_name="ma",otel_scope_version="v0.1.0",type="bar"} 100 bar_bytes{otel_scope_name="mb",otel_scope_version="v0.1.0",type="bar"} 100 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 -otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/conflict_type_counter_and_updowncounter_1.txt b/exporters/prometheus/testdata/conflict_type_counter_and_updowncounter_1.txt index 0418558f724..53ef48dd8b9 100644 --- a/exporters/prometheus/testdata/conflict_type_counter_and_updowncounter_1.txt +++ b/exporters/prometheus/testdata/conflict_type_counter_and_updowncounter_1.txt @@ -1,9 +1,6 @@ # HELP foo_total meter foo # TYPE foo_total counter foo_total{otel_scope_name="ma",otel_scope_version="v0.1.0",type="foo"} 100 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/conflict_type_counter_and_updowncounter_2.txt b/exporters/prometheus/testdata/conflict_type_counter_and_updowncounter_2.txt index a50ed8d5e1f..3409743921e 100644 --- a/exporters/prometheus/testdata/conflict_type_counter_and_updowncounter_2.txt +++ b/exporters/prometheus/testdata/conflict_type_counter_and_updowncounter_2.txt @@ -1,9 +1,6 @@ # HELP foo_total meter foo # TYPE foo_total gauge foo_total{otel_scope_name="ma",otel_scope_version="v0.1.0",type="foo"} 100 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/conflict_type_histogram_and_updowncounter_1.txt b/exporters/prometheus/testdata/conflict_type_histogram_and_updowncounter_1.txt index 8a0d2d10241..96757fcc522 100644 --- a/exporters/prometheus/testdata/conflict_type_histogram_and_updowncounter_1.txt +++ b/exporters/prometheus/testdata/conflict_type_histogram_and_updowncounter_1.txt @@ -1,9 +1,6 @@ # HELP foo_bytes meter gauge foo # TYPE foo_bytes gauge foo_bytes{A="B",otel_scope_name="ma",otel_scope_version="v0.1.0"} 100 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/conflict_type_histogram_and_updowncounter_2.txt b/exporters/prometheus/testdata/conflict_type_histogram_and_updowncounter_2.txt index 8e16f340862..523beabcb62 100644 --- a/exporters/prometheus/testdata/conflict_type_histogram_and_updowncounter_2.txt +++ b/exporters/prometheus/testdata/conflict_type_histogram_and_updowncounter_2.txt @@ -18,9 +18,6 @@ foo_bytes_bucket{A="B",le="10000",otel_scope_name="ma",otel_scope_version="v0.1. foo_bytes_bucket{A="B",le="+Inf",otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 foo_bytes_sum{A="B",otel_scope_name="ma",otel_scope_version="v0.1.0"} 100 foo_bytes_count{A="B",otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/conflict_unit_two_counters.txt b/exporters/prometheus/testdata/conflict_unit_two_counters.txt index 21bf84e5b46..3701f8211a3 100644 --- a/exporters/prometheus/testdata/conflict_unit_two_counters.txt +++ b/exporters/prometheus/testdata/conflict_unit_two_counters.txt @@ -2,10 +2,6 @@ # TYPE bar_total counter bar_total{otel_scope_name="ma",otel_scope_version="v0.1.0",type="bar"} 100 bar_total{otel_scope_name="mb",otel_scope_version="v0.1.0",type="bar"} 100 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 -otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/conflict_unit_two_histograms.txt b/exporters/prometheus/testdata/conflict_unit_two_histograms.txt index 81b231e9823..3b0d58c6a8a 100644 --- a/exporters/prometheus/testdata/conflict_unit_two_histograms.txt +++ b/exporters/prometheus/testdata/conflict_unit_two_histograms.txt @@ -36,10 +36,6 @@ bar_bucket{A="B",le="10000",otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 bar_bucket{A="B",le="+Inf",otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 bar_sum{A="B",otel_scope_name="mb",otel_scope_version="v0.1.0"} 100 bar_count{A="B",otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 -otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/conflict_unit_two_updowncounters.txt b/exporters/prometheus/testdata/conflict_unit_two_updowncounters.txt index 8f795073906..d681fdd1de2 100644 --- a/exporters/prometheus/testdata/conflict_unit_two_updowncounters.txt +++ b/exporters/prometheus/testdata/conflict_unit_two_updowncounters.txt @@ -2,10 +2,6 @@ # TYPE bar gauge bar{otel_scope_name="ma",otel_scope_version="v0.1.0",type="bar"} 100 bar{otel_scope_name="mb",otel_scope_version="v0.1.0",type="bar"} 100 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 -otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/counter.txt b/exporters/prometheus/testdata/counter.txt index d654ac16df1..ca83ae63d04 100755 --- a/exporters/prometheus/testdata/counter.txt +++ b/exporters/prometheus/testdata/counter.txt @@ -1,10 +1,7 @@ # HELP foo_seconds_total a simple counter # TYPE foo_seconds_total counter -foo_seconds_total{A="B",C="D",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 -foo_seconds_total{A="D",C="B",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 5 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +foo_seconds_total{A="B",C="D",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 +foo_seconds_total{A="D",C="B",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 5 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/counter_disabled_suffix.txt b/exporters/prometheus/testdata/counter_disabled_suffix.txt index d7411b12df3..e16c8181e93 100755 --- a/exporters/prometheus/testdata/counter_disabled_suffix.txt +++ b/exporters/prometheus/testdata/counter_disabled_suffix.txt @@ -1,10 +1,7 @@ # HELP foo_seconds a simple counter without a total suffix # TYPE foo_seconds counter -foo_seconds{A="B",C="D",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 -foo_seconds{A="D",C="B",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 5 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +foo_seconds{A="B",C="D",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 +foo_seconds{A="D",C="B",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 5 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/counter_utf8.txt b/exporters/prometheus/testdata/counter_utf8.txt index a3acdcc3bd1..12035839582 100755 --- a/exporters/prometheus/testdata/counter_utf8.txt +++ b/exporters/prometheus/testdata/counter_utf8.txt @@ -1,10 +1,7 @@ # HELP "foo.things_seconds_total" a simple counter # TYPE "foo.things_seconds_total" counter -{"foo.things_seconds_total","A.G"="B","C.H"="D","E.I"="true","F.J"="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 -{"foo.things_seconds_total","A.G"="D","C.H"="B","E.I"="true","F.J"="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 5 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +{"foo.things_seconds_total","A.G"="B","C.H"="D","E.I"="true","F.J"="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 +{"foo.things_seconds_total","A.G"="D","C.H"="B","E.I"="true","F.J"="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 5 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/counter_with_unit_suffix.txt b/exporters/prometheus/testdata/counter_with_unit_suffix.txt index 8bef333ac54..c34307e01e8 100755 --- a/exporters/prometheus/testdata/counter_with_unit_suffix.txt +++ b/exporters/prometheus/testdata/counter_with_unit_suffix.txt @@ -1,10 +1,7 @@ # HELP "foo.seconds_total" a simple counter # TYPE "foo.seconds_total" counter -{"foo.seconds_total",A="B",C="D",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 -{"foo.seconds_total",A="D",C="B",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 5 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +{"foo.seconds_total",A="B",C="D",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 +{"foo.seconds_total",A="D",C="B",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 5 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/custom_resource.txt b/exporters/prometheus/testdata/custom_resource.txt index e52c07074e9..211e9c88c84 100755 --- a/exporters/prometheus/testdata/custom_resource.txt +++ b/exporters/prometheus/testdata/custom_resource.txt @@ -1,9 +1,6 @@ # HELP foo_total a simple counter # TYPE foo_total counter -foo_total{A="B",C="D",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +foo_total{A="B",C="D",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 # HELP target_info Target metadata # TYPE target_info gauge target_info{A="B",C="D","service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/empty_resource.txt b/exporters/prometheus/testdata/empty_resource.txt index 5dbcfb3b8a4..c8ef680a6b7 100755 --- a/exporters/prometheus/testdata/empty_resource.txt +++ b/exporters/prometheus/testdata/empty_resource.txt @@ -1,9 +1,6 @@ # HELP foo_total a simple counter # TYPE foo_total counter -foo_total{A="B",C="D",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +foo_total{A="B",C="D",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 # HELP target_info Target metadata # TYPE target_info gauge target_info 1 diff --git a/exporters/prometheus/testdata/exponential_histogram.txt b/exporters/prometheus/testdata/exponential_histogram.txt index 419107a7e91..c6eae9831b1 100644 --- a/exporters/prometheus/testdata/exponential_histogram.txt +++ b/exporters/prometheus/testdata/exponential_histogram.txt @@ -1,11 +1,8 @@ # HELP exponential_histogram_baz_bytes a very nice histogram # TYPE exponential_histogram_baz_bytes histogram -exponential_histogram_baz_bytes_bucket{A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="+Inf"} 4 -exponential_histogram_baz_bytes_sum{A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 236 -exponential_histogram_baz_bytes_count{A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 4 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +exponential_histogram_baz_bytes_bucket{A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="+Inf"} 4 +exponential_histogram_baz_bytes_sum{A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 236 +exponential_histogram_baz_bytes_count{A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 4 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/gauge.txt b/exporters/prometheus/testdata/gauge.txt index 719e38adc84..24db6da2538 100644 --- a/exporters/prometheus/testdata/gauge.txt +++ b/exporters/prometheus/testdata/gauge.txt @@ -1,9 +1,6 @@ # HELP bar_ratio a fun little gauge # TYPE bar_ratio gauge -bar_ratio{A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} .75 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +bar_ratio{A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} .75 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/histogram.txt b/exporters/prometheus/testdata/histogram.txt index c38b206cd14..ba1bcd1f878 100644 --- a/exporters/prometheus/testdata/histogram.txt +++ b/exporters/prometheus/testdata/histogram.txt @@ -1,21 +1,18 @@ # HELP histogram_baz_bytes a very nice histogram # TYPE histogram_baz_bytes histogram -histogram_baz_bytes_bucket{A="B",C="D",le="0",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 0 -histogram_baz_bytes_bucket{A="B",C="D",le="5",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 0 -histogram_baz_bytes_bucket{A="B",C="D",le="10",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 -histogram_baz_bytes_bucket{A="B",C="D",le="25",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 2 -histogram_baz_bytes_bucket{A="B",C="D",le="50",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 2 -histogram_baz_bytes_bucket{A="B",C="D",le="75",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 2 -histogram_baz_bytes_bucket{A="B",C="D",le="100",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 2 -histogram_baz_bytes_bucket{A="B",C="D",le="250",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 4 -histogram_baz_bytes_bucket{A="B",C="D",le="500",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 4 -histogram_baz_bytes_bucket{A="B",C="D",le="1000",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 4 -histogram_baz_bytes_bucket{A="B",C="D",le="+Inf",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 4 -histogram_baz_bytes_sum{A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 236 -histogram_baz_bytes_count{A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 4 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +histogram_baz_bytes_bucket{A="B",C="D",le="0", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 0 +histogram_baz_bytes_bucket{A="B",C="D",le="5", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 0 +histogram_baz_bytes_bucket{A="B",C="D",le="10", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +histogram_baz_bytes_bucket{A="B",C="D",le="25", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 2 +histogram_baz_bytes_bucket{A="B",C="D",le="50", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 2 +histogram_baz_bytes_bucket{A="B",C="D",le="75", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 2 +histogram_baz_bytes_bucket{A="B",C="D",le="100", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 2 +histogram_baz_bytes_bucket{A="B",C="D",le="250", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 4 +histogram_baz_bytes_bucket{A="B",C="D",le="500", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 4 +histogram_baz_bytes_bucket{A="B",C="D",le="1000", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 4 +histogram_baz_bytes_bucket{A="B",C="D",le="+Inf", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 4 +histogram_baz_bytes_sum{A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 236 +histogram_baz_bytes_count{A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 4 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/multi_scopes.txt b/exporters/prometheus/testdata/multi_scopes.txt index 403672d89af..58a0e13da3e 100644 --- a/exporters/prometheus/testdata/multi_scopes.txt +++ b/exporters/prometheus/testdata/multi_scopes.txt @@ -4,10 +4,6 @@ bar_seconds_total{otel_scope_name="meterbar",otel_scope_version="v0.1.0",type="b # HELP foo_seconds_total meter foo counter # TYPE foo_seconds_total counter foo_seconds_total{otel_scope_name="meterfoo",otel_scope_version="v0.1.0",type="foo"} 100 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="meterfoo",otel_scope_version="v0.1.0"} 1 -otel_scope_info{otel_scope_name="meterbar",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/no_conflict_two_counters.txt b/exporters/prometheus/testdata/no_conflict_two_counters.txt index 2bb6da76728..0ee453eff50 100644 --- a/exporters/prometheus/testdata/no_conflict_two_counters.txt +++ b/exporters/prometheus/testdata/no_conflict_two_counters.txt @@ -2,10 +2,6 @@ # TYPE foo_bytes_total counter foo_bytes_total{A="B",otel_scope_name="ma",otel_scope_version="v0.1.0"} 100 foo_bytes_total{A="B",otel_scope_name="mb",otel_scope_version="v0.1.0"} 100 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 -otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/no_conflict_two_histograms.txt b/exporters/prometheus/testdata/no_conflict_two_histograms.txt index 39252257420..207240fb16e 100644 --- a/exporters/prometheus/testdata/no_conflict_two_histograms.txt +++ b/exporters/prometheus/testdata/no_conflict_two_histograms.txt @@ -36,10 +36,6 @@ foo_bytes_bucket{A="B",le="10000",otel_scope_name="mb",otel_scope_version="v0.1. foo_bytes_bucket{A="B",le="+Inf",otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 foo_bytes_sum{A="B",otel_scope_name="mb",otel_scope_version="v0.1.0"} 100 foo_bytes_count{A="B",otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 -otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/no_conflict_two_updowncounters.txt b/exporters/prometheus/testdata/no_conflict_two_updowncounters.txt index 96a1f7a665f..bc9373b47c5 100644 --- a/exporters/prometheus/testdata/no_conflict_two_updowncounters.txt +++ b/exporters/prometheus/testdata/no_conflict_two_updowncounters.txt @@ -2,10 +2,6 @@ # TYPE foo_bytes gauge foo_bytes{A="B",otel_scope_name="ma",otel_scope_version="v0.1.0"} 100 foo_bytes{A="B",otel_scope_name="mb",otel_scope_version="v0.1.0"} 100 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1 -otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/non_monotonic_sum_does_not_add_exemplars.txt b/exporters/prometheus/testdata/non_monotonic_sum_does_not_add_exemplars.txt index 3bf851e4d4c..b848d6e3fed 100644 --- a/exporters/prometheus/testdata/non_monotonic_sum_does_not_add_exemplars.txt +++ b/exporters/prometheus/testdata/non_monotonic_sum_does_not_add_exemplars.txt @@ -1,10 +1,7 @@ # HELP foo_seconds a simple up down counter # TYPE foo_seconds gauge -foo_seconds{A="B",C="D",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 23.3 -foo_seconds{A="D",C="B",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 5 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +foo_seconds{A="B",C="D",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 23.3 +foo_seconds{A="D",C="B",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 5 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/sanitized_labels.txt b/exporters/prometheus/testdata/sanitized_labels.txt index 38d755cb50c..731cacf18af 100755 --- a/exporters/prometheus/testdata/sanitized_labels.txt +++ b/exporters/prometheus/testdata/sanitized_labels.txt @@ -1,9 +1,6 @@ # HELP foo_total a sanitary counter # TYPE foo_total counter -foo_total{A_B="Q",C_D="Y;Z",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +foo_total{A_B="Q",C_D="Y;Z", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 # HELP target_info Target metadata # TYPE target_info gauge target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1 diff --git a/exporters/prometheus/testdata/sanitized_names.txt b/exporters/prometheus/testdata/sanitized_names.txt index f7374017b4e..5914b879e6b 100644 --- a/exporters/prometheus/testdata/sanitized_names.txt +++ b/exporters/prometheus/testdata/sanitized_names.txt @@ -1,35 +1,32 @@ # HELP bar a fun little gauge # TYPE bar gauge -bar{A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 75 +bar{A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 75 # HELP "0invalid.counter.name_total" a counter with an invalid name # TYPE "0invalid.counter.name_total" counter -{"0invalid.counter.name_total",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 100 +{"0invalid.counter.name_total",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 100 # HELP "invalid.gauge.name" a gauge with an invalid name # TYPE "invalid.gauge.name" gauge -{"invalid.gauge.name",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 100 +{"invalid.gauge.name",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 100 # HELP "invalid.hist.name" a histogram with an invalid name # TYPE "invalid.hist.name" histogram -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="0"} 0 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="5"} 0 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="10"} 0 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="25"} 1 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="50"} 1 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="75"} 1 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="100"} 1 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="250"} 1 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="500"} 1 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="750"} 1 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="1000"} 1 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="2500"} 1 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="5000"} 1 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="7500"} 1 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="10000"} 1 -{"invalid.hist.name_bucket",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="+Inf"} 1 -{"invalid.hist.name_sum",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 23 -{"invalid.hist.name_count",A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="0"} 0 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="5"} 0 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="10"} 0 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="25"} 1 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="50"} 1 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="75"} 1 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="100"} 1 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="250"} 1 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="500"} 1 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="750"} 1 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="1000"} 1 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="2500"} 1 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="5000"} 1 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="7500"} 1 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="10000"} 1 +{"invalid.hist.name_bucket",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0",le="+Inf"} 1 +{"invalid.hist.name_sum",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 23 +{"invalid.hist.name_count",A="B",C="D", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/with_allow_resource_attributes_filter.txt b/exporters/prometheus/testdata/with_allow_resource_attributes_filter.txt index d7d5cebf439..a260163f8f6 100755 --- a/exporters/prometheus/testdata/with_allow_resource_attributes_filter.txt +++ b/exporters/prometheus/testdata/with_allow_resource_attributes_filter.txt @@ -1,9 +1,6 @@ # HELP foo_total a simple counter # TYPE foo_total counter -foo_total{A="B",C="D",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0","service.name"="prometheus_test"} 16.2 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +foo_total{A="B",C="D",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0","service.name"="prometheus_test"} 16.2 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/with_namespace.txt b/exporters/prometheus/testdata/with_namespace.txt index b55dd4c7377..bb81162ec1f 100755 --- a/exporters/prometheus/testdata/with_namespace.txt +++ b/exporters/prometheus/testdata/with_namespace.txt @@ -1,9 +1,6 @@ # HELP test_foo_total a simple counter # TYPE test_foo_total counter -test_foo_total{A="B",C="D",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +test_foo_total{A="B",C="D",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/with_resource_attributes_filter.txt b/exporters/prometheus/testdata/with_resource_attributes_filter.txt index e68ac8f5f80..509e3cdcc5a 100755 --- a/exporters/prometheus/testdata/with_resource_attributes_filter.txt +++ b/exporters/prometheus/testdata/with_resource_attributes_filter.txt @@ -1,9 +1,6 @@ # HELP foo_total a simple counter # TYPE foo_total counter -foo_total{A="B",C="D",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0","service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 24.9 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +foo_total{A="B",C="D",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0","service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 24.9 # HELP target_info Target metadata # TYPE target_info gauge target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1 diff --git a/exporters/prometheus/testdata/without_target_info.txt b/exporters/prometheus/testdata/without_target_info.txt index eafb7e20424..3c78bfc07b2 100755 --- a/exporters/prometheus/testdata/without_target_info.txt +++ b/exporters/prometheus/testdata/without_target_info.txt @@ -1,6 +1,3 @@ # HELP foo_total a simple counter # TYPE foo_total counter -foo_total{A="B",C="D",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3 -# HELP otel_scope_info Instrumentation Scope metadata -# TYPE otel_scope_info gauge -otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1 +foo_total{A="B",C="D",E="true",F="42", otel_scope_fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3