From d986c7f7f4dc0c992bd2d5c7eb51d426c7d93226 Mon Sep 17 00:00:00 2001
From: Timofey Kirillov <timofey.kirillov@flant.com>
Date: Mon, 11 Jul 2022 20:30:21 +0300
Subject: [PATCH] chore(telemetry): use new telemetry schema version

* use eventType and eventData for event-specific data;

* use attributes for common fields: os, arch, version (of werf), groupChannel (trdl use werf >1.2 alpha<).

Signed-off-by: Timofey Kirillov <timofey.kirillov@flant.com>
---
 pkg/telemetry/telemetrywerfio.go | 37 +++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/pkg/telemetry/telemetrywerfio.go b/pkg/telemetry/telemetrywerfio.go
index ab510ec6c4..11f907cf51 100644
--- a/pkg/telemetry/telemetrywerfio.go
+++ b/pkg/telemetry/telemetrywerfio.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"os"
+	"runtime"
 	"time"
 
 	"github.com/google/uuid"
@@ -11,10 +13,13 @@ import (
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	"go.opentelemetry.io/otel/trace"
+
+	"github.com/werf/werf/pkg/werf"
 )
 
 const (
-	spanName = "telemetry.werf.io"
+	spanName      = "telemetry.werf.io"
+	schemaVersion = 1
 )
 
 type TelemetryWerfIOInterface interface {
@@ -95,7 +100,21 @@ func (t *TelemetryWerfIO) CommandStarted(ctx context.Context) {
 	t.sendEvent(ctx, CommandStartedEvent, nil)
 }
 
-func (t *TelemetryWerfIO) sendEvent(ctx context.Context, eventType EventType, data interface{}) error {
+func (t *TelemetryWerfIO) getAttributes() map[string]interface{} {
+	attributes := map[string]interface{}{
+		"version": werf.Version,
+		"os":      runtime.GOOS,
+		"arch":    runtime.GOARCH,
+	}
+
+	if val := os.Getenv("TRDL_USE_WERF_GROUP_CHANNEL"); val != "" {
+		attributes["groupChannel"] = val
+	}
+
+	return attributes
+}
+
+func (t *TelemetryWerfIO) sendEvent(ctx context.Context, eventType EventType, eventData interface{}) error {
 	trc := t.getTracer()
 
 	_, span := trc.Start(ctx, spanName)
@@ -106,18 +125,26 @@ func (t *TelemetryWerfIO) sendEvent(ctx context.Context, eventType EventType, da
 	span.SetAttributes(attribute.Key("executionID").String(t.executionID))
 	span.SetAttributes(attribute.Key("projectID").String(t.projectID))
 	span.SetAttributes(attribute.Key("command").String(t.command))
+
+	rawAttributes, err := json.Marshal(t.getAttributes())
+	if err != nil {
+		return fmt.Errorf("unable to marshal attributes: %w", err)
+	}
+	span.SetAttributes(attribute.Key("attributes").String(string(rawAttributes)))
+
 	span.SetAttributes(attribute.Key("eventType").String(string(eventType)))
 
-	rawData, err := json.Marshal(data)
+	rawEventData, err := json.Marshal(eventData)
 	if err != nil {
 		return fmt.Errorf("unable to marshal event data: %w", err)
 	}
+	span.SetAttributes(attribute.Key("eventData").String(string(rawEventData)))
+	span.SetAttributes(attribute.Key("schemaVersion").Int64(schemaVersion))
 
-	span.SetAttributes(attribute.Key("data").String(string(rawData)))
 	span.End()
 
 	if IsLogsEnabled() {
-		fmt.Printf("Telemetry: sent event: ts=%d executionID=%q projectID=%q command=%q eventType=%q data=%q\n", ts, t.executionID, t.projectID, t.command, string(eventType), string(rawData))
+		fmt.Printf("Telemetry: sent event: ts=%d executionID=%q projectID=%q command=%q attributes=%q eventType=%q eventData=%q schemaVersion=%d\n", ts, t.executionID, t.projectID, t.command, string(rawAttributes), string(eventType), string(rawEventData), schemaVersion)
 	}
 
 	return nil