Skip to content

Add trigger token for executor usage #2391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daved merged 4 commits into from
Mar 1, 2023
Merged

Add trigger token for executor usage #2391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89e1020
Add trigger token for executor usage
daved Feb 23, 2023
0ebc76d
Fix exec/executor trigger token string vals
daved Feb 23, 2023
0104e05
Fix isexectrigger in target pkg
daved Feb 24, 2023
40099dd
Merge branch 'version/0-37-0-RC1' into green/add_exec_trigger.DX-1588
daved Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/svcctl/comm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 3 additions & 1 deletion pkg/platform/runtime/target/target.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -50,6 +51,7 @@ var usageTriggers = []Trigger{
TriggerScript,
TriggerDeploy,
TriggerExec,
TriggerExecutor,
TriggerSwitch,
TriggerImport,
TriggerPackage,
Expand Down
2 changes: 1 addition & 1 deletion test/integration/analytics_int_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down