@atlaskit/media-client 18.1.0 → 19.1.0

package/dist/cjs/uploader/index.js

@@ -9,8 +9,6 @@ exports.uploadFile = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _chunkinator = require("@atlaskit/chunkinator");
@@ -27,12 +25,6 @@ var _constants = require("../constants");
 
 var _calculateChunkSize = require("./calculateChunkSize");
 
-var _mediaCommon = require("@atlaskit/media-common");
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 var hashingFunction = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(blob) {
     var hasher;
@@ -60,7 +52,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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(chunks) {
       var response, results;
@@ -71,40 +63,27 @@ var createProbingFunction = function createProbingFunction(store, deferredUpload
               _context2.t0 = store;
               _context2.t1 = hashedChunks(chunks);
               _context2.t2 = collectionName;
-
-              if (!(0, _mediaCommon.getMediaFeatureFlag)('mediaUploadApiV2', store.featureFlags)) {
-                _context2.next = 9;
-                break;
-              }
-
-              _context2.next = 6;
+              _context2.next = 5;
               return deferredUploadId;
 
-            case 6:
+            case 5:
               _context2.t3 = _context2.sent;
-              _context2.next = 10;
-              break;
-
-            case 9:
-              _context2.t3 = undefined;
-
-            case 10:
-              _context2.t4 = _context2.t3;
-              _context2.t5 = {
+              _context2.t4 = {
                 collectionName: _context2.t2,
-                uploadId: _context2.t4
+                uploadId: _context2.t3
               };
-              _context2.next = 14;
-              return _context2.t0.probeChunks.call(_context2.t0, _context2.t1, _context2.t5);
+              _context2.t5 = traceContext;
+              _context2.next = 10;
+              return _context2.t0.probeChunks.call(_context2.t0, _context2.t1, _context2.t4, _context2.t5);
 
-            case 14:
+            case 10:
               response = _context2.sent;
               results = response.data.results;
               return _context2.abrupt("return", Object.values(results).map(function (result) {
                 return result.exists;
               }));
 
-            case 17:
+            case 13:
             case "end":
               return _context2.stop();
           }
@@ -118,41 +97,31 @@ 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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(chunk) {
-      var options;
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              if (!(0, _mediaCommon.getMediaFeatureFlag)('mediaUploadApiV2', store.featureFlags)) {
-                _context3.next = 8;
-                break;
-              }
-
-              _context3.t1 = chunk.partNumber;
-              _context3.next = 4;
+              _context3.t0 = store;
+              _context3.t1 = chunk.hash;
+              _context3.t2 = chunk.blob;
+              _context3.t3 = collectionName;
+              _context3.t4 = chunk.partNumber;
+              _context3.next = 7;
               return deferredUploadId;
 
-            case 4:
-              _context3.t2 = _context3.sent;
-              _context3.t0 = {
-                partNumber: _context3.t1,
-                uploadId: _context3.t2
+            case 7:
+              _context3.t5 = _context3.sent;
+              _context3.t6 = {
+                collectionName: _context3.t3,
+                partNumber: _context3.t4,
+                uploadId: _context3.t5
               };
-              _context3.next = 9;
-              break;
-
-            case 8:
-              _context3.t0 = {};
-
-            case 9:
-              options = _context3.t0;
+              _context3.t7 = traceContext;
               _context3.next = 12;
-              return store.uploadChunk(chunk.hash, chunk.blob, _objectSpread({
-                collectionName: collectionName
-              }, options));
+              return _context3.t0.uploadChunk.call(_context3.t0, _context3.t1, _context3.t2, _context3.t6, _context3.t7);
 
             case 12:
               return _context3.abrupt("return", _context3.sent);
@@ -171,7 +140,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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(chunks) {
@@ -190,13 +159,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();
           }
@@ -211,7 +181,7 @@ var createProcessingFunction = function createProcessingFunction(store, deferred
 };
 
 var createFileFromUpload = /*#__PURE__*/function () {
-  var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(file, store, uploadableFileUpfrontIds, uploadId) {
+  var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(file, store, uploadableFileUpfrontIds, uploadId, traceContext) {
     var collection, name, mimeType, id, occurrenceKey;
     return _regenerator.default.wrap(function _callee5$(_context5) {
       while (1) {
@@ -227,7 +197,7 @@ var createFileFromUpload = /*#__PURE__*/function () {
               occurrenceKey: occurrenceKey,
               collection: collection,
               replaceFileId: id
-            }));
+            }, traceContext));
 
           case 3:
           case "end":
@@ -237,12 +207,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);
   };
 }();
 
-var uploadFile = function uploadFile(file, store, uploadableFileUpfrontIds, callbacks) {
+var uploadFile = function uploadFile(file, store, uploadableFileUpfrontIds, callbacks, traceContext) {
   var content = file.content,
       collection = file.collection;
   var deferredUploadId = uploadableFileUpfrontIds.deferredUploadId,
@@ -251,7 +221,7 @@ var uploadFile = function uploadFile(file, store, uploadableFileUpfrontIds, call
   var chunkSize = _constants.CHUNK_SIZE;
 
   try {
-    if (content instanceof Blob && (0, _mediaCommon.getMediaFeatureFlag)('mediaUploadApiV2', store.featureFlags)) {
+    if (content instanceof Blob) {
       chunkSize = (0, _calculateChunkSize.calculateChunkSize)(content.size);
     }
   } catch (err) {
@@ -275,10 +245,10 @@ var uploadFile = function uploadFile(file, store, uploadableFileUpfrontIds, call
     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: _constants.PROCESSING_BATCH_SIZE,
-    processingFunction: createProcessingFunction(store, deferredUploadId, collection)
+    processingFunction: createProcessingFunction(store, deferredUploadId, collection, traceContext)
   }, {
     onProgress: function onProgress(progress) {
       if (callbacks) {
@@ -291,7 +261,7 @@ var uploadFile = function uploadFile(file, store, uploadableFileUpfrontIds, call
 
   var subscription = (0, _from.from)(deferredUploadId).pipe((0, _concatMap.concatMap)(function (uploadId) {
     return chunkinatorObservable.pipe((0, _concatMap.concatMap)(function () {
-      return (0, _from.from)(createFileFromUpload(file, store, uploadableFileUpfrontIds, uploadId));
+      return (0, _from.from)(createFileFromUpload(file, store, uploadableFileUpfrontIds, uploadId, traceContext));
     }));
   })).subscribe({
     error: function error(err) {

package/dist/cjs/utils/createFileDataLoader.js

@@ -16,12 +16,18 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 require("setimmediate");
 
 var _dataloader = _interopRequireDefault(require("dataloader"));
 
-// import setimmediate to temporary fix dataloader 2.0.0 bug
-// @see https://github.com/graphql/dataloader/issues/249
+var _mediaCommon = require("@atlaskit/media-common");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 var MAX_BATCH_SIZE = 100;
 exports.MAX_BATCH_SIZE = MAX_BATCH_SIZE;
 
@@ -38,7 +44,9 @@ var getItemsFromKeys = function getItemsFromKeys(dataloaderKeys, fileItems) {
     var id = fileItem.id,
         collection = fileItem.collection;
     var key = makeCacheKey(id, collection);
-    prev[key] = isBatchLoadingErrorResult(fileItem) ? fileItem.error : fileItem.details;
+    prev[key] = isBatchLoadingErrorResult(fileItem) ? fileItem.error : _objectSpread(_objectSpread({}, fileItem.details), {}, {
+      metadataTraceContext: fileItem.metadataTraceContext
+    });
     return prev;
   }, {});
   return dataloaderKeys.map(function (dataloaderKey) {
@@ -84,26 +92,35 @@ function createBatchLoadingFunc(mediaStore) {
               _context2.next = 5;
               return Promise.all(Object.keys(fileIdsByCollection).map( /*#__PURE__*/function () {
                 var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(collectionNameKey) {
-                  var fileIds, collectionName, response;
+                  var metadataTraceContext, fileIds, collectionName, response, itemsWithMetadataTraceContext;
                   return _regenerator.default.wrap(function _callee$(_context) {
                     while (1) {
                       switch (_context.prev = _context.next) {
                         case 0:
+                          metadataTraceContext = {
+                            traceId: (0, _mediaCommon.getRandomHex)(8),
+                            spanId: (0, _mediaCommon.getRandomHex)(8)
+                          };
                           fileIds = fileIdsByCollection[collectionNameKey];
                           collectionName = collectionNameKey === nonCollectionName ? undefined : collectionNameKey;
-                          _context.prev = 2;
-                          _context.next = 5;
-                          return mediaStore.getItems(fileIds, collectionName);
+                          _context.prev = 3;
+                          _context.next = 6;
+                          return mediaStore.getItems(fileIds, collectionName, metadataTraceContext);
 
-                        case 5:
+                        case 6:
                           response = _context.sent;
-                          items.push.apply(items, (0, _toConsumableArray2.default)(response.data.items));
-                          _context.next = 12;
+                          itemsWithMetadataTraceContext = response.data.items.map(function (item) {
+                            return _objectSpread(_objectSpread({}, item), {}, {
+                              metadataTraceContext: metadataTraceContext
+                            });
+                          });
+                          items.push.apply(items, (0, _toConsumableArray2.default)(itemsWithMetadataTraceContext));
+                          _context.next = 14;
                           break;
 
-                        case 9:
-                          _context.prev = 9;
-                          _context.t0 = _context["catch"](2);
+                        case 11:
+                          _context.prev = 11;
+                          _context.t0 = _context["catch"](3);
                           fileIds.forEach(function (fileId) {
                             items.push({
                               id: fileId,
@@ -112,12 +129,12 @@ function createBatchLoadingFunc(mediaStore) {
                             });
                           });
 
-                        case 12:
+                        case 14:
                         case "end":
                           return _context.stop();
                       }
                     }
-                  }, _callee, null, [[2, 9]]);
+                  }, _callee, null, [[3, 11]]);
                 }));
 
                 return function (_x2) {

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEFAULT_RETRY_OPTIONS = void 0;
+exports.ZipkinHeaderKeys = exports.DEFAULT_RETRY_OPTIONS = void 0;
 exports.clientTimeoutPromise = clientTimeoutPromise;
 exports.cloneRequestError = cloneRequestError;
 exports.createMapResponseToBlob = createMapResponseToBlob;
@@ -14,6 +14,7 @@ exports.createProcessFetchResponse = createProcessFetchResponse;
 exports.createRequestErrorFromResponse = createRequestErrorFromResponse;
 exports.createRequestErrorReason = createRequestErrorReason;
 exports.createUrl = createUrl;
+exports.extendHeaders = extendHeaders;
 exports.extractMediaHeaders = extractMediaHeaders;
 exports.fetchRetry = fetchRetry;
 exports.isAbortedRequestError = isAbortedRequestError;
@@ -24,7 +25,6 @@ exports.mapResponseToBlob = mapResponseToBlob;
 exports.mapResponseToJson = mapResponseToJson;
 exports.mapResponseToVoid = mapResponseToVoid;
 exports.waitPromise = waitPromise;
-exports.withAuth = withAuth;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -71,7 +71,26 @@ function isRateLimitedError(error) {
   return !!error && (0, _errors.isRequestError)(error) && error.attributes.statusCode === 429 || !!error && !!error.message && error.message.includes('429');
 }
 
+var ZipkinHeaderKeys = {
+  traceId: 'x-b3-traceid',
+  spanId: 'x-b3-spanid',
+  parentSpanId: 'x-b3-parentspanid',
+  sampled: 'x-b3-sampled',
+  flags: 'x-b3-flags'
+};
+exports.ZipkinHeaderKeys = ZipkinHeaderKeys;
+
+var mapTraceIdToRequestHeaders = function mapTraceIdToRequestHeaders(traceContext) {
+  var _ref;
+
+  return traceContext ? (_ref = {}, (0, _defineProperty2.default)(_ref, ZipkinHeaderKeys.traceId, traceContext.traceId), (0, _defineProperty2.default)(_ref, ZipkinHeaderKeys.spanId, traceContext.spanId), _ref) : {};
+};
+
 function mapAuthToRequestHeaders(auth) {
+  if (!auth) {
+    return {};
+  }
+
   if ((0, _mediaCore.isClientBasedAuth)(auth)) {
     return {
       'X-Client-Id': auth.clientId,
@@ -85,18 +104,18 @@ function mapAuthToRequestHeaders(auth) {
   };
 }
 
-function createUrl(url, _ref) {
-  var params = _ref.params,
-      auth = _ref.auth;
+function createUrl(url, _ref2) {
+  var params = _ref2.params,
+      auth = _ref2.auth;
   var parsedUrl = new URL(url);
   var authParams = auth && (0, _authQueryParameters.mapAuthToQueryParameters)(auth) || {};
 
   var paramsToAppend = _objectSpread(_objectSpread({}, params), authParams);
 
-  Object.entries(paramsToAppend).filter(function (_ref2) {
-    var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-        _ = _ref3[0],
-        value = _ref3[1];
+  Object.entries(paramsToAppend).filter(function (_ref3) {
+    var _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
+        _ = _ref4[0],
+        value = _ref4[1];
 
     return value != null;
   }).forEach(function (pair) {
@@ -108,14 +127,12 @@ function createUrl(url, _ref) {
   return parsedUrl.toString();
 }
 
-function withAuth(auth) {
-  return function (headers) {
-    if (auth) {
-      return _objectSpread(_objectSpread({}, headers || {}), mapAuthToRequestHeaders(auth));
-    }
+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.
@@ -213,7 +230,7 @@ function mapResponseToVoid() {
 
 function createMapResponseToJson(metadata) {
   return /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(response) {
+    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(response) {
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -241,14 +258,14 @@ function createMapResponseToJson(metadata) {
     }));
 
     return function (_x3) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 }
 
 function createMapResponseToBlob(metadata) {
   return /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(response) {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(response) {
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -276,7 +293,7 @@ function createMapResponseToBlob(metadata) {
     }));
 
     return function (_x4) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 }
@@ -325,7 +342,7 @@ function _fetchRetry() {
             timeoutInMs = startTimeoutInMs;
 
             waitAndBumpTimeout = /*#__PURE__*/function () {
-              var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+              var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
                 return _regenerator.default.wrap(function _callee5$(_context5) {
                   while (1) {
                     switch (_context5.prev = _context5.next) {
@@ -346,7 +363,7 @@ function _fetchRetry() {
               }));
 
               return function waitAndBumpTimeout() {
-                return _ref6.apply(this, arguments);
+                return _ref7.apply(this, arguments);
               };
             }();
 

package/dist/cjs/utils/request/index.js

@@ -50,6 +50,7 @@ function _request() {
         body,
         _options$clientOption,
         clientOptions,
+        traceContext,
         retryOptions,
         metadata,
         doFetch,
@@ -61,11 +62,12 @@ function _request() {
           case 0:
             options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
             controller = _args.length > 2 ? _args[2] : undefined;
-            _options$method = options.method, method = _options$method === void 0 ? 'GET' : _options$method, endpoint = options.endpoint, auth = options.auth, params = options.params, headers = options.headers, body = options.body, _options$clientOption = options.clientOptions, clientOptions = _options$clientOption === void 0 ? {} : _options$clientOption;
+            _options$method = options.method, method = _options$method === void 0 ? 'GET' : _options$method, endpoint = options.endpoint, auth = options.auth, params = options.params, headers = options.headers, body = options.body, _options$clientOption = options.clientOptions, clientOptions = _options$clientOption === void 0 ? {} : _options$clientOption, traceContext = options.traceContext;
             retryOptions = clientOptions.retryOptions;
             metadata = {
               method: method,
-              endpoint: endpoint
+              endpoint: endpoint,
+              traceContext: traceContext
             }; // TODO BMPT-918: add client timeout feature behing a FF (using clientOptions.clientTimeout + Promise.race)
 
             doFetch = function doFetch() {
@@ -74,7 +76,7 @@ function _request() {
               }), {
                 method: method,
                 body: body,
-                headers: (0, _helpers.withAuth)(auth)(headers),
+                headers: (0, _helpers.extendHeaders)(headers, auth, traceContext),
                 signal: controller && controller.signal
               }).then((0, _helpers.createProcessFetchResponse)(metadata));
             };

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "18.1.0",
+	"version": "19.1.0",
 	"sideEffects": false
 }

package/dist/es2019/client/collection-fetcher.js

@@ -46,7 +46,7 @@ export class CollectionFetcher {
     collectionCache[collectionName].items.splice(collectionCacheIndex, 1);
   }
 
-  getItems(collectionName, params) {
+  getItems(collectionName, params, traceContext) {
     if (!collectionCache[collectionName]) {
       collectionCache[collectionName] = createCacheEntry();
     }
@@ -55,7 +55,7 @@ export class CollectionFetcher {
     const subject = collection.subject;
     this.mediaStore.getCollectionItems(collectionName, { ...params,
       details: 'full'
-    }).then(items => {
+    }, traceContext).then(items => {
       const {
         contents,
         nextInclusiveStartKey
@@ -70,14 +70,14 @@ export class CollectionFetcher {
     return fromObservable(subject);
   }
 
-  async removeFile(id, collectionName, occurrenceKey) {
-    await this.mediaStore.removeCollectionFile(id, collectionName, occurrenceKey);
+  async removeFile(id, collectionName, occurrenceKey, traceContext) {
+    await this.mediaStore.removeCollectionFile(id, collectionName, occurrenceKey, traceContext);
     this.removeFromCache(id, collectionName);
     const collection = collectionCache[collectionName];
     collection.subject.next(collection.items);
   }
 
-  async loadNextPage(collectionName, params) {
+  async loadNextPage(collectionName, params, traceContext) {
     const collection = collectionCache[collectionName];
     const isLoading = collection ? collection.isLoadingNextPage : false;
 
@@ -94,7 +94,7 @@ export class CollectionFetcher {
     const response = await this.mediaStore.getCollectionItems(collectionName, { ...params,
       inclusiveStartKey,
       details: 'full'
-    });
+    }, traceContext);
     const {
       contents,
       nextInclusiveStartKey

package/dist/es2019/client/file-fetcher/index.js

@@ -106,19 +106,20 @@ export class FileFetcherImpl {
 
   getFileBinaryURL(id, collectionName) {
     return this.mediaStore.getFileBinaryURL(id, collectionName);
-  }
+  } // TODO: ----- ADD TICKET TO PASS TRACE ID to this.dataloader.load
+
 
-  touchFiles(descriptors, collection) {
+  touchFiles(descriptors, collection, traceContext) {
     return this.mediaStore.touchFiles({
       descriptors
     }, {
       collection
-    }).then(({
+    }, traceContext).then(({
       data
     }) => data);
   }
 
-  generateUploadableFileUpfrontIds(collection) {
+  generateUploadableFileUpfrontIds(collection, traceContext) {
     const id = uuid();
     const occurrenceKey = uuid();
     const touchFileDescriptor = {
@@ -126,7 +127,7 @@ export class FileFetcherImpl {
       occurrenceKey,
       collection
     };
-    const deferredUploadId = this.touchFiles([touchFileDescriptor], collection).then(touchedFiles => touchedFiles.created[0].uploadId);
+    const deferredUploadId = this.touchFiles([touchFileDescriptor], collection, traceContext).then(touchedFiles => touchedFiles.created[0].uploadId);
     return {
       id,
       occurrenceKey,
@@ -134,8 +135,8 @@ export class FileFetcherImpl {
     };
   }
 
-  async uploadExternal(url, collection) {
-    const uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection);
+  async uploadExternal(url, collection, traceContext) {
+    const uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection, traceContext);
     const {
       id,
       occurrenceKey
@@ -199,7 +200,7 @@ export class FileFetcherImpl {
         preview
       }); // we don't want to wait for the file to be upload
 
-      this.upload(file, undefined, uploadableFileUpfrontIds);
+      this.upload(file, undefined, uploadableFileUpfrontIds, traceContext);
       const dimensions = await getDimensionsFromBlob(mediaType, blob);
       resolve({
         dimensions,
@@ -208,7 +209,7 @@ export class FileFetcherImpl {
     });
   }
 
-  upload(file, controller, uploadableFileUpfrontIds) {
+  upload(file, controller, uploadableFileUpfrontIds, traceContext) {
     if (typeof file.content === 'string') {
       file.content = convertBase64ToBlob(file.content);
     }
@@ -221,7 +222,7 @@ export class FileFetcherImpl {
     } = file;
 
     if (!uploadableFileUpfrontIds) {
-      uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection);
+      uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection, traceContext);
     }
 
     const id = uploadableFileUpfrontIds.id;
@@ -291,7 +292,7 @@ export class FileFetcherImpl {
     } = uploadFile(file, this.mediaStore, uploadableFileUpfrontIds, {
       onUploadFinish,
       onProgress
-    });
+    }, traceContext);
     getFileStreamsCache().set(id, subject); // We should report progress asynchronously, since this is what consumer expects
     // (otherwise in newUploadService file-converting event will be emitted before files-added)
 
@@ -307,7 +308,8 @@ export class FileFetcherImpl {
     }
 
     return fromObservable(subject);
-  }
+  } // TODO: ----- ADD TICKET
+
 
   async downloadBinary(id, name = 'download', collectionName) {
     const url = await this.mediaStore.getFileBinaryURL(id, collectionName);
@@ -321,7 +323,7 @@ export class FileFetcherImpl {
     });
   }
 
-  async copyFile(source, destination, options = {}) {
+  async copyFile(source, destination, options = {}, traceContext) {
     const {
       authProvider,
       collection: sourceCollection,
@@ -361,7 +363,7 @@ export class FileFetcherImpl {
     try {
       const {
         data: copiedFile
-      } = await mediaStore.copyFileWithToken(body, params); // if we were passed a "mimeType", we propagate it into copiedFileWithMimeType
+      } = await mediaStore.copyFileWithToken(body, params, traceContext); // if we were passed a "mimeType", we propagate it into copiedFileWithMimeType
 
       const copiedFileWithMimeType = { ...copiedFile,
         ...(mimeType ? {