add source example id to telemetry

hugodutka · hugodutka · commit d66e041f6a1c · 2024-11-27T11:51:20.000Z
diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go
@@ -868,6 +868,9 @@ func ConvertTemplateVersion(version database.TemplateVersion) TemplateVersion {
 	if version.TemplateID.Valid {
 		snapVersion.TemplateID = &version.TemplateID.UUID
 	}
+	if version.SourceExampleID.Valid {
+		snapVersion.SourceExampleID = &version.SourceExampleID.String
+	}
 	return snapVersion
 }
 
@@ -1116,11 +1119,12 @@ type Template struct {
 }
 
 type TemplateVersion struct {
-	ID             uuid.UUID  `json:"id"`
-	CreatedAt      time.Time  `json:"created_at"`
-	TemplateID     *uuid.UUID `json:"template_id,omitempty"`
-	OrganizationID uuid.UUID  `json:"organization_id"`
-	JobID          uuid.UUID  `json:"job_id"`
+	ID              uuid.UUID  `json:"id"`
+	CreatedAt       time.Time  `json:"created_at"`
+	TemplateID      *uuid.UUID `json:"template_id,omitempty"`
+	OrganizationID  uuid.UUID  `json:"organization_id"`
+	JobID           uuid.UUID  `json:"job_id"`
+	SourceExampleID *string    `json:"source_example_id,omitempty"`
 }
 
 type ProvisionerJob struct {
diff --git a/coderd/telemetry/telemetry_test.go b/coderd/telemetry/telemetry_test.go
@@ -1,6 +1,7 @@
 package telemetry_test
 
 import (
+	"database/sql"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -48,6 +49,10 @@ func TestTelemetry(t *testing.T) {
 		_ = dbgen.Template(t, db, database.Template{
 			Provisioner: database.ProvisionerTypeTerraform,
 		})
+		sourceExampleID := uuid.NewString()
+		_ = dbgen.TemplateVersion(t, db, database.TemplateVersion{
+			SourceExampleID: sql.NullString{String: sourceExampleID, Valid: true},
+		})
 		_ = dbgen.TemplateVersion(t, db, database.TemplateVersion{})
 		user := dbgen.User(t, db, database.User{})
 		_ = dbgen.Workspace(t, db, database.WorkspaceTable{})
@@ -93,7 +98,7 @@ func TestTelemetry(t *testing.T) {
 		require.Len(t, snapshot.ProvisionerJobs, 1)
 		require.Len(t, snapshot.Licenses, 1)
 		require.Len(t, snapshot.Templates, 1)
-		require.Len(t, snapshot.TemplateVersions, 1)
+		require.Len(t, snapshot.TemplateVersions, 2)
 		require.Len(t, snapshot.Users, 1)
 		require.Len(t, snapshot.Groups, 2)
 		// 1 member in the everyone group + 1 member in the custom group
@@ -111,6 +116,17 @@ func TestTelemetry(t *testing.T) {
 		require.Len(t, wsa.Subsystems, 2)
 		require.Equal(t, string(database.WorkspaceAgentSubsystemEnvbox), wsa.Subsystems[0])
 		require.Equal(t, string(database.WorkspaceAgentSubsystemExectrace), wsa.Subsystems[1])
+
+		tvs := snapshot.TemplateVersions
+		sort.Slice(tvs, func(i, j int) bool {
+			// Sort by SourceExampleID presence (non-nil comes before nil)
+			if (tvs[i].SourceExampleID != nil) != (tvs[j].SourceExampleID != nil) {
+				return tvs[i].SourceExampleID != nil
+			}
+			return false
+		})
+		require.Equal(t, tvs[0].SourceExampleID, &sourceExampleID)
+		require.Nil(t, tvs[1].SourceExampleID)
 	})
 	t.Run("HashedEmail", func(t *testing.T) {
 		t.Parallel()

Original file line number	Diff line number	Diff line change
`@@ -868,6 +868,9 @@ func ConvertTemplateVersion(version database.TemplateVersion) TemplateVersion {`
`868`	`868`	`if version.TemplateID.Valid {`
`869`	`869`	`snapVersion.TemplateID = &version.TemplateID.UUID`
`870`	`870`	`}`
	`871`	`+ if version.SourceExampleID.Valid {`
	`872`	`+ snapVersion.SourceExampleID = &version.SourceExampleID.String`
	`873`	`+ }`
`871`	`874`	`return snapVersion`
`872`	`875`	`}`
`873`	`876`
`@@ -1116,11 +1119,12 @@ type Template struct {`
`1116`	`1119`	`}`
`1117`	`1120`
`1118`	`1121`	`type TemplateVersion struct {`
`1119`		- ID uuid.UUID `json:"id"`
`1120`		- CreatedAt time.Time `json:"created_at"`
`1121`		- TemplateID *uuid.UUID `json:"template_id,omitempty"`
`1122`		- OrganizationID uuid.UUID `json:"organization_id"`
`1123`		- JobID uuid.UUID `json:"job_id"`
	`1122`	+ ID uuid.UUID `json:"id"`
	`1123`	+ CreatedAt time.Time `json:"created_at"`
	`1124`	+ TemplateID *uuid.UUID `json:"template_id,omitempty"`
	`1125`	+ OrganizationID uuid.UUID `json:"organization_id"`
	`1126`	+ JobID uuid.UUID `json:"job_id"`
	`1127`	+ SourceExampleID *string `json:"source_example_id,omitempty"`
`1124`	`1128`	`}`
`1125`	`1129`
`1126`	`1130`	`type ProvisionerJob struct {`