Skip to content

Commit 59b5328

Browse files
songy23mx-psicodeboten
authored
cherry-pick of open-telemetry@d82267d `go.opentelemetry.io/otel/exporters/prometheus v0.59.1` does not fully fix the metric name issue so we have to revert to v0.58.0 Downgrades opentelemetry-go dependencies effectively reverting open-telemetry#13289 and others - Due to a [bug](open-telemetry/opentelemetry-go#7039) in the prometheus exporter, if you are configuring a prometheus exporter, the collector's internal metrics will be emitted with an unexpected suffix in its name. For example, the metric `otelcol_exporter_sent_spans__spans__total` instead of `otelcol_exporter_sent_spans_total`. The workaround is to manually configure `without_units: true` in your prometheus exporter config ```yaml service: telemetry: metrics: readers: - pull: exporter: prometheus: host: 0.0.0.0 port: 8888 without_units: true ``` If you are using the collector's default Prometheus exporter for exporting internal metrics you are unaffected. Signed-off-by: alex boten <[email protected]> Co-authored-by: Pablo Baeyens <[email protected]> Co-authored-by: alex boten <[email protected]>
1 parent f68d710 commit 59b5328

File tree

100 files changed

+364
-351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+364
-351
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: service
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Downgrade dependency of prometheus exporter in OTel Go SDK
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [13429]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext: This fixes the bug where collector's internal metrics are emitted with an unexpected suffix in their names when users configure the service::telemetry::metrics::readers with Prometheus
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: 'bug_fix'
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: service
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Revert Default internal metrics config now enables `otel_scope_` labels
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12939, 13344]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext: Reverting change temporarily due to prometheus exporter downgrade. This unfortunately re-introduces the bug that instrumentation scope attributes cause errors in Prometheus exporter. See http://github.com/open-telemetry/opentelemetry-collector/issues/12939 for details.
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []

cmd/mdatagen/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
go.opentelemetry.io/collector/scraper/scrapertest v0.130.1
2626
go.opentelemetry.io/otel v1.37.0
2727
go.opentelemetry.io/otel/metric v1.37.0
28-
go.opentelemetry.io/otel/sdk/metric v1.37.0
28+
go.opentelemetry.io/otel/sdk/metric v1.36.0
2929
go.opentelemetry.io/otel/trace v1.37.0
3030
go.uber.org/goleak v1.3.0
3131
go.uber.org/zap v1.27.0
@@ -67,7 +67,7 @@ require (
6767
go.opentelemetry.io/collector/receiver/xreceiver v0.130.1 // indirect
6868
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
6969
go.opentelemetry.io/otel/log v0.13.0 // indirect
70-
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
70+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
7171
go.uber.org/multierr v1.11.0 // indirect
7272
go.yaml.in/yaml/v3 v3.0.4 // indirect
7373
golang.org/x/net v0.40.0 // indirect

cmd/mdatagen/go.sum

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcorecol/go.mod

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ require (
5252
github.com/golang/snappy v1.0.0 // indirect
5353
github.com/google/go-tpm v0.9.5 // indirect
5454
github.com/google/uuid v1.6.0 // indirect
55-
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
5655
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
5756
github.com/hashicorp/go-version v1.7.0 // indirect
5857
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -74,7 +73,6 @@ require (
7473
github.com/prometheus/client_golang v1.22.0 // indirect
7574
github.com/prometheus/client_model v0.6.2 // indirect
7675
github.com/prometheus/common v0.65.0 // indirect
77-
github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f // indirect
7876
github.com/prometheus/procfs v0.17.0 // indirect
7977
github.com/rs/cors v1.11.1 // indirect
8078
github.com/shirou/gopsutil/v4 v4.25.6 // indirect
@@ -139,8 +137,8 @@ require (
139137
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
140138
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 // indirect
141139
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
142-
go.opentelemetry.io/contrib/otelconf v0.17.0 // indirect
143-
go.opentelemetry.io/contrib/propagators/b3 v1.37.0 // indirect
140+
go.opentelemetry.io/contrib/otelconf v0.16.0 // indirect
141+
go.opentelemetry.io/contrib/propagators/b3 v1.36.0 // indirect
144142
go.opentelemetry.io/contrib/zpages v0.62.0 // indirect
145143
go.opentelemetry.io/otel v1.37.0 // indirect
146144
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.13.0 // indirect
@@ -150,7 +148,7 @@ require (
150148
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
151149
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
152150
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 // indirect
153-
go.opentelemetry.io/otel/exporters/prometheus v0.59.1 // indirect
151+
go.opentelemetry.io/otel/exporters/prometheus v0.58.0 // indirect
154152
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.13.0 // indirect
155153
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.37.0 // indirect
156154
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.37.0 // indirect

cmd/otelcorecol/go.sum

Lines changed: 6 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

component/componentstatus/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
go.opentelemetry.io/otel v1.37.0 // indirect
2525
go.opentelemetry.io/otel/log v0.13.0 // indirect
2626
go.opentelemetry.io/otel/metric v1.37.0 // indirect
27-
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
27+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
2828
go.opentelemetry.io/otel/trace v1.37.0 // indirect
2929
go.uber.org/multierr v1.11.0 // indirect
3030
go.uber.org/zap v1.27.0 // indirect

component/componentstatus/go.sum

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

component/componenttest/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ require (
77
go.opentelemetry.io/collector/component v1.36.1
88
go.opentelemetry.io/collector/pdata v1.36.1
99
go.opentelemetry.io/otel/metric v1.37.0
10-
go.opentelemetry.io/otel/sdk v1.37.0
11-
go.opentelemetry.io/otel/sdk/metric v1.37.0
10+
go.opentelemetry.io/otel/sdk v1.36.0
11+
go.opentelemetry.io/otel/sdk/metric v1.36.0
1212
go.opentelemetry.io/otel/trace v1.37.0
1313
go.uber.org/goleak v1.3.0
1414
go.uber.org/multierr v1.11.0

component/componenttest/go.sum

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)