@atlaskit/media-client 18.1.0 → 19.0.0

package/dist/esm/client/media-store/index.js

@@ -39,13 +39,6 @@ var jsonHeaders = {
   Accept: 'application/json',
   'Content-Type': 'application/json'
 };
-export var ZipkinHeaderKeys = {
-  traceId: 'x-b3-traceid',
-  spanId: 'x-b3-spanid',
-  parentSpanId: 'x-b3-parentspanid',
-  sampled: 'x-b3-sampled',
-  flags: 'x-b3-flags'
-};
 export var MediaStore = /*#__PURE__*/function () {
   function MediaStore(config, featureFlags) {
     var _this = this;
@@ -67,7 +60,7 @@ export var MediaStore = /*#__PURE__*/function () {
   _createClass(MediaStore, [{
     key: "getCollectionItems",
     value: function () {
-      var _getCollectionItems = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(collectionName, params) {
+      var _getCollectionItems = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(collectionName, params, traceContext) {
         var metadata, options, response, _yield$createMapRespo, _yield$createMapRespo2, contents, nextInclusiveStartKey, contentsWithoutEmptyFiles;
 
         return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -85,7 +78,8 @@ export var MediaStore = /*#__PURE__*/function () {
                   params: _objectSpread(_objectSpread({}, defaultGetCollectionItems), params),
                   headers: {
                     Accept: 'application/json'
-                  }
+                  },
+                  traceContext: traceContext
                 });
                 _context.next = 4;
                 return this.request("/collection/".concat(collectionName, "/items"), options);
@@ -120,7 +114,7 @@ export var MediaStore = /*#__PURE__*/function () {
         }, _callee, this);
       }));
 
-      function getCollectionItems(_x, _x2) {
+      function getCollectionItems(_x, _x2, _x3) {
         return _getCollectionItems.apply(this, arguments);
       }
 
@@ -129,7 +123,7 @@ export var MediaStore = /*#__PURE__*/function () {
   }, {
     key: "removeCollectionFile",
     value: function () {
-      var _removeCollectionFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id, collectionName, occurrenceKey) {
+      var _removeCollectionFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id, collectionName, occurrenceKey, traceContext) {
         var metadata, body, options;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
@@ -157,7 +151,8 @@ export var MediaStore = /*#__PURE__*/function () {
                     Accept: 'application/json',
                     'Content-Type': 'application/json'
                   },
-                  body: JSON.stringify(body)
+                  body: JSON.stringify(body),
+                  traceContext: traceContext
                 });
                 _context2.next = 5;
                 return this.request("/collection/".concat(collectionName), options);
@@ -170,7 +165,7 @@ export var MediaStore = /*#__PURE__*/function () {
         }, _callee2, this);
       }));
 
-      function removeCollectionFile(_x3, _x4, _x5) {
+      function removeCollectionFile(_x4, _x5, _x6, _x7) {
         return _removeCollectionFile.apply(this, arguments);
       }
 
@@ -181,6 +176,7 @@ export var MediaStore = /*#__PURE__*/function () {
     value: function createUpload() {
       var createUpTo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
       var collectionName = arguments.length > 1 ? arguments[1] : undefined;
+      var traceContext = arguments.length > 2 ? arguments[2] : undefined;
       var metadata = {
         method: 'POST',
         endpoint: '/upload'
@@ -195,7 +191,8 @@ export var MediaStore = /*#__PURE__*/function () {
         },
         headers: {
           Accept: 'application/json'
-        }
+        },
+        traceContext: traceContext
       });
 
       return this.request("/upload", options).then(createMapResponseToJson(metadata));
@@ -208,6 +205,7 @@ export var MediaStore = /*#__PURE__*/function () {
             collectionName,
             uploadId,
             partNumber,
+            traceContext,
             metadata,
             options,
             _args3 = arguments;
@@ -217,6 +215,7 @@ export var MediaStore = /*#__PURE__*/function () {
             switch (_context3.prev = _context3.next) {
               case 0:
                 _ref = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : {}, collectionName = _ref.collectionName, uploadId = _ref.uploadId, partNumber = _ref.partNumber;
+                traceContext = _args3.length > 3 ? _args3[3] : undefined;
                 metadata = {
                   method: 'PUT',
                   endpoint: '/chunk/{etag}'
@@ -229,12 +228,13 @@ export var MediaStore = /*#__PURE__*/function () {
                   authContext: {
                     collectionName: collectionName
                   },
-                  body: blob
+                  body: blob,
+                  traceContext: traceContext
                 });
-                _context3.next = 5;
+                _context3.next = 6;
                 return this.request("/chunk/".concat(etag), options);
 
-              case 5:
+              case 6:
               case "end":
                 return _context3.stop();
             }
@@ -242,7 +242,7 @@ export var MediaStore = /*#__PURE__*/function () {
         }, _callee3, this);
       }));
 
-      function uploadChunk(_x6, _x7) {
+      function uploadChunk(_x8, _x9) {
         return _uploadChunk.apply(this, arguments);
       }
 
@@ -255,6 +255,7 @@ export var MediaStore = /*#__PURE__*/function () {
           collectionName = _ref2.collectionName,
           uploadId = _ref2.uploadId;
 
+      var traceContext = arguments.length > 2 ? arguments[2] : undefined;
       var metadata = {
         method: 'POST',
         endpoint: '/chunk/probe'
@@ -270,7 +271,8 @@ export var MediaStore = /*#__PURE__*/function () {
         headers: jsonHeaders,
         body: JSON.stringify({
           chunks: chunks
-        })
+        }),
+        traceContext: traceContext
       });
 
       return this.request("/chunk/probe", options).then(createMapResponseToJson(metadata));
@@ -279,6 +281,7 @@ export var MediaStore = /*#__PURE__*/function () {
     key: "createFileFromUpload",
     value: function createFileFromUpload(body) {
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var traceContext = arguments.length > 2 ? arguments[2] : undefined;
       var metadata = {
         method: 'POST',
         endpoint: '/file/upload'
@@ -290,7 +293,8 @@ export var MediaStore = /*#__PURE__*/function () {
         },
         params: params,
         headers: jsonHeaders,
-        body: JSON.stringify(body)
+        body: JSON.stringify(body),
+        traceContext: traceContext
       });
 
       return this.request('/file/upload', options).then(createMapResponseToJson(metadata));
@@ -299,6 +303,7 @@ export var MediaStore = /*#__PURE__*/function () {
     key: "touchFiles",
     value: function touchFiles(body) {
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var traceContext = arguments.length > 2 ? arguments[2] : undefined;
       var metadata = {
         method: 'POST',
         endpoint: '/upload/createWithFiles'
@@ -309,7 +314,8 @@ export var MediaStore = /*#__PURE__*/function () {
           collectionName: params.collection
         },
         headers: jsonHeaders,
-        body: JSON.stringify(body)
+        body: JSON.stringify(body),
+        traceContext: traceContext
       });
 
       return this.request('/upload/createWithFiles', options).then(createMapResponseToJson(metadata));
@@ -318,6 +324,7 @@ export var MediaStore = /*#__PURE__*/function () {
     key: "getFile",
     value: function getFile(fileId) {
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var traceContext = arguments.length > 2 ? arguments[2] : undefined;
       var metadata = {
         method: 'GET',
         endpoint: '/file/{fileId}'
@@ -327,7 +334,8 @@ export var MediaStore = /*#__PURE__*/function () {
         authContext: {
           collectionName: params.collection
         },
-        params: params
+        params: params,
+        traceContext: traceContext
       });
 
       return this.request("/file/".concat(fileId), options).then(createMapResponseToJson(metadata));
@@ -360,12 +368,13 @@ export var MediaStore = /*#__PURE__*/function () {
         }, _callee4, this);
       }));
 
-      function getFileImageURL(_x8, _x9) {
+      function getFileImageURL(_x10, _x11) {
         return _getFileImageURL.apply(this, arguments);
       }
 
       return getFileImageURL;
-    }()
+    }() // TODO Create ticket in case Trace Id can be supported through query params
+
   }, {
     key: "getFileImageURLSync",
     value: function getFileImageURLSync(id, params) {
@@ -415,7 +424,7 @@ export var MediaStore = /*#__PURE__*/function () {
         }, _callee5, this);
       }));
 
-      function getFileBinaryURL(_x10, _x11) {
+      function getFileBinaryURL(_x12, _x13) {
         return _getFileBinaryURL.apply(this, arguments);
       }
 
@@ -464,7 +473,7 @@ export var MediaStore = /*#__PURE__*/function () {
         }, _callee6, this);
       }));
 
-      function getArtifactURL(_x12, _x13, _x14) {
+      function getArtifactURL(_x14, _x15, _x16) {
         return _getArtifactURL.apply(this, arguments);
       }
 
@@ -473,9 +482,7 @@ export var MediaStore = /*#__PURE__*/function () {
   }, {
     key: "getImage",
     value: function () {
-      var _getImage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(id, params, controller, fetchMaxRes, traceId) {
-        var _ref4;
-
+      var _getImage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(id, params, controller, fetchMaxRes, traceContext) {
         var isWebpSupported, headers, metadata, options;
         return _regeneratorRuntime.wrap(function _callee7$(_context7) {
           while (1) {
@@ -483,7 +490,7 @@ export var MediaStore = /*#__PURE__*/function () {
               case 0:
                 // TODO add checkWebpSupport() back https://product-fabric.atlassian.net/browse/MPT-584
                 isWebpSupported = false;
-                headers = !!traceId ? (_ref4 = {}, _defineProperty(_ref4, ZipkinHeaderKeys.traceId, traceId), _defineProperty(_ref4, ZipkinHeaderKeys.spanId, getRandomHex(16)), _ref4) : {};
+                headers = {};
 
                 if (isWebpSupported) {
                   headers.accept = 'image/webp,image/*,*/*;q=0.8';
@@ -498,7 +505,8 @@ export var MediaStore = /*#__PURE__*/function () {
                     collectionName: params && params.collection
                   },
                   params: extendImageParams(params, fetchMaxRes),
-                  headers: headers
+                  headers: headers,
+                  traceContext: traceContext
                 });
                 return _context7.abrupt("return", this.request("/file/".concat(id, "/image"), options, controller).then(createMapResponseToBlob(metadata)));
 
@@ -510,7 +518,7 @@ export var MediaStore = /*#__PURE__*/function () {
         }, _callee7, this);
       }));
 
-      function getImage(_x15, _x16, _x17, _x18, _x19) {
+      function getImage(_x17, _x18, _x19, _x20, _x21) {
         return _getImage.apply(this, arguments);
       }
 
@@ -519,7 +527,7 @@ export var MediaStore = /*#__PURE__*/function () {
   }, {
     key: "getItems",
     value: function () {
-      var _getItems = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(ids, collectionName) {
+      var _getItems = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(ids, collectionName, traceContext) {
         var descriptors, metadata, options;
         return _regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) {
@@ -543,7 +551,8 @@ export var MediaStore = /*#__PURE__*/function () {
                   headers: jsonHeaders,
                   body: JSON.stringify({
                     descriptors: descriptors
-                  })
+                  }),
+                  traceContext: traceContext
                 });
                 return _context8.abrupt("return", this.request('/items', options).then(createMapResponseToJson(metadata)));
 
@@ -555,7 +564,7 @@ export var MediaStore = /*#__PURE__*/function () {
         }, _callee8, this);
       }));
 
-      function getItems(_x20, _x21) {
+      function getItems(_x22, _x23, _x24) {
         return _getItems.apply(this, arguments);
       }
 
@@ -564,7 +573,7 @@ export var MediaStore = /*#__PURE__*/function () {
   }, {
     key: "getImageMetadata",
     value: function () {
-      var _getImageMetadata = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(id, params) {
+      var _getImageMetadata = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(id, params, traceContext) {
         var metadata, options;
         return _regeneratorRuntime.wrap(function _callee9$(_context9) {
           while (1) {
@@ -578,7 +587,8 @@ export var MediaStore = /*#__PURE__*/function () {
                   authContext: {
                     collectionName: params && params.collection
                   },
-                  params: params
+                  params: params,
+                  traceContext: traceContext
                 });
                 return _context9.abrupt("return", this.request("/file/".concat(id, "/image/metadata"), options).then(createMapResponseToJson(metadata)));
 
@@ -590,7 +600,7 @@ export var MediaStore = /*#__PURE__*/function () {
         }, _callee9, this);
       }));
 
-      function getImageMetadata(_x22, _x23) {
+      function getImageMetadata(_x25, _x26, _x27) {
         return _getImageMetadata.apply(this, arguments);
       }
 
@@ -599,7 +609,7 @@ export var MediaStore = /*#__PURE__*/function () {
   }, {
     key: "appendChunksToUpload",
     value: function () {
-      var _appendChunksToUpload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(uploadId, body, collectionName) {
+      var _appendChunksToUpload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(uploadId, body, collectionName, traceContext) {
         var metadata, options;
         return _regeneratorRuntime.wrap(function _callee10$(_context10) {
           while (1) {
@@ -614,7 +624,8 @@ export var MediaStore = /*#__PURE__*/function () {
                     collectionName: collectionName
                   },
                   headers: jsonHeaders,
-                  body: JSON.stringify(body)
+                  body: JSON.stringify(body),
+                  traceContext: traceContext
                 });
                 _context10.next = 4;
                 return this.request("/upload/".concat(uploadId, "/chunks"), options);
@@ -627,7 +638,7 @@ export var MediaStore = /*#__PURE__*/function () {
         }, _callee10, this);
       }));
 
-      function appendChunksToUpload(_x24, _x25, _x26) {
+      function appendChunksToUpload(_x28, _x29, _x30, _x31) {
         return _appendChunksToUpload.apply(this, arguments);
       }
 
@@ -635,7 +646,7 @@ export var MediaStore = /*#__PURE__*/function () {
     }()
   }, {
     key: "copyFileWithToken",
-    value: function copyFileWithToken(body, params) {
+    value: function copyFileWithToken(body, params, traceContext) {
       var metadata = {
         method: 'POST',
         endpoint: '/file/copy/withToken'
@@ -649,8 +660,9 @@ export var MediaStore = /*#__PURE__*/function () {
         params: params,
         // Contains collection name to write to
         headers: jsonHeaders,
-        body: JSON.stringify(body) // Contains collection name to read from
-
+        body: JSON.stringify(body),
+        // Contains collection name to read from
+        traceContext: traceContext
       });
 
       return this.request('/file/copy/withToken', options).then(createMapResponseToJson(metadata));
@@ -668,7 +680,9 @@ export var MediaStore = /*#__PURE__*/function () {
             headers,
             body,
             clientOptions,
+            traceContext,
             auth,
+            extendedTraceContext,
             response,
             _args11 = arguments;
         return _regeneratorRuntime.wrap(function _callee11$(_context11) {
@@ -681,13 +695,16 @@ export var MediaStore = /*#__PURE__*/function () {
                   authContext: {}
                 };
                 controller = _args11.length > 2 ? _args11[2] : undefined;
-                method = options.method, endpoint = options.endpoint, authContext = options.authContext, params = options.params, headers = options.headers, body = options.body, clientOptions = options.clientOptions;
+                method = options.method, endpoint = options.endpoint, authContext = options.authContext, params = options.params, headers = options.headers, body = options.body, clientOptions = options.clientOptions, traceContext = options.traceContext;
                 _context11.next = 5;
                 return this.resolveAuth(authContext);
 
               case 5:
                 auth = _context11.sent;
-                _context11.next = 8;
+                extendedTraceContext = traceContext ? _objectSpread(_objectSpread({}, traceContext), {}, {
+                  spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || getRandomHex(16)
+                }) : undefined;
+                _context11.next = 9;
                 return _request("".concat(auth.baseUrl).concat(path), {
                   method: method,
                   endpoint: endpoint,
@@ -695,16 +712,17 @@ export var MediaStore = /*#__PURE__*/function () {
                   params: params,
                   headers: headers,
                   body: body,
-                  clientOptions: clientOptions
+                  clientOptions: clientOptions,
+                  traceContext: extendedTraceContext
                 }, controller);
 
-              case 8:
+              case 9:
                 response = _context11.sent;
                 setKeyValueInSessionStorage(MEDIA_API_REGION, response.headers.get('x-media-region'));
                 setKeyValueInSessionStorage(MEDIA_API_ENVIRONMENT, response.headers.get('x-media-env'));
                 return _context11.abrupt("return", response);
 
-              case 12:
+              case 13:
               case "end":
                 return _context11.stop();
             }
@@ -712,7 +730,7 @@ export var MediaStore = /*#__PURE__*/function () {
         }, _callee11, this);
       }));
 
-      function request(_x27) {
+      function request(_x32) {
         return _request2.apply(this, arguments);
       }
 

package/dist/esm/uploader/index.js

@@ -42,7 +42,7 @@ var hashingFunction = /*#__PURE__*/function () {
   };
 }();
 
-var createProbingFunction = function createProbingFunction(store, deferredUploadId, collectionName) {
+var createProbingFunction = function createProbingFunction(store, deferredUploadId, collectionName, traceContext) {
   return /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(chunks) {
       var response, results;
@@ -76,17 +76,18 @@ var createProbingFunction = function createProbingFunction(store, deferredUpload
                 collectionName: _context2.t2,
                 uploadId: _context2.t4
               };
-              _context2.next = 14;
-              return _context2.t0.probeChunks.call(_context2.t0, _context2.t1, _context2.t5);
+              _context2.t6 = traceContext;
+              _context2.next = 15;
+              return _context2.t0.probeChunks.call(_context2.t0, _context2.t1, _context2.t5, _context2.t6);
 
-            case 14:
+            case 15:
               response = _context2.sent;
               results = response.data.results;
               return _context2.abrupt("return", Object.values(results).map(function (result) {
                 return result.exists;
               }));
 
-            case 17:
+            case 18:
             case "end":
               return _context2.stop();
           }
@@ -100,7 +101,7 @@ var createProbingFunction = function createProbingFunction(store, deferredUpload
   }();
 };
 
-var createUploadingFunction = function createUploadingFunction(store, deferredUploadId, collectionName) {
+var createUploadingFunction = function createUploadingFunction(store, deferredUploadId, collectionName, traceContext) {
   return /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(chunk) {
       var options;
@@ -134,7 +135,7 @@ var createUploadingFunction = function createUploadingFunction(store, deferredUp
               _context3.next = 12;
               return store.uploadChunk(chunk.hash, chunk.blob, _objectSpread({
                 collectionName: collectionName
-              }, options));
+              }, options), traceContext);
 
             case 12:
               return _context3.abrupt("return", _context3.sent);
@@ -153,7 +154,7 @@ var createUploadingFunction = function createUploadingFunction(store, deferredUp
   }();
 };
 
-var createProcessingFunction = function createProcessingFunction(store, deferredUploadId, collection) {
+var createProcessingFunction = function createProcessingFunction(store, deferredUploadId, collection, traceContext) {
   var offset = 0;
   return /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(chunks) {
@@ -172,13 +173,14 @@ var createProcessingFunction = function createProcessingFunction(store, deferred
                 offset: offset
               };
               _context4.t3 = collection;
-              _context4.next = 8;
-              return _context4.t0.appendChunksToUpload.call(_context4.t0, _context4.t1, _context4.t2, _context4.t3);
+              _context4.t4 = traceContext;
+              _context4.next = 9;
+              return _context4.t0.appendChunksToUpload.call(_context4.t0, _context4.t1, _context4.t2, _context4.t3, _context4.t4);
 
-            case 8:
+            case 9:
               offset += chunks.length;
 
-            case 9:
+            case 10:
             case "end":
               return _context4.stop();
           }
@@ -193,7 +195,7 @@ var createProcessingFunction = function createProcessingFunction(store, deferred
 };
 
 var createFileFromUpload = /*#__PURE__*/function () {
-  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(file, store, uploadableFileUpfrontIds, uploadId) {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(file, store, uploadableFileUpfrontIds, uploadId, traceContext) {
     var collection, name, mimeType, id, occurrenceKey;
     return _regeneratorRuntime.wrap(function _callee5$(_context5) {
       while (1) {
@@ -209,7 +211,7 @@ var createFileFromUpload = /*#__PURE__*/function () {
               occurrenceKey: occurrenceKey,
               collection: collection,
               replaceFileId: id
-            }));
+            }, traceContext));
 
           case 3:
           case "end":
@@ -219,12 +221,12 @@ var createFileFromUpload = /*#__PURE__*/function () {
     }, _callee5);
   }));
 
-  return function createFileFromUpload(_x5, _x6, _x7, _x8) {
+  return function createFileFromUpload(_x5, _x6, _x7, _x8, _x9) {
     return _ref5.apply(this, arguments);
   };
 }();
 
-export var uploadFile = function uploadFile(file, store, uploadableFileUpfrontIds, callbacks) {
+export var uploadFile = function uploadFile(file, store, uploadableFileUpfrontIds, callbacks, traceContext) {
   var content = file.content,
       collection = file.collection;
   var deferredUploadId = uploadableFileUpfrontIds.deferredUploadId,
@@ -257,10 +259,10 @@ export var uploadFile = function uploadFile(file, store, uploadableFileUpfrontId
     probingBatchSize: 100,
     chunkSize: chunkSize,
     uploadingConcurrency: 3,
-    uploadingFunction: createUploadingFunction(store, deferredUploadId, collection),
-    probingFunction: createProbingFunction(store, deferredUploadId, collection),
+    uploadingFunction: createUploadingFunction(store, deferredUploadId, collection, traceContext),
+    probingFunction: createProbingFunction(store, deferredUploadId, collection, traceContext),
     processingBatchSize: PROCESSING_BATCH_SIZE,
-    processingFunction: createProcessingFunction(store, deferredUploadId, collection)
+    processingFunction: createProcessingFunction(store, deferredUploadId, collection, traceContext)
   }, {
     onProgress: function onProgress(progress) {
       if (callbacks) {
@@ -273,7 +275,7 @@ export var uploadFile = function uploadFile(file, store, uploadableFileUpfrontId
 
   var subscription = from(deferredUploadId).pipe(concatMap(function (uploadId) {
     return chunkinatorObservable.pipe(concatMap(function () {
-      return from(createFileFromUpload(file, store, uploadableFileUpfrontIds, uploadId));
+      return from(createFileFromUpload(file, store, uploadableFileUpfrontIds, uploadId, traceContext));
     }));
   })).subscribe({
     error: function error(err) {

package/dist/esm/utils/request/helpers.js

@@ -31,7 +31,25 @@ export function isFetchNetworkError(err) {
 export function isRateLimitedError(error) {
   return !!error && isRequestError(error) && error.attributes.statusCode === 429 || !!error && !!error.message && error.message.includes('429');
 }
+export var ZipkinHeaderKeys = {
+  traceId: 'x-b3-traceid',
+  spanId: 'x-b3-spanid',
+  parentSpanId: 'x-b3-parentspanid',
+  sampled: 'x-b3-sampled',
+  flags: 'x-b3-flags'
+};
+
+var mapTraceIdToRequestHeaders = function mapTraceIdToRequestHeaders(traceContext) {
+  var _ref;
+
+  return traceContext ? (_ref = {}, _defineProperty(_ref, ZipkinHeaderKeys.traceId, traceContext.traceId), _defineProperty(_ref, ZipkinHeaderKeys.spanId, traceContext.spanId), _ref) : {};
+};
+
 export function mapAuthToRequestHeaders(auth) {
+  if (!auth) {
+    return {};
+  }
+
   if (isClientBasedAuth(auth)) {
     return {
       'X-Client-Id': auth.clientId,
@@ -44,18 +62,18 @@ export function mapAuthToRequestHeaders(auth) {
     Authorization: "Bearer ".concat(auth.token)
   };
 }
-export function createUrl(url, _ref) {
-  var params = _ref.params,
-      auth = _ref.auth;
+export function createUrl(url, _ref2) {
+  var params = _ref2.params,
+      auth = _ref2.auth;
   var parsedUrl = new URL(url);
   var authParams = auth && mapAuthToQueryParameters(auth) || {};
 
   var paramsToAppend = _objectSpread(_objectSpread({}, params), authParams);
 
-  Object.entries(paramsToAppend).filter(function (_ref2) {
-    var _ref3 = _slicedToArray(_ref2, 2),
-        _ = _ref3[0],
-        value = _ref3[1];
+  Object.entries(paramsToAppend).filter(function (_ref3) {
+    var _ref4 = _slicedToArray(_ref3, 2),
+        _ = _ref4[0],
+        value = _ref4[1];
 
     return value != null;
   }).forEach(function (pair) {
@@ -66,14 +84,12 @@ export function createUrl(url, _ref) {
   parsedUrl.searchParams.sort();
   return parsedUrl.toString();
 }
-export function withAuth(auth) {
-  return function (headers) {
-    if (auth) {
-      return _objectSpread(_objectSpread({}, headers || {}), mapAuthToRequestHeaders(auth));
-    }
+export function extendHeaders(headers, auth, traceContext) {
+  if (!auth && !traceContext && !headers) {
+    return undefined;
+  }
 
-    return headers;
-  };
+  return _objectSpread(_objectSpread(_objectSpread({}, headers !== null && headers !== void 0 ? headers : {}), mapAuthToRequestHeaders(auth)), mapTraceIdToRequestHeaders(traceContext));
 }
 /**
  * @deprecated Helper is deprecated and will be removed in the next major version.
@@ -167,7 +183,7 @@ export function mapResponseToVoid() {
 }
 export function createMapResponseToJson(metadata) {
   return /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -195,13 +211,13 @@ export function createMapResponseToJson(metadata) {
     }));
 
     return function (_x3) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 }
 export function createMapResponseToBlob(metadata) {
   return /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(response) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(response) {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -229,7 +245,7 @@ export function createMapResponseToBlob(metadata) {
     }));
 
     return function (_x4) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 }
@@ -274,7 +290,7 @@ function _fetchRetry() {
             timeoutInMs = startTimeoutInMs;
 
             waitAndBumpTimeout = /*#__PURE__*/function () {
-              var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+              var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
                 return _regeneratorRuntime.wrap(function _callee5$(_context5) {
                   while (1) {
                     switch (_context5.prev = _context5.next) {
@@ -295,7 +311,7 @@ function _fetchRetry() {
               }));
 
               return function waitAndBumpTimeout() {
-                return _ref6.apply(this, arguments);
+                return _ref7.apply(this, arguments);
               };
             }();