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

otterize · May 1, 2023 · a0fdb5c · a0fdb5c
1 parent 44730c4
commit a0fdb5c
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 42 deletions.
diff --git a/src/operator/main.go b/src/operator/main.go
@@ -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)
 

diff --git a/src/shared/telemetries/telemetriesgql/generated.go b/src/shared/telemetries/telemetriesgql/generated.go
diff --git a/src/shared/telemetries/telemetriesgql/schema.graphql b/src/shared/telemetries/telemetriesgql/schema.graphql
diff --git a/src/shared/telemetries/telemetrysender/config.go b/src/shared/telemetries/telemetrysender/config.go
@@ -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()

diff --git a/src/shared/telemetries/telemetrysender/global_sender.go b/src/shared/telemetries/telemetrysender/global_sender.go
@@ -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)
 	}

diff --git a/src/shared/telemetries/telemetrysender/sender.go b/src/shared/telemetries/telemetrysender/sender.go
@@ -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}
@@ -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 {