Fixes from self review

Author: bhanurp

common/commands/command.go

@@ -29,14 +29,10 @@ type Command interface {
 	CommandName() string
 }
 
-// Exec executes a command and collects enhanced metrics
 func Exec(command Command) error {
 	commandName := command.CommandName()
 	flags := GetContextFlags()
-
-	log.Debug("Exec() collecting metrics for command:", commandName, "with flags:", flags)
 	CollectMetrics(commandName, flags)
-
 	channel := make(chan bool)
 	go reportUsage(command, channel)
 	err := command.Run()
@@ -118,9 +114,7 @@ func reportUsageToVisibilitySystem(command Command, serverDetails *config.Server
 
 	commandName := command.CommandName()
 	metricsData := GetCollectedMetrics(commandName)
-
 	if metricsData != nil {
-		log.Debug("Using enhanced metrics for command:", commandName)
 		visibilityMetricsData := &visibility.MetricsData{
 			FlagsUsed:    metricsData.FlagsUsed,
 			OS:           metricsData.OS,
@@ -132,7 +126,6 @@ func reportUsageToVisibilitySystem(command Command, serverDetails *config.Server
 		commandsCountMetric = visibility.NewCommandsCountMetricWithEnhancedData(commandName, visibilityMetricsData)
 		ClearCollectedMetrics(commandName)
 	} else {
-		log.Debug("No enhanced metrics found for command:", commandName, "- using standard metric")
 		commandsCountMetric = visibility.NewCommandsCountMetric(commandName)
 	}
 

common/commands/metrics_collector.go

@@ -23,6 +23,7 @@ type metricsCollector struct {
 	data map[string]*MetricsData
 }
 
+var contextFlags []string
 var globalMetricsCollector = &metricsCollector{
 	data: make(map[string]*MetricsData),
 }
@@ -163,42 +164,14 @@ func ClearCollectedMetrics(commandName string) {
 	delete(globalMetricsCollector.data, commandName)
 }
 
-// ClearAllMetrics clears all stored metrics
-func ClearAllMetrics() {
-	globalMetricsCollector.mu.Lock()
-	defer globalMetricsCollector.mu.Unlock()
-	globalMetricsCollector.data = make(map[string]*MetricsData)
-}
-
-var contextFlags []string
-var contextFlagsMutex sync.Mutex
-
 // SetContextFlags stores flags for the current command execution
 func SetContextFlags(flags []string) {
-	contextFlagsMutex.Lock()
-	defer contextFlagsMutex.Unlock()
 	contextFlags = append([]string(nil), flags...)
 }
 
 // GetContextFlags retrieves and clears the stored flags
 func GetContextFlags() []string {
-	contextFlagsMutex.Lock()
-	defer contextFlagsMutex.Unlock()
 	flags := contextFlags
 	contextFlags = nil
 	return flags
 }
-
-// TransferMetrics moves metrics from one command name to another.
-// Useful when collecting metrics with a temporary key that needs to be moved to the actual command name.
-func TransferMetrics(fromCommandName, toCommandName string) bool {
-	globalMetricsCollector.mu.Lock()
-	defer globalMetricsCollector.mu.Unlock()
-
-	if metricsData, exists := globalMetricsCollector.data[fromCommandName]; exists {
-		globalMetricsCollector.data[toCommandName] = metricsData
-		delete(globalMetricsCollector.data, fromCommandName)
-		return true
-	}
-	return false
-}

common/commands/metrics_collector_test.go

@@ -13,6 +13,13 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/utils/usage/visibility"
 )
 
+// ClearAllMetrics clears all stored metrics
+func ClearAllMetrics() {
+	globalMetricsCollector.mu.Lock()
+	defer globalMetricsCollector.mu.Unlock()
+	globalMetricsCollector.data = make(map[string]*MetricsData)
+}
+
 func TestCollectMetrics(t *testing.T) {
 	// Clear any existing metrics
 	globalMetricsCollector.mu.Lock()

plugins/components/conversionlayer.go

@@ -368,7 +368,7 @@ func convertBoolFlag(f BoolFlag) cli.Flag {
 	}
 }
 
-// getActionFunc creates an action function that converts CLI context and collects metrics
+// getActionFunc wrap the base's ActionFunc with our own, while retrieving needed information from the Context.
 func getActionFunc(cmd Command) cli.ActionFunc {
 	return func(baseContext *cli.Context) error {
 		pluginContext, err := ConvertContext(baseContext, cmd.Flags...)
@@ -428,18 +428,20 @@ func fillFlagMaps(c *Context, baseContext *cli.Context, originalFlags []Flag) er
 		}
 		if boolFlag, ok := flag.(BoolFlag); ok {
 			val := getValueForBoolFlag(boolFlag, baseContext)
+			// Only store the flag if:
+			// - The user explicitly set it, OR
+			// - The resolved value is 'true' (e.g., default is true and user didn't override it)
+			// This avoids adding unnecessary 'false' flags that aren't relevant.
 			if baseContext.IsSet(boolFlag.Name) || val {
+				// Store the flag and its resolved value in the context map
 				c.boolFlags[boolFlag.Name] = val
 			}
 		}
 	}
-
 	c.FlagsUsed = flagsUsed
-
 	if c.CommandName != "" {
 		commands.CollectMetrics(c.CommandName, flagsUsed)
 	}
-
 	return nil
 }
 

utils/usage/visibility/commands_count_metric.go

@@ -22,7 +22,7 @@ type commandsCountLabels struct {
 	ProductID                            string `json:"product_id"`
 	ProductVersion                       string `json:"product_version"`
 	FeatureID                            string `json:"feature_id"`
-	OIDCUsed                             string `json:"oidc_used"`
+	ProviderType                         string `json:"provider_type"`
 	JobID                                string `json:"job_id"`
 	RunID                                string `json:"run_id"`
 	GitRepo                              string `json:"git_repo"`
@@ -43,7 +43,7 @@ func NewCommandsCountMetric(commandName string) services.VisibilityMetric {
 			ProductID:                            coreutils.GetCliUserAgentName(),
 			ProductVersion:                       coreutils.GetCliUserAgentVersion(),
 			FeatureID:                            commandName,
-			OIDCUsed:                             os.Getenv(coreutils.OidcProviderType),
+			ProviderType:                         os.Getenv(coreutils.OidcProviderType),
 			JobID:                                os.Getenv(coreutils.CIJobID),
 			RunID:                                os.Getenv(coreutils.CIRunID),
 			GitRepo:                              os.Getenv(coreutils.SourceCodeRepository),
@@ -63,10 +63,10 @@ func NewCommandsCountMetricWithEnhancedData(commandName string, metricsData *Met
 		ProductID:                            coreutils.GetCliUserAgentName(),
 		ProductVersion:                       coreutils.GetCliUserAgentVersion(),
 		FeatureID:                            commandName,
-		OIDCUsed:                             os.Getenv("JFROG_CLI_USAGE_OIDC_USED"),
-		JobID:                                os.Getenv("JFROG_CLI_USAGE_JOB_ID"),
-		RunID:                                os.Getenv("JFROG_CLI_USAGE_RUN_ID"),
-		GitRepo:                              os.Getenv("JFROG_CLI_USAGE_GIT_REPO"),
+		ProviderType:                         os.Getenv(coreutils.OidcProviderType),
+		JobID:                                os.Getenv(coreutils.CIJobID),
+		RunID:                                os.Getenv(coreutils.CIRunID),
+		GitRepo:                              os.Getenv(coreutils.SourceCodeRepository),
 		GhTokenForCodeScanningAlertsProvided: os.Getenv("JFROG_CLI_USAGE_GH_TOKEN_FOR_CODE_SCANNING_ALERTS_PROVIDED"),
 		Flags:                                "",
 		Platform:                             "",