Skip to content

Commit 362bd2d

Browse files
author
Andrew Ellison
authored
Bugfix/public event vars (#87)
* make event context vars public * Adds run ID * handle distinct id within go-commons
1 parent 7f35ac8 commit 362bd2d

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ require (
2424
golang.org/x/crypto v0.1.0
2525
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
2626
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
27+
vizzlo.com/mixpanel v1.2.0
2728
)
2829

2930
require (
@@ -118,5 +119,4 @@ require (
118119
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
119120
sigs.k8s.io/structured-merge-diff/v4 v4.0.3 // indirect
120121
sigs.k8s.io/yaml v1.2.0 // indirect
121-
vizzlo.com/mixpanel v1.2.0 // indirect
122122
)

telemetry/mixpanel.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package telemetry
22

33
import (
4+
"github.com/google/uuid"
45
"log"
56
"time"
67

@@ -12,6 +13,7 @@ type MixpanelTelemetryTracker struct {
1213
client *mixpanel.Client
1314
appName string
1415
version string
16+
runId string
1517
}
1618

1719
/*
@@ -33,14 +35,14 @@ func (m MixpanelTelemetryTracker) TrackEvent(eventContext EventContext, eventPro
3335
baseProps := map[string]interface{}{
3436
"timestamp": time.Now().Unix(),
3537
"context": m.appName,
36-
"command": eventContext.command,
38+
"command": eventContext.Command,
3739
"version": m.version,
3840
}
3941

4042
// Combine our baseline props that we send for _ALL_ events with the passed in props from the event
4143
trackProps := mergeMaps(baseProps, eventProps)
4244

43-
err := m.client.Track(m.clientId, eventContext.eventName, trackProps)
45+
err := m.client.Track(m.runId, eventContext.EventName, trackProps)
4446

4547
if err != nil {
4648
log.Fatal(err)
@@ -49,5 +51,11 @@ func (m MixpanelTelemetryTracker) TrackEvent(eventContext EventContext, eventPro
4951

5052
func NewMixPanelTelemetryClient(clientId string, appName string, version string) MixpanelTelemetryTracker {
5153
mixpanelClient := mixpanel.New(clientId)
52-
return MixpanelTelemetryTracker{client: mixpanelClient, clientId: clientId, appName: appName, version: version}
54+
return MixpanelTelemetryTracker{
55+
client: mixpanelClient,
56+
clientId: clientId,
57+
appName: appName,
58+
version: version,
59+
runId: uuid.New().String(),
60+
}
5361
}

telemetry/telemetry.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ type telemetryTracker interface {
55
}
66

77
type EventContext struct {
8-
command string
9-
eventName string
8+
Command string
9+
EventName string
1010
}

0 commit comments

Comments
 (0)