diff --git a/cmd/otel-allocator/allocation/strategy.go b/cmd/otel-allocator/allocation/strategy.go index 63dd65b930..14bcca3e5a 100644 --- a/cmd/otel-allocator/allocation/strategy.go +++ b/cmd/otel-allocator/allocation/strategy.go @@ -54,7 +54,7 @@ var ( type AllocationOption func(Allocator) type Filter interface { - Apply(map[string]*target.TargetItem) map[string]*target.TargetItem + Apply(map[string]*target.Item) map[string]*target.Item } func WithFilter(filter Filter) AllocationOption { @@ -63,7 +63,7 @@ func WithFilter(filter Filter) AllocationOption { } } -func RecordTargetsKeptPerJob(targets map[string]*target.TargetItem) map[string]float64 { +func RecordTargetsKeptPerJob(targets map[string]*target.Item) map[string]float64 { targetsPerJob := make(map[string]float64) for _, tItem := range targets { diff --git a/cmd/otel-allocator/main.go b/cmd/otel-allocator/main.go index a2ba856e9d..9dd52a1054 100644 --- a/cmd/otel-allocator/main.go +++ b/cmd/otel-allocator/main.go @@ -39,6 +39,7 @@ import ( "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/collector" "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config" lbdiscovery "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/discovery" + "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/prehook" "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target" allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/watcher" ) diff --git a/cmd/otel-allocator/prehook/prehook.go b/cmd/otel-allocator/prehook/prehook.go index ae5333d589..ebe41c0970 100644 --- a/cmd/otel-allocator/prehook/prehook.go +++ b/cmd/otel-allocator/prehook/prehook.go @@ -28,7 +28,7 @@ const ( ) type Hook interface { - Apply(map[string]*target.TargetItem) map[string]*target.TargetItem + Apply(map[string]*target.Item) map[string]*target.Item SetConfig(map[string][]*relabel.Config) GetConfig() map[string][]*relabel.Config } diff --git a/cmd/otel-allocator/prehook/relabel.go b/cmd/otel-allocator/prehook/relabel.go index 7047d7a97a..54059773c6 100644 --- a/cmd/otel-allocator/prehook/relabel.go +++ b/cmd/otel-allocator/prehook/relabel.go @@ -47,7 +47,7 @@ func convertLabelToPromLabelSet(lbls model.LabelSet) []labels.Label { return newLabels } -func (tf *RelabelConfigTargetFilter) Apply(targets map[string]*target.TargetItem) map[string]*target.TargetItem { +func (tf *RelabelConfigTargetFilter) Apply(targets map[string]*target.Item) map[string]*target.Item { numTargets := len(targets) // need to wait until relabelCfg is set diff --git a/cmd/otel-allocator/prehook/relabel_test.go b/cmd/otel-allocator/prehook/relabel_test.go index 314922ebb6..151188242f 100644 --- a/cmd/otel-allocator/prehook/relabel_test.go +++ b/cmd/otel-allocator/prehook/relabel_test.go @@ -120,9 +120,9 @@ func colIndex(index, numCols int) int { return index % numCols } -func makeNNewTargets(n int, numCollectors int, startingIndex int) (map[string]*target.TargetItem, int, map[string]*target.TargetItem, map[string][]*relabel.Config) { - toReturn := map[string]*target.TargetItem{} - expectedMap := make(map[string]*target.TargetItem) +func makeNNewTargets(n int, numCollectors int, startingIndex int) (map[string]*target.Item, int, map[string]*target.Item, map[string][]*relabel.Config) { + toReturn := map[string]*target.Item{} + expectedMap := make(map[string]*target.Item) numItemsRemaining := n relabelConfig := make(map[string][]*relabel.Config) for i := startingIndex; i < n+startingIndex; i++ { @@ -133,7 +133,7 @@ func makeNNewTargets(n int, numCollectors int, startingIndex int) (map[string]*t "total": model.LabelValue(strconv.Itoa(n + startingIndex)), } jobName := fmt.Sprintf("test-job-%d", i) - newTarget := target.NewTargetItem(jobName, "test-url", label, collector) + newTarget := target.NewItem(jobName, "test-url", label, collector) // add a single replace, drop, or keep action as relabel_config for targets var index int ind, _ := rand.Int(rand.Reader, big.NewInt(int64(len(relabelConfigs))))