[chore] move all target-allocator code to internal

open-telemetry · Jan 20, 2025 · 3033807 · 3033807
1 parent a36367b
commit 3033807
Show file tree

Hide file tree

Showing 43 changed files with 37 additions and 37 deletions.
diff --git a/cmd/otel-allocator/benchmark_test.go b/cmd/otel-allocator/benchmark_test.go
@@ -33,10 +33,10 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/prehook"
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/server"
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/prehook"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/server"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
 )
 
 // BenchmarkProcessTargets benchmarks the whole target allocation pipeline. It starts with data the prometheus

diff --git a/cmd/otel-allocator/allocation/allocator.go → ...llocator/internal/allocation/allocator.go b/cmd/otel-allocator/allocation/allocator.go → ...llocator/internal/allocation/allocator.go
@@ -21,8 +21,8 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/diff"
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/diff"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
 )
 
 /*

diff --git a/...el-allocator/allocation/allocator_test.go → ...tor/internal/allocation/allocator_test.go b/...el-allocator/allocation/allocator_test.go → ...tor/internal/allocation/allocator_test.go
diff --git a/...llocator/allocation/consistent_hashing.go → ...internal/allocation/consistent_hashing.go b/...llocator/allocation/consistent_hashing.go → ...internal/allocation/consistent_hashing.go
diff --git a/...tor/allocation/consistent_hashing_test.go → ...nal/allocation/consistent_hashing_test.go b/...tor/allocation/consistent_hashing_test.go → ...nal/allocation/consistent_hashing_test.go
diff --git a/...el-allocator/allocation/least_weighted.go → ...tor/internal/allocation/least_weighted.go b/...el-allocator/allocation/least_weighted.go → ...tor/internal/allocation/least_weighted.go
@@ -15,7 +15,7 @@
 package allocation
 
 import (
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
 )
 
 const leastWeightedStrategyName = "least-weighted"

diff --git a/...locator/allocation/least_weighted_test.go → ...nternal/allocation/least_weighted_test.go b/...locator/allocation/least_weighted_test.go → ...nternal/allocation/least_weighted_test.go
diff --git a/cmd/otel-allocator/allocation/per_node.go → ...allocator/internal/allocation/per_node.go b/cmd/otel-allocator/allocation/per_node.go → ...allocator/internal/allocation/per_node.go
diff --git a/...tel-allocator/allocation/per_node_test.go → ...ator/internal/allocation/per_node_test.go b/...tel-allocator/allocation/per_node_test.go → ...ator/internal/allocation/per_node_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
 )
 
 var loggerPerNode = logf.Log.WithName("unit-tests")

diff --git a/cmd/otel-allocator/allocation/strategy.go → ...allocator/internal/allocation/strategy.go b/cmd/otel-allocator/allocation/strategy.go → ...allocator/internal/allocation/strategy.go
@@ -23,7 +23,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
 )
 
 type AllocatorProvider func(log logr.Logger, opts ...AllocationOption) Allocator

diff --git a/...tel-allocator/allocation/strategy_test.go → ...ator/internal/allocation/strategy_test.go b/...tel-allocator/allocation/strategy_test.go → ...ator/internal/allocation/strategy_test.go
@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/diff"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/diff"
 )
 
 func BenchmarkGetAllTargetsByCollectorAndJob(b *testing.B) {

diff --git a/cmd/otel-allocator/allocation/testutils.go → ...llocator/internal/allocation/testutils.go b/cmd/otel-allocator/allocation/testutils.go → ...llocator/internal/allocation/testutils.go
@@ -25,7 +25,7 @@ import (
 	"github.com/stretchr/testify/require"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
 )
 
 func colIndex(index, numCols int) int {

diff --git a/cmd/otel-allocator/collector/collector.go → ...allocator/internal/collector/collector.go b/cmd/otel-allocator/collector/collector.go → ...allocator/internal/collector/collector.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
 )
 
 const (

diff --git a/...tel-allocator/collector/collector_test.go → ...ator/internal/collector/collector_test.go b/...tel-allocator/collector/collector_test.go → ...ator/internal/collector/collector_test.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
 )
 
 var logger = logf.Log.WithName("collector-unit-tests")

diff --git a/cmd/otel-allocator/config/config.go → cmd/otel-allocator/internal/config/config.go b/cmd/otel-allocator/config/config.go → cmd/otel-allocator/internal/config/config.go
diff --git a/cmd/otel-allocator/config/config_test.go → ...-allocator/internal/config/config_test.go b/cmd/otel-allocator/config/config_test.go → ...-allocator/internal/config/config_test.go
diff --git a/cmd/otel-allocator/config/flags.go → cmd/otel-allocator/internal/config/flags.go b/cmd/otel-allocator/config/flags.go → cmd/otel-allocator/internal/config/flags.go
diff --git a/cmd/otel-allocator/config/flags_test.go → ...l-allocator/internal/config/flags_test.go b/cmd/otel-allocator/config/flags_test.go → ...l-allocator/internal/config/flags_test.go
diff --git a/...llocator/config/testdata/config_test.yaml → ...internal/config/testdata/config_test.yaml b/...llocator/config/testdata/config_test.yaml → ...internal/config/testdata/config_test.yaml
diff --git a/...locator/config/testdata/file_sd_test.json → ...nternal/config/testdata/file_sd_test.json b/...locator/config/testdata/file_sd_test.json → ...nternal/config/testdata/file_sd_test.json
diff --git a/...-allocator/config/testdata/no_config.yaml → ...r/internal/config/testdata/no_config.yaml b/...-allocator/config/testdata/no_config.yaml → ...r/internal/config/testdata/no_config.yaml
diff --git a/...g/testdata/pod_service_selector_test.yaml → ...g/testdata/pod_service_selector_test.yaml b/...g/testdata/pod_service_selector_test.yaml → ...g/testdata/pod_service_selector_test.yaml
diff --git a/cmd/otel-allocator/diff/diff.go → cmd/otel-allocator/internal/diff/diff.go b/cmd/otel-allocator/diff/diff.go → cmd/otel-allocator/internal/diff/diff.go
diff --git a/cmd/otel-allocator/diff/diff_test.go → ...otel-allocator/internal/diff/diff_test.go b/cmd/otel-allocator/diff/diff_test.go → ...otel-allocator/internal/diff/diff_test.go
diff --git a/cmd/otel-allocator/prehook/prehook.go → ...tel-allocator/internal/prehook/prehook.go b/cmd/otel-allocator/prehook/prehook.go → ...tel-allocator/internal/prehook/prehook.go
@@ -20,7 +20,7 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/prometheus/prometheus/model/relabel"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
 )
 
 const (

diff --git a/cmd/otel-allocator/prehook/relabel.go → ...tel-allocator/internal/prehook/relabel.go b/cmd/otel-allocator/prehook/relabel.go → ...tel-allocator/internal/prehook/relabel.go
@@ -18,7 +18,7 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/prometheus/prometheus/model/relabel"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
 )
 
 type RelabelConfigTargetFilter struct {

diff --git a/cmd/otel-allocator/prehook/relabel_test.go → ...llocator/internal/prehook/relabel_test.go b/cmd/otel-allocator/prehook/relabel_test.go → ...llocator/internal/prehook/relabel_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
 )
 
 var (

diff --git a/cmd/otel-allocator/server/bench_test.go → ...l-allocator/internal/server/bench_test.go b/cmd/otel-allocator/server/bench_test.go → ...l-allocator/internal/server/bench_test.go
@@ -27,8 +27,8 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
 )
 
 func BenchmarkServerTargetsHandler(b *testing.B) {

diff --git a/cmd/otel-allocator/server/mocks_test.go → ...l-allocator/internal/server/mocks_test.go b/cmd/otel-allocator/server/mocks_test.go → ...l-allocator/internal/server/mocks_test.go
@@ -15,8 +15,8 @@
 package server
 
 import (
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
 )
 
 var _ allocation.Allocator = &mockAllocator{}

diff --git a/cmd/otel-allocator/server/server.go → cmd/otel-allocator/internal/server/server.go b/cmd/otel-allocator/server/server.go → cmd/otel-allocator/internal/server/server.go
@@ -38,8 +38,8 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 	"gopkg.in/yaml.v2"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
 )
 
 var (

diff --git a/cmd/otel-allocator/server/server_test.go → ...-allocator/internal/server/server_test.go b/cmd/otel-allocator/server/server_test.go → ...-allocator/internal/server/server_test.go
@@ -35,9 +35,9 @@ import (
 	"gopkg.in/yaml.v2"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
-	allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
+	allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
 )
 
 var (

diff --git a/...ver/testdata/prom-config-all-actions.yaml → ...ver/testdata/prom-config-all-actions.yaml b/...ver/testdata/prom-config-all-actions.yaml → ...ver/testdata/prom-config-all-actions.yaml
diff --git a/...tor/server/testdata/prom-config-test.yaml → ...nal/server/testdata/prom-config-test.yaml b/...tor/server/testdata/prom-config-test.yaml → ...nal/server/testdata/prom-config-test.yaml
diff --git a/...cator/server/testdata/prom-no-config.yaml → ...ernal/server/testdata/prom-no-config.yaml b/...cator/server/testdata/prom-no-config.yaml → ...ernal/server/testdata/prom-no-config.yaml
diff --git a/cmd/otel-allocator/target/discovery.go → ...el-allocator/internal/target/discovery.go b/cmd/otel-allocator/target/discovery.go → ...el-allocator/internal/target/discovery.go
@@ -32,7 +32,7 @@ import (
 	"go.uber.org/zap/zapcore"
 	"gopkg.in/yaml.v3"
 
-	allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/watcher"
+	allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/watcher"
 )
 
 var (

diff --git a/cmd/otel-allocator/target/discovery_test.go → ...locator/internal/target/discovery_test.go b/cmd/otel-allocator/target/discovery_test.go → ...locator/internal/target/discovery_test.go
@@ -33,8 +33,8 @@ import (
 	"github.com/stretchr/testify/require"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
-	allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/watcher"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
+	allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/watcher"
 )
 
 var defaultScrapeProtocols = []promconfig.ScrapeProtocol{

diff --git a/cmd/otel-allocator/target/target.go → cmd/otel-allocator/internal/target/target.go b/cmd/otel-allocator/target/target.go → cmd/otel-allocator/internal/target/target.go
diff --git a/cmd/otel-allocator/target/testdata/test.yaml → ...ocator/internal/target/testdata/test.yaml b/cmd/otel-allocator/target/testdata/test.yaml → ...ocator/internal/target/testdata/test.yaml
diff --git a/...llocator/target/testdata/test_update.yaml → ...internal/target/testdata/test_update.yaml b/...llocator/target/testdata/test_update.yaml → ...internal/target/testdata/test_update.yaml
diff --git a/cmd/otel-allocator/watcher/promOperator.go → ...llocator/internal/watcher/promOperator.go b/cmd/otel-allocator/watcher/promOperator.go → ...llocator/internal/watcher/promOperator.go
@@ -44,7 +44,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/retry"
 
-	allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
+	allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
 )
 
 const (

diff --git a/...el-allocator/watcher/promOperator_test.go → ...tor/internal/watcher/promOperator_test.go b/...el-allocator/watcher/promOperator_test.go → ...tor/internal/watcher/promOperator_test.go
@@ -46,7 +46,7 @@ import (
 	fcache "k8s.io/client-go/tools/cache/testing"
 	"k8s.io/utils/ptr"
 
-	allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
+	allocatorconfig "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
 )
 
 var defaultScrapeProtocols = []promconfig.ScrapeProtocol{

diff --git a/cmd/otel-allocator/watcher/watcher.go → ...tel-allocator/internal/watcher/watcher.go b/cmd/otel-allocator/watcher/watcher.go → ...tel-allocator/internal/watcher/watcher.go
diff --git a/cmd/otel-allocator/main.go b/cmd/otel-allocator/main.go
@@ -29,13 +29,13 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/allocation"
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/collector"
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/config"
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/prehook"
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/server"
-	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
-	allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/watcher"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/allocation"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/collector"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/config"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/prehook"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/server"
+	"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
+	allocatorWatcher "github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/watcher"
 )
 
 var (