From 4fa9380ecc65835ab0bb15a85381a78a91d4482d Mon Sep 17 00:00:00 2001
From: Pedro Nasser <pedronasser@gmail.com>
Date: Fri, 5 Aug 2016 19:04:17 -0300
Subject: [PATCH] added request uid

---
 api/runner/runner.go | 1 +
 api/runner/task.go   | 2 +-
 api/server/runner.go | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/api/runner/runner.go b/api/runner/runner.go
index 0b8b73873..2dfcb9d21 100644
--- a/api/runner/runner.go
+++ b/api/runner/runner.go
@@ -17,6 +17,7 @@ import (
 )
 
 type Config struct {
+	ID      string
 	Ctx     context.Context
 	Route   *models.Route
 	Payload string
diff --git a/api/runner/task.go b/api/runner/task.go
index 9cd4bc2bb..e65b8134b 100644
--- a/api/runner/task.go
+++ b/api/runner/task.go
@@ -23,7 +23,7 @@ func (t *containerTask) EnvVars() map[string]string {
 	return env
 }
 
-func (t *containerTask) Id() string                         { return "" }
+func (t *containerTask) Id() string                         { return t.cfg.ID }
 func (t *containerTask) Group() string                      { return "" }
 func (t *containerTask) Image() string                      { return t.cfg.Route.Image }
 func (t *containerTask) Timeout() uint                      { return uint(t.cfg.Timeout.Seconds()) }
diff --git a/api/server/runner.go b/api/server/runner.go
index 178615a87..9ad294cca 100644
--- a/api/server/runner.go
+++ b/api/server/runner.go
@@ -12,6 +12,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/iron-io/functions/api/models"
 	"github.com/iron-io/functions/api/runner"
+	"github.com/satori/go.uuid"
 )
 
 func handleRunner(c *gin.Context) {
@@ -22,6 +23,11 @@ func handleRunner(c *gin.Context) {
 
 	log := c.MustGet("log").(logrus.FieldLogger)
 
+	reqID := uuid.NewV5(uuid.Nil, c.Request.RemoteAddr+c.Request.URL.Path).String()
+	c.Set("reqID", reqID)
+
+	log = log.WithFields(logrus.Fields{"request_id": reqID})
+
 	var err error
 
 	var payload []byte
@@ -83,6 +89,7 @@ func handleRunner(c *gin.Context) {
 				Route:   el,
 				Payload: string(payload),
 				Timeout: 30 * time.Second,
+				ID:      reqID,
 			})
 
 			if err := run.Run(); err != nil {