Merge pull request #2391 from ActiveState/green/add_exec_trigger.DX-1588

Add trigger token for executor usage

Author: daved

internal/svcctl/comm.go

@@ -113,7 +113,7 @@ func HeartbeatHandler(cfg *config.Instance, resolver Resolver, analyticsReporter
 			}
 
 			dims := &dimensions.Values{
-				Trigger:          p.StrP(target.TriggerExec.String()),
+				Trigger:          p.StrP(target.TriggerExecutor.String()),
 				Headless:         p.StrP(strconv.FormatBool(metaData.Headless)),
 				CommitID:         p.StrP(metaData.CommitUUID),
 				ProjectNameSpace: p.StrP(metaData.Namespace),

pkg/platform/runtime/target/target.go

@@ -25,7 +25,8 @@ const (
 	TriggerActivate           Trigger = "activate"
 	TriggerScript             Trigger = "script"
 	TriggerDeploy             Trigger = "deploy"
-	TriggerExec               Trigger = "exec"
+	TriggerExec               Trigger = "exec-cmd"
+	TriggerExecutor           Trigger = "exec"
 	TriggerResetExec          Trigger = "reset-exec"
 	TriggerSwitch             Trigger = "switch"
 	TriggerImport             Trigger = "import"
@@ -50,6 +51,7 @@ var usageTriggers = []Trigger{
 	TriggerScript,
 	TriggerDeploy,
 	TriggerExec,
+	TriggerExecutor,
 	TriggerSwitch,
 	TriggerImport,
 	TriggerPackage,

test/integration/analytics_int_test.go

@@ -118,7 +118,7 @@ func (suite *AnalyticsIntegrationTestSuite) TestActivateEvents() {
 			if e.Dimensions == nil || e.Dimensions.Trigger == nil {
 				return false
 			}
-			return (*e.Dimensions.Trigger) == target.TriggerExec.String()
+			return (*e.Dimensions.Trigger) == target.TriggerExecutor.String()
 		})
 		suite.Require().Equal(1, countEvents(executorEvents, anaConst.CatRuntimeUsage, anaConst.ActRuntimeAttempt),
 			ts.DebugMessage("Should have a runtime attempt, events:\n"+debugEvents(suite.T(), executorEvents)))