Normalize labels on deprecated CLI flags to (deprecated) use {replace…

…ment}

Signed-off-by: Yuri Shkuro <ys@uber.com>

cmd/agent/app/reporter/tchannel/flags.go

@@ -55,15 +55,15 @@ func AddFlags(flags *flag.FlagSet) {
 	flags.String(
 		collectorHostPort,
 		"",
-		"Deprecated; comma-separated string representing host:ports of a static list of collectors to connect to directly (e.g. when not using service discovery)")
+		"(deprecated) see --"+tchannelPrefix+hostPort)
 	flags.Int(
 		discoveryMinPeers,
 		defaultMinPeers,
-		"Deprecated; if using service discovery, the min number of connections to maintain to the backend")
+		"(deprecated) see --"+tchannelPrefix+discoveryMinPeers)
 	flags.Duration(
 		discoveryConnCheckTimeout,
 		defaultConnCheckTimeout,
-		"Deprecated; sets the timeout used when establishing new connections")
+		"(deprecated) see --"+tchannelPrefix+discoveryConnCheckTimeout)
 }
 
 // InitFromViper initializes Builder with properties retrieved from Viper.

cmd/flags/admin.go

@@ -68,7 +68,7 @@ func (s *AdminServer) setLogger(logger *zap.Logger) {
 
 // AddFlags registers CLI flags.
 func (s *AdminServer) AddFlags(flagSet *flag.FlagSet) {
-	flagSet.Int(healthCheckHTTPPort, 0, "(deprecated) The http port for the health check service")
+	flagSet.Int(healthCheckHTTPPort, 0, "(deprecated) see --"+adminHTTPPort)
 	flagSet.Int(adminHTTPPort, s.adminPort, "The http port for the admin server, including health check, /metrics, etc.")
 }
 

cmd/flags/flags.go

@@ -61,7 +61,7 @@ type logging struct {
 
 // AddFlags adds flags for SharedFlags
 func AddFlags(flagSet *flag.FlagSet) {
-	flagSet.String(spanStorageType, "", fmt.Sprintf(`Deprecated; please use %s environment variable. Run this binary with "env" command for help.`, storage.SpanStorageTypeEnvVar))
+	flagSet.String(spanStorageType, "", fmt.Sprintf(`(deprecated) please use %s environment variable. Run this binary with "env" command for help.`, storage.SpanStorageTypeEnvVar))
 	AddLoggingFlag(flagSet)
 }
 

plugin/storage/cassandra/options.go

@@ -201,7 +201,7 @@ func addFlags(flagSet *flag.FlagSet, nsConfig *namespaceConfig) {
 	flagSet.Bool(
 		nsConfig.namespace+suffixEnableDependenciesV2,
 		nsConfig.EnableDependenciesV2,
-		"DEPRECATED: Jaeger will automatically detect the version of the dependencies table")
+		"(deprecated) Jaeger will automatically detect the version of the dependencies table")
 }
 
 // InitFromViper initializes Options with properties from viper