From 0f79cdcc57fc375ed6e799091e0e69f35afbaf6e Mon Sep 17 00:00:00 2001 From: Sumit Morchhale Date: Tue, 17 Nov 2026 13:04:55 +0530 Subject: [PATCH 1/4] added telemetry changes --- internal/commands/telemetry.go | 54 ++++++++++- internal/params/envs.go | 1 + internal/params/flags.go | 12 ++- internal/params/keys.go | 1 + internal/wrappers/jwt-helper.go | 127 +++++++++++++++++++++++++- internal/wrappers/jwt-helper_test.go | 129 +++++++++++++++++++++++++++ internal/wrappers/telemetry.go | 39 +++++--- 7 files changed, 349 insertions(+), 14 deletions(-) diff --git a/internal/commands/telemetry.go b/internal/commands/telemetry.go index b858454ac..0d09afa7c 100644 --- a/internal/commands/telemetry.go +++ b/internal/commands/telemetry.go @@ -6,6 +6,7 @@ import ( "github.com/checkmarx/ast-cli/internal/wrappers" "github.com/pkg/errors" "github.com/spf13/cobra" + "github.com/spf13/viper" ) func NewTelemetryCommand(telemetryWrapper wrappers.TelemetryWrapper) *cobra.Command { @@ -42,7 +43,18 @@ func telemetryAISubCommand(telemetryAIWrapper wrappers.TelemetryWrapper) *cobra. telemetryAICmd.PersistentFlags().String(params.AgentFlag, "", "Agent") telemetryAICmd.PersistentFlags().String(params.ScanTypeFlag, "", "Scan Type") telemetryAICmd.PersistentFlags().String(params.StatusFlag, "", "Status") + telemetryAICmd.PersistentFlags().String(params.StatusResultFlag, "", "Status Result") telemetryAICmd.PersistentFlags().Int(params.TotalCountFlag, 0, "Total Count") + telemetryAICmd.PersistentFlags().String(params.AgentVersionFlag, "", "Agent Version") + telemetryAICmd.PersistentFlags().String(params.CxPluginVersionFlag, "", "CX Plugin Version") + telemetryAICmd.PersistentFlags().String(params.PluginTypeFlag, "", "Plugin Type") + telemetryAICmd.PersistentFlags().String(params.RepoURLFlag, "", "Repository URL") + telemetryAICmd.PersistentFlags().String(params.InstallationIDFlag, "", "Installation ID") + telemetryAICmd.PersistentFlags().String(params.AuthMethodFlag, "", "Auth Method") + telemetryAICmd.PersistentFlags().String(params.VulnerabilityIDFlag, "", "Vulnerability ID") + telemetryAICmd.PersistentFlags().String(params.RemediationModeFlag, "", "Remediation Mode") + telemetryAICmd.PersistentFlags().String(params.AiAgentSessionIdFlag, "", "AI Agent Session ID") + telemetryAICmd.PersistentFlags().String(params.ApiVersionFlag, "", "API Version") return telemetryAICmd } @@ -57,19 +69,59 @@ func runTelemetryAI(telemetryWrapper wrappers.TelemetryWrapper) func(*cobra.Comm engine, _ := cmd.Flags().GetString("engine") scanType, _ := cmd.Flags().GetString("scan-type") status, _ := cmd.Flags().GetString("status") - totalCount, _ := cmd.Flags().GetInt("total-count") + totalCount, _ := cmd.Flags().GetInt(params.TotalCountFlag) + statusResult, _ := cmd.Flags().GetString(params.StatusResultFlag) + agentVersion, _ := cmd.Flags().GetString(params.AgentVersionFlag) + cxPluginVersion, _ := cmd.Flags().GetString(params.CxPluginVersionFlag) + pluginType, _ := cmd.Flags().GetString(params.PluginTypeFlag) + repoURL, _ := cmd.Flags().GetString(params.RepoURLFlag) + installationID, _ := cmd.Flags().GetString(params.InstallationIDFlag) + authMethod, _ := cmd.Flags().GetString(params.AuthMethodFlag) + vulnerabilityID, _ := cmd.Flags().GetString(params.VulnerabilityIDFlag) + remediationMode, _ := cmd.Flags().GetString(params.RemediationModeFlag) + aiAgentSessionIdFlag, _ := cmd.Flags().GetString(params.AiAgentSessionIdFlag) + apiVersion, _ := cmd.Flags().GetString(params.ApiVersionFlag) + uniqueID := wrappers.GetUniqueID() + machineID := wrappers.GetMachineID() + + var sessionID string + if eventType == "authentication" && status == "success" { + sessionID = wrappers.GetSessionID() + } else { + sessionID = viper.GetString(params.SessionIDConfigKey) + } + var eventAttrs *wrappers.EventAttributes + if installationID != "" || authMethod != "" || vulnerabilityID != "" || remediationMode != "" || aiAgentSessionIdFlag != "" { + eventAttrs = &wrappers.EventAttributes{ + InstallationID: installationID, + AuthMethod: authMethod, + VulnerabilityID: vulnerabilityID, + RemediationMode: remediationMode, + AiAgentSessionId: aiAgentSessionIdFlag, + } + } + err := telemetryWrapper.SendAIDataToLog(&wrappers.DataForAITelemetry{ AIProvider: aiProvider, ProblemSeverity: problemSeverity, Type: eventType, SubType: subType, Agent: agent, + AgentVersion: agentVersion, + CxPluginVersion: cxPluginVersion, + PluginType: pluginType, Engine: engine, ScanType: scanType, Status: status, + StatusResult: statusResult, + APIVersion: apiVersion, TotalCount: totalCount, + RepoURL: repoURL, UniqueID: uniqueID, + SessionID: sessionID, + MachineID: machineID, + EventAttributes: eventAttrs, }) if err != nil { diff --git a/internal/params/envs.go b/internal/params/envs.go index 42982dd7c..75b256715 100644 --- a/internal/params/envs.go +++ b/internal/params/envs.go @@ -86,6 +86,7 @@ const ( ConfigFilePathEnv = "CX_CONFIG_FILE_PATH" RealtimeScannerPathEnv = "CX_REALTIME_SCANNER_PATH" UniqueIDEnv = "CX_UNIQUE_ID" + SessionIDEnv = "CX_SESSION_ID" StartMultiPartUploadPathEnv = "CX_START_MULTIPART_UPLOAD_PATH" MultipartPresignedPathEnv = "CX_MULTIPART_PRESIGNED_URL_PATH" CompleteMultipartUploadPathEnv = "CX_COMPLETE_MULTIPART_UPLOAD_PATH" diff --git a/internal/params/flags.go b/internal/params/flags.go index 5b322ff39..b43815320 100644 --- a/internal/params/flags.go +++ b/internal/params/flags.go @@ -16,8 +16,19 @@ const ( SubTypeFlag = "sub-type" EngineFlag = "engine" StatusFlag = "status" + StatusResultFlag = "status-result" scanTypeFlag = "scan-type" TotalCountFlag = "total-count" + AgentVersionFlag = "agent-version" + CxPluginVersionFlag = "cx-plugin-version" + PluginTypeFlag = "plugin-type" + RepoURLFlag = "repo-url" + InstallationIDFlag = "installation-id" + AuthMethodFlag = "auth-method" + VulnerabilityIDFlag = "vulnerability-id" + RemediationModeFlag = "remediation-mode" + AiAgentSessionIdFlag = "ai-agent-session-id" + ApiVersionFlag = "api-version" OriginFlag = "origin" AgentFlagUsage = "Scan origin name" ApplicationName = "application-name" @@ -167,7 +178,6 @@ const ( URLFlagUsage = "API base URL" QueryIDFlag = "query-id" SSHKeyFlag = "ssh-key" - RepoURLFlag = "repo-url" SSHValue = "ssh-value" KicsContainerNameKey = "kics-container-name" KicsPlatformsFlag = "kics-platforms" diff --git a/internal/params/keys.go b/internal/params/keys.go index 480ee49d8..10424f67c 100644 --- a/internal/params/keys.go +++ b/internal/params/keys.go @@ -84,6 +84,7 @@ var ( ConfigFilePathKey = strings.ToLower(ConfigFilePathEnv) RealtimeScannerPathKey = strings.ToLower(RealtimeScannerPathEnv) UniqueIDConfigKey = strings.ToLower(UniqueIDEnv) + SessionIDConfigKey = strings.ToLower(SessionIDEnv) StartMultiPartUploadPathKey = strings.ToLower(StartMultiPartUploadPathEnv) MultipartPresignedPathKey = strings.ToLower(MultipartPresignedPathEnv) CompleteMultiPartUploadPathKey = strings.ToLower(CompleteMultipartUploadPathEnv) diff --git a/internal/wrappers/jwt-helper.go b/internal/wrappers/jwt-helper.go index 566a88303..026fe4a16 100644 --- a/internal/wrappers/jwt-helper.go +++ b/internal/wrappers/jwt-helper.go @@ -1,7 +1,11 @@ package wrappers import ( + "bytes" + "os" + "os/exec" "os/user" + "runtime" "strconv" "strings" @@ -13,6 +17,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" "github.com/spf13/viper" + "golang.org/x/sys/windows/registry" ) // JWTStruct model used to get all jwt fields @@ -222,10 +227,14 @@ func GetUniqueID() string { // Check if unique id is already set uniqueID = viper.GetString(commonParams.UniqueIDConfigKey) - if uniqueID != "" { + if uniqueID != "" && isValidUniqueIDFormat(uniqueID) { return uniqueID } + if uniqueID != "" { + logger.PrintIfVerbose("Existing unique ID invalid format, regenerating") + } + // Generate new unique id currentUser, err := user.Current() if err != nil { @@ -247,3 +256,119 @@ func GetUniqueID() string { } return uniqueID } + +func isValidUniqueIDFormat(uniqueID string) bool { + parts := strings.Split(uniqueID, "_") + if len(parts) != 2 { + return false + } + + guid := parts[0] + storedUsername := parts[1] + + if len(guid) != 36 { + return false + } + + if _, err := uuid.Parse(guid); err != nil { + return false + } + + if storedUsername == "" { + return false + } + + currentUser, err := user.Current() + if err != nil { + return false + } + currentUsername := currentUser.Username + currentUsername = strings.TrimSpace(currentUsername) + if strings.Contains(currentUsername, "\\") { + currentUsername = strings.Split(currentUsername, "\\")[1] + } + + if storedUsername != currentUsername { + return false + } + + return true +} + +func GetSessionID() string { + sessionID := uuid.New().String() + viper.Set(commonParams.SessionIDConfigKey, sessionID) + configFilePath, err := configuration.GetConfigFilePath() + if err != nil { + logger.PrintIfVerbose("Failed to get config file path: " + err.Error()) + return sessionID + } + + err = configuration.SafeWriteSingleConfigKeyString(configFilePath, commonParams.SessionIDConfigKey, sessionID) + if err != nil { + logger.PrintIfVerbose("Failed to write session ID config: " + err.Error()) + } + return sessionID +} + +func GetMachineID() string { + switch runtime.GOOS { + case "windows": + return getWindowsMachineID() + case "darwin": + return getMacOSMachineID() + case "linux": + return getLinuxMachineID() + default: + return "" + } +} + +func getWindowsMachineID() string { + k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Cryptography`, registry.QUERY_VALUE|registry.WOW64_64KEY) + if err != nil { + logger.PrintIfVerbose("Failed to open registry key: " + err.Error()) + return "" + } + defer k.Close() + + machineID, _, err := k.GetStringValue("MachineGuid") + if err != nil { + logger.PrintIfVerbose("Failed to read MachineGuid from registry: " + err.Error()) + return "" + } + return machineID +} + +func getMacOSMachineID() string { + buf := &bytes.Buffer{} + cmd := exec.Command("ioreg", "-rd1", "-c", "IOPlatformExpertDevice") + cmd.Stdout = buf + err := cmd.Run() + if err != nil { + logger.PrintIfVerbose("Failed to run ioreg: " + err.Error()) + return "" + } + for _, line := range strings.Split(buf.String(), "\n") { + if strings.Contains(line, "IOPlatformUUID") { + parts := strings.SplitAfter(line, `" = "`) + if len(parts) == 2 { + machineID := strings.TrimRight(parts[1], `"`) + return strings.TrimSpace(machineID) + } + } + } + return "" +} + +func getLinuxMachineID() string { + machineID, err := os.ReadFile("/var/lib/dbus/machine-id") + if err == nil { + return strings.TrimSpace(string(machineID)) + } + machineID, err = os.ReadFile("/etc/machine-id") + if err == nil { + return strings.TrimSpace(string(machineID)) + } + return "" +} diff --git a/internal/wrappers/jwt-helper_test.go b/internal/wrappers/jwt-helper_test.go index 9356921ef..5750f787d 100644 --- a/internal/wrappers/jwt-helper_test.go +++ b/internal/wrappers/jwt-helper_test.go @@ -116,6 +116,82 @@ func TestGetUniqueID(t *testing.T) { }) } +func TestIsValidUniqueIDFormat(t *testing.T) { + tests := []struct { + name string + uniqueID string + valid bool + }{ + { + name: "valid format with UUID and username", + uniqueID: "550e8400-e29b-41d4-a716-446655440000_testuser", + valid: true, + }, + { + name: "invalid - no underscore", + uniqueID: "550e8400-e29b-41d4-a716-446655440000testuser", + valid: false, + }, + { + name: "invalid - empty username", + uniqueID: "550e8400-e29b-41d4-a716-446655440000_", + valid: false, + }, + { + name: "invalid - malformed UUID", + uniqueID: "550e8400-e29b-41d4-invalid-446655440000_testuser", + valid: false, + }, + { + name: "invalid - multiple underscores", + uniqueID: "550e8400-e29b-41d4-a716-446655440000_test_user", + valid: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + result := isValidUniqueIDFormat(tt.uniqueID) + assert.Equal(t, tt.valid, result, "validation result should match expected") + }) + } +} + +func TestGetSessionID(t *testing.T) { + // Save original value and restore after test + originalID := viper.GetString(commonParams.SessionIDConfigKey) + defer viper.Set(commonParams.SessionIDConfigKey, originalID) + + t.Run("generates new session ID when none exists", func(t *testing.T) { + viper.Set(commonParams.SessionIDConfigKey, "") + + result := GetSessionID() + + assert.Assert(t, result != "", "Should generate new session ID") + assert.Assert(t, len(result) == 36, "Should be valid UUID format (36 chars)") + assert.Assert(t, strings.Count(result, "-") == 4, "Should have 4 dashes in UUID") + }) + + t.Run("returns existing valid session ID from config", func(t *testing.T) { + validID := "550e8400-e29b-41d4-a716-446655440000" + viper.Set(commonParams.SessionIDConfigKey, validID) + + result := GetSessionID() + + assert.Equal(t, validID, result, "Should return existing valid session ID") + }) + + t.Run("regenerates invalid session ID", func(t *testing.T) { + invalidID := "550e8400-e29b-41d4-invalid-446655440000" + viper.Set(commonParams.SessionIDConfigKey, invalidID) + + result := GetSessionID() + + assert.Assert(t, result != invalidID, "Should regenerate when ID is invalid") + assert.Assert(t, len(result) == 36, "Should generate valid UUID format") + }) +} + func TestBuildLicenseDetailsFromJWT(t *testing.T) { tests := []struct { name string @@ -203,3 +279,56 @@ func TestBuildLicenseDetailsFromJWT(t *testing.T) { }) } } +func TestGetMachineID(t *testing.T) { + t.Run("returns non-empty machine ID", func(t *testing.T) { + result := GetMachineID() + + // GetMachineID may return empty on unsupported platforms, but should not crash + if result != "" { + assert.Assert(t, len(result) > 0, "Should return a machine ID") + } + }) +} + +func TestGetWindowsMachineID(t *testing.T) { + t.Run("registry key access", func(t *testing.T) { + // Basic test - verify function exists and can be called + // Actual registry access only works on Windows + result := getWindowsMachineID() + + // Should return string (empty if not on Windows or registry unavailable) + assert.Assert(t, result == "" || len(result) > 0, "Should return valid string") + }) +} + +func TestGetMacOSMachineID(t *testing.T) { + t.Run("ioreg command execution", func(t *testing.T) { + // Basic test - verify function exists and can be called + // Actual ioreg execution only works on macOS + result := getMacOSMachineID() + + // Should return string (empty if not on macOS or ioreg unavailable) + assert.Assert(t, result == "" || len(result) > 0, "Should return valid string") + }) +} + +func TestGetLinuxMachineID(t *testing.T) { + t.Run("file read from standard Linux paths", func(t *testing.T) { + // Basic test - verify function exists and can be called + // Actual file reads only work on Linux with proper permissions + result := getLinuxMachineID() + + // Should return string (empty if not on Linux or files unavailable) + assert.Assert(t, result == "" || len(result) > 0, "Should return valid string") + }) + + t.Run("prioritizes /var/lib/dbus/machine-id over /etc/machine-id", func(t *testing.T) { + // This test verifies the order is correct per third-party library logic + // On actual Linux systems, both paths usually contain the same ID + result1 := getLinuxMachineID() + result2 := getLinuxMachineID() + + // Results should be consistent between calls + assert.Equal(t, result1, result2, "Should return consistent machine ID") + }) +} diff --git a/internal/wrappers/telemetry.go b/internal/wrappers/telemetry.go index 39ec639b1..05fbbda97 100644 --- a/internal/wrappers/telemetry.go +++ b/internal/wrappers/telemetry.go @@ -1,17 +1,34 @@ package wrappers +type EventAttributes struct { + InstallationID string `json:"installationId"` + AuthMethod string `json:"authMethod"` + VulnerabilityID string `json:"vulnerabilityId"` + RemediationMode string `json:"remediationMode"` + AiAgentSessionId string `json:"aiAgentSessionId"` +} + type DataForAITelemetry struct { - AIProvider string `json:"aiProvider"` - ProblemSeverity string `json:"problemSeverity"` - Type string `json:"type"` - SubType string `json:"subType"` - Agent string `json:"agent"` - Engine string `json:"engine"` - ScanType string `json:"scanType"` - Status string `json:"status"` - TotalCount int `json:"totalCount"` - UniqueID string `json:"uniqueId"` - AiAgentSessionId string `json:"aiAgentSessionId,omitempty"` + AIProvider string `json:"aiProvider"` + ProblemSeverity string `json:"problemSeverity"` + Type string `json:"type"` + SubType string `json:"subType"` + Agent string `json:"agent"` + AgentVersion string `json:"agentVersion"` + CxPluginVersion string `json:"cxPluginVersion"` + PluginType string `json:"pluginType"` + Engine string `json:"engine"` + ScanType string `json:"scanType"` + Status string `json:"status"` + StatusResult string `json:"statusResult"` + APIVersion string `json:"apiVersion,omitempty"` + TotalCount int `json:"totalCount"` + RepoURL string `json:"repoUrl"` + UniqueID string `json:"uniqueId"` + SessionID string `json:"sessionId"` + MachineID string `json:"machineId"` + EventAttributes *EventAttributes `json:"eventAttributes"` + AiAgentSessionId string `json:"aiAgentSessionId"` } type TelemetryWrapper interface { From ce3b148863172d7623c83347f1e70ffc2517bf9d Mon Sep 17 00:00:00 2001 From: Sumit Morchhale Date: Tue, 17 Nov 2026 13:37:24 +0530 Subject: [PATCH 2/4] added tele chnages --- internal/wrappers/jwt-helper.go | 16 ---------------- internal/wrappers/machineID_unix.go | 8 ++++++++ internal/wrappers/machineID_windows.go | 25 +++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 internal/wrappers/machineID_unix.go create mode 100644 internal/wrappers/machineID_windows.go diff --git a/internal/wrappers/jwt-helper.go b/internal/wrappers/jwt-helper.go index 026fe4a16..b20c8a569 100644 --- a/internal/wrappers/jwt-helper.go +++ b/internal/wrappers/jwt-helper.go @@ -17,7 +17,6 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" "github.com/spf13/viper" - "golang.org/x/sys/windows/registry" ) // JWTStruct model used to get all jwt fields @@ -324,21 +323,6 @@ func GetMachineID() string { } } -func getWindowsMachineID() string { - k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Cryptography`, registry.QUERY_VALUE|registry.WOW64_64KEY) - if err != nil { - logger.PrintIfVerbose("Failed to open registry key: " + err.Error()) - return "" - } - defer k.Close() - - machineID, _, err := k.GetStringValue("MachineGuid") - if err != nil { - logger.PrintIfVerbose("Failed to read MachineGuid from registry: " + err.Error()) - return "" - } - return machineID -} func getMacOSMachineID() string { buf := &bytes.Buffer{} diff --git a/internal/wrappers/machineID_unix.go b/internal/wrappers/machineID_unix.go new file mode 100644 index 000000000..3f08e10ed --- /dev/null +++ b/internal/wrappers/machineID_unix.go @@ -0,0 +1,8 @@ +//go:build !windows +// +build !windows + +package wrappers + +func getWindowsMachineID() string { + return "" +} diff --git a/internal/wrappers/machineID_windows.go b/internal/wrappers/machineID_windows.go new file mode 100644 index 000000000..b81f59d53 --- /dev/null +++ b/internal/wrappers/machineID_windows.go @@ -0,0 +1,25 @@ +//go:build windows +// +build windows + +package wrappers + +import ( + "github.com/checkmarx/ast-cli/internal/logger" + "golang.org/x/sys/windows/registry" +) + +func getWindowsMachineID() string { + k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Cryptography`, registry.QUERY_VALUE|registry.WOW64_64KEY) + if err != nil { + logger.PrintIfVerbose("Failed to open registry key: " + err.Error()) + return "" + } + defer k.Close() + + machineID, _, err := k.GetStringValue("MachineGuid") + if err != nil { + logger.PrintIfVerbose("Failed to read MachineGuid from registry: " + err.Error()) + return "" + } + return machineID +} From 3e8049f8525815a4378fd6c699b3a200f5d517b0 Mon Sep 17 00:00:00 2001 From: Sumit Morchhale Date: Tue, 17 Nov 2026 21:42:33 +0530 Subject: [PATCH 3/4] added event attribute flag --- internal/commands/telemetry.go | 57 +++++++++++++++++++++------------- internal/params/flags.go | 6 +--- internal/wrappers/telemetry.go | 8 +---- 3 files changed, 38 insertions(+), 33 deletions(-) diff --git a/internal/commands/telemetry.go b/internal/commands/telemetry.go index 0d09afa7c..5075c5c6a 100644 --- a/internal/commands/telemetry.go +++ b/internal/commands/telemetry.go @@ -1,6 +1,8 @@ package commands import ( + "strings" + "github.com/MakeNowJust/heredoc" "github.com/checkmarx/ast-cli/internal/params" "github.com/checkmarx/ast-cli/internal/wrappers" @@ -28,7 +30,7 @@ func telemetryAISubCommand(telemetryAIWrapper wrappers.TelemetryWrapper) *cobra. Long: "Collects telemetry data for user interactions related to AI features.", Example: heredoc.Doc( ` - $ cx telemetry ai --ai-provider --problem-severity --type --sub-type --agent --engine + $ cx telemetry ai --ai-provider --problem-severity --type --sub-type --agent --engine --event-attributes "apiVersion=v2;vulnerabilityId=CVE-2021-44228;remediationMode=DevAssist" `, ), @@ -49,16 +51,41 @@ func telemetryAISubCommand(telemetryAIWrapper wrappers.TelemetryWrapper) *cobra. telemetryAICmd.PersistentFlags().String(params.CxPluginVersionFlag, "", "CX Plugin Version") telemetryAICmd.PersistentFlags().String(params.PluginTypeFlag, "", "Plugin Type") telemetryAICmd.PersistentFlags().String(params.RepoURLFlag, "", "Repository URL") - telemetryAICmd.PersistentFlags().String(params.InstallationIDFlag, "", "Installation ID") - telemetryAICmd.PersistentFlags().String(params.AuthMethodFlag, "", "Auth Method") - telemetryAICmd.PersistentFlags().String(params.VulnerabilityIDFlag, "", "Vulnerability ID") - telemetryAICmd.PersistentFlags().String(params.RemediationModeFlag, "", "Remediation Mode") - telemetryAICmd.PersistentFlags().String(params.AiAgentSessionIdFlag, "", "AI Agent Session ID") + telemetryAICmd.PersistentFlags().String(params.EventAttributesFlag, "", "Event Attributes in key=value;key=value format (e.g., apiVersion=v2;vulnerabilityId=CVE-2021-44228;remediationMode=DevAssist)") telemetryAICmd.PersistentFlags().String(params.ApiVersionFlag, "", "API Version") return telemetryAICmd } +func parseEventAttributes(eventAttributesStr string) *wrappers.EventAttributes { + if eventAttributesStr == "" { + return nil + } + + attrs := make(wrappers.EventAttributes) + pairs := strings.Split(eventAttributesStr, ";") + + for _, pair := range pairs { + kv := strings.SplitN(pair, "=", 2) + if len(kv) != 2 { + continue + } + + key := strings.TrimSpace(kv[0]) + value := strings.TrimSpace(kv[1]) + + if key != "" { + attrs[key] = value + } + } + + if len(attrs) == 0 { + return nil + } + + return &attrs +} + func runTelemetryAI(telemetryWrapper wrappers.TelemetryWrapper) func(*cobra.Command, []string) error { return func(cmd *cobra.Command, _ []string) error { aiProvider, _ := cmd.Flags().GetString("ai-provider") @@ -75,11 +102,7 @@ func runTelemetryAI(telemetryWrapper wrappers.TelemetryWrapper) func(*cobra.Comm cxPluginVersion, _ := cmd.Flags().GetString(params.CxPluginVersionFlag) pluginType, _ := cmd.Flags().GetString(params.PluginTypeFlag) repoURL, _ := cmd.Flags().GetString(params.RepoURLFlag) - installationID, _ := cmd.Flags().GetString(params.InstallationIDFlag) - authMethod, _ := cmd.Flags().GetString(params.AuthMethodFlag) - vulnerabilityID, _ := cmd.Flags().GetString(params.VulnerabilityIDFlag) - remediationMode, _ := cmd.Flags().GetString(params.RemediationModeFlag) - aiAgentSessionIdFlag, _ := cmd.Flags().GetString(params.AiAgentSessionIdFlag) + eventAttributesStr, _ := cmd.Flags().GetString(params.EventAttributesFlag) apiVersion, _ := cmd.Flags().GetString(params.ApiVersionFlag) uniqueID := wrappers.GetUniqueID() @@ -91,16 +114,8 @@ func runTelemetryAI(telemetryWrapper wrappers.TelemetryWrapper) func(*cobra.Comm } else { sessionID = viper.GetString(params.SessionIDConfigKey) } - var eventAttrs *wrappers.EventAttributes - if installationID != "" || authMethod != "" || vulnerabilityID != "" || remediationMode != "" || aiAgentSessionIdFlag != "" { - eventAttrs = &wrappers.EventAttributes{ - InstallationID: installationID, - AuthMethod: authMethod, - VulnerabilityID: vulnerabilityID, - RemediationMode: remediationMode, - AiAgentSessionId: aiAgentSessionIdFlag, - } - } + + eventAttrs := parseEventAttributes(eventAttributesStr) err := telemetryWrapper.SendAIDataToLog(&wrappers.DataForAITelemetry{ AIProvider: aiProvider, diff --git a/internal/params/flags.go b/internal/params/flags.go index b43815320..1d4626417 100644 --- a/internal/params/flags.go +++ b/internal/params/flags.go @@ -23,11 +23,7 @@ const ( CxPluginVersionFlag = "cx-plugin-version" PluginTypeFlag = "plugin-type" RepoURLFlag = "repo-url" - InstallationIDFlag = "installation-id" - AuthMethodFlag = "auth-method" - VulnerabilityIDFlag = "vulnerability-id" - RemediationModeFlag = "remediation-mode" - AiAgentSessionIdFlag = "ai-agent-session-id" + EventAttributesFlag = "event-attributes" ApiVersionFlag = "api-version" OriginFlag = "origin" AgentFlagUsage = "Scan origin name" diff --git a/internal/wrappers/telemetry.go b/internal/wrappers/telemetry.go index 05fbbda97..0bba88a90 100644 --- a/internal/wrappers/telemetry.go +++ b/internal/wrappers/telemetry.go @@ -1,12 +1,6 @@ package wrappers -type EventAttributes struct { - InstallationID string `json:"installationId"` - AuthMethod string `json:"authMethod"` - VulnerabilityID string `json:"vulnerabilityId"` - RemediationMode string `json:"remediationMode"` - AiAgentSessionId string `json:"aiAgentSessionId"` -} +type EventAttributes map[string]string type DataForAITelemetry struct { AIProvider string `json:"aiProvider"` From 4f2891ccbd32fbb88cdb832f551a703f988b77d4 Mon Sep 17 00:00:00 2001 From: Sumit Morchhale Date: Wed, 18 Nov 2026 10:55:30 +0530 Subject: [PATCH 4/4] added code for telemetry command --- internal/commands/telemetry.go | 4 ++-- internal/wrappers/telemetry.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/commands/telemetry.go b/internal/commands/telemetry.go index 5075c5c6a..19e1386b8 100644 --- a/internal/commands/telemetry.go +++ b/internal/commands/telemetry.go @@ -106,7 +106,7 @@ func runTelemetryAI(telemetryWrapper wrappers.TelemetryWrapper) func(*cobra.Comm apiVersion, _ := cmd.Flags().GetString(params.ApiVersionFlag) uniqueID := wrappers.GetUniqueID() - machineID := wrappers.GetMachineID() + machineUniqueId := wrappers.GetMachineID() var sessionID string if eventType == "authentication" && status == "success" { @@ -135,7 +135,7 @@ func runTelemetryAI(telemetryWrapper wrappers.TelemetryWrapper) func(*cobra.Comm RepoURL: repoURL, UniqueID: uniqueID, SessionID: sessionID, - MachineID: machineID, + MachineUniqueId: machineUniqueId, EventAttributes: eventAttrs, }) diff --git a/internal/wrappers/telemetry.go b/internal/wrappers/telemetry.go index 0bba88a90..ef1a485a6 100644 --- a/internal/wrappers/telemetry.go +++ b/internal/wrappers/telemetry.go @@ -20,7 +20,7 @@ type DataForAITelemetry struct { RepoURL string `json:"repoUrl"` UniqueID string `json:"uniqueId"` SessionID string `json:"sessionId"` - MachineID string `json:"machineId"` + MachineUniqueId string `json:"machineUniqueId"` EventAttributes *EventAttributes `json:"eventAttributes"` AiAgentSessionId string `json:"aiAgentSessionId"` }