Remove collector from tchannel reporter flag (#1174)

Signed-off-by: Pavol Loffay <ploffay@redhat.com>

CHANGELOG.md

@@ -18,7 +18,7 @@ The following agent flags has has been deprecated in order to support multiple r
 ```
 New flags:
 ```bash
---reporter.tchannel.collector.host-port
+--reporter.tchannel.host-port
 --reporter.tchannel.discovery.conn-check-timeout
 --reporter.tchannel.discovery.min-peers
 ```

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

@@ -27,14 +27,15 @@ const (
 	defaultConnCheckTimeout   = 250 * time.Millisecond
 	tchannelPrefix            = "reporter.tchannel."
 	collectorHostPort         = "collector.host-port"
+	hostPort                  = "host-port"
 	discoveryMinPeers         = "discovery.min-peers"
 	discoveryConnCheckTimeout = "discovery.conn-check-timeout"
 )
 
 // AddFlags adds flags for Builder.
 func AddFlags(flags *flag.FlagSet) {
 	flags.String(
-		tchannelPrefix+collectorHostPort,
+		tchannelPrefix+hostPort,
 		"",
 		"comma-separated string representing host:ports of a static list of collectors to connect to directly (e.g. when not using service discovery)")
 	flags.Int(
@@ -75,8 +76,8 @@ func (b *Builder) InitFromViper(v *viper.Viper, logger *zap.Logger) *Builder {
 		logger.Warn("Using deprecated configuration", zap.String("option", discoveryConnCheckTimeout))
 	}
 
-	if len(v.GetString(tchannelPrefix+collectorHostPort)) > 0 {
-		b.CollectorHostPorts = strings.Split(v.GetString(tchannelPrefix+collectorHostPort), ",")
+	if len(v.GetString(tchannelPrefix+hostPort)) > 0 {
+		b.CollectorHostPorts = strings.Split(v.GetString(tchannelPrefix+hostPort), ",")
 	}
 	b.DiscoveryMinPeers = v.GetInt(tchannelPrefix + discoveryMinPeers)
 	b.ConnCheckTimeout = v.GetDuration(tchannelPrefix + discoveryConnCheckTimeout)

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

@@ -39,7 +39,7 @@ func TestBingFlags(t *testing.T) {
 		builder Builder
 	}{
 		{flags: []string{
-			"--reporter.tchannel.collector.host-port=1.2.3.4:555,1.2.3.4:666",
+			"--reporter.tchannel.host-port=1.2.3.4:555,1.2.3.4:666",
 			"--reporter.tchannel.discovery.min-peers=42",
 			"--reporter.tchannel.discovery.conn-check-timeout=85s",
 		}, builder: Builder{ConnCheckTimeout: time.Second * 85, DiscoveryMinPeers: 42, CollectorHostPorts: []string{"1.2.3.4:555", "1.2.3.4:666"}},
@@ -55,7 +55,7 @@ func TestBingFlags(t *testing.T) {
 			"--collector.host-port=1.2.3.4:555,1.2.3.4:666",
 			"--discovery.min-peers=42",
 			"--discovery.conn-check-timeout=85s",
-			"--reporter.tchannel.collector.host-port=1.2.3.4:5556,1.2.3.4:6667",
+			"--reporter.tchannel.host-port=1.2.3.4:5556,1.2.3.4:6667",
 			"--reporter.tchannel.discovery.min-peers=43",
 			"--reporter.tchannel.discovery.conn-check-timeout=86s",
 		},

docker-compose/jaeger-docker-compose.yml

@@ -25,7 +25,7 @@ services:
 
     jaeger-agent:
       image: jaegertracing/jaeger-agent
-      command: ["--reporter.tchannel.collector.host-port=jaeger-collector:14267"]
+      command: ["--reporter.tchannel.host-port=jaeger-collector:14267"]
       ports:
         - "5775:5775/udp"
         - "6831:6831/udp"