Send Segment extra info to FE (#967)

kubeshop · Jul 22, 2022 · d285aa8 · d285aa8
1 parent 0076b63
commit d285aa8
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml
@@ -61,7 +61,7 @@ jobs:
           ANALYTICS_BE_KEY=${{ secrets.ANALYTICS_BE_KEY }}
           ANALYTICS_FE_KEY=${{ secrets.ANALYTICS_FE_KEY }}
           VERSION=sha-${{ steps.vars.outputs.sha_short }}
-          ENV=main
+          TRACETEST_ENV=main
 
   deploy-beta:
     if: github.event_name == 'push'

diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -118,7 +118,7 @@ jobs:
         cache-to: type=local,dest=/tmp/.buildx-cache-new
         build-args: |
           VERSION=pr-${{ github.event.pull_request.number }}
-          ENV=pr
+          TRACETEST_ENV=pr
     - name: Update docker cache
       run: |
         rm -rf /tmp/.buildx-cache

diff --git a/.github/workflows/release-server.yml b/.github/workflows/release-server.yml
@@ -62,7 +62,7 @@ jobs:
           ANALYTICS_BE_KEY=${{ secrets.ANALYTICS_BE_KEY }}
           ANALYTICS_FE_KEY=${{ secrets.ANALYTICS_FE_KEY }}
           VERSION=${{ github.ref_name}}
-          ENV=main
+          TRACETEST_ENV=main
 
     - name: Run GoReleaser to publish release notes
       uses: goreleaser/goreleaser-action@v2
@@ -174,7 +174,7 @@ jobs:
           ANALYTICS_BE_KEY=${{ secrets.ANALYTICS_BE_KEY }}
           ANALYTICS_FE_KEY=${{ secrets.ANALYTICS_FE_KEY }}
           VERSION=${{ github.ref_name}}-demo
-          ENV=demo
+          TRACETEST_ENV=demo
     - name: Set ouput docker tag
       run: echo "::set-output tag=${{ steps.meta.outputs.tags }}"
 

diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ WORKDIR /go/src
 ARG ANALYTICS_BE_KEY
 ARG ANALYTICS_FE_KEY
 ARG VERSION
-ARG ENV
+ARG TRACETEST_ENV
 
 RUN apk add --update make
 

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
       context: .
       args:
         VERSION: dev
-        ENV: docker-compose
+        TRACETEST_ENV: docker-compose
     volumes:
       - type: bind
         source: ./local-config/config.tests.yaml

diff --git a/server/analytics/segment.go b/server/analytics/segment.go
@@ -13,8 +13,8 @@ func newSegmentTracker(hostname, serverID, appVersion, env string) Tracker {
 	client := segment.New(SecretKey)
 
 	client.Enqueue(segment.Identify{
-		UserId: serverID,
 		Traits: segment.NewTraits().
+			Set("serverID", serverID).
 			Set("env", env).
 			Set("appVersion", appVersion).
 			Set("hostname", hostname),
@@ -46,6 +46,7 @@ func (t segmentTracker) Ready() bool {
 
 func (t segmentTracker) Track(name string, props map[string]string) error {
 	p := segment.NewProperties().
+		Set("serverID", t.serverID).
 		Set("env", t.env).
 		Set("appVersion", t.appVersion).
 		Set("hostname", t.hostname)

diff --git a/server/app/app.go b/server/app/app.go
@@ -72,7 +72,7 @@ func spaHandler(prefix, staticPath, indexPath string, tplVars map[string]string)
 }
 
 func (a *App) Start() error {
-	fmt.Println("Starting tracetest", Version)
+	fmt.Printf("Starting tracetest (version %s, env %s)\n", Version, Env)
 
 	serverID, isNewInstall, err := a.db.ServerID()
 
@@ -151,6 +151,9 @@ func (a *App) Start() error {
 				"AnalyticsKey":     analytics.FrontendKey,
 				"AnalyticsEnabled": fmt.Sprintf("%t", a.config.GA.Enabled),
 				"ServerPathPrefix": fmt.Sprintf("%s/", a.config.Server.PathPrefix),
+				"ServerID":         serverID,
+				"AppVersion":       Version,
+				"Env":              Env,
 			},
 		),
 	)