Set UUID into the logs

coupergateway · Oct 27, 2022 · 3cd831d · 3cd831d
1 parent 2b4502b
commit 3cd831d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/command/jobs/transport.go b/command/jobs/transport.go
@@ -8,18 +8,20 @@ import (
 )
 
 type Job struct {
-	ctx     context.Context
-	handler *handler.Endpoint
-	job     *config.Job
+	ctx      context.Context
+	handler  *handler.Endpoint
+	job      *config.Job
+	settings *config.Settings
 }
 
 var jobs = make(map[string]*Job)
 
-func AddJob(ctx context.Context, j *config.Job, h *handler.Endpoint) {
+func AddJob(ctx context.Context, j *config.Job, h *handler.Endpoint, settings *config.Settings) {
 	jobs[j.Name] = &Job{
-		ctx:     ctx,
-		handler: h,
-		job:     j,
+		ctx:      ctx,
+		handler:  h,
+		job:      j,
+		settings: settings,
 	}
 }
 
@@ -38,3 +40,7 @@ func (j *Job) GetHandler() *handler.Endpoint {
 func (j *Job) GetJob() *config.Job {
 	return j.job
 }
+
+func (j *Job) GetSettings() *config.Settings {
+	return j.settings
+}
diff --git a/command/run.go b/command/run.go
@@ -26,6 +26,7 @@ import (
 	"github.com/avenga/couper/config/runtime"
 	"github.com/avenga/couper/errors"
 	"github.com/avenga/couper/eval"
+	"github.com/avenga/couper/handler/middleware"
 	"github.com/avenga/couper/server"
 	"github.com/avenga/couper/server/writer"
 	"github.com/avenga/couper/telemetry"
@@ -228,8 +229,10 @@ func (r *Run) Execute(args Args, config *config.Couper, logEntry *logrus.Entry)
 			ctx := context.WithValue(req.Context(), request.LogEntry, logEntry)
 			*req = *req.WithContext(ctx)
 
+			uidHandler := middleware.NewUIDHandler(job.GetSettings(), "")(job.GetHandler())
+
 			// Execute initial, do not wait for execution
-			go job.GetHandler().ServeHTTP(writer.NewResponseWriter(httptest.NewRecorder(), ""), req)
+			go uidHandler.ServeHTTP(writer.NewResponseWriter(httptest.NewRecorder(), ""), req)
 
 			interval, _ := time.ParseDuration(job.GetJob().Interval)
 
@@ -238,8 +241,10 @@ func (r *Run) Execute(args Args, config *config.Couper, logEntry *logrus.Entry)
 				case <-job.GetCtx().Done():
 					return
 				case <-time.After(interval):
+					uidHandler := middleware.NewUIDHandler(job.GetSettings(), "")(job.GetHandler())
+
 					// Do not wait for execution
-					go job.GetHandler().ServeHTTP(writer.NewResponseWriter(httptest.NewRecorder(), ""), req)
+					go uidHandler.ServeHTTP(writer.NewResponseWriter(httptest.NewRecorder(), ""), req)
 				}
 			}
 		}(job, name)

diff --git a/config/runtime/server.go b/config/runtime/server.go
@@ -124,7 +124,7 @@ func NewServerConfiguration(conf *config.Couper, log *logrus.Entry, memStore *ca
 
 			endpointHandler := handler.NewEndpoint(endpointOptions, log, nil)
 
-			jobs.AddJob(conf.Context, job, endpointHandler)
+			jobs.AddJob(conf.Context, job, endpointHandler, conf.Settings)
 		}
 	}