opentracing: add timeout tag to fragment spans (#270)

zalando · Nov 14, 2018 · ab689b3 · ab689b3
1 parent 22608d3
commit ab689b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/fragment.js b/lib/fragment.js
@@ -124,7 +124,8 @@ module.exports = class Fragment extends EventEmitter {
             id,
             primary,
             async: isAsync,
-            public: isPublic
+            public: isPublic,
+            timeout
         } = this.attributes;
 
         span.addTags({
@@ -134,7 +135,8 @@ module.exports = class Fragment extends EventEmitter {
             public: isPublic,
             async: isAsync,
             id: id || 'unnamed',
-            primary
+            primary,
+            timeout
         });
 
         this.requestFragment(url, this.attributes, request, span).then(

diff --git a/tests/tailor.js b/tests/tailor.js
@@ -1371,7 +1371,8 @@ describe('Tailor', () => {
                         fallback: false,
                         public: false,
                         async: false,
-                        id: 'unnamed'
+                        id: 'unnamed',
+                        timeout: 3000
                     });
                 })
                 .then(done, done);
@@ -1387,7 +1388,7 @@ describe('Tailor', () => {
                 .reply(500);
 
             mockTemplate.returns(
-                '<fragment id="test" src="https://fragment/1" fallback-src="http://localhost:9000/2"></fragment>'
+                '<fragment id="test" src="https://fragment/1" timeout="200" fallback-src="http://localhost:9000/2"></fragment>'
             );
 
             getResponse('http://localhost:8080/test')
@@ -1400,7 +1401,8 @@ describe('Tailor', () => {
                         fallback: false,
                         primary: false,
                         async: false,
-                        public: false
+                        public: false,
+                        timeout: 200
                     });
                 })
                 .then(done, done);