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

Jump to bottom

Align telemetry related variables and keys with the new schema #172

Merged
merged 1 commit into from
May 1, 2023
+42 −42
Merged

Align telemetry related variables and keys with the new schema #172

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
2 changes: 1 addition & 1 deletion src/operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ func main() {
} else {
kubeSystemUID = string(kubeSystemNs.UID)
}
telemetrysender.SetGlobalPlatformIdentifier(telemetrysender.Anonymize(kubeSystemUID))
telemetrysender.SetGlobalContextId(telemetrysender.Anonymize(kubeSystemUID))

kafkaServersStore := kafkaacls.NewServersStore(tlsSource, enforcementConfig.EnableKafkaACL, kafkaacls.NewKafkaIntentsAdmin, enforcementConfig.EnforcementEnabledGlobally)

Expand Down
20 changes: 10 additions & 10 deletions src/shared/telemetries/telemetriesgql/generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/shared/telemetries/telemetriesgql/schema.graphql
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions src/shared/telemetries/telemetrysender/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ import (
)

const (
TelemetriesAPIAddressKey = "telemetries-address"
TimeoutKey = "telemetry-client-timeout"
CloudClientTimeoutDefault = "30s"
TelemetriesEnabledKey = "telemetries-enabled"
TelemetriesEnabledDefault = true
TelemetriesMaxBatchSizeKey = "telemetries-max-batch-size"
TelemetriesMaxBatchSizeDefault = 100
TelemetriesIntervalKey = "telemetries-interval-seconds"
TelemetriesIntervalDefault = 5
TelemetriesAddressDefault = "https://app.otterize.com/api/telemetry/query"
EnvPrefix = "OTTERIZE"
TelemetryAPIAddressKey = "telemetry-address"
TimeoutKey = "telemetry-client-timeout"
CloudClientTimeoutDefault = "30s"
TelemetryEnabledKey = "telemetry-enabled"
TelemetryEnabledDefault = true
TelemetryMaxBatchSizeKey = "telemetry-max-batch-size"
TelemetryMaxBatchSizeDefault = 100
TelemetryIntervalKey = "telemetry-interval-seconds"
TelemetryIntervalDefault = 5
TelemetryAddressDefault = "https://app.otterize.com/api/telemetry/query"
EnvPrefix = "OTTERIZE"
)

func init() {
viper.SetDefault(TelemetriesAPIAddressKey, TelemetriesAddressDefault)
viper.SetDefault(TelemetryAPIAddressKey, TelemetryAddressDefault)
viper.SetDefault(TimeoutKey, CloudClientTimeoutDefault)
viper.SetDefault(TelemetriesIntervalKey, TelemetriesIntervalDefault)
viper.SetDefault(TelemetriesMaxBatchSizeKey, TelemetriesMaxBatchSizeDefault)
viper.SetDefault(TelemetriesEnabledKey, TelemetriesEnabledDefault)
viper.SetDefault(TelemetryIntervalKey, TelemetryIntervalDefault)
viper.SetDefault(TelemetryMaxBatchSizeKey, TelemetryMaxBatchSizeDefault)
viper.SetDefault(TelemetryEnabledKey, TelemetryEnabledDefault)
viper.SetEnvPrefix(EnvPrefix)
viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
viper.AutomaticEnv()
Expand Down
20 changes: 10 additions & 10 deletions src/shared/telemetries/telemetrysender/global_sender.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,30 @@ import (
)

var (
senderInitOnce = sync.Once{}
sender *TelemetrySender
globalPlatformIdentifier string
globalRuntimeIdentifier string
senderInitOnce = sync.Once{}
sender *TelemetrySender
globalContextId string
globalComponentInstanceId string
)

func SetGlobalPlatformIdentifier(platformIdentifier string) {
globalPlatformIdentifier = platformIdentifier
func SetGlobalContextId(contextId string) {
globalContextId = contextId
}

func send(componentType telemetriesgql.ComponentType, eventType telemetriesgql.EventType, count int) {
senderInitOnce.Do(func() {
sender = New()
globalRuntimeIdentifier = uuid.NewString()
globalComponentInstanceId = uuid.NewString()
if flag.Lookup("test.v") != nil {
logrus.Infof("Disabling telemetry sender because this is a test")
sender.enabled = false
}
})
if err := sender.Send(
telemetriesgql.Component{
ComponentType: componentType,
Identifier: globalRuntimeIdentifier,
PlatformIdentifier: globalPlatformIdentifier,
ComponentType: componentType,
ComponentInstanceId: globalComponentInstanceId,
ContextId: globalContextId,
}, eventType, count); err != nil {
logrus.Warningf("failed sending telemetry. %s", err)
}
Expand Down
8 changes: 4 additions & 4 deletions src/shared/telemetries/telemetrysender/sender.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type TelemetrySender struct {
}

func newGqlClient() graphql.Client {
apiAddress := viper.GetString(TelemetriesAPIAddressKey)
apiAddress := viper.GetString(TelemetryAPIAddressKey)
clientTimeout := viper.GetDuration(TimeoutKey)
transport := &http.Transport{}
clientWithTimeout := &http.Client{Timeout: clientTimeout, Transport: transport}
Expand All @@ -34,9 +34,9 @@ func batchSendTelemetries(ctx context.Context, telemetriesClient graphql.Client,
}

func New() *TelemetrySender {
enabled := viper.GetBool(TelemetriesEnabledKey)
maxBatchSize := viper.GetInt(TelemetriesMaxBatchSizeKey)
interval := viper.GetInt(TelemetriesIntervalKey)
enabled := viper.GetBool(TelemetryEnabledKey)
maxBatchSize := viper.GetInt(TelemetryMaxBatchSizeKey)
interval := viper.GetInt(TelemetryIntervalKey)
telemetriesClient := newGqlClient()
sender := &TelemetrySender{telemetriesClient: telemetriesClient, enabled: enabled}
batchSendFunc := func(telemetries []telemetriesgql.TelemetryInput) error {
Expand Down