From b9c2ebc97c94cb47173ed1f04b31d4b15c53ae89 Mon Sep 17 00:00:00 2001
From: zryfish <jeffzhang@yunify.com>
Date: Sat, 30 May 2020 23:54:21 +0800
Subject: [PATCH] fix jaeger api endpoint bug (#2140)

---
 cmd/ks-apiserver/app/server.go                    | 7 ++++++-
 pkg/kapis/servicemesh/metrics/v1alpha2/handler.go | 6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cmd/ks-apiserver/app/server.go b/cmd/ks-apiserver/app/server.go
index 33e91e3d6..09c4fa7db 100644
--- a/cmd/ks-apiserver/app/server.go
+++ b/cmd/ks-apiserver/app/server.go
@@ -26,6 +26,8 @@ import (
 	apiserverconfig "kubesphere.io/kubesphere/pkg/apiserver/config"
 	"kubesphere.io/kubesphere/pkg/utils/signals"
 	"kubesphere.io/kubesphere/pkg/utils/term"
+
+	tracing "kubesphere.io/kubesphere/pkg/kapis/servicemesh/metrics/v1alpha2"
 )
 
 func NewAPIServerCommand() *cobra.Command {
@@ -90,7 +92,10 @@ func initializeServicemeshConfig(s *options.ServerRunOptions) {
 	// Initialize kiali config
 	config := kconfig.NewConfig()
 
-	//tracing.JaegerQueryUrl = s.ServiceMeshOptions.JaegerQueryHost
+	// Config jaeger query endpoint address
+	if s.ServiceMeshOptions != nil && len(s.ServiceMeshOptions.JaegerQueryHost) != 0 {
+		tracing.JaegerQueryUrl = s.ServiceMeshOptions.JaegerQueryHost
+	}
 
 	// Exclude system namespaces
 	config.API.Namespaces.Exclude = []string{"istio-system", "kubesphere*", "kube*"}
diff --git a/pkg/kapis/servicemesh/metrics/v1alpha2/handler.go b/pkg/kapis/servicemesh/metrics/v1alpha2/handler.go
index 06338a20b..05c53d731 100644
--- a/pkg/kapis/servicemesh/metrics/v1alpha2/handler.go
+++ b/pkg/kapis/servicemesh/metrics/v1alpha2/handler.go
@@ -10,7 +10,8 @@ import (
 	"net/http"
 )
 
-var JaegerQueryUrl = "http://jaeger-query.istio-system.svc:16686/jaeger"
+// default jaeger query api endpoint address
+var JaegerQueryUrl = "http://jaeger-query.istio-system.svc:16686"
 
 // Get app metrics
 func getAppMetrics(request *restful.Request, response *restful.Response) {
@@ -84,9 +85,10 @@ func getServiceTracing(request *restful.Request, response *restful.Response) {
 	url := fmt.Sprintf("%s/api/traces?%s&service=%s", JaegerQueryUrl, request.Request.URL.RawQuery, serviceName)
 
 	resp, err := http.Get(url)
+	klog.V(4).Infof("Proxy trace request to %s", url)
 
 	if err != nil {
-		klog.Errorf("query jaeger faile with err %v", err)
+		klog.Errorf("query jaeger failed with err %v", err)
 		api.HandleInternalError(response, nil, err)
 		return
 	}