telemetry

Author: pierre-b

internal/service/telemetry_service.go

@@ -24,6 +24,15 @@ type TelemetryMetrics struct {
 	MessagesCount      int    `json:"messages_count"`
 	ListsCount         int    `json:"lists_count"`
 	APIEndpoint        string `json:"api_endpoint"`
+
+	// Integration flags - boolean for each email provider
+	Mailgun   bool `json:"mailgun"`
+	AmazonSES bool `json:"amazonses"`
+	Mailjet   bool `json:"mailjet"`
+	SendGrid  bool `json:"sendgrid"`
+	Postmark  bool `json:"postmark"`
+	SMTP      bool `json:"smtp"`
+	S3        bool `json:"s3"`
 }
 
 const (
@@ -82,7 +91,7 @@ func (t *TelemetryService) SendMetricsForAllWorkspaces(ctx context.Context) erro
 
 	// Collect and send metrics for each workspace
 	for _, workspace := range workspaces {
-		if err := t.sendMetricsForWorkspace(ctx, workspace.ID); err != nil {
+		if err := t.sendMetricsForWorkspace(ctx, workspace); err != nil {
 			// Continue with other workspaces on error
 		}
 	}
@@ -91,10 +100,10 @@ func (t *TelemetryService) SendMetricsForAllWorkspaces(ctx context.Context) erro
 }
 
 // sendMetricsForWorkspace collects and sends telemetry metrics for a specific workspace
-func (t *TelemetryService) sendMetricsForWorkspace(ctx context.Context, workspaceID string) error {
+func (t *TelemetryService) sendMetricsForWorkspace(ctx context.Context, workspace *domain.Workspace) error {
 	// Create SHA1 hash of workspace ID
 	hasher := sha1.New()
-	hasher.Write([]byte(workspaceID))
+	hasher.Write([]byte(workspace.ID))
 	workspaceIDSHA1 := hex.EncodeToString(hasher.Sum(nil))
 
 	// Collect metrics
@@ -103,8 +112,11 @@ func (t *TelemetryService) sendMetricsForWorkspace(ctx context.Context, workspac
 		APIEndpoint:     t.apiEndpoint,
 	}
 
-	// Get workspace database connection
-	db, err := t.workspaceRepo.GetConnection(ctx, workspaceID)
+	// Set integration flags from workspace integrations
+	t.setIntegrationFlagsFromWorkspace(workspace, &metrics)
+
+	// Get workspace database connection for counting metrics
+	db, err := t.workspaceRepo.GetConnection(ctx, workspace.ID)
 	if err != nil {
 		// Continue without database metrics
 	} else {
@@ -140,7 +152,7 @@ func (t *TelemetryService) sendMetricsForWorkspace(ctx context.Context, workspac
 
 // countContacts counts the total number of contacts in a workspace
 func (t *TelemetryService) countContacts(ctx context.Context, db *sql.DB) (int, error) {
-	query := `SELECT COUNT(DISTINCT email) FROM contacts`
+	query := `SELECT COUNT(*) FROM contacts`
 	var count int
 	err := db.QueryRowContext(ctx, query).Scan(&count)
 	if err != nil {
@@ -184,7 +196,7 @@ func (t *TelemetryService) countMessages(ctx context.Context, db *sql.DB) (int,
 
 // countLists counts the total number of lists in a workspace
 func (t *TelemetryService) countLists(ctx context.Context, db *sql.DB) (int, error) {
-	query := `SELECT COUNT(*) FROM lists WHERE deleted_at IS NULL`
+	query := `SELECT COUNT(*) FROM lists`
 	var count int
 	err := db.QueryRowContext(ctx, query).Scan(&count)
 	if err != nil {
@@ -193,6 +205,39 @@ func (t *TelemetryService) countLists(ctx context.Context, db *sql.DB) (int, err
 	return count, nil
 }
 
+// setIntegrationFlagsFromWorkspace sets boolean flags for each integration type from workspace integrations
+func (t *TelemetryService) setIntegrationFlagsFromWorkspace(workspace *domain.Workspace, metrics *TelemetryMetrics) {
+	// Iterate through workspace integrations and set flags based on email provider kind
+	for _, integration := range workspace.Integrations {
+		if integration.Type == domain.IntegrationTypeEmail {
+			switch integration.EmailProvider.Kind {
+			case domain.EmailProviderKindMailgun:
+				metrics.Mailgun = true
+			case domain.EmailProviderKindSES:
+				metrics.AmazonSES = true
+			case domain.EmailProviderKindMailjet:
+				metrics.Mailjet = true
+			case domain.EmailProviderKindPostmark:
+				metrics.Postmark = true
+			case domain.EmailProviderKindSMTP:
+				metrics.SMTP = true
+			case domain.EmailProviderKindSparkPost:
+				metrics.SendGrid = true // SparkPost maps to SendGrid for telemetry
+			}
+		}
+	}
+
+	// Check if S3-compatible file storage is configured
+	if t.isS3FileStorageConfigured(&workspace.Settings.FileManager) {
+		metrics.S3 = true
+	}
+}
+
+// isS3FileStorageConfigured checks if S3-compatible file storage is configured in workspace settings
+func (t *TelemetryService) isS3FileStorageConfigured(fileManager *domain.FileManagerSettings) bool {
+	return fileManager.Endpoint != "" && fileManager.Bucket != "" && fileManager.AccessKey != ""
+}
+
 // sendMetrics sends the collected metrics to the telemetry endpoint
 func (t *TelemetryService) sendMetrics(ctx context.Context, metrics TelemetryMetrics) error {
 	// Marshal metrics to JSON

internal/service/telemetry_service_test.go

@@ -142,3 +142,75 @@ func TestTelemetryService_HardcodedEndpoint(t *testing.T) {
 	// Verify that the hardcoded endpoint is used
 	assert.Equal(t, "https://telemetry.notifuse.com", TelemetryEndpoint)
 }
+
+func TestTelemetryService_SetIntegrationFlags(t *testing.T) {
+	config := TelemetryServiceConfig{
+		Enabled:     true,
+		APIEndpoint: "https://api.example.com",
+		Logger:      logger.NewLoggerWithLevel("debug"),
+	}
+
+	service := NewTelemetryService(config)
+
+	// Test workspace with various integrations
+	workspace := &domain.Workspace{
+		ID:   "test-workspace",
+		Name: "Test Workspace",
+		Integrations: domain.Integrations{
+			{
+				ID:   "mailgun-integration",
+				Name: "Mailgun",
+				Type: domain.IntegrationTypeEmail,
+				EmailProvider: domain.EmailProvider{
+					Kind: domain.EmailProviderKindMailgun,
+				},
+			},
+			{
+				ID:   "ses-integration",
+				Name: "Amazon SES",
+				Type: domain.IntegrationTypeEmail,
+				EmailProvider: domain.EmailProvider{
+					Kind: domain.EmailProviderKindSES,
+				},
+			},
+			{
+				ID:   "smtp-integration",
+				Name: "SMTP",
+				Type: domain.IntegrationTypeEmail,
+				EmailProvider: domain.EmailProvider{
+					Kind: domain.EmailProviderKindSMTP,
+				},
+			},
+		},
+	}
+
+	// Test the integration flag setting
+	metrics := TelemetryMetrics{}
+	service.setIntegrationFlagsFromWorkspace(workspace, &metrics)
+
+	// Verify that the correct flags are set
+	assert.True(t, metrics.Mailgun, "Mailgun flag should be true")
+	assert.True(t, metrics.AmazonSES, "AmazonSES flag should be true")
+	assert.True(t, metrics.SMTP, "SMTP flag should be true")
+	assert.False(t, metrics.Mailjet, "Mailjet flag should be false")
+	assert.False(t, metrics.SendGrid, "SendGrid flag should be false")
+	assert.False(t, metrics.Postmark, "Postmark flag should be false")
+
+	// Test empty workspace
+	emptyWorkspace := &domain.Workspace{
+		ID:           "empty-workspace",
+		Name:         "Empty Workspace",
+		Integrations: domain.Integrations{},
+	}
+
+	emptyMetrics := TelemetryMetrics{}
+	service.setIntegrationFlagsFromWorkspace(emptyWorkspace, &emptyMetrics)
+
+	// Verify all flags are false
+	assert.False(t, emptyMetrics.Mailgun, "All flags should be false for empty workspace")
+	assert.False(t, emptyMetrics.AmazonSES, "All flags should be false for empty workspace")
+	assert.False(t, emptyMetrics.SMTP, "All flags should be false for empty workspace")
+	assert.False(t, emptyMetrics.Mailjet, "All flags should be false for empty workspace")
+	assert.False(t, emptyMetrics.SendGrid, "All flags should be false for empty workspace")
+	assert.False(t, emptyMetrics.Postmark, "All flags should be false for empty workspace")
+}

telemetry/.gcloudignore

@@ -0,0 +1,60 @@
+# This file specifies files that are *not* uploaded to Google Cloud
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line below:
+.git
+.gitignore
+
+# Node.js dependencies:
+node_modules/
+
+# Python pycache:
+__pycache__/
+# Ignored by the build system
+/setup.cfg
+
+# Go build artifacts
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool
+*.out
+
+# Dependency directories
+vendor/
+
+# IDE files
+.vscode/
+.idea/
+*.swp
+*.swo
+
+# OS generated files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Local development files
+.env
+.env.local
+*.log
+
+# Documentation
+README.md