remove port option

Signed-off-by: ohdearaugustin <[email protected]>

cmd/query/app/flags.go

@@ -51,8 +51,6 @@ const (
 type QueryOptions struct {
 	// HostPort is the host:port address that the query service listens o n
 	HostPort string
-	// Port is the port that the query service listens in on (deprecated, will be removed after 2020-06-30 or in release v1.20.0, whichever is later)
-	Port int
 	// BasePath is the prefix for all UI and API HTTP routes
 	BasePath string
 	// StaticAssets is the path for the static assets for the UI (https://github.com/uber/jaeger-ui)

cmd/query/app/server.go

@@ -100,7 +100,7 @@ func (s *Server) Start() error {
 	}
 	s.conn = conn
 
-	tcpPort := s.queryOptions.Port
+	var tcpPort int
 	if port, err := netutils.GetPort(s.conn.Addr()); err == nil {
 		tcpPort = port
 	}

cmd/query/app/server_test.go

@@ -90,7 +90,7 @@ func TestServerGracefulExit(t *testing.T) {
 
 	querySvc := &querysvc.QueryService{}
 	tracer := opentracing.NoopTracer{}
-	server := NewServer(flagsSvc, querySvc, &QueryOptions{Port: ports.QueryAdminHTTP}, tracer)
+	server := NewServer(flagsSvc, querySvc, &QueryOptions{HostPort: ports.PortToHostPort(ports.QueryAdminHTTP)}, tracer)
 	assert.NoError(t, server.Start())
 
 	// Wait for servers to come up before we can call .Close()