Skip to content

Commit a8bdd11

Browse files
authored
[chore] remove init function from prehook package (#3625)
* [chore] remove init function from prehook package * remove Register
1 parent 1a0a729 commit a8bdd11

File tree

2 files changed

+14
-29
lines changed

2 files changed

+14
-29
lines changed

cmd/otel-allocator/prehook/prehook.go

+3-22
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,12 @@
1515
package prehook
1616

1717
import (
18-
"errors"
19-
2018
"github.com/go-logr/logr"
2119
"github.com/prometheus/prometheus/model/relabel"
2220

2321
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
2422
)
2523

26-
const (
27-
relabelConfigTargetFilterName = "relabel-config"
28-
)
29-
3024
type Hook interface {
3125
Apply(map[string]*target.Item) map[string]*target.Item
3226
SetConfig(map[string][]*relabel.Config)
@@ -36,7 +30,9 @@ type Hook interface {
3630
type HookProvider func(log logr.Logger) Hook
3731

3832
var (
39-
registry = map[string]HookProvider{}
33+
registry = map[string]HookProvider{
34+
relabelConfigTargetFilterName: newRelabelConfigTargetFilter,
35+
}
4036
)
4137

4238
func New(name string, log logr.Logger) Hook {
@@ -47,18 +43,3 @@ func New(name string, log logr.Logger) Hook {
4743
log.Info("Unrecognized filter strategy; filtering disabled")
4844
return nil
4945
}
50-
51-
func Register(name string, provider HookProvider) error {
52-
if _, ok := registry[name]; ok {
53-
return errors.New("already registered")
54-
}
55-
registry[name] = provider
56-
return nil
57-
}
58-
59-
func init() {
60-
err := Register(relabelConfigTargetFilterName, NewRelabelConfigTargetFilter)
61-
if err != nil {
62-
panic(err)
63-
}
64-
}

cmd/otel-allocator/prehook/relabel.go

+11-7
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,23 @@ import (
2121
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
2222
)
2323

24-
type RelabelConfigTargetFilter struct {
24+
const (
25+
relabelConfigTargetFilterName = "relabel-config"
26+
)
27+
28+
type relabelConfigTargetFilter struct {
2529
log logr.Logger
2630
relabelCfg map[string][]*relabel.Config
2731
}
2832

29-
func NewRelabelConfigTargetFilter(log logr.Logger) Hook {
30-
return &RelabelConfigTargetFilter{
33+
func newRelabelConfigTargetFilter(log logr.Logger) Hook {
34+
return &relabelConfigTargetFilter{
3135
log: log,
3236
relabelCfg: make(map[string][]*relabel.Config),
3337
}
3438
}
3539

36-
func (tf *RelabelConfigTargetFilter) Apply(targets map[string]*target.Item) map[string]*target.Item {
40+
func (tf *relabelConfigTargetFilter) Apply(targets map[string]*target.Item) map[string]*target.Item {
3741
numTargets := len(targets)
3842

3943
// need to wait until relabelCfg is set
@@ -58,7 +62,7 @@ func (tf *RelabelConfigTargetFilter) Apply(targets map[string]*target.Item) map[
5862
return targets
5963
}
6064

61-
func (tf *RelabelConfigTargetFilter) SetConfig(cfgs map[string][]*relabel.Config) {
65+
func (tf *relabelConfigTargetFilter) SetConfig(cfgs map[string][]*relabel.Config) {
6266
relabelCfgCopy := make(map[string][]*relabel.Config)
6367
for key, val := range cfgs {
6468
relabelCfgCopy[key] = tf.replaceRelabelConfig(val)
@@ -71,7 +75,7 @@ func (tf *RelabelConfigTargetFilter) SetConfig(cfgs map[string][]*relabel.Config
7175
// for why SHARD == 0 is a necessary substitution. Otherwise the keep action that uses this env variable,
7276
// would not match the regex and all targets end up dropped. Also note, $(SHARD) will always be 0 and it
7377
// does not make sense to read from the environment because it is never set in the allocator.
74-
func (tf *RelabelConfigTargetFilter) replaceRelabelConfig(cfg []*relabel.Config) []*relabel.Config {
78+
func (tf *relabelConfigTargetFilter) replaceRelabelConfig(cfg []*relabel.Config) []*relabel.Config {
7579
for i := range cfg {
7680
str := cfg[i].Regex.String()
7781
if str == "$(SHARD)" {
@@ -82,7 +86,7 @@ func (tf *RelabelConfigTargetFilter) replaceRelabelConfig(cfg []*relabel.Config)
8286
return cfg
8387
}
8488

85-
func (tf *RelabelConfigTargetFilter) GetConfig() map[string][]*relabel.Config {
89+
func (tf *relabelConfigTargetFilter) GetConfig() map[string][]*relabel.Config {
8690
relabelCfgCopy := make(map[string][]*relabel.Config)
8791
for k, v := range tf.relabelCfg {
8892
relabelCfgCopy[k] = v

0 commit comments

Comments
 (0)