From 1c175411b666564d545f9780bfc3a0bc40fbcfd1 Mon Sep 17 00:00:00 2001
From: Jeremy White <jeremy.white@target.com>
Date: Tue, 20 Mar 2018 13:37:05 -0500
Subject: [PATCH] OpenTracing zipKin Support. Reference - Issue #429

Co-authored-by: Kristina Fischer <Kristina.Fischer@target.com>
Co-authored-by: Michael Murphy <Michael.Murphy@target.com>
Co-authored-by: Nathan West <nathan.west@target.com>
Co-authored-by: Austin Hartzheim <Austin.Hartzheim@target.com>
Co-authored-by: Jacob Hansen <Jacob.Hansen@target.com>
---
 main.go             | 8 ++++----
 proxy/http_proxy.go | 3 +--
 trace/trace.go      | 4 ++--
 trace/trace_test.go | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/main.go b/main.go
index faa085d48..9d8b13bd5 100644
--- a/main.go
+++ b/main.go
@@ -196,10 +196,10 @@ func newHTTPProxy(cfg *config.Config) http.Handler {
 			}
 			return t
 		},
-		Requests: metrics.DefaultRegistry.GetTimer("requests"),
-		Noroute:  metrics.DefaultRegistry.GetCounter("notfound"),
-		Logger:   l,
-		TracerCfg:   cfg.Tracing,
+		Requests:  metrics.DefaultRegistry.GetTimer("requests"),
+		Noroute:   metrics.DefaultRegistry.GetCounter("notfound"),
+		Logger:    l,
+		TracerCfg: cfg.Tracing,
 	}
 }
 
diff --git a/proxy/http_proxy.go b/proxy/http_proxy.go
index a8335f40a..a705e3d70 100644
--- a/proxy/http_proxy.go
+++ b/proxy/http_proxy.go
@@ -18,9 +18,8 @@ import (
 	"github.com/fabiolb/fabio/noroute"
 	"github.com/fabiolb/fabio/proxy/gzip"
 	"github.com/fabiolb/fabio/route"
-	"github.com/fabiolb/fabio/uuid"
 	"github.com/fabiolb/fabio/trace"
-
+	"github.com/fabiolb/fabio/uuid"
 )
 
 // HTTPProxy is a dynamic reverse proxy for HTTP and HTTPS protocols.
diff --git a/trace/trace.go b/trace/trace.go
index 7747efe62..bed1a49ca 100644
--- a/trace/trace.go
+++ b/trace/trace.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	opentracing "github.com/opentracing/opentracing-go"
-	zipkin "github.com/openzipkin/zipkin-go-opentracing"
 	"github.com/opentracing/opentracing-go/ext"
+	zipkin "github.com/openzipkin/zipkin-go-opentracing"
 )
 
 func InjectHeaders(span opentracing.Span, req *http.Request) {
@@ -90,4 +90,4 @@ func InitializeTracer(collectorType string, connectString string, serviceName st
 	log.Printf("\n\nTRACER: %v\n\n", tracer)
 	log.Printf("\n\nCOLLECTOR: %v\n\n", collector)
 	log.Printf("\n\nRECORDER: %v\n\n", recorder)
-}
\ No newline at end of file
+}
diff --git a/trace/trace_test.go b/trace/trace_test.go
index acfe83209..46cffdc0f 100644
--- a/trace/trace_test.go
+++ b/trace/trace_test.go
@@ -2,8 +2,8 @@ package trace
 
 import (
 	opentracing "github.com/opentracing/opentracing-go"
-	mocktracer "github.com/opentracing/opentracing-go/mocktracer"
 	"github.com/opentracing/opentracing-go/ext"
+	mocktracer "github.com/opentracing/opentracing-go/mocktracer"
 	"net/http"
 	"testing"
 )