Addressing PR review comments

mattermost · Jul 4, 2024 · a017f80 · a017f80
1 parent 16f6dd7
commit a017f80
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 23 deletions.
diff --git a/server/api_channel.go b/server/api_channel.go
@@ -108,11 +108,6 @@ func (p *Plugin) handleSince(c *gin.Context) {
 		"user_actual_id": user.Id,
 		"since":          data.Since,
 		"type":           promptPreset,
-		"feature": map[string]any{
-			"name":    "AI",
-			"is_free": false,
-			"skus":    []string{"enterprise"},
-		},
 	})
 
 	prompt, err := p.prompts.ChatCompletion(promptPreset, context, p.getDefaultToolsStore(context.IsDMWithBot()))

diff --git a/server/api_post.go b/server/api_post.go
@@ -119,11 +119,6 @@ func (p *Plugin) handleSummarize(c *gin.Context) {
 		"channel_id":     channel.Id,
 		"post_id":        post.Id,
 		"user_actual_id": user.Id,
-		"feature": map[string]any{
-			"name":    "AI",
-			"is_free": false,
-			"skus":    []string{"enterprise"},
-		},
 	})
 
 	createdPost, err := p.startNewSummaryThread(bot, post.Id, p.MakeConversationContext(bot, user, channel, nil))
@@ -213,11 +208,6 @@ func (p *Plugin) handleSummarizeTranscription(c *gin.Context) {
 		"channel_id":     channel.Id,
 		"post_id":        post.Id,
 		"user_actual_id": user.Id,
-		"feature": map[string]any{
-			"name":    "AI",
-			"is_free": false,
-			"skus":    []string{"enterprise"},
-		},
 	})
 
 	createdPost, err := p.newCallTranscriptionSummaryThread(bot, user, post, channel)

diff --git a/server/telemetry.go b/server/telemetry.go
@@ -9,6 +9,8 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/mattermost/mattermost-plugin-ai/server/telemetry"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/rudderlabs/analytics-go"
 )
 
 const (
@@ -28,6 +30,20 @@ var (
 	}
 	telemetryClientTypesMap  map[string]struct{}
 	telemetryClientEventsMap map[string]struct{}
+
+	enterpriseSKUs = []string{model.LicenseShortSkuEnterprise}
+	// currently unused
+	// professionalSKUs = []string{model.LicenseShortSkuProfessional, model.LicenseShortSkuEnterprise}
+
+	// We only need to map events that require a SKU (i.e., licensed features). Anything available on unlicensed
+	// servers will map to null as expected.
+	eventToSkusMap = map[string][]string{
+		evUserStartedConversation: enterpriseSKUs,
+		evContextualInterrogation: enterpriseSKUs,
+		evSummarizeUnreadMessages: enterpriseSKUs,
+		evSummarizeThread:         enterpriseSKUs,
+		evSummarizeTranscription:  enterpriseSKUs,
+	}
 )
 
 func init() {
@@ -42,10 +58,15 @@ func init() {
 }
 
 type trackEventRequest struct {
-	Event      string                 `json:"event"`
-	ClientType string                 `json:"clientType"`
-	Source     string                 `json:"source"`
-	Props      map[string]interface{} `json:"props"`
+	Event      string         `json:"event"`
+	ClientType string         `json:"clientType"`
+	Source     string         `json:"source"`
+	Props      map[string]any `json:"props"`
+}
+
+type eventFeature struct {
+	Name string   `json:"name"`
+	Skus []string `json:"skus"`
 }
 
 func (p *Plugin) track(ev string, props map[string]interface{}) {
@@ -54,7 +75,17 @@ func (p *Plugin) track(ev string, props map[string]interface{}) {
 	if p.telemetry == nil {
 		return
 	}
-	if err := p.telemetry.Track(ev, props); err != nil {
+
+	ctx := &analytics.Context{
+		Extra: map[string]any{
+			"feature": eventFeature{
+				Name: "Copilot",
+				Skus: eventToSkusMap[ev],
+			},
+		},
+	}
+
+	if err := p.telemetry.Track(ev, props, ctx); err != nil {
 		p.API.LogError(err.Error())
 	}
 }

diff --git a/server/telemetry/telemetry.go b/server/telemetry/telemetry.go
@@ -13,7 +13,7 @@ type ClientConfig struct {
 	WriteKey     string
 	DataplaneURL string
 	DiagnosticID string
-	DefaultProps map[string]interface{}
+	DefaultProps map[string]any
 }
 
 func (c *ClientConfig) isValid() error {
@@ -48,9 +48,9 @@ func NewClient(config ClientConfig) (*Client, error) {
 	}, nil
 }
 
-func (c *Client) Track(event string, props map[string]interface{}) error {
+func (c *Client) Track(event string, props map[string]interface{}, ctx *analytics.Context) error {
 	if props == nil {
-		props = map[string]interface{}{}
+		props = map[string]any{}
 	}
 
 	for k, v := range c.config.DefaultProps {
@@ -61,6 +61,7 @@ func (c *Client) Track(event string, props map[string]interface{}) error {
 		Event:      event,
 		UserId:     c.config.DiagnosticID,
 		Properties: props,
+		Context:    ctx,
 	}); err != nil {
 		return fmt.Errorf("telemetry: failed to track event: %w", err)
 	}