Skip to content

Commit 7a3e79d

Browse files
authored
[chore] simplify exporter code (#3642)
1 parent 4cfe94b commit 7a3e79d

File tree

2 files changed

+11
-33
lines changed

2 files changed

+11
-33
lines changed

internal/components/exporters/helpers.go

+2-23
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,8 @@ import (
88
)
99

1010
// registry holds a record of all known receiver parsers.
11-
var registry = make(map[string]components.Parser)
12-
13-
// Register adds a new parser builder to the list of known builders.
14-
func Register(name string, p components.Parser) {
15-
registry[name] = p
16-
}
17-
18-
// IsRegistered checks whether a parser is registered with the given name.
19-
func IsRegistered(name string) bool {
20-
_, ok := registry[name]
21-
return ok
11+
var registry = map[string]components.Parser{
12+
"prometheus": components.NewSinglePortParserBuilder("prometheus", 8888).MustBuild(),
2213
}
2314

2415
// ParserFor returns a parser builder for the given exporter name.
@@ -29,15 +20,3 @@ func ParserFor(name string) components.Parser {
2920
// We want the default for exporters to fail silently.
3021
return components.NewBuilder[any]().WithName(name).MustBuild()
3122
}
32-
33-
var (
34-
componentParsers = []components.Parser{
35-
components.NewSinglePortParserBuilder("prometheus", 8888).MustBuild(),
36-
}
37-
)
38-
39-
func init() {
40-
for _, parser := range componentParsers {
41-
Register(parser.ParserType(), parser)
42-
}
43-
}

internal/components/exporters/helpers_test.go

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
package exporters_test
4+
package exporters
55

66
import (
77
"testing"
@@ -10,13 +10,12 @@ import (
1010
"github.com/stretchr/testify/assert"
1111

1212
"github.com/open-telemetry/opentelemetry-operator/internal/components"
13-
"github.com/open-telemetry/opentelemetry-operator/internal/components/exporters"
1413
"github.com/open-telemetry/opentelemetry-operator/internal/naming"
1514
)
1615

1716
func TestParserForReturns(t *testing.T) {
1817
const testComponentName = "test"
19-
parser := exporters.ParserFor(testComponentName)
18+
parser := ParserFor(testComponentName)
2019
assert.Equal(t, "test", parser.ParserType())
2120
assert.Equal(t, "__test", parser.ParserName())
2221
ports, err := parser.Ports(logr.Discard(), testComponentName, map[string]interface{}{
@@ -28,9 +27,8 @@ func TestParserForReturns(t *testing.T) {
2827

2928
func TestCanRegister(t *testing.T) {
3029
const testComponentName = "test"
31-
exporters.Register(testComponentName, components.NewSinglePortParserBuilder(testComponentName, 9000).MustBuild())
32-
assert.True(t, exporters.IsRegistered(testComponentName))
33-
parser := exporters.ParserFor(testComponentName)
30+
registry[testComponentName] = components.NewSinglePortParserBuilder(testComponentName, 9000).MustBuild()
31+
parser := ParserFor(testComponentName)
3432
assert.Equal(t, "test", parser.ParserType())
3533
assert.Equal(t, "__test", parser.ParserName())
3634
ports, err := parser.Ports(logr.Discard(), testComponentName, map[string]interface{}{})
@@ -49,11 +47,12 @@ func TestExporterComponentParsers(t *testing.T) {
4947
} {
5048
t.Run(tt.exporterName, func(t *testing.T) {
5149
t.Run("is registered", func(t *testing.T) {
52-
assert.True(t, exporters.IsRegistered(tt.exporterName))
50+
_, ok := registry[tt.exporterName]
51+
assert.True(t, ok)
5352
})
5453
t.Run("bad config errors", func(t *testing.T) {
5554
// prepare
56-
parser := exporters.ParserFor(tt.exporterName)
55+
parser := ParserFor(tt.exporterName)
5756

5857
// test throwing in pure junk
5958
_, err := parser.Ports(logr.Discard(), tt.exporterName, func() {})
@@ -64,7 +63,7 @@ func TestExporterComponentParsers(t *testing.T) {
6463

6564
t.Run("assigns the expected port", func(t *testing.T) {
6665
// prepare
67-
parser := exporters.ParserFor(tt.exporterName)
66+
parser := ParserFor(tt.exporterName)
6867

6968
// test
7069
ports, err := parser.Ports(logr.Discard(), tt.exporterName, map[string]interface{}{})
@@ -82,7 +81,7 @@ func TestExporterComponentParsers(t *testing.T) {
8281

8382
t.Run("allows port to be overridden", func(t *testing.T) {
8483
// prepare
85-
parser := exporters.ParserFor(tt.exporterName)
84+
parser := ParserFor(tt.exporterName)
8685

8786
// test
8887
ports, err := parser.Ports(logr.Discard(), tt.exporterName, map[string]interface{}{

0 commit comments

Comments
 (0)