Merge 506c70a into fc3a224

TykTechnologies · Jun 13, 2019 · 7e3e975 · 7e3e975
2 parents fc3a224 + 506c70a
commit 7e3e975
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 14 deletions.
diff --git a/gateway/instrumentation_handlers.go b/gateway/instrumentation_handlers.go
@@ -17,6 +17,7 @@ import (
 
 var applicationGCStats = debug.GCStats{}
 var instrument = health.NewStream()
+var instrumentationEnabled bool
 
 // setupInstrumentation handles all the intialisation of the instrumentation handler
 func setupInstrumentation() {
@@ -32,6 +33,8 @@ func setupInstrumentation() {
 		return
 	}
 
+	instrumentationEnabled = true
+
 	log.Info("Sending stats to: ", config.Global().StatsdConnectionString, " with prefix: ", config.Global().StatsdPrefix)
 	statsdSink, err := NewStatsDSink(config.Global().StatsdConnectionString,
 		&StatsDSinkOptions{Prefix: config.Global().StatsdPrefix})

diff --git a/gateway/middleware.go b/gateway/middleware.go
@@ -74,17 +74,22 @@ func createMiddleware(mw TykMiddleware) func(http.Handler) http.Handler {
 			}
 
 			job := instrument.NewJob("MiddlewareCall")
-			meta := health.Kvs{
-				"from_ip":  request.RealIP(r),
-				"method":   r.Method,
-				"endpoint": r.URL.Path,
-				"raw_url":  r.URL.String(),
-				"size":     strconv.Itoa(int(r.ContentLength)),
-				"mw_name":  mw.Name(),
-			}
+			meta := health.Kvs{}
 			eventName := mw.Name() + "." + "executed"
-			job.EventKv("executed", meta)
-			job.EventKv(eventName, meta)
+
+			if instrumentationEnabled {
+				meta = health.Kvs{
+					"from_ip":  request.RealIP(r),
+					"method":   r.Method,
+					"endpoint": r.URL.Path,
+					"raw_url":  r.URL.String(),
+					"size":     strconv.Itoa(int(r.ContentLength)),
+					"mw_name":  mw.Name(),
+				}
+				job.EventKv("executed", meta)
+				job.EventKv(eventName, meta)
+			}
+
 			startTime := time.Now()
 			mw.Logger().WithField("ts", startTime.UnixNano()).Debug("Started")
 
@@ -104,16 +109,23 @@ func createMiddleware(mw TykMiddleware) func(http.Handler) http.Handler {
 				meta["error"] = err.Error()
 
 				finishTime := time.Since(startTime)
-				job.TimingKv("exec_time", finishTime.Nanoseconds(), meta)
-				job.TimingKv(eventName+".exec_time", finishTime.Nanoseconds(), meta)
+
+				if instrumentationEnabled {
+					job.TimingKv("exec_time", finishTime.Nanoseconds(), meta)
+					job.TimingKv(eventName+".exec_time", finishTime.Nanoseconds(), meta)
+				}
 
 				mw.Logger().WithError(err).WithField("code", errCode).WithField("ns", finishTime.Nanoseconds()).Debug("Finished")
 				return
 			}
 
 			finishTime := time.Since(startTime)
-			job.TimingKv("exec_time", finishTime.Nanoseconds(), meta)
-			job.TimingKv(eventName+".exec_time", finishTime.Nanoseconds(), meta)
+
+			if instrumentationEnabled {
+				job.TimingKv("exec_time", finishTime.Nanoseconds(), meta)
+				job.TimingKv(eventName+".exec_time", finishTime.Nanoseconds(), meta)
+			}
+
 			mw.Logger().WithField("code", errCode).WithField("ns", finishTime.Nanoseconds()).Debug("Finished")
 
 			// Special code, bypasses all other execution