@atlaskit/media-client 19.0.0 → 19.1.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/media-client
 
+## 19.1.1
+
+### Patch Changes
+
+- [`6455cf006b3`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6455cf006b3) - Builds for this package now pass through a tokens babel plugin, removing runtime invocations of the tokens() function and improving performance.
+
+## 19.1.0
+
+### Minor Changes
+
+- [`81573c1dfa7`](https://bitbucket.org/atlassian/atlassian-frontend/commits/81573c1dfa7) - Items call creates a batched metadata trace Id
+- [`0bccac57db6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0bccac57db6) - remove mediaUploadApiV2 Feature flag
+
+### Patch Changes
+
+- [`a8eeb045e3a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a8eeb045e3a) - adding media only callouts to docs
+- [`3d40d5e9b37`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3d40d5e9b37) - Adopt updated version of getRandomHex function for generating traceId
+- Updated dependencies
+
 ## 19.0.0
 
 ### Major Changes

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

@@ -733,7 +733,7 @@ var MediaStore = /*#__PURE__*/function () {
               case 5:
                 auth = _context11.sent;
                 extendedTraceContext = traceContext ? _objectSpread(_objectSpread({}, traceContext), {}, {
-                  spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || (0, _mediaCommon.getRandomHex)(16)
+                  spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || (0, _mediaCommon.getRandomHex)(8)
                 }) : undefined;
                 _context11.next = 9;
                 return (0, _request3.request)("".concat(auth.baseUrl).concat(path), {

package/dist/cjs/models/file-state.js

@@ -73,7 +73,8 @@ var mapMediaFileToFileState = function mapMediaFileToFileState(mediaFile) {
       mediaType = _mediaFile$data.mediaType,
       mimeType = _mediaFile$data.mimeType,
       representations = _mediaFile$data.representations,
-      createdAt = _mediaFile$data.createdAt;
+      createdAt = _mediaFile$data.createdAt,
+      metadataTraceContext = _mediaFile$data.metadataTraceContext;
   var baseState = {
     id: id,
     name: name,
@@ -82,7 +83,8 @@ var mapMediaFileToFileState = function mapMediaFileToFileState(mediaFile) {
     mimeType: mimeType,
     artifacts: artifacts,
     representations: representations,
-    createdAt: createdAt
+    createdAt: createdAt,
+    metadataTraceContext: metadataTraceContext
   };
 
   switch (processingStatus) {

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;
@@ -71,41 +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.t6 = traceContext;
-              _context2.next = 15;
-              return _context2.t0.probeChunks.call(_context2.t0, _context2.t1, _context2.t5, _context2.t6);
+              _context2.t5 = traceContext;
+              _context2.next = 10;
+              return _context2.t0.probeChunks.call(_context2.t0, _context2.t1, _context2.t4, _context2.t5);
 
-            case 15:
+            case 10:
               response = _context2.sent;
               results = response.data.results;
               return _context2.abrupt("return", Object.values(results).map(function (result) {
                 return result.exists;
               }));
 
-            case 18:
+            case 13:
             case "end":
               return _context2.stop();
           }
@@ -122,38 +100,28 @@ var createProbingFunction = function createProbingFunction(store, deferredUpload
 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), traceContext);
+              return _context3.t0.uploadChunk.call(_context3.t0, _context3.t1, _context3.t2, _context3.t6, _context3.t7);
 
             case 12:
               return _context3.abrupt("return", _context3.sent);
@@ -253,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) {

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/index.js

@@ -66,7 +66,8 @@ function _request() {
             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() {

package/dist/cjs/version.json

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

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

@@ -395,7 +395,7 @@ export class MediaStore {
     } = options;
     const auth = await this.resolveAuth(authContext);
     const extendedTraceContext = traceContext ? { ...traceContext,
-      spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || getRandomHex(16)
+      spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || getRandomHex(8)
     } : undefined;
     const response = await request(`${auth.baseUrl}${path}`, {
       method,

package/dist/es2019/models/file-state.js

@@ -25,7 +25,8 @@ export const mapMediaFileToFileState = mediaFile => {
     mediaType,
     mimeType,
     representations,
-    createdAt
+    createdAt,
+    metadataTraceContext
   } = mediaFile.data;
   const baseState = {
     id,
@@ -35,7 +36,8 @@ export const mapMediaFileToFileState = mediaFile => {
     mimeType,
     artifacts,
     representations,
-    createdAt
+    createdAt,
+    metadataTraceContext
   };
 
   switch (processingStatus) {

package/dist/es2019/uploader/index.js

@@ -5,7 +5,6 @@ import { createHasher } from '../utils/hashing/hasherCreator';
 import { UploaderError } from './error';
 import { CHUNK_SIZE, PROCESSING_BATCH_SIZE } from '../constants';
 import { calculateChunkSize, fileSizeError } from './calculateChunkSize';
-import { getMediaFeatureFlag } from '@atlaskit/media-common'; // TODO: Allow to pass multiple files
 
 const hashingFunction = async blob => {
   const hasher = await createHasher();
@@ -15,20 +14,17 @@ const hashingFunction = async blob => {
 const createProbingFunction = (store, deferredUploadId, collectionName, traceContext) => async chunks => {
   const response = await store.probeChunks(hashedChunks(chunks), {
     collectionName,
-    uploadId: getMediaFeatureFlag('mediaUploadApiV2', store.featureFlags) ? await deferredUploadId : undefined
+    uploadId: await deferredUploadId
   }, traceContext);
   const results = response.data.results;
   return Object.values(results).map(result => result.exists);
 };
 
 const createUploadingFunction = (store, deferredUploadId, collectionName, traceContext) => async chunk => {
-  const options = getMediaFeatureFlag('mediaUploadApiV2', store.featureFlags) ? {
-    partNumber: chunk.partNumber,
-    uploadId: await deferredUploadId
-  } : {};
   return await store.uploadChunk(chunk.hash, chunk.blob, {
     collectionName,
-    ...options
+    partNumber: chunk.partNumber,
+    uploadId: await deferredUploadId
   }, traceContext);
 };
 
@@ -77,7 +73,7 @@ export const uploadFile = (file, store, uploadableFileUpfrontIds, callbacks, tra
   let chunkSize = CHUNK_SIZE;
 
   try {
-    if (content instanceof Blob && getMediaFeatureFlag('mediaUploadApiV2', store.featureFlags)) {
+    if (content instanceof Blob) {
       chunkSize = calculateChunkSize(content.size);
     }
   } catch (err) {

package/dist/es2019/utils/createFileDataLoader.js

@@ -2,6 +2,7 @@
 // @see https://github.com/graphql/dataloader/issues/249
 import 'setimmediate';
 import Dataloader from 'dataloader';
+import { getRandomHex } from '@atlaskit/media-common';
 export const MAX_BATCH_SIZE = 100;
 
 const isBatchLoadingErrorResult = result => {
@@ -17,7 +18,9 @@ export const getItemsFromKeys = (dataloaderKeys, fileItems) => {
       collection
     } = fileItem;
     const key = makeCacheKey(id, collection);
-    prev[key] = isBatchLoadingErrorResult(fileItem) ? fileItem.error : fileItem.details;
+    prev[key] = isBatchLoadingErrorResult(fileItem) ? fileItem.error : { ...fileItem.details,
+      metadataTraceContext: fileItem.metadataTraceContext
+    };
     return prev;
   }, {});
   return dataloaderKeys.map(dataloaderKey => {
@@ -55,12 +58,19 @@ export function createBatchLoadingFunc(mediaStore) {
     }, {});
     const items = [];
     await Promise.all(Object.keys(fileIdsByCollection).map(async collectionNameKey => {
+      const metadataTraceContext = {
+        traceId: getRandomHex(8),
+        spanId: getRandomHex(8)
+      };
       const fileIds = fileIdsByCollection[collectionNameKey];
       const collectionName = collectionNameKey === nonCollectionName ? undefined : collectionNameKey;
 
       try {
-        const response = await mediaStore.getItems(fileIds, collectionName);
-        items.push(...response.data.items);
+        const response = await mediaStore.getItems(fileIds, collectionName, metadataTraceContext);
+        const itemsWithMetadataTraceContext = response.data.items.map(item => ({ ...item,
+          metadataTraceContext
+        }));
+        items.push(...itemsWithMetadataTraceContext);
       } catch (error) {
         fileIds.forEach(fileId => {
           items.push({

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

@@ -17,7 +17,8 @@ export async function request(url, options = {}, controller) {
   } = clientOptions;
   const metadata = {
     method,
-    endpoint
+    endpoint,
+    traceContext
   }; // TODO BMPT-918: add client timeout feature behing a FF (using clientOptions.clientTimeout + Promise.race)
 
   const doFetch = () => fetch(createUrl(url, {

package/dist/es2019/version.json

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

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

@@ -702,7 +702,7 @@ export var MediaStore = /*#__PURE__*/function () {
               case 5:
                 auth = _context11.sent;
                 extendedTraceContext = traceContext ? _objectSpread(_objectSpread({}, traceContext), {}, {
-                  spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || getRandomHex(16)
+                  spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || getRandomHex(8)
                 }) : undefined;
                 _context11.next = 9;
                 return _request("".concat(auth.baseUrl).concat(path), {

package/dist/esm/models/file-state.js

@@ -43,7 +43,8 @@ export var mapMediaFileToFileState = function mapMediaFileToFileState(mediaFile)
       mediaType = _mediaFile$data.mediaType,
       mimeType = _mediaFile$data.mimeType,
       representations = _mediaFile$data.representations,
-      createdAt = _mediaFile$data.createdAt;
+      createdAt = _mediaFile$data.createdAt,
+      metadataTraceContext = _mediaFile$data.metadataTraceContext;
   var baseState = {
     id: id,
     name: name,
@@ -52,7 +53,8 @@ export var mapMediaFileToFileState = function mapMediaFileToFileState(mediaFile)
     mimeType: mimeType,
     artifacts: artifacts,
     representations: representations,
-    createdAt: createdAt
+    createdAt: createdAt,
+    metadataTraceContext: metadataTraceContext
   };
 
   switch (processingStatus) {

package/dist/esm/uploader/index.js

@@ -1,10 +1,4 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-
-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) { _defineProperty(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; }
-
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { chunkinator } from '@atlaskit/chunkinator';
 import { from } from 'rxjs/observable/from';
@@ -13,7 +7,6 @@ import { createHasher } from '../utils/hashing/hasherCreator';
 import { UploaderError } from './error';
 import { CHUNK_SIZE, PROCESSING_BATCH_SIZE } from '../constants';
 import { calculateChunkSize, fileSizeError } from './calculateChunkSize';
-import { getMediaFeatureFlag } from '@atlaskit/media-common'; // TODO: Allow to pass multiple files
 
 var hashingFunction = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(blob) {
@@ -53,41 +46,27 @@ var createProbingFunction = function createProbingFunction(store, deferredUpload
               _context2.t0 = store;
               _context2.t1 = hashedChunks(chunks);
               _context2.t2 = collectionName;
-
-              if (!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.t6 = traceContext;
-              _context2.next = 15;
-              return _context2.t0.probeChunks.call(_context2.t0, _context2.t1, _context2.t5, _context2.t6);
+              _context2.t5 = traceContext;
+              _context2.next = 10;
+              return _context2.t0.probeChunks.call(_context2.t0, _context2.t1, _context2.t4, _context2.t5);
 
-            case 15:
+            case 10:
               response = _context2.sent;
               results = response.data.results;
               return _context2.abrupt("return", Object.values(results).map(function (result) {
                 return result.exists;
               }));
 
-            case 18:
+            case 13:
             case "end":
               return _context2.stop();
           }
@@ -104,38 +83,28 @@ var createProbingFunction = function createProbingFunction(store, deferredUpload
 var createUploadingFunction = function createUploadingFunction(store, deferredUploadId, collectionName, traceContext) {
   return /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(chunk) {
-      var options;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              if (!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), traceContext);
+              return _context3.t0.uploadChunk.call(_context3.t0, _context3.t1, _context3.t2, _context3.t6, _context3.t7);
 
             case 12:
               return _context3.abrupt("return", _context3.sent);
@@ -235,7 +204,7 @@ export var uploadFile = function uploadFile(file, store, uploadableFileUpfrontId
   var chunkSize = CHUNK_SIZE;
 
   try {
-    if (content instanceof Blob && getMediaFeatureFlag('mediaUploadApiV2', store.featureFlags)) {
+    if (content instanceof Blob) {
       chunkSize = calculateChunkSize(content.size);
     }
   } catch (err) {

package/dist/esm/utils/createFileDataLoader.js

@@ -1,10 +1,17 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+
+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) { _defineProperty(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; }
+
 // import setimmediate to temporary fix dataloader 2.0.0 bug
 // @see https://github.com/graphql/dataloader/issues/249
 import 'setimmediate';
 import Dataloader from 'dataloader';
+import { getRandomHex } from '@atlaskit/media-common';
 export var MAX_BATCH_SIZE = 100;
 
 var isBatchLoadingErrorResult = function isBatchLoadingErrorResult(result) {
@@ -20,7 +27,9 @@ export var getItemsFromKeys = function getItemsFromKeys(dataloaderKeys, fileItem
     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) {
@@ -64,26 +73,35 @@ export function createBatchLoadingFunc(mediaStore) {
               _context2.next = 5;
               return Promise.all(Object.keys(fileIdsByCollection).map( /*#__PURE__*/function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(collectionNameKey) {
-                  var fileIds, collectionName, response;
+                  var metadataTraceContext, fileIds, collectionName, response, itemsWithMetadataTraceContext;
                   return _regeneratorRuntime.wrap(function _callee$(_context) {
                     while (1) {
                       switch (_context.prev = _context.next) {
                         case 0:
+                          metadataTraceContext = {
+                            traceId: getRandomHex(8),
+                            spanId: 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, _toConsumableArray(response.data.items));
-                          _context.next = 12;
+                          itemsWithMetadataTraceContext = response.data.items.map(function (item) {
+                            return _objectSpread(_objectSpread({}, item), {}, {
+                              metadataTraceContext: metadataTraceContext
+                            });
+                          });
+                          items.push.apply(items, _toConsumableArray(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,
@@ -92,12 +110,12 @@ export 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/esm/utils/request/index.js

@@ -36,7 +36,8 @@ function _request() {
             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() {

package/dist/esm/version.json

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

package/dist/types/client/media-store/index.d.ts

@@ -47,6 +47,7 @@ export interface ResponseFileItem {
     type: 'file';
     details: MediaCollectionItemFullDetails;
     collection?: string;
+    metadataTraceContext?: MediaTraceContext;
 }
 export interface ItemsPayload {
     items: ResponseFileItem[];

package/dist/types/models/file-state.d.ts

@@ -1,7 +1,10 @@
-import { FileStatus as CommonFileStatus } from '@atlaskit/media-common';
+import { FileStatus as CommonFileStatus, MediaTraceContext } from '@atlaskit/media-common';
 import { MediaStoreResponse } from '../client/media-store';
 import { MediaFileArtifacts } from './artifacts';
 import { MediaCollectionItemFullDetails, MediaFile, MediaRepresentations, MediaType } from './media';
+export declare type BaseFileState = {
+    metadataTraceContext?: MediaTraceContext;
+};
 export declare type FileStatus = CommonFileStatus;
 export interface FilePreview {
     value: Blob | string;
@@ -18,7 +21,7 @@ export interface GetFileOptions {
     collectionName?: string;
     occurrenceKey?: string;
 }
-export interface UploadingFileState {
+export interface UploadingFileState extends BaseFileState {
     status: 'uploading';
     id: string;
     occurrenceKey?: string;
@@ -33,7 +36,7 @@ export interface UploadingFileState {
 export interface PreviewableFileState {
     preview: FilePreview | Promise<FilePreview>;
 }
-export interface ProcessingFileState {
+export interface ProcessingFileState extends BaseFileState {
     status: 'processing';
     id: string;
     occurrenceKey?: string;
@@ -46,7 +49,7 @@ export interface ProcessingFileState {
     representations?: MediaRepresentations;
     createdAt?: number;
 }
-export interface ProcessedFileState {
+export interface ProcessedFileState extends BaseFileState {
     status: 'processed';
     id: string;
     occurrenceKey?: string;
@@ -59,7 +62,7 @@ export interface ProcessedFileState {
     representations?: MediaRepresentations;
     createdAt?: number;
 }
-export interface ProcessingFailedState {
+export interface ProcessingFailedState extends BaseFileState {
     status: 'failed-processing';
     id: string;
     occurrenceKey?: string;
@@ -72,7 +75,7 @@ export interface ProcessingFailedState {
     representations?: MediaRepresentations;
     createdAt?: number;
 }
-export interface ErrorFileState {
+export interface ErrorFileState extends BaseFileState {
     status: 'error';
     id: string;
     occurrenceKey?: string;

package/dist/types/models/media.d.ts

@@ -1,4 +1,4 @@
-import { MediaFeatureFlags, MediaType } from '@atlaskit/media-common';
+import { MediaFeatureFlags, MediaTraceContext, MediaType } from '@atlaskit/media-common';
 import type { MediaFileArtifacts } from './artifacts';
 export declare type MediaFileProcessingStatus = 'pending' | 'succeeded' | 'failed';
 export type { MediaType } from '@atlaskit/media-common';
@@ -13,6 +13,7 @@ export declare type MediaFile = {
     readonly artifacts: MediaFileArtifacts;
     readonly representations: MediaRepresentations;
     readonly createdAt?: number;
+    readonly metadataTraceContext?: MediaTraceContext;
 };
 export declare type MediaCollection = {
     readonly name: string;
@@ -41,6 +42,7 @@ export declare type MediaCollectionItemFullDetails = {
     readonly artifacts: MediaFileArtifacts;
     readonly representations: MediaRepresentations;
     readonly createdAt?: number;
+    readonly metadataTraceContext?: MediaTraceContext;
 };
 export declare type MediaRepresentations = {
     image?: Object;

package/dist/types/utils/request/types.d.ts

@@ -21,6 +21,7 @@ export declare type RequestMetadata = {
     readonly endpoint?: string;
     readonly mediaRegion?: string;
     readonly mediaEnv?: string;
+    readonly traceContext?: MediaTraceContext;
 };
 export declare type RequestOptions = RequestMetadata & {
     readonly auth?: Auth;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-client",
-  "version": "19.0.0",
+  "version": "19.1.1",
   "description": "Media API Web Client Library",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@atlaskit/chunkinator": "^4.1.0",
-    "@atlaskit/media-common": "^2.17.0",
+    "@atlaskit/media-common": "^2.18.0",
     "@babel/runtime": "^7.0.0",
     "dataloader": "^2.0.0",
     "deep-equal": "^1.0.1",
@@ -42,18 +42,18 @@
     "xstate": "^4.20.0"
   },
   "peerDependencies": {
-    "@atlaskit/media-core": "^34.0.0",
+    "@atlaskit/media-core": "^34.0.1",
     "@emotion/react": "^11.7.1",
     "react": "^16.8.0"
   },
   "devDependencies": {
     "@atlaskit/button": "^16.5.0",
     "@atlaskit/docs": "*",
-    "@atlaskit/media-card": "^74.3.0",
+    "@atlaskit/media-card": "^74.4.0",
     "@atlaskit/media-core": "^34.0.0",
-    "@atlaskit/media-test-helpers": "^30.0.0",
+    "@atlaskit/media-test-helpers": "^30.1.0",
     "@atlaskit/ssr": "*",
-    "@atlaskit/tokens": "^0.11.0",
+    "@atlaskit/tokens": "^0.13.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@emotion/react": "^11.7.1",
     "@types/deep-equal": "^1.0.1",

package/report.api.md

@@ -1,4 +1,4 @@
-<!-- API Report Version: 2.2 -->
+<!-- API Report Version: 2.3 -->
 
 ## API Report File for "@atlaskit/media-client"
 
@@ -50,6 +50,11 @@ export type Artifacts = {
   [name: string]: MediaArtifact;
 };
 
+// @public (undocumented)
+type BaseFileState = {
+  metadataTraceContext?: MediaTraceContext;
+};
+
 // @public
 abstract class BaseMediaClientError<
     Attributes extends MediaClientErrorAttributes,
@@ -186,7 +191,7 @@ export interface EmptyFile {
 }
 
 // @public (undocumented)
-export interface ErrorFileState {
+export interface ErrorFileState extends BaseFileState {
   // (undocumented)
   id: string;
   // (undocumented)
@@ -866,6 +871,7 @@ export type MediaCollectionItemFullDetails = {
   readonly artifacts: MediaFileArtifacts;
   readonly representations: MediaRepresentations;
   readonly createdAt?: number;
+  readonly metadataTraceContext?: MediaTraceContext;
 };
 
 // @public (undocumented)
@@ -891,6 +897,7 @@ export type MediaFile = {
   readonly artifacts: MediaFileArtifacts;
   readonly representations: MediaRepresentations;
   readonly createdAt?: number;
+  readonly metadataTraceContext?: MediaTraceContext;
 };
 
 // @public (undocumented)
@@ -1363,7 +1370,7 @@ export interface PreviewableFileState {
 export interface PreviewOptions {}
 
 // @public (undocumented)
-export interface ProcessedFileState {
+export interface ProcessedFileState extends BaseFileState {
   // (undocumented)
   artifacts: MediaFileArtifacts;
   // (undocumented)
@@ -1389,7 +1396,7 @@ export interface ProcessedFileState {
 }
 
 // @public (undocumented)
-export interface ProcessingFailedState {
+export interface ProcessingFailedState extends BaseFileState {
   // (undocumented)
   artifacts: Object;
   // (undocumented)
@@ -1415,7 +1422,7 @@ export interface ProcessingFailedState {
 }
 
 // @public (undocumented)
-export interface ProcessingFileState {
+export interface ProcessingFileState extends BaseFileState {
   // (undocumented)
   artifacts?: MediaFileArtifacts;
   // (undocumented)
@@ -1515,6 +1522,7 @@ export type RequestMetadata = {
   readonly endpoint?: string;
   readonly mediaRegion?: string;
   readonly mediaEnv?: string;
+  readonly traceContext?: MediaTraceContext;
 };
 
 // @public (undocumented)
@@ -1544,6 +1552,8 @@ export interface ResponseFileItem {
   // (undocumented)
   id: string;
   // (undocumented)
+  metadataTraceContext?: MediaTraceContext;
+  // (undocumented)
   type: 'file';
 }
 
@@ -1651,7 +1661,7 @@ export interface UploadFileResult {
 }
 
 // @public (undocumented)
-export interface UploadingFileState {
+export interface UploadingFileState extends BaseFileState {
   // (undocumented)
   createdAt?: number;
   // (undocumented)