From 89e1020dd46b370638834d435c12cf9e8618d1e7 Mon Sep 17 00:00:00 2001 From: daved Date: Wed, 22 Feb 2023 19:37:27 -0800 Subject: [PATCH 1/3] Add trigger token for executor usage --- internal/svcctl/comm.go | 2 +- pkg/platform/runtime/target/target.go | 10 +++++++++- test/integration/analytics_int_test.go | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/internal/svcctl/comm.go b/internal/svcctl/comm.go index 975af879bc..1031726c5c 100644 --- a/internal/svcctl/comm.go +++ b/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), diff --git a/pkg/platform/runtime/target/target.go b/pkg/platform/runtime/target/target.go index 0359ea283a..d466ecb7ff 100644 --- a/pkg/platform/runtime/target/target.go +++ b/pkg/platform/runtime/target/target.go @@ -26,6 +26,7 @@ const ( TriggerScript Trigger = "script" TriggerDeploy Trigger = "deploy" TriggerExec Trigger = "exec" + TriggerExecutor Trigger = "executor" TriggerResetExec Trigger = "reset-exec" TriggerSwitch Trigger = "switch" TriggerImport Trigger = "import" @@ -50,6 +51,7 @@ var usageTriggers = []Trigger{ TriggerScript, TriggerDeploy, TriggerExec, + TriggerExecutor, TriggerSwitch, TriggerImport, TriggerPackage, @@ -74,8 +76,14 @@ func (t Trigger) IndicatesUsage() bool { return t.IsExecTrigger() && funk.Contains(usageTriggers, TriggerExec) } +var ( + triggerExecPrefix = TriggerExec.String() + ": " + triggerExecutorPrefix = TriggerExecutor.String() + ": " +) + func (t Trigger) IsExecTrigger() bool { - return strings.HasPrefix(string(t), string(TriggerExec)+": ") + s := t.String() + return strings.HasPrefix(s, triggerExecPrefix) || strings.HasPrefix(s, triggerExecutorPrefix) } type ProjectTarget struct { diff --git a/test/integration/analytics_int_test.go b/test/integration/analytics_int_test.go index bc0e24e5b9..582af3d59f 100644 --- a/test/integration/analytics_int_test.go +++ b/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))) From 0ebc76d79de5b96264631eb459a31894a5480617 Mon Sep 17 00:00:00 2001 From: daved Date: Thu, 23 Feb 2023 10:28:52 -0800 Subject: [PATCH 2/3] Fix exec/executor trigger token string vals --- pkg/platform/runtime/target/target.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/platform/runtime/target/target.go b/pkg/platform/runtime/target/target.go index d466ecb7ff..9817962f5b 100644 --- a/pkg/platform/runtime/target/target.go +++ b/pkg/platform/runtime/target/target.go @@ -25,8 +25,8 @@ const ( TriggerActivate Trigger = "activate" TriggerScript Trigger = "script" TriggerDeploy Trigger = "deploy" - TriggerExec Trigger = "exec" - TriggerExecutor Trigger = "executor" + TriggerExec Trigger = "exec-cmd" + TriggerExecutor Trigger = "exec" TriggerResetExec Trigger = "reset-exec" TriggerSwitch Trigger = "switch" TriggerImport Trigger = "import" @@ -82,8 +82,9 @@ var ( ) func (t Trigger) IsExecTrigger() bool { - s := t.String() - return strings.HasPrefix(s, triggerExecPrefix) || strings.HasPrefix(s, triggerExecutorPrefix) + trigger := t.String() + return strings.HasPrefix(trigger, triggerExecutorPrefix) || + strings.HasPrefix(trigger, triggerExecPrefix) } type ProjectTarget struct { From 0104e0566ac12a7e24ca5ce7cb2ff652d05f85e1 Mon Sep 17 00:00:00 2001 From: daved Date: Fri, 24 Feb 2023 10:29:03 -0800 Subject: [PATCH 3/3] Fix isexectrigger in target pkg --- pkg/platform/runtime/target/target.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkg/platform/runtime/target/target.go b/pkg/platform/runtime/target/target.go index 9817962f5b..76fb260bfe 100644 --- a/pkg/platform/runtime/target/target.go +++ b/pkg/platform/runtime/target/target.go @@ -76,15 +76,8 @@ func (t Trigger) IndicatesUsage() bool { return t.IsExecTrigger() && funk.Contains(usageTriggers, TriggerExec) } -var ( - triggerExecPrefix = TriggerExec.String() + ": " - triggerExecutorPrefix = TriggerExecutor.String() + ": " -) - func (t Trigger) IsExecTrigger() bool { - trigger := t.String() - return strings.HasPrefix(trigger, triggerExecutorPrefix) || - strings.HasPrefix(trigger, triggerExecPrefix) + return strings.HasPrefix(string(t), string(TriggerExec)+": ") } type ProjectTarget struct {