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

INSTA-13149: Make open telemetry ports and enablement more configurable #250

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

INSTA-13149: Make open telemetry ports and enablement more configurable #250

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
50 changes: 16 additions & 34 deletions api/v1/inline_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* (c) Copyright IBM Corp. 2021
* (c) Copyright Instana Inc. 2021
*/
(c) Copyright IBM Corp. 2021,2025
*/

package v1

import (
Expand Down Expand Up @@ -356,44 +356,26 @@ type KubernetesDeploymentSpec struct {
}

type OpenTelemetry struct {
// Deprecated setting for backwards compatibility
// Deprecated setting for backwards compatibility. Specify whether Open telemetry is enabled (default is true).
// +kubebuilder:validation:Optional
Enabled `json:",inline" yaml:",inline"`

// Specify whether GRPC is enabled (default is true).
// +kubebuilder:validation:Optional
GRPC *Enabled `json:"grpc,omitempty" yaml:"grpc,omitempty"`
GRPC OpenTelemetryPortConfig `json:"grpc,omitempty" yaml:"grpc,omitempty"`

// Specify whether HTTP is enabled (default is true).
// +kubebuilder:validation:Optional
HTTP *Enabled `json:"http,omitempty" yaml:"http,omitempty"`
HTTP OpenTelemetryPortConfig `json:"http,omitempty" yaml:"http,omitempty"`
}

func (otlp OpenTelemetry) GrpcIsEnabled() bool {
// explicit opt-out or opt-in via new setting
if otlp.GRPC != nil && otlp.GRPC.Enabled != nil {
return *otlp.GRPC.Enabled
}
// explicit opt-out via legacy setting
if otlp.Enabled.Enabled != nil && !*otlp.Enabled.Enabled {
return false
}
// enabled by default
return true
}

func (otlp OpenTelemetry) HttpIsEnabled() bool {
// explicit opt-out or opt-in via new setting
if otlp.HTTP != nil && otlp.HTTP.Enabled != nil {
return *otlp.HTTP.Enabled
}
// explicit opt-out via legacy setting
if otlp.Enabled.Enabled != nil && !*otlp.Enabled.Enabled {
return false
}
// enabled by default
return true
}

func (otlp OpenTelemetry) IsEnabled() bool {
return otlp.GrpcIsEnabled() || otlp.HttpIsEnabled()
type OpenTelemetryPortConfig struct {
// Explicitly enable
// +kubebuilder:validation:Optional
Enabled *bool `json:"enabled,omitempty" yaml:"enabled,omitempty"`
// Specify the port
// +kubebuilder:validation:Optional
Port *int32 `json:"port,omitempty" yaml:"port,omitempty"`
}

type Zone struct {
Expand Down
Loading