Merge pull request #35 from tarent/feature/TOOM-3692-Add-correlation-…

…id-in-http-header

Feature/toom 3692 add correlation id in http header

.gitignore

@@ -1 +1,2 @@
-cover.out
+cover.out
+/.idea

composition/composition_handler_test.go

@@ -126,7 +126,7 @@ func Test_CompositionHandler_CorrectHeaderAndStatusCodeReturned(t *testing.T) {
 	ch.ServeHTTP(resp, r)
 
 	a.Equal(200, resp.Code)
-	a.Equal(3, len(resp.Header())) // Set-Cookie + Content-Type + Content-Lenth
+	a.Equal(3, len(resp.Header())) // Set-Cookie + Content-Type + Content-Length
 	a.Equal("", resp.Header().Get("Transfer-Encoding"))
 	a.Contains(resp.Header()["Set-Cookie"], "cookie-content 1")
 	a.Contains(resp.Header()["Set-Cookie"], "cookie-content 2")

composition/content_fetcher.go

@@ -80,13 +80,13 @@ func (fetcher *ContentFetcher) WaitForResults() []*FetchResult {
 	return results
 }
 
-// AddFetchJob addes one job to the fetcher and recursively adds the dependencies also.
+// AddFetchJob adds one job to the fetcher and recursively adds the dependencies also.
 func (fetcher *ContentFetcher) AddFetchJob(d *FetchDefinition) {
 	fetcher.r.mutex.Lock()
 	defer fetcher.r.mutex.Unlock()
 
 	hash := d.Hash()
-	if fetcher.isAlreadySheduled(hash) {
+	if fetcher.isAlreadyScheduled(hash) {
 		return
 	}
 
@@ -128,7 +128,6 @@ func (fetcher *ContentFetcher) AddFetchJob(d *FetchDefinition) {
 					WithField("correlation_id", logging.GetCorrelationId(definitionCopy.Header)).
 					Errorf("failed fetching %v", d.URL)
 			}
-
 		}
 	}()
 }
@@ -139,9 +138,9 @@ func (fetcher *ContentFetcher) Empty() bool {
 	return len(fetcher.r.results) == 0
 }
 
-// isAlreadySheduled checks, if there is already a job for a FetchDefinition, or it is already fetched.
+// isAlreadyScheduled checks, if there is already a job for a FetchDefinition, or it is already fetched.
 // The method has to be called in a locked mutex block.
-func (fetcher *ContentFetcher) isAlreadySheduled(fetchDefinitionHash string) bool {
+func (fetcher *ContentFetcher) isAlreadyScheduled(fetchDefinitionHash string) bool {
 	for _, fetchResult := range fetcher.r.results {
 		if fetchDefinitionHash == fetchResult.Hash {
 			return true

composition/fetch_definition.go

@@ -12,7 +12,7 @@ import (
 const MAX_PRIORITY int = 4294967295
 
 // ForwardRequestHeaders are those headers,
-// which are incuded from the original client request to the backend request.
+// which are included from the original client request to the backend request.
 // TODO: Add Host header to an XFF header
 var ForwardRequestHeaders = []string{
 	"Authorization",
@@ -34,7 +34,7 @@ var ForwardRequestHeaders = []string{
 }
 
 // ForwardResponseHeaders are those headers,
-// which are incuded from the servers backend response to the client.
+// which are included from the servers backend response to the client.
 var ForwardResponseHeaders = []string{
 	"Age",
 	"Allow",
@@ -207,6 +207,7 @@ func copyHeaders(src, dest http.Header, whitelist []string) http.Header {
 			dest.Add(k, v)
 		}
 	}
+
 	return dest
 }
 

composition/fetch_definition_test.go

@@ -21,6 +21,7 @@ func Test_FetchDefinition_NewFetchDefinitionFromRequest(t *testing.T) {
 		"Cookie":          {"aa=bb;"},
 		"X-Feature-Toggle": {"true"},
 		"Accept-Encoding": {"gzip"}, // should not be copied
+		"X-Correlation-Id": {"foobar123"},
 	}
 
 	fd := NewFetchDefinitionFromRequest("http://upstream:8080/", r)
@@ -32,6 +33,7 @@ func Test_FetchDefinition_NewFetchDefinitionFromRequest(t *testing.T) {
 	a.Equal("aa=bb;", fd.Header.Get("Cookie"))
 	a.Equal("true", fd.Header.Get("X-Feature-Toggle"))
 	a.Equal("", fd.Header.Get("Accept-Encoding"))
+	a.Equal("foobar123", fd.Header.Get("X-Correlation-Id"))
 
 	a.Equal("POST", fd.Method)
 	b, err := ioutil.ReadAll(fd.Body)