Add/fix tests

Workable · Oct 3, 2023 · d19a3dc · d19a3dc
1 parent 894c7c3
commit d19a3dc
Show file tree

Hide file tree

Showing 6 changed files with 187 additions and 84 deletions.
diff --git a/__snapshots__/diamorphosis.test.ts.js b/__snapshots__/diamorphosis.test.ts.js
@@ -64,7 +64,7 @@ exports['Diamorphosis Test should set json/console loggingvariables when nothing
   },
   "printLogo": true,
   "log": {
-    "pattern": "%[[%d] [%p] %c%] %x{logTracer} %m",
+    "pattern": "%[[%d] [%p] %c%] %x{requestId}%m %x{logTracer}",
     "level": "debug",
     "console": true,
     "json": false
@@ -192,32 +192,31 @@ exports['Diamorphosis Test should set json/console loggingvariables when nothing
     "logKeys": [
       "requestId",
       "visitor",
-      "correlationId"
+      "correlationId",
+      "propagatedHeaders"
     ],
-    "istioTraceContextHeaders": {
+    "propagatedHeaders": {
       "enabled": true,
       "headers": [
+        "cf-ray",
         "x-request-id",
         "x-b3-traceid",
         "x-b3-spanid",
         "x-b3-parentspanid",
         "x-b3-sampled",
         "x-b3-flags",
-        "x-ot-span-context"
-      ]
-    },
-    "headerPropagation": {
-      "enabled": true,
-      "headers": [
-        "cf-ray"
+        "x-ot-span-context",
+        "x-depth",
+        "x-parent-id",
+        "x-initiator-id"
       ]
     }
   }
 }
 
 exports['Diamorphosis Test should set json/console loggingvariables when console:not set, json:true, styles:[] shoud be console:false, json:true, styles:["json"] 1'] = {
   "log": {
-    "pattern": "%[[%d] [%p] %c%] %x{logTracer} %m",
+    "pattern": "%[[%d] [%p] %c%] %x{requestId}%m %x{logTracer}",
     "level": "debug",
     "console": false,
     "json": true
@@ -411,32 +410,31 @@ exports['Diamorphosis Test should set json/console loggingvariables when console
     "logKeys": [
       "requestId",
       "visitor",
-      "correlationId"
+      "correlationId",
+      "propagatedHeaders"
     ],
-    "istioTraceContextHeaders": {
+    "propagatedHeaders": {
       "enabled": true,
       "headers": [
+        "cf-ray",
         "x-request-id",
         "x-b3-traceid",
         "x-b3-spanid",
         "x-b3-parentspanid",
         "x-b3-sampled",
         "x-b3-flags",
-        "x-ot-span-context"
-      ]
-    },
-    "headerPropagation": {
-      "enabled": true,
-      "headers": [
-        "cf-ray"
+        "x-ot-span-context",
+        "x-depth",
+        "x-parent-id",
+        "x-initiator-id"
       ]
     }
   }
 }
 
 exports['Diamorphosis Test should set json/console loggingvariables when console:true, json:true, styles:[] shoud be console:true, json:true, styles:["json"] 1'] = {
   "log": {
-    "pattern": "%[[%d] [%p] %c%] %x{logTracer} %m",
+    "pattern": "%[[%d] [%p] %c%] %x{requestId}%m %x{logTracer}",
     "level": "debug",
     "console": true,
     "json": true
@@ -630,32 +628,31 @@ exports['Diamorphosis Test should set json/console loggingvariables when console
     "logKeys": [
       "requestId",
       "visitor",
-      "correlationId"
+      "correlationId",
+      "propagatedHeaders"
     ],
-    "istioTraceContextHeaders": {
+    "propagatedHeaders": {
       "enabled": true,
       "headers": [
+        "cf-ray",
         "x-request-id",
         "x-b3-traceid",
         "x-b3-spanid",
         "x-b3-parentspanid",
         "x-b3-sampled",
         "x-b3-flags",
-        "x-ot-span-context"
-      ]
-    },
-    "headerPropagation": {
-      "enabled": true,
-      "headers": [
-        "cf-ray"
+        "x-ot-span-context",
+        "x-depth",
+        "x-parent-id",
+        "x-initiator-id"
       ]
     }
   }
 }
 
 exports['Diamorphosis Test should set json/console loggingvariables when console:false, json:true, styles:[] shoud be console:false, json:true, styles:["json"] 1'] = {
   "log": {
-    "pattern": "%[[%d] [%p] %c%] %x{logTracer} %m",
+    "pattern": "%[[%d] [%p] %c%] %x{requestId}%m %x{logTracer}",
     "level": "debug",
     "console": false,
     "json": true
@@ -849,32 +846,31 @@ exports['Diamorphosis Test should set json/console loggingvariables when console
     "logKeys": [
       "requestId",
       "visitor",
-      "correlationId"
+      "correlationId",
+      "propagatedHeaders"
     ],
-    "istioTraceContextHeaders": {
+    "propagatedHeaders": {
       "enabled": true,
       "headers": [
+        "cf-ray",
         "x-request-id",
         "x-b3-traceid",
         "x-b3-spanid",
         "x-b3-parentspanid",
         "x-b3-sampled",
         "x-b3-flags",
-        "x-ot-span-context"
-      ]
-    },
-    "headerPropagation": {
-      "enabled": true,
-      "headers": [
-        "cf-ray"
+        "x-ot-span-context",
+        "x-depth",
+        "x-parent-id",
+        "x-initiator-id"
       ]
     }
   }
 }
 
 exports['Diamorphosis Test should set json/console loggingvariables when console:not set, json:true, styles:["simple"] shoud be console:false, json:true, styles:["simple"] 1'] = {
   "log": {
-    "pattern": "%[[%d] [%p] %c%] %x{logTracer} %m",
+    "pattern": "%[[%d] [%p] %c%] %x{requestId}%m %x{logTracer}",
     "level": "debug",
     "console": false,
     "json": true
@@ -1068,24 +1064,23 @@ exports['Diamorphosis Test should set json/console loggingvariables when console
     "logKeys": [
       "requestId",
       "visitor",
-      "correlationId"
+      "correlationId",
+      "propagatedHeaders"
     ],
-    "istioTraceContextHeaders": {
+    "propagatedHeaders": {
       "enabled": true,
       "headers": [
+        "cf-ray",
         "x-request-id",
         "x-b3-traceid",
         "x-b3-spanid",
         "x-b3-parentspanid",
         "x-b3-sampled",
         "x-b3-flags",
-        "x-ot-span-context"
-      ]
-    },
-    "headerPropagation": {
-      "enabled": true,
-      "headers": [
-        "cf-ray"
+        "x-ot-span-context",
+        "x-depth",
+        "x-parent-id",
+        "x-initiator-id"
       ]
     }
   }
@@ -1213,7 +1208,7 @@ exports['Diamorphosis Test should set json/console loggingvariables when console
   },
   "printLogo": false,
   "log": {
-    "pattern": "%[[%d] [%p] %c%] %x{logTracer} %m",
+    "pattern": "%[[%d] [%p] %c%] %x{requestId}%m %x{logTracer}",
     "level": "fatal",
     "console": true,
     "json": false
@@ -1292,24 +1287,23 @@ exports['Diamorphosis Test should set json/console loggingvariables when console
     "logKeys": [
       "requestId",
       "visitor",
-      "correlationId"
+      "correlationId",
+      "propagatedHeaders"
     ],
-    "istioTraceContextHeaders": {
+    "propagatedHeaders": {
       "enabled": true,
       "headers": [
+        "cf-ray",
         "x-request-id",
         "x-b3-traceid",
         "x-b3-spanid",
         "x-b3-parentspanid",
         "x-b3-sampled",
         "x-b3-flags",
-        "x-ot-span-context"
-      ]
-    },
-    "headerPropagation": {
-      "enabled": true,
-      "headers": [
-        "cf-ray"
+        "x-ot-span-context",
+        "x-depth",
+        "x-parent-id",
+        "x-initiator-id"
       ]
     }
   }
@@ -1437,7 +1431,7 @@ exports['Diamorphosis Test should set json/console loggingvariables when console
   },
   "printLogo": false,
   "log": {
-    "pattern": "%[[%d] [%p] %c%] %x{logTracer} %m",
+    "pattern": "%[[%d] [%p] %c%] %x{requestId}%m %x{logTracer}",
     "level": "fatal",
     "console": true,
     "json": true
@@ -1518,24 +1512,23 @@ exports['Diamorphosis Test should set json/console loggingvariables when console
     "logKeys": [
       "requestId",
       "visitor",
-      "correlationId"
+      "correlationId",
+      "propagatedHeaders"
     ],
-    "istioTraceContextHeaders": {
+    "propagatedHeaders": {
       "enabled": true,
       "headers": [
+        "cf-ray",
         "x-request-id",
         "x-b3-traceid",
         "x-b3-spanid",
         "x-b3-parentspanid",
         "x-b3-sampled",
         "x-b3-flags",
-        "x-ot-span-context"
-      ]
-    },
-    "headerPropagation": {
-      "enabled": true,
-      "headers": [
-        "cf-ray"
+        "x-ot-span-context",
+        "x-depth",
+        "x-parent-id",
+        "x-initiator-id"
       ]
     }
   }

diff --git a/src/utils.ts b/src/utils.ts
@@ -24,7 +24,7 @@ export const nodeVersionGreaterThanEqual = (requestedVersion: string, version =
   return true;
 };
 
-export function appendHeadersFromStore(properties, store, config) {
+export function appendHeadersFromStore(properties: any, store: Map<string, any>, config: any) {
   if (!config.requestContext.enabled) return;
   if (!config.requestContext.propagatedHeaders.enabled) return;
   properties.headers = properties.headers || {};

diff --git a/test/examples/json-appender.test.ts b/test/examples/json-appender.test.ts
@@ -48,6 +48,7 @@ describe('json-appender', function () {
           message: 'hello world',
           context: pickBy({
             requestId: 'test-id',
+            propagatedHeaders: {},
             context: 'foo'
           })
         })
@@ -78,6 +79,7 @@ describe('json-appender', function () {
             message: 'test - this was a test error',
             stack_trace: 'Error: test\n    at /logError ',
             context: pickBy({
+              propagatedHeaders: {},
               requestId: 'test-id',
               context: 'foo'
             })
@@ -98,6 +100,7 @@ describe('json-appender', function () {
                 component: 'koa',
                 action: '/logError',
                 params: { path: {}, query: {}, body: {}, requestId: 'test-id' },
+                propagatedHeaders: {},
                 state: { riviereStartedAt: 1546300800000, requestId: 'test-id' },
                 requestId: 'test-id'
               },

diff --git a/test/examples/request-context-example.test.ts b/test/examples/request-context-example.test.ts
@@ -102,7 +102,7 @@ describe('request-context', function () {
     describe('when feature flag is off', function () {
       beforeEach(function () {
         const config = require('../../examples/request-context-example/config.js');
-        config.requestContext.headerPropagation = { enabled: false };
+        config.requestContext.propagatedHeaders = { enabled: false };
       });
 
       it('should not propagate headers', async function () {
@@ -118,7 +118,7 @@ describe('request-context', function () {
 
     it('/propagateTracingHeaders returns 200 and propagates whitelisted headers', async function () {
       const config = require('../../examples/request-context-example/config.js');
-      config.requestContext.headerPropagation = { enabled: true, headers: ['header1', 'header2'] };
+      config.requestContext.propagatedHeaders = { enabled: true, headers: ['header1', 'header2'] };
 
       const propagatedRequestMock = nock('http://foo.com')
         .matchHeader('header1', 'header-value')

diff --git a/test/initializers/rabbitmq/index.test.ts b/test/initializers/rabbitmq/index.test.ts
@@ -26,7 +26,8 @@ describe('Test rabbitmq connection', function () {
         maxRetries: 0,
         retryDelay: 1000,
         connectDelay: 5000
-      }
+      },
+      requestContext: { enabled: true, propagatedHeaders: { enabled: true } }
     };
     onStub = sandbox.stub();
     stub = sandbox.stub().returns({