From 31ffad8fa161ea7535a2c76658a1f529aa778431 Mon Sep 17 00:00:00 2001
From: "reynaldi.wijaya" <reynaldi.wijaya@lalamove.com>
Date: Tue, 21 May 2019 11:06:41 +0800
Subject: [PATCH] UPT: Add variable to define custom sampler host and port, add
 commituser

---
 internal/ingress/controller/config/config.go | 10 ++++++++++
 internal/ingress/controller/nginx.go         |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/internal/ingress/controller/config/config.go b/internal/ingress/controller/config/config.go
index f06856406..71ba36fd0 100755
--- a/internal/ingress/controller/config/config.go
+++ b/internal/ingress/controller/config/config.go
@@ -495,6 +495,14 @@ type Configuration struct {
 	// Default: 1
 	JaegerSamplerParam string `json:"jaeger-sampler-param"`
 
+	// JaegerSamplerHost specifies the host used for remote sampling consultation
+	// Default: http://127.0.0.1
+	JaegerSamplerHost string `json:"jaeger-sampler-host"`
+
+	// JaegerSamplerHost specifies the host used for remote sampling consultation
+	// Default: 5778
+	JaegerSamplerPort int `json:"jaeger-sampler-port"`
+
 	// DatadogCollectorHost specifies the datadog agent host to use when uploading traces
 	DatadogCollectorHost string `json:"datadog-collector-host"`
 
@@ -714,6 +722,8 @@ func NewDefault() Configuration {
 		JaegerServiceName:            "nginx",
 		JaegerSamplerType:            "const",
 		JaegerSamplerParam:           "1",
+		JaegerSamplerPort:            5778,
+		JaegerSamplerHost:            "http://127.0.0.1",
 		DatadogServiceName:           "nginx",
 		DatadogCollectorPort:         8126,
 		DatadogOperationNameOverride: "nginx.handle",
diff --git a/internal/ingress/controller/nginx.go b/internal/ingress/controller/nginx.go
index 34c23ad50..fa461d1b5 100755
--- a/internal/ingress/controller/nginx.go
+++ b/internal/ingress/controller/nginx.go
@@ -1044,7 +1044,8 @@ const jaegerTmpl = `{
   "service_name": "{{ .JaegerServiceName }}",
   "sampler": {
 	"type": "{{ .JaegerSamplerType }}",
-	"param": {{ .JaegerSamplerParam }}
+	"param": {{ .JaegerSamplerParam }},
+	"samplingServerURL": "{{ .JaegerSamplerHost }}:{{ .JaegerSamplerPort }}/sampling"
   },
   "reporter": {
 	"localAgentHostPort": "{{ .JaegerCollectorHost }}:{{ .JaegerCollectorPort }}"