Skip to content

Commit dc411e3

Browse files
dashpolecodeboten
dashpole
and
codeboten
authored
Give NoOp create settings a unique name (open-telemetry#9637)
Long story, but i'm working on updating the prometheus dependency: open-telemetry/opentelemetry-collector-contrib#30934 As part of that update, we need to adapt to a change that makes the prometheus servers' self-observability metrics independent. See prometheus/prometheus#13507 and prometheus/prometheus#13610 One way to adapt to this change is by adding a label to each receivers' metrics to differentiate one Prometheus receiver from another. I've tried taking that approach in open-telemetry/opentelemetry-collector-contrib#30934, but the current issue is that the NoOp components all have the same name, which causes the self-observability metrics to collide. I can work around this in the prometheus receiver's own tests, but I can't work around the issue in the `generated_component_test.go` tests, since those are generated. This PR makes the ID returned by `NewNopCreateSettings` unique by giving it a unique name. **Link to tracking Issue:** Part of open-telemetry/opentelemetry-collector-contrib#30883 cc @Aneurysm9 --------- Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>
1 parent bc4ebbb commit dc411e3

File tree

42 files changed

+94
-5
lines changed

Some content is hidden

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

42 files changed

+94
-5
lines changed

‎.chloggen/unique-noop-name.yaml

+25
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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: components
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Give NoOp components a unique name
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [9637]
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:
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

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ require (
2929
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
3030
github.com/gogo/protobuf v1.3.2 // indirect
3131
github.com/golang/protobuf v1.5.3 // indirect
32+
github.com/google/uuid v1.6.0 // indirect
3233
github.com/json-iterator/go v1.1.12 // indirect
3334
github.com/knadh/koanf/maps v0.1.1 // indirect
3435
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect

‎cmd/mdatagen/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎connector/connectortest/connector.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ package connectortest // import "go.opentelemetry.io/collector/connector/connect
66
import (
77
"context"
88

9+
"github.com/google/uuid"
10+
911
"go.opentelemetry.io/collector/component"
1012
"go.opentelemetry.io/collector/component/componenttest"
1113
"go.opentelemetry.io/collector/connector"
@@ -18,7 +20,7 @@ var nopType = component.MustNewType("nop")
1820
// NewNopCreateSettings returns a new nop settings for Create* functions.
1921
func NewNopCreateSettings() connector.CreateSettings {
2022
return connector.CreateSettings{
21-
ID: component.NewID(nopType),
23+
ID: component.NewIDWithName(nopType, uuid.NewString()),
2224
TelemetrySettings: componenttest.NewNopTelemetrySettings(),
2325
BuildInfo: component.NewDefaultBuildInfo(),
2426
}

‎connector/forwardconnector/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ require (
2323
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
2424
github.com/gogo/protobuf v1.3.2 // indirect
2525
github.com/golang/protobuf v1.5.3 // indirect
26+
github.com/google/uuid v1.6.0 // indirect
2627
github.com/json-iterator/go v1.1.12 // indirect
2728
github.com/knadh/koanf/maps v0.1.1 // indirect
2829
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect

‎connector/forwardconnector/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎connector/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module go.opentelemetry.io/collector/connector
33
go 1.21
44

55
require (
6+
github.com/google/uuid v1.6.0
67
github.com/stretchr/testify v1.9.0
78
go.opentelemetry.io/collector v0.96.0
89
go.opentelemetry.io/collector/component v0.96.0

‎connector/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/debugexporter/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ require (
2424
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
2525
github.com/gogo/protobuf v1.3.2 // indirect
2626
github.com/golang/protobuf v1.5.3 // indirect
27+
github.com/google/uuid v1.6.0 // indirect
2728
github.com/json-iterator/go v1.1.12 // indirect
2829
github.com/knadh/koanf/maps v0.1.1 // indirect
2930
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect

‎exporter/debugexporter/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/exportertest/nop_exporter.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ package exportertest // import "go.opentelemetry.io/collector/exporter/exportert
66
import (
77
"context"
88

9+
"github.com/google/uuid"
10+
911
"go.opentelemetry.io/collector/component"
1012
"go.opentelemetry.io/collector/component/componenttest"
1113
"go.opentelemetry.io/collector/consumer/consumertest"
@@ -17,7 +19,7 @@ var nopType = component.MustNewType("nop")
1719
// NewNopCreateSettings returns a new nop settings for Create*Exporter functions.
1820
func NewNopCreateSettings() exporter.CreateSettings {
1921
return exporter.CreateSettings{
20-
ID: component.NewID(nopType),
22+
ID: component.NewIDWithName(nopType, uuid.NewString()),
2123
TelemetrySettings: componenttest.NewNopTelemetrySettings(),
2224
BuildInfo: component.NewDefaultBuildInfo(),
2325
}

‎exporter/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ go 1.21
44

55
require (
66
github.com/cenkalti/backoff/v4 v4.2.1
7+
github.com/google/uuid v1.6.0
78
github.com/stretchr/testify v1.9.0
89
go.opentelemetry.io/collector v0.96.0
910
go.opentelemetry.io/collector/component v0.96.0

‎exporter/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/loggingexporter/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ require (
2626
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
2727
github.com/gogo/protobuf v1.3.2 // indirect
2828
github.com/golang/protobuf v1.5.3 // indirect
29+
github.com/google/uuid v1.6.0 // indirect
2930
github.com/json-iterator/go v1.1.12 // indirect
3031
github.com/knadh/koanf/maps v0.1.1 // indirect
3132
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect

‎exporter/loggingexporter/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/otlpexporter/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ require (
3737
github.com/gogo/protobuf v1.3.2 // indirect
3838
github.com/golang/protobuf v1.5.3 // indirect
3939
github.com/golang/snappy v0.0.4 // indirect
40+
github.com/google/uuid v1.6.0 // indirect
4041
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
4142
github.com/hashicorp/go-version v1.6.0 // indirect
4243
github.com/json-iterator/go v1.1.12 // indirect

‎exporter/otlpexporter/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/otlphttpexporter/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ require (
3737
github.com/gogo/protobuf v1.3.2 // indirect
3838
github.com/golang/protobuf v1.5.3 // indirect
3939
github.com/golang/snappy v0.0.4 // indirect
40+
github.com/google/uuid v1.6.0 // indirect
4041
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
4142
github.com/hashicorp/go-version v1.6.0 // indirect
4243
github.com/json-iterator/go v1.1.12 // indirect

‎exporter/otlphttpexporter/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extension/ballastextension/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ require (
2525
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
2626
github.com/gogo/protobuf v1.3.2 // indirect
2727
github.com/golang/protobuf v1.5.3 // indirect
28+
github.com/google/uuid v1.6.0 // indirect
2829
github.com/knadh/koanf/maps v0.1.1 // indirect
2930
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
3031
github.com/knadh/koanf/v2 v2.1.0 // indirect

‎extension/ballastextension/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extension/extensiontest/nop_extension.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ package extensiontest // import "go.opentelemetry.io/collector/extension/extensi
66
import (
77
"context"
88

9+
"github.com/google/uuid"
10+
911
"go.opentelemetry.io/collector/component"
1012
"go.opentelemetry.io/collector/component/componenttest"
1113
"go.opentelemetry.io/collector/extension"
@@ -16,7 +18,7 @@ var nopType = component.MustNewType("nop")
1618
// NewNopCreateSettings returns a new nop settings for extension.Factory Create* functions.
1719
func NewNopCreateSettings() extension.CreateSettings {
1820
return extension.CreateSettings{
19-
ID: component.NewID(nopType),
21+
ID: component.NewIDWithName(nopType, uuid.NewString()),
2022
TelemetrySettings: componenttest.NewNopTelemetrySettings(),
2123
BuildInfo: component.NewDefaultBuildInfo(),
2224
}

‎extension/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module go.opentelemetry.io/collector/extension
33
go 1.21
44

55
require (
6+
github.com/google/uuid v1.6.0
67
github.com/stretchr/testify v1.9.0
78
go.opentelemetry.io/collector/component v0.96.0
89
go.opentelemetry.io/collector/confmap v0.96.0

‎extension/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extension/memorylimiterextension/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ require (
2323
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
2424
github.com/gogo/protobuf v1.3.2 // indirect
2525
github.com/golang/protobuf v1.5.3 // indirect
26+
github.com/google/uuid v1.6.0 // indirect
2627
github.com/knadh/koanf/maps v0.1.1 // indirect
2728
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
2829
github.com/knadh/koanf/v2 v2.1.0 // indirect

‎extension/memorylimiterextension/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extension/zpagesextension/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ require (
2727
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
2828
github.com/gogo/protobuf v1.3.2 // indirect
2929
github.com/golang/protobuf v1.5.3 // indirect
30+
github.com/google/uuid v1.6.0 // indirect
3031
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
3132
github.com/knadh/koanf/maps v0.1.1 // indirect
3233
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect

‎extension/zpagesextension/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/e2e/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ require (
3333
github.com/gogo/protobuf v1.3.2 // indirect
3434
github.com/golang/protobuf v1.5.3 // indirect
3535
github.com/golang/snappy v0.0.4 // indirect
36+
github.com/google/uuid v1.6.0 // indirect
3637
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
3738
github.com/hashicorp/go-version v1.6.0 // indirect
3839
github.com/json-iterator/go v1.1.12 // indirect

‎internal/e2e/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎processor/batchprocessor/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ require (
3434
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
3535
github.com/gogo/protobuf v1.3.2 // indirect
3636
github.com/golang/protobuf v1.5.3 // indirect
37+
github.com/google/uuid v1.6.0 // indirect
3738
github.com/json-iterator/go v1.1.12 // indirect
3839
github.com/knadh/koanf/maps v0.1.1 // indirect
3940
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect

‎processor/batchprocessor/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎processor/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module go.opentelemetry.io/collector/processor
33
go 1.21
44

55
require (
6+
github.com/google/uuid v1.6.0
67
github.com/stretchr/testify v1.9.0
78
go.opentelemetry.io/collector v0.96.0
89
go.opentelemetry.io/collector/component v0.96.0

0 commit comments

Comments
 (0)