Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[service] use WithNamespace instead of WrapRegistererWithPrefix #8988

Merged
merged 4 commits into from
Nov 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .chloggen/codeboten_use-namespace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: service

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: use WithNamespace instead of WrapRegistererWithPrefix

# One or more tracking issues or pull requests related to the change
issues: [8988]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |
Using this functionality in the otel prom exporter fixes a bug where the
target_info was prefixed as otelcol_target_info previously.

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
4 changes: 2 additions & 2 deletions service/internal/proctelemetry/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,16 +203,16 @@ func initPrometheusExporter(prometheusConfig *config.Prometheus, asyncErrorChann
if prometheusConfig.Port == nil {
return nil, nil, fmt.Errorf("port must be specified")
}
wrappedRegisterer := prometheus.WrapRegistererWithPrefix("otelcol_", promRegistry)
exporter, err := otelprom.New(
otelprom.WithRegisterer(wrappedRegisterer),
otelprom.WithRegisterer(promRegistry),
// https://github.com/open-telemetry/opentelemetry-collector/issues/8043
otelprom.WithoutUnits(),
// Disabled for the moment until this becomes stable, and we are ready to break backwards compatibility.
otelprom.WithoutScopeInfo(),
otelprom.WithProducer(opencensus.NewMetricProducer()),
// This allows us to produce metrics that are backwards compatible w/ opencensus
otelprom.WithoutCounterSuffixes(),
otelprom.WithNamespace("otelcol"),
)
if err != nil {
return nil, nil, fmt.Errorf("error creating otel prometheus exporter: %w", err)
Expand Down
6 changes: 3 additions & 3 deletions service/telemetry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func TestTelemetryInit(t *testing.T) {
"net_host_port": "",
},
},
metricPrefix + "target_info": {
"target_info": {
value: 0,
labels: map[string]string{
"service_name": "otelcol",
Expand Down Expand Up @@ -180,7 +180,7 @@ func TestTelemetryInit(t *testing.T) {
value: 10,
labels: map[string]string{},
},
metricPrefix + "target_info": {
"target_info": {
value: 0,
labels: map[string]string{
"service_name": "otelcol",
Expand Down Expand Up @@ -236,7 +236,7 @@ func TestTelemetryInit(t *testing.T) {
"net_host_port": "",
},
},
metricPrefix + "target_info": {
"target_info": {
value: 0,
labels: map[string]string{
"service_name": "otelcol",
Expand Down
Loading