Skip to content

Move apis package to a dedicated sub-module #4972

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

Open
iypetrov wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Move apis package to a dedicated sub-module #4972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d348845
feat: move apis to a separate sub-module
iypetrov Apr 17, 2026
1489ca3
feat: add apihelpers package
iypetrov Apr 17, 2026
76d1ae2
chore: mv from internal/apihelpers -> apihelpers
iypetrov Apr 20, 2026
9e46683
Merge branch 'main' into move-apis-package-to-a-dedicated-module-2
iypetrov Apr 20, 2026
2893fbf
Merge branch 'main' into move-apis-package-to-a-dedicated-module-2
iypetrov Apr 21, 2026
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
541 changes: 541 additions & 0 deletions apihelpers/v1beta1/config.go
View file
Open in desktop

Large diffs are not rendered by default.

441 changes: 220 additions & 221 deletions apis/v1beta1/config_test.go → apihelpers/v1beta1/config_test.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion apis/v1beta1/helpers.go → apihelpers/v1beta1/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package v1beta1
package apihelpers

import (
"fmt"
Expand All @@ -12,6 +12,8 @@ import (
"strings"
)

const defaultServicePort int32 = 8888

// parseAddressEndpoint parses the address and returns the host and port.
// If the address is an environment variable, it returns the default port.
// If the address is an explicit port, it returns the port.
Expand Down
2 changes: 1 addition & 1 deletion apis/v1beta1/helpers_test.go → apihelpers/v1beta1/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package v1beta1
package apihelpers

import (
"slices"
Expand Down
20 changes: 11 additions & 9 deletions apis/v1beta1/metrics.go → apihelpers/v1beta1/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package v1beta1
package apihelpers

import (
"context"
Expand All @@ -14,6 +14,8 @@ import (
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/metrics"

"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
)

const (
Expand Down Expand Up @@ -110,7 +112,7 @@ func NewMetrics(prv metric.MeterProvider, ctx context.Context, cl client.Reader)

// Init metrics from the first time the operator starts.
func (m *Metrics) init(ctx context.Context, cl client.Reader) error {
list := &OpenTelemetryCollectorList{}
list := &v1beta1.OpenTelemetryCollectorList{}
if err := cl.List(ctx, list); err != nil {
return fmt.Errorf("failed to list: %w", err)
}
Expand All @@ -121,22 +123,22 @@ func (m *Metrics) init(ctx context.Context, cl client.Reader) error {
return nil
}

func (m *Metrics) Create(ctx context.Context, collector *OpenTelemetryCollector) {
func (m *Metrics) Create(ctx context.Context, collector *v1beta1.OpenTelemetryCollector) {
m.updateComponentCounters(ctx, collector, true)
m.updateGeneralCRMetricsComponents(ctx, collector, true)
}

func (m *Metrics) Delete(ctx context.Context, collector *OpenTelemetryCollector) {
func (m *Metrics) Delete(ctx context.Context, collector *v1beta1.OpenTelemetryCollector) {
m.updateComponentCounters(ctx, collector, false)
m.updateGeneralCRMetricsComponents(ctx, collector, false)
}

func (m *Metrics) Update(ctx context.Context, oldCollector, newCollector *OpenTelemetryCollector) {
func (m *Metrics) Update(ctx context.Context, oldCollector, newCollector *v1beta1.OpenTelemetryCollector) {
m.Delete(ctx, oldCollector)
m.Create(ctx, newCollector)
}

func (m *Metrics) updateGeneralCRMetricsComponents(ctx context.Context, collector *OpenTelemetryCollector, up bool) {
func (m *Metrics) updateGeneralCRMetricsComponents(ctx context.Context, collector *v1beta1.OpenTelemetryCollector, up bool) {
inc := 1
if !up {
inc = -1
Expand All @@ -148,7 +150,7 @@ func (m *Metrics) updateGeneralCRMetricsComponents(ctx context.Context, collecto
))
}

func (m *Metrics) updateComponentCounters(ctx context.Context, collector *OpenTelemetryCollector, up bool) {
func (m *Metrics) updateComponentCounters(ctx context.Context, collector *v1beta1.OpenTelemetryCollector, up bool) {
components := getComponentsFromConfig(collector.Spec.Config)
moveCounter(ctx, collector, components.receivers, m.receiversCounter, up)
moveCounter(ctx, collector, components.exporters, m.exporterCounter, up)
Expand Down Expand Up @@ -176,7 +178,7 @@ func extractElements(elements map[string]any) []string {
return items
}

func getComponentsFromConfig(yamlContent Config) *componentDefinitions {
func getComponentsFromConfig(yamlContent v1beta1.Config) *componentDefinitions {
info := &componentDefinitions{
receivers: extractElements(yamlContent.Receivers.Object),
exporters: extractElements(yamlContent.Exporters.Object),
Expand All @@ -198,7 +200,7 @@ func getComponentsFromConfig(yamlContent Config) *componentDefinitions {
}

func moveCounter(
ctx context.Context, collector *OpenTelemetryCollector, types []string, upDown metric.Int64UpDownCounter, up bool,
ctx context.Context, collector *v1beta1.OpenTelemetryCollector, types []string, upDown metric.Int64UpDownCounter, up bool,
) {
for _, exporter := range types {
inc := 1
Expand Down
Loading
Loading