Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] move all target-allocator code to internal #3632

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[chore] move all target-allocator code to internal #3632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/otel-allocator/benchmark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmd/otel-allocator/allocation/allocator.go → ...llocator/internal/allocation/allocator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion ...el-allocator/allocation/allocator_test.go → ...tor/internal/allocation/allocator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/prometheus/prometheus/model/labels"
"github.com/stretchr/testify/assert"

"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
)

func TestSetCollectors(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ...llocator/allocation/consistent_hashing.go → ...internal/allocation/consistent_hashing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/buraksezer/consistent"
"github.com/cespare/xxhash/v2"

"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
)

const consistentHashingStrategyName = "consistent-hashing"
Expand Down
0 ...tor/allocation/consistent_hashing_test.go → ...nal/allocation/consistent_hashing_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...el-allocator/allocation/least_weighted.go → ...tor/internal/allocation/least_weighted.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 ...locator/allocation/least_weighted_test.go → ...nternal/allocation/least_weighted_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/otel-allocator/allocation/per_node.go → ...allocator/internal/allocation/per_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package allocation
import (
"fmt"

"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/target"
"github.com/open-telemetry/opentelemetry-operator/cmd/otel-allocator/internal/target"
)

const perNodeStrategyName = "per-node"
Expand Down
2 changes: 1 addition & 1 deletion ...tel-allocator/allocation/per_node_test.go → ...ator/internal/allocation/per_node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion cmd/otel-allocator/allocation/strategy.go → ...allocator/internal/allocation/strategy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...tel-allocator/allocation/strategy_test.go → ...ator/internal/allocation/strategy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/otel-allocator/allocation/testutils.go → ...llocator/internal/allocation/testutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cmd/otel-allocator/collector/collector.go → ...allocator/internal/collector/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion ...tel-allocator/collector/collector_test.go → ...ator/internal/collector/collector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
0 cmd/otel-allocator/config/config.go → cmd/otel-allocator/internal/config/config.go
View file
Open in desktop
File renamed without changes.
0 cmd/otel-allocator/config/config_test.go → ...-allocator/internal/config/config_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/otel-allocator/config/flags.go → cmd/otel-allocator/internal/config/flags.go
View file
Open in desktop
File renamed without changes.
0 cmd/otel-allocator/config/flags_test.go → ...l-allocator/internal/config/flags_test.go
View file
Open in desktop
File renamed without changes.
0 ...llocator/config/testdata/config_test.yaml → ...internal/config/testdata/config_test.yaml
View file
Open in desktop
File renamed without changes.
0 ...locator/config/testdata/file_sd_test.json → ...nternal/config/testdata/file_sd_test.json
View file
Open in desktop
File renamed without changes.
0 ...-allocator/config/testdata/no_config.yaml → ...r/internal/config/testdata/no_config.yaml
View file
Open in desktop
File renamed without changes.
0 ...g/testdata/pod_service_selector_test.yaml → ...g/testdata/pod_service_selector_test.yaml
View file
Open in desktop
File renamed without changes.
0 cmd/otel-allocator/diff/diff.go → cmd/otel-allocator/internal/diff/diff.go
View file
Open in desktop
File renamed without changes.
0 cmd/otel-allocator/diff/diff_test.go → ...otel-allocator/internal/diff/diff_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/otel-allocator/prehook/prehook.go → ...tel-allocator/internal/prehook/prehook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion cmd/otel-allocator/prehook/relabel.go → ...tel-allocator/internal/prehook/relabel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cmd/otel-allocator/prehook/relabel_test.go → ...llocator/internal/prehook/relabel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions cmd/otel-allocator/server/bench_test.go → ...l-allocator/internal/server/bench_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/otel-allocator/server/mocks_test.go → ...l-allocator/internal/server/mocks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
4 changes: 2 additions & 2 deletions cmd/otel-allocator/server/server.go → cmd/otel-allocator/internal/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions cmd/otel-allocator/server/server_test.go → ...-allocator/internal/server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
0 ...ver/testdata/prom-config-all-actions.yaml → ...ver/testdata/prom-config-all-actions.yaml
View file
Open in desktop
File renamed without changes.
0 ...tor/server/testdata/prom-config-test.yaml → ...nal/server/testdata/prom-config-test.yaml
View file
Open in desktop
File renamed without changes.
0 ...cator/server/testdata/prom-no-config.yaml → ...ernal/server/testdata/prom-no-config.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/otel-allocator/target/discovery.go → ...el-allocator/internal/target/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions cmd/otel-allocator/target/discovery_test.go → ...locator/internal/target/discovery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
0 cmd/otel-allocator/target/target.go → cmd/otel-allocator/internal/target/target.go
View file
Open in desktop
File renamed without changes.
0 cmd/otel-allocator/target/testdata/test.yaml → ...ocator/internal/target/testdata/test.yaml
View file
Open in desktop
File renamed without changes.
0 ...llocator/target/testdata/test_update.yaml → ...internal/target/testdata/test_update.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/otel-allocator/watcher/promOperator.go → ...llocator/internal/watcher/promOperator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion ...el-allocator/watcher/promOperator_test.go → ...tor/internal/watcher/promOperator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
0 cmd/otel-allocator/watcher/watcher.go → ...tel-allocator/internal/watcher/watcher.go
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions cmd/otel-allocator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Loading