Remove EmitMetric option from the CLI #2380 (#3029)

* Remove EmitMetric option from the CLI * Mark properties related to EmitMetric to be deprecated. * Remove usage of unused variables and set default value of EmitMetric to be true. * Change the default value of emitmetric flag in the unit tests to be true. * Change the default value of emitmetric flag in the unit test to be true. * Remove the option from test of UpdateDomain * Remove extra argument in the test. * Pull changes from master and merge. * Missing file commit
uber · Feb 14, 2020 · cb5da71 · cb5da71
1 parent d613cde
commit cb5da71
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 40 deletions.
diff --git a/.gen/go/shared/shared.go b/.gen/go/shared/shared.go
diff --git a/common/domain/handler_GlobalDomainDisabled_test.go b/common/domain/handler_GlobalDomainDisabled_test.go
@@ -205,7 +205,7 @@ func (s *domainHandlerGlobalDomainDisabledSuite) TestRegisterGetDomain_AllDefaul
 	}, resp.DomainInfo)
 	s.Equal(&shared.DomainConfiguration{
 		WorkflowExecutionRetentionPeriodInDays: common.Int32Ptr(retention),
-		EmitMetric:                             common.BoolPtr(false),
+		EmitMetric:                             common.BoolPtr(true),
 		HistoryArchivalStatus:                  shared.ArchivalStatusDisabled.Ptr(),
 		HistoryArchivalURI:                     common.StringPtr(""),
 		VisibilityArchivalStatus:               shared.ArchivalStatusDisabled.Ptr(),

diff --git a/common/domain/handler_GlobalDomainEnabled_MasterCluster_test.go b/common/domain/handler_GlobalDomainEnabled_MasterCluster_test.go
@@ -178,7 +178,7 @@ func (s *domainHandlerGlobalDomainEnabledMasterClusterSuite) TestRegisterGetDoma
 	}, resp.DomainInfo)
 	s.Equal(&shared.DomainConfiguration{
 		WorkflowExecutionRetentionPeriodInDays: common.Int32Ptr(retention),
-		EmitMetric:                             common.BoolPtr(false),
+		EmitMetric:                             common.BoolPtr(true),
 		HistoryArchivalStatus:                  shared.ArchivalStatusDisabled.Ptr(),
 		HistoryArchivalURI:                     common.StringPtr(""),
 		VisibilityArchivalStatus:               shared.ArchivalStatusDisabled.Ptr(),
@@ -473,7 +473,7 @@ func (s *domainHandlerGlobalDomainEnabledMasterClusterSuite) TestRegisterGetDoma
 	}, resp.DomainInfo)
 	s.Equal(&shared.DomainConfiguration{
 		WorkflowExecutionRetentionPeriodInDays: common.Int32Ptr(retention),
-		EmitMetric:                             common.BoolPtr(false),
+		EmitMetric:                             common.BoolPtr(true),
 		HistoryArchivalStatus:                  shared.ArchivalStatusDisabled.Ptr(),
 		HistoryArchivalURI:                     common.StringPtr(""),
 		VisibilityArchivalStatus:               shared.ArchivalStatusDisabled.Ptr(),

diff --git a/common/domain/handler_GlobalDomainEnabled_NotMasterCluster_test.go b/common/domain/handler_GlobalDomainEnabled_NotMasterCluster_test.go
@@ -149,7 +149,7 @@ func (s *domainHandlerGlobalDomainEnabledNotMasterClusterSuite) TestRegisterGetD
 	}, resp.DomainInfo)
 	s.Equal(&shared.DomainConfiguration{
 		WorkflowExecutionRetentionPeriodInDays: common.Int32Ptr(retention),
-		EmitMetric:                             common.BoolPtr(false),
+		EmitMetric:                             common.BoolPtr(true),
 		HistoryArchivalStatus:                  shared.ArchivalStatusDisabled.Ptr(),
 		HistoryArchivalURI:                     common.StringPtr(""),
 		VisibilityArchivalStatus:               shared.ArchivalStatusDisabled.Ptr(),

diff --git a/common/persistence/persistenceInterface.go b/common/persistence/persistenceInterface.go
@@ -602,7 +602,7 @@ type (
 	InternalDomainConfig struct {
 		// NOTE: this retention is in days, not in seconds
 		Retention                int32
-		EmitMetric               bool
+		EmitMetric               bool                    // deprecated
 		ArchivalBucket           string                  // deprecated
 		ArchivalStatus           workflow.ArchivalStatus // deprecated
 		HistoryArchivalStatus    workflow.ArchivalStatus

diff --git a/idls b/idls
diff --git a/tools/cli/app_test.go b/tools/cli/app_test.go
@@ -178,7 +178,7 @@ func (s *cliAppSuite) TestDomainUpdate() {
 	s.serverFrontendClient.EXPECT().UpdateDomain(gomock.Any(), gomock.Any()).Return(nil, nil).Times(2)
 	err := s.app.Run([]string{"", "--do", domainName, "domain", "update"})
 	s.Nil(err)
-	err = s.app.Run([]string{"", "--do", domainName, "domain", "update", "--desc", "another desc", "--oe", "another@uber.com", "--rd", "1", "--em", "f"})
+	err = s.app.Run([]string{"", "--do", domainName, "domain", "update", "--desc", "another desc", "--oe", "another@uber.com", "--rd", "1"})
 	s.Nil(err)
 }
 

diff --git a/tools/cli/domainCommands.go b/tools/cli/domainCommands.go
@@ -79,14 +79,8 @@ func (d *domainCLIImpl) RegisterDomain(c *cli.Context) {
 		retentionDays = c.Int(FlagRetentionDays)
 	}
 	securityToken := c.String(FlagSecurityToken)
-	emitMetric := false
 	var err error
-	if c.IsSet(FlagEmitMetric) {
-		emitMetric, err = strconv.ParseBool(c.String(FlagEmitMetric))
-		if err != nil {
-			ErrorAndExit(fmt.Sprintf("Option %s format is invalid.", FlagEmitMetric), err)
-		}
-	}
+
 	var isGlobalDomainPtr *bool
 	if c.IsSet(FlagIsGlobalDomain) {
 		isGlobalDomain, err := strconv.ParseBool(c.String(FlagIsGlobalDomain))
@@ -135,7 +129,6 @@ func (d *domainCLIImpl) RegisterDomain(c *cli.Context) {
 		OwnerEmail:                             common.StringPtr(ownerEmail),
 		Data:                                   domainData,
 		WorkflowExecutionRetentionPeriodInDays: common.Int32Ptr(int32(retentionDays)),
-		EmitMetric:                             common.BoolPtr(emitMetric),
 		Clusters:                               clusters,
 		ActiveClusterName:                      activeClusterName,
 		SecurityToken:                          common.StringPtr(securityToken),
@@ -214,12 +207,6 @@ func (d *domainCLIImpl) UpdateDomain(c *cli.Context) {
 		if c.IsSet(FlagRetentionDays) {
 			retentionDays = int32(c.Int(FlagRetentionDays))
 		}
-		if c.IsSet(FlagEmitMetric) {
-			emitMetric, err = strconv.ParseBool(c.String(FlagEmitMetric))
-			if err != nil {
-				ErrorAndExit(fmt.Sprintf("Option %s format is invalid.", FlagEmitMetric), err)
-			}
-		}
 		if c.IsSet(FlagClusters) {
 			clusterStr := c.String(FlagClusters)
 			clusters = append(clusters, &shared.ClusterReplicationConfiguration{

diff --git a/tools/cli/domainUtils.go b/tools/cli/domainUtils.go
@@ -61,10 +61,6 @@ var (
 			Name:  FlagRetentionDaysWithAlias,
 			Usage: "Workflow execution retention in days",
 		},
-		cli.StringFlag{
-			Name:  FlagEmitMetricWithAlias,
-			Usage: "Flag to emit metric",
-		},
 		cli.StringFlag{
 			Name:  FlagActiveClusterNameWithAlias,
 			Usage: "Active cluster name",
@@ -119,10 +115,6 @@ var (
 			Name:  FlagRetentionDaysWithAlias,
 			Usage: "Workflow execution retention in days",
 		},
-		cli.StringFlag{
-			Name:  FlagEmitMetricWithAlias,
-			Usage: "Flag to emit metric",
-		},
 		cli.StringFlag{
 			Name:  FlagActiveClusterNameWithAlias,
 			Usage: "Active cluster name",

diff --git a/tools/cli/flags.go b/tools/cli/flags.go
@@ -123,8 +123,6 @@ const (
 	FlagOwnerEmailWithAlias               = FlagOwnerEmail + ", oe"
 	FlagRetentionDays                     = "retention"
 	FlagRetentionDaysWithAlias            = FlagRetentionDays + ", rd"
-	FlagEmitMetric                        = "emit_metric"
-	FlagEmitMetricWithAlias               = FlagEmitMetric + ", em"
 	FlagHistoryArchivalStatus             = "history_archival_status"
 	FlagHistoryArchivalStatusWithAlias    = FlagHistoryArchivalStatus + ", has"
 	FlagHistoryArchivalURI                = "history_uri"