Skip to content

Commit 2729657

Browse files
pellaredpellared
authored
Merge branch 'main' into logtest-redesign-2ed
2 parents ecbd5f4 + 7111f2c commit 2729657

35 files changed

+84
-68
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
2525
- Remove `ScopeRecords`, `EmittedRecord`, `RecordFactory` types from `go.opentelemetry.io/otel/log/logtest`. (#6342)
2626
- Remove `AssertRecordEqual` function from `go.opentelemetry.io/otel/log/logtest`. (#6342)
2727

28+
### Changed
29+
30+
- ⚠️ Update `github.com/prometheus/client_golang` to `v1.21.1`, which changes the `NameValidationScheme` to `UTF8Validation`.
31+
This allows metrics names to keep original delimiters (e.g. `.`), rather than replacing with underscores.
32+
This can be reverted by setting `github.com/prometheus/common/model.NameValidationScheme` to `LegacyValidation` in `github.com/prometheus/common/model`. (#6433)
33+
2834
### Fixes
2935

3036
- Stop percent encoding header environment variables in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc` and `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`. (#6392)

‎exporters/prometheus/exporter_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestPrometheusExporter(t *testing.T) {
6868
},
6969
{
7070
name: "counter that already has the unit suffix",
71-
expectedFile: "testdata/counter.txt",
71+
expectedFile: "testdata/counter_with_unit_suffix.txt",
7272
recordMetrics: func(ctx context.Context, meter otelmetric.Meter) {
7373
opt := otelmetric.WithAttributes(
7474
attribute.Key("A").String("B"),

‎exporters/prometheus/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module go.opentelemetry.io/otel/exporters/prometheus
33
go 1.23.0
44

55
require (
6-
github.com/prometheus/client_golang v1.20.5
6+
github.com/prometheus/client_golang v1.21.1
77
github.com/prometheus/client_model v0.6.1
88
github.com/prometheus/common v0.62.0
99
github.com/stretchr/testify v1.10.0
@@ -25,7 +25,7 @@ require (
2525
github.com/kylelemons/godebug v1.1.0 // indirect
2626
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2727
github.com/pmezard/go-difflib v1.0.0 // indirect
28-
github.com/prometheus/procfs v0.15.1 // indirect
28+
github.com/prometheus/procfs v0.16.0 // indirect
2929
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
3030
golang.org/x/sys v0.31.0 // indirect
3131
gopkg.in/yaml.v3 v3.0.1 // indirect

‎exporters/prometheus/go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
1313
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
1414
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
1515
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
16-
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
17-
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
16+
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
17+
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
1818
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
1919
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
2020
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -25,14 +25,14 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
2525
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
2626
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2727
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
28-
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
29-
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
28+
github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
29+
github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
3030
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
3131
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
3232
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
3333
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
34-
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
35-
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
34+
github.com/prometheus/procfs v0.16.0 h1:xh6oHhKwnOJKMYiYBDWmkHqQPyiY40sny36Cmx2bbsM=
35+
github.com/prometheus/procfs v0.16.0/go.mod h1:8veyXUu3nGP7oaCxhX6yeaM5u4stL2FeMXnCqhDthZg=
3636
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
3737
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
3838
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=

‎exporters/prometheus/testdata/conflict_help_two_counters_1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
88
otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1
99
# HELP target_info Target metadata
1010
# TYPE target_info gauge
11-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
11+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/conflict_help_two_counters_2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
88
otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1
99
# HELP target_info Target metadata
1010
# TYPE target_info gauge
11-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
11+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/conflict_help_two_histograms_1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
4242
otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1
4343
# HELP target_info Target metadata
4444
# TYPE target_info gauge
45-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
45+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/conflict_help_two_histograms_2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
4242
otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1
4343
# HELP target_info Target metadata
4444
# TYPE target_info gauge
45-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
45+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/conflict_help_two_updowncounters_1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
88
otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1
99
# HELP target_info Target metadata
1010
# TYPE target_info gauge
11-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
11+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/conflict_help_two_updowncounters_2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
88
otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1
99
# HELP target_info Target metadata
1010
# TYPE target_info gauge
11-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
11+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/conflict_type_counter_and_updowncounter_1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ foo_total{otel_scope_name="ma",otel_scope_version="v0.1.0",type="foo"} 100
66
otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
77
# HELP target_info Target metadata
88
# TYPE target_info gauge
9-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
9+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/conflict_type_counter_and_updowncounter_2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ foo_total{otel_scope_name="ma",otel_scope_version="v0.1.0",type="foo"} 100
66
otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
77
# HELP target_info Target metadata
88
# TYPE target_info gauge
9-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
9+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/conflict_type_histogram_and_updowncounter_1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ foo_bytes{A="B",otel_scope_name="ma",otel_scope_version="v0.1.0"} 100
66
otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
77
# HELP target_info Target metadata
88
# TYPE target_info gauge
9-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
9+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/conflict_type_histogram_and_updowncounter_2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ foo_bytes_count{A="B",otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
2323
otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
2424
# HELP target_info Target metadata
2525
# TYPE target_info gauge
26-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
26+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/conflict_unit_two_counters.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
88
otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1
99
# HELP target_info Target metadata
1010
# TYPE target_info gauge
11-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
11+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/conflict_unit_two_histograms.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
4242
otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1
4343
# HELP target_info Target metadata
4444
# TYPE target_info gauge
45-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
45+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/conflict_unit_two_updowncounters.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
88
otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1
99
# HELP target_info Target metadata
1010
# TYPE target_info gauge
11-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
11+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/counter.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ foo_seconds_total{A="D",C="B",E="true",F="42",otel_scope_name="testmeter",otel_s
77
otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1
88
# HELP target_info Target metadata
99
# TYPE target_info gauge
10-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
10+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/counter_disabled_suffix.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ foo_seconds{A="D",C="B",E="true",F="42",otel_scope_name="testmeter",otel_scope_v
77
otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1
88
# HELP target_info Target metadata
99
# TYPE target_info gauge
10-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
10+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/counter_with_unit_suffix.txt

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# HELP "foo.seconds_total" a simple counter
2+
# TYPE "foo.seconds_total" counter
3+
{"foo.seconds_total",A="B",C="D",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 24.3
4+
{"foo.seconds_total",A="D",C="B",E="true",F="42",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 5
5+
# HELP otel_scope_info Instrumentation Scope metadata
6+
# TYPE otel_scope_info gauge
7+
otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1
8+
# HELP target_info Target metadata
9+
# TYPE target_info gauge
10+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/custom_resource.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ foo_total{A="B",C="D",E="true",F="42",otel_scope_name="testmeter",otel_scope_ver
66
otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1
77
# HELP target_info Target metadata
88
# TYPE target_info gauge
9-
target_info{A="B",C="D",service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
9+
target_info{A="B",C="D","service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/gauge.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ bar_ratio{A="B",C="D",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} .
66
otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1
77
# HELP target_info Target metadata
88
# TYPE target_info gauge
9-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
9+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/histogram.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ histogram_baz_bytes_count{A="B",C="D",otel_scope_name="testmeter",otel_scope_ver
1818
otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1
1919
# HELP target_info Target metadata
2020
# TYPE target_info gauge
21-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
21+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/multi_scopes.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ otel_scope_info{otel_scope_name="meterfoo",otel_scope_version="v0.1.0"} 1
1010
otel_scope_info{otel_scope_name="meterbar",otel_scope_version="v0.1.0"} 1
1111
# HELP target_info Target metadata
1212
# TYPE target_info gauge
13-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
13+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/no_conflict_two_counters.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
88
otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1
99
# HELP target_info Target metadata
1010
# TYPE target_info gauge
11-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
11+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/no_conflict_two_histograms.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
4242
otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1
4343
# HELP target_info Target metadata
4444
# TYPE target_info gauge
45-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
45+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/no_conflict_two_updowncounters.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ otel_scope_info{otel_scope_name="ma",otel_scope_version="v0.1.0"} 1
88
otel_scope_info{otel_scope_name="mb",otel_scope_version="v0.1.0"} 1
99
# HELP target_info Target metadata
1010
# TYPE target_info gauge
11-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
11+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

‎exporters/prometheus/testdata/non_monotonic_sum_does_not_add_exemplars.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ foo_seconds{A="D",C="B",E="true",F="42",otel_scope_name="testmeter",otel_scope_v
77
otel_scope_info{fizz="buzz",otel_scope_name="testmeter",otel_scope_version="v0.1.0"} 1
88
# HELP target_info Target metadata
99
# TYPE target_info gauge
10-
target_info{service_name="prometheus_test",telemetry_sdk_language="go",telemetry_sdk_name="opentelemetry",telemetry_sdk_version="latest"} 1
10+
target_info{"service.name"="prometheus_test","telemetry.sdk.language"="go","telemetry.sdk.name"="opentelemetry","telemetry.sdk.version"="latest"} 1

0 commit comments

Comments
 (0)