telemetry: don't generate cluster_id for server instances without con…

…figured meta storage telemetry: added instance_info.meta_storage property that is filled with configured meta storage type
Zatte · Sep 12, 2022 · 432b30d · 432b30d
1 parent b1749d9
commit 432b30d
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 90 deletions.
diff --git a/server/main.go b/server/main.go
@@ -56,7 +56,6 @@ import (
 	"github.com/jitsucom/jitsu/server/telemetry"
 	"github.com/jitsucom/jitsu/server/timestamp"
 	"github.com/jitsucom/jitsu/server/users"
-	"github.com/jitsucom/jitsu/server/uuid"
 	"github.com/jitsucom/jitsu/server/wal"
 	"github.com/spf13/viper"
 )
@@ -170,6 +169,8 @@ func main() {
 	if err != nil {
 		logging.Fatalf("Error initializing meta storage: %v", err)
 	}
+	telemetry.EnrichMetaStorage(metaStorage)
+
 	ctx, cancel := context.WithCancel(context.Background())
 
 	// ** Coordination Service **
@@ -220,7 +221,7 @@ func main() {
 		notifications.SystemErrorf("Panic:\n%s\n%s", value, string(debug.Stack()))
 	}
 
-	clusterID := metaStorage.GetOrCreateClusterID(uuid.New())
+	clusterID := metaStorage.GetOrCreateClusterID()
 	systemInfo := runtime.GetInfo()
 	telemetry.EnrichSystemInfo(clusterID, systemInfo)
 

diff --git a/server/meta/dummy.go b/server/meta/dummy.go
@@ -60,7 +60,7 @@ func (d *Dummy) GetTaskLogs(taskID string, from, to time.Time) ([]TaskLogRecord,
 func (d *Dummy) PushTask(task *Task) error { return nil }
 func (d *Dummy) PollTask() (*Task, error)  { return nil, nil }
 
-func (d *Dummy) GetOrCreateClusterID(generatedClusterID string) string { return generatedClusterID }
+func (d *Dummy) GetOrCreateClusterID() string { return "" }
 
 func (d *Dummy) Type() string {
 	return DummyType