@atlaskit/util-service-support 6.3.3 → 6.3.5

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/util-service-support
 
+## 6.3.5
+
+### Patch Changes
+
+- [`6344a66774597`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6344a66774597) -
+  Add optional reportTracingHeaders callback and extractTracingHeaders utility to
+  RequestServiceOptions for extracting tracing headers from responses
+
+## 6.3.4
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 6.3.3
 
 ### Patch Changes
@@ -190,7 +204,6 @@
 
   Remove namespace imports from React, ReactDom, and PropTypes- Updated dependencies
   [6548261c9a](https://bitbucket.org/atlassian/atlassian-frontend/commits/6548261c9a):
-
   - @atlaskit/docs@8.3.2
 
 ## 5.0.0
@@ -373,7 +386,6 @@ Bumped dependencies.
 - [patch][18dfac7332](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/18dfac7332):
 
   In this PR, we are:
-
   - Re-introducing dist build folders
   - Adding back cjs
   - Replacing es5 by cjs and es2015 by esm
@@ -392,19 +404,16 @@ Bumped dependencies.
 ## 4.0.2
 
 - [patch][0a4ccaafae](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/0a4ccaafae):
-
   - Bump tslib
 
 ## 4.0.1
 
 - [patch][1bcaa1b991](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/1bcaa1b991):
-
   - Add npmignore for index.ts to prevent some jest tests from resolving that instead of index.js
 
 ## 4.0.0
 
 - [major][9d5cc39394](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/9d5cc39394):
-
   - Dropped ES5 distributables from the typescript packages
 
 ## 3.1.1
@@ -416,7 +425,6 @@ Bumped dependencies.
 ## 3.1.0
 
 - [minor][1d19234fbd](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/1d19234fbd):
-
   - Enable noImplicitAny and resolve issues for elements util packages
 
 ## 3.0.5
@@ -427,7 +435,6 @@ Bumped dependencies.
 ## 3.0.4
 
 - [patch][0a297ba](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/0a297ba):
-
   - Packages should not be shown in the navigation, search and overview
 
 ## 3.0.3

package/afm-cc/tsconfig.json

@@ -1,11 +1,12 @@
 {
-	"extends": "../../../../tsconfig.entry-points.confluence.json",
+	"extends": "../../../../tsconfig.local-consumption.json",
 	"compilerOptions": {
 		"declaration": true,
 		"target": "es5",
 		"outDir": "../../../../../confluence/tsDist/@atlaskit__util-service-support",
 		"rootDir": "../",
-		"composite": true
+		"composite": true,
+		"noCheck": true
 	},
 	"include": [
 		"../src/**/*.ts",
@@ -30,4 +31,4 @@
 			"path": "../../../react-ufo/atlaskit/afm-cc/tsconfig.json"
 		}
 	]
-}
+}

package/afm-jira/tsconfig.json

@@ -1,11 +1,12 @@
 {
-	"extends": "../../../../tsconfig.entry-points.jira.json",
+	"extends": "../../../../tsconfig.local-consumption.json",
 	"compilerOptions": {
 		"declaration": true,
 		"target": "es5",
-		"outDir": "../../../../../tsDist/@atlaskit__util-service-support/app",
+		"outDir": "../../../../../jira/tsDist/@atlaskit__util-service-support/app",
 		"rootDir": "../",
-		"composite": true
+		"composite": true,
+		"noCheck": true
 	},
 	"include": [
 		"../src/**/*.ts",

package/{afm-volt → afm-products}/tsconfig.json

@@ -1,11 +1,12 @@
 {
-	"extends": "../../../../tsconfig.entry-points.volt.json",
+	"extends": "../../../../tsconfig.local-consumption.json",
 	"compilerOptions": {
 		"declaration": true,
 		"target": "es5",
-		"outDir": "../../../../../volt/tsDist/@atlaskit__util-service-support/app",
+		"outDir": "../../../../../tsDist/@atlaskit__util-service-support/app",
 		"rootDir": "../",
-		"composite": true
+		"composite": true,
+		"noCheck": true
 	},
 	"include": [
 		"../src/**/*.ts",
@@ -24,10 +25,10 @@
 	],
 	"references": [
 		{
-			"path": "../../../platform/feature-flags/afm-volt/tsconfig.json"
+			"path": "../../../platform/feature-flags/afm-products/tsconfig.json"
 		},
 		{
-			"path": "../../../react-ufo/atlaskit/afm-volt/tsconfig.json"
+			"path": "../../../react-ufo/atlaskit/afm-products/tsconfig.json"
 		}
 	]
 }

package/dist/cjs/multipartServiceUtils.js

@@ -11,8 +11,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _browser = require("meros/browser");
 var _types = require("./types");
 var _shared = require("./shared");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _featureFlagsAccessed = require("@atlaskit/react-ufo/feature-flags-accessed");
 var _experienceTraceIdContext = require("@atlaskit/react-ufo/experience-trace-id-context");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -41,8 +39,6 @@ var _requestServiceMultipart = exports.requestServiceMultipart = /*#__PURE__*/fu
       requestUrl,
       headers,
       credentials,
-      TRACING_HEADER_FOR_SERVICE_UTIL,
-      tracingHeaderEnabled,
       tracingHeaders,
       requestOptions,
       fetchResponse,
@@ -58,13 +54,7 @@ var _requestServiceMultipart = exports.requestServiceMultipart = /*#__PURE__*/fu
           requestUrl = (0, _shared.buildUrl)(url, path, queryParams, secOptions);
           headers = (0, _shared.buildHeaders)(secOptions, requestInit && requestInit.headers);
           credentials = (0, _types.buildCredentials)(secOptions); // Get tracing headers from UFO
-          TRACING_HEADER_FOR_SERVICE_UTIL = 'platform_collab_provider_tracingheaders';
-          tracingHeaderEnabled = (0, _platformFeatureFlags.fg)('platform_collab_provider_tracingheaders');
-          (0, _featureFlagsAccessed.addFeatureFlagAccessed)(TRACING_HEADER_FOR_SERVICE_UTIL, tracingHeaderEnabled);
-          tracingHeaders = {};
-          if (tracingHeaderEnabled) {
-            tracingHeaders = (0, _experienceTraceIdContext.getActiveTraceHttpRequestHeaders)(url);
-          }
+          tracingHeaders = (0, _experienceTraceIdContext.getActiveTraceHttpRequestHeaders)(url);
           requestOptions = _objectSpread(_objectSpread({}, requestInit), {}, {
             // populate headers mainly for the collab provider however
             // other components which uses this util can get the header as well.
@@ -72,38 +62,38 @@ var _requestServiceMultipart = exports.requestServiceMultipart = /*#__PURE__*/fu
             headers: _objectSpread(_objectSpread({}, headers), tracingHeaders),
             credentials: credentials
           });
-          _context.next = 15;
+          _context.next = 11;
           return fetch(requestUrl, requestOptions);
-        case 15:
+        case 11:
           fetchResponse = _context.sent;
-          _context.next = 18;
+          _context.next = 14;
           return (0, _browser.meros)(fetchResponse);
-        case 18:
+        case 14:
           parts = _context.sent;
           if (!(fetchResponse.ok && fetchResponse.status !== 204)) {
-            _context.next = 28;
+            _context.next = 24;
             break;
           }
           if (!(parts[Symbol.asyncIterator] < 'u')) {
-            _context.next = 22;
+            _context.next = 18;
             break;
           }
           return _context.abrupt("return", {
             isMultipart: true,
             parts: parts
           });
-        case 22:
-          _context.next = 24;
+        case 18:
+          _context.next = 20;
           return parts.json();
-        case 24:
+        case 20:
           _context.t0 = _context.sent;
           return _context.abrupt("return", {
             isMultipart: false,
             body: _context.t0
           });
-        case 28:
+        case 24:
           if (!(fetchResponse.status === 401 && refreshedSecurityProvider)) {
-            _context.next = 30;
+            _context.next = 26;
             break;
           }
           return _context.abrupt("return", refreshedSecurityProvider().then(function (newSecOptions) {
@@ -115,12 +105,12 @@ var _requestServiceMultipart = exports.requestServiceMultipart = /*#__PURE__*/fu
             };
             return _requestServiceMultipart(retryServiceConfig, options);
           }));
-        case 30:
+        case 26:
           return _context.abrupt("return", Promise.reject({
             code: fetchResponse.status,
             reason: fetchResponse.statusText
           }));
-        case 31:
+        case 27:
         case "end":
           return _context.stop();
       }

package/dist/cjs/serviceUtils.js

@@ -4,15 +4,31 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.requestService = void 0;
+exports.requestService = exports.extractTracingHeaders = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _experienceTraceIdContext = require("@atlaskit/react-ufo/experience-trace-id-context");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _featureFlagsAccessed = require("@atlaskit/react-ufo/feature-flags-accessed");
 var _types = require("./types");
 var _shared = require("./shared");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var TRACING_RESPONSE_HEADERS = ['x-trace-id', 'atl-request-id'];
+
+/**
+ * Extracts tracing headers (x-trace-id, atl-request-id) from a Response object.
+ * Returns only headers that are present in the response.
+ */
+var extractTracingHeaders = exports.extractTracingHeaders = function extractTracingHeaders(response) {
+  var headers = {};
+  for (var _i = 0, _TRACING_RESPONSE_HEA = TRACING_RESPONSE_HEADERS; _i < _TRACING_RESPONSE_HEA.length; _i++) {
+    var name = _TRACING_RESPONSE_HEA[_i];
+    var value = response.headers.get(name);
+    if (value) {
+      headers[name] = value;
+    }
+  }
+  return headers;
+};
+
 /**
  * @returns Promise containing the json response
  */
@@ -31,13 +47,7 @@ var _requestService = exports.requestService = function requestService(serviceCo
   var ignoreResponsePayload = (options === null || options === void 0 ? void 0 : options.ignoreResponsePayload) || false;
 
   // Get tracing headers from UFO
-  var TRACING_HEADER_FOR_SERVICE_UTIL = 'platform_collab_provider_tracingheaders';
-  var tracingHeaderEnabled = (0, _platformFeatureFlags.fg)('platform_collab_provider_tracingheaders');
-  (0, _featureFlagsAccessed.addFeatureFlagAccessed)(TRACING_HEADER_FOR_SERVICE_UTIL, tracingHeaderEnabled);
-  var tracingHeaders = {};
-  if (tracingHeaderEnabled) {
-    tracingHeaders = (0, _experienceTraceIdContext.getActiveTraceHttpRequestHeaders)(url);
-  }
+  var tracingHeaders = (0, _experienceTraceIdContext.getActiveTraceHttpRequestHeaders)(url);
   var requestOptions = _objectSpread(_objectSpread({}, requestInit), {}, {
     // populate headers mainly for the collab provider however
     // other components which uses this util can get the header as well.
@@ -46,6 +56,12 @@ var _requestService = exports.requestService = function requestService(serviceCo
     credentials: credentials
   });
   return fetch(requestUrl, requestOptions).then(function (response) {
+    if (options !== null && options !== void 0 && options.reportTracingHeaders) {
+      var _tracingHeaders = extractTracingHeaders(response);
+      if (Object.keys(_tracingHeaders).length > 0) {
+        options.reportTracingHeaders(_tracingHeaders);
+      }
+    }
     if (response.status === 204) {
       return Promise.resolve();
     } else if (response.ok) {

package/dist/es2019/multipartServiceUtils.js

@@ -1,8 +1,6 @@
 import { meros } from 'meros/browser';
 import { buildCredentials } from './types';
 import { buildHeaders, buildUrl, defaultRequestServiceOptions } from './shared';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { addFeatureFlagAccessed } from '@atlaskit/react-ufo/feature-flags-accessed';
 import { getActiveTraceHttpRequestHeaders } from '@atlaskit/react-ufo/experience-trace-id-context';
 
 /** Copied from meros types, as there are difficulties with resolving the type in CI */
@@ -34,13 +32,7 @@ export const requestServiceMultipart = async (serviceConfig, options = defaultRe
   const credentials = buildCredentials(secOptions);
 
   // Get tracing headers from UFO
-  const TRACING_HEADER_FOR_SERVICE_UTIL = 'platform_collab_provider_tracingheaders';
-  const tracingHeaderEnabled = fg('platform_collab_provider_tracingheaders');
-  addFeatureFlagAccessed(TRACING_HEADER_FOR_SERVICE_UTIL, tracingHeaderEnabled);
-  let tracingHeaders = {};
-  if (tracingHeaderEnabled) {
-    tracingHeaders = getActiveTraceHttpRequestHeaders(url);
-  }
+  const tracingHeaders = getActiveTraceHttpRequestHeaders(url);
   const requestOptions = {
     ...requestInit,
     // populate headers mainly for the collab provider however

package/dist/es2019/serviceUtils.js

@@ -1,8 +1,22 @@
 import { getActiveTraceHttpRequestHeaders } from '@atlaskit/react-ufo/experience-trace-id-context';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { addFeatureFlagAccessed } from '@atlaskit/react-ufo/feature-flags-accessed';
 import { buildCredentials } from './types';
 import { defaultRequestServiceOptions, buildUrl, buildHeaders } from './shared';
+const TRACING_RESPONSE_HEADERS = ['x-trace-id', 'atl-request-id'];
+
+/**
+ * Extracts tracing headers (x-trace-id, atl-request-id) from a Response object.
+ * Returns only headers that are present in the response.
+ */
+export const extractTracingHeaders = response => {
+  const headers = {};
+  for (const name of TRACING_RESPONSE_HEADERS) {
+    const value = response.headers.get(name);
+    if (value) {
+      headers[name] = value;
+    }
+  }
+  return headers;
+};
 
 /**
  * @returns Promise containing the json response
@@ -25,13 +39,7 @@ export const requestService = (serviceConfig, options) => {
   const ignoreResponsePayload = (options === null || options === void 0 ? void 0 : options.ignoreResponsePayload) || false;
 
   // Get tracing headers from UFO
-  const TRACING_HEADER_FOR_SERVICE_UTIL = 'platform_collab_provider_tracingheaders';
-  const tracingHeaderEnabled = fg('platform_collab_provider_tracingheaders');
-  addFeatureFlagAccessed(TRACING_HEADER_FOR_SERVICE_UTIL, tracingHeaderEnabled);
-  let tracingHeaders = {};
-  if (tracingHeaderEnabled) {
-    tracingHeaders = getActiveTraceHttpRequestHeaders(url);
-  }
+  const tracingHeaders = getActiveTraceHttpRequestHeaders(url);
   const requestOptions = {
     ...requestInit,
     // populate headers mainly for the collab provider however
@@ -44,6 +52,12 @@ export const requestService = (serviceConfig, options) => {
     credentials
   };
   return fetch(requestUrl, requestOptions).then(response => {
+    if (options !== null && options !== void 0 && options.reportTracingHeaders) {
+      const tracingHeaders = extractTracingHeaders(response);
+      if (Object.keys(tracingHeaders).length > 0) {
+        options.reportTracingHeaders(tracingHeaders);
+      }
+    }
     if (response.status === 204) {
       return Promise.resolve();
     } else if (response.ok) {

package/dist/esm/multipartServiceUtils.js

@@ -6,8 +6,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { meros } from 'meros/browser';
 import { buildCredentials } from './types';
 import { buildHeaders, buildUrl, defaultRequestServiceOptions } from './shared';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { addFeatureFlagAccessed } from '@atlaskit/react-ufo/feature-flags-accessed';
 import { getActiveTraceHttpRequestHeaders } from '@atlaskit/react-ufo/experience-trace-id-context';
 
 /** Copied from meros types, as there are difficulties with resolving the type in CI */
@@ -35,8 +33,6 @@ var _requestServiceMultipart = /*#__PURE__*/function () {
       requestUrl,
       headers,
       credentials,
-      TRACING_HEADER_FOR_SERVICE_UTIL,
-      tracingHeaderEnabled,
       tracingHeaders,
       requestOptions,
       fetchResponse,
@@ -52,13 +48,7 @@ var _requestServiceMultipart = /*#__PURE__*/function () {
           requestUrl = buildUrl(url, path, queryParams, secOptions);
           headers = buildHeaders(secOptions, requestInit && requestInit.headers);
           credentials = buildCredentials(secOptions); // Get tracing headers from UFO
-          TRACING_HEADER_FOR_SERVICE_UTIL = 'platform_collab_provider_tracingheaders';
-          tracingHeaderEnabled = fg('platform_collab_provider_tracingheaders');
-          addFeatureFlagAccessed(TRACING_HEADER_FOR_SERVICE_UTIL, tracingHeaderEnabled);
-          tracingHeaders = {};
-          if (tracingHeaderEnabled) {
-            tracingHeaders = getActiveTraceHttpRequestHeaders(url);
-          }
+          tracingHeaders = getActiveTraceHttpRequestHeaders(url);
           requestOptions = _objectSpread(_objectSpread({}, requestInit), {}, {
             // populate headers mainly for the collab provider however
             // other components which uses this util can get the header as well.
@@ -66,38 +56,38 @@ var _requestServiceMultipart = /*#__PURE__*/function () {
             headers: _objectSpread(_objectSpread({}, headers), tracingHeaders),
             credentials: credentials
           });
-          _context.next = 15;
+          _context.next = 11;
           return fetch(requestUrl, requestOptions);
-        case 15:
+        case 11:
           fetchResponse = _context.sent;
-          _context.next = 18;
+          _context.next = 14;
           return meros(fetchResponse);
-        case 18:
+        case 14:
           parts = _context.sent;
           if (!(fetchResponse.ok && fetchResponse.status !== 204)) {
-            _context.next = 28;
+            _context.next = 24;
             break;
           }
           if (!(parts[Symbol.asyncIterator] < 'u')) {
-            _context.next = 22;
+            _context.next = 18;
             break;
           }
           return _context.abrupt("return", {
             isMultipart: true,
             parts: parts
           });
-        case 22:
-          _context.next = 24;
+        case 18:
+          _context.next = 20;
           return parts.json();
-        case 24:
+        case 20:
           _context.t0 = _context.sent;
           return _context.abrupt("return", {
             isMultipart: false,
             body: _context.t0
           });
-        case 28:
+        case 24:
           if (!(fetchResponse.status === 401 && refreshedSecurityProvider)) {
-            _context.next = 30;
+            _context.next = 26;
             break;
           }
           return _context.abrupt("return", refreshedSecurityProvider().then(function (newSecOptions) {
@@ -109,12 +99,12 @@ var _requestServiceMultipart = /*#__PURE__*/function () {
             };
             return _requestServiceMultipart(retryServiceConfig, options);
           }));
-        case 30:
+        case 26:
           return _context.abrupt("return", Promise.reject({
             code: fetchResponse.status,
             reason: fetchResponse.statusText
           }));
-        case 31:
+        case 27:
         case "end":
           return _context.stop();
       }

package/dist/esm/serviceUtils.js

@@ -2,10 +2,25 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { getActiveTraceHttpRequestHeaders } from '@atlaskit/react-ufo/experience-trace-id-context';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { addFeatureFlagAccessed } from '@atlaskit/react-ufo/feature-flags-accessed';
 import { buildCredentials } from './types';
 import { defaultRequestServiceOptions, buildUrl, buildHeaders } from './shared';
+var TRACING_RESPONSE_HEADERS = ['x-trace-id', 'atl-request-id'];
+
+/**
+ * Extracts tracing headers (x-trace-id, atl-request-id) from a Response object.
+ * Returns only headers that are present in the response.
+ */
+export var extractTracingHeaders = function extractTracingHeaders(response) {
+  var headers = {};
+  for (var _i = 0, _TRACING_RESPONSE_HEA = TRACING_RESPONSE_HEADERS; _i < _TRACING_RESPONSE_HEA.length; _i++) {
+    var name = _TRACING_RESPONSE_HEA[_i];
+    var value = response.headers.get(name);
+    if (value) {
+      headers[name] = value;
+    }
+  }
+  return headers;
+};
 
 /**
  * @returns Promise containing the json response
@@ -25,13 +40,7 @@ var _requestService = function requestService(serviceConfig, options) {
   var ignoreResponsePayload = (options === null || options === void 0 ? void 0 : options.ignoreResponsePayload) || false;
 
   // Get tracing headers from UFO
-  var TRACING_HEADER_FOR_SERVICE_UTIL = 'platform_collab_provider_tracingheaders';
-  var tracingHeaderEnabled = fg('platform_collab_provider_tracingheaders');
-  addFeatureFlagAccessed(TRACING_HEADER_FOR_SERVICE_UTIL, tracingHeaderEnabled);
-  var tracingHeaders = {};
-  if (tracingHeaderEnabled) {
-    tracingHeaders = getActiveTraceHttpRequestHeaders(url);
-  }
+  var tracingHeaders = getActiveTraceHttpRequestHeaders(url);
   var requestOptions = _objectSpread(_objectSpread({}, requestInit), {}, {
     // populate headers mainly for the collab provider however
     // other components which uses this util can get the header as well.
@@ -40,6 +49,12 @@ var _requestService = function requestService(serviceConfig, options) {
     credentials: credentials
   });
   return fetch(requestUrl, requestOptions).then(function (response) {
+    if (options !== null && options !== void 0 && options.reportTracingHeaders) {
+      var _tracingHeaders = extractTracingHeaders(response);
+      if (Object.keys(_tracingHeaders).length > 0) {
+        options.reportTracingHeaders(_tracingHeaders);
+      }
+    }
     if (response.status === 204) {
       return Promise.resolve();
     } else if (response.ok) {

package/dist/types/serviceUtils.d.ts

@@ -1,4 +1,9 @@
 import { type RequestServiceOptions, type ServiceConfig } from './types';
+/**
+ * Extracts tracing headers (x-trace-id, atl-request-id) from a Response object.
+ * Returns only headers that are present in the response.
+ */
+export declare const extractTracingHeaders: (response: Response) => Record<string, string>;
 /**
  * @returns Promise containing the json response
  */

package/dist/types/types.d.ts

@@ -76,5 +76,10 @@ export interface RequestServiceOptions {
     ignoreResponsePayload?: boolean;
     path?: string;
     queryParams?: KeyValues;
+    /**
+     * Optional callback invoked with tracing headers extracted from the response.
+     * Only exposes x-trace-id and atl-request-id headers.
+     */
+    reportTracingHeaders?: (headers: Record<string, string>) => void;
     requestInit?: RequestInit;
 }

package/dist/types-ts4.5/serviceUtils.d.ts

@@ -1,4 +1,9 @@
 import { type RequestServiceOptions, type ServiceConfig } from './types';
+/**
+ * Extracts tracing headers (x-trace-id, atl-request-id) from a Response object.
+ * Returns only headers that are present in the response.
+ */
+export declare const extractTracingHeaders: (response: Response) => Record<string, string>;
 /**
  * @returns Promise containing the json response
  */

package/dist/types-ts4.5/types.d.ts

@@ -76,5 +76,10 @@ export interface RequestServiceOptions {
     ignoreResponsePayload?: boolean;
     path?: string;
     queryParams?: KeyValues;
+    /**
+     * Optional callback invoked with tracing headers extracted from the response.
+     * Only exposes x-trace-id and atl-request-id headers.
+     */
+    reportTracingHeaders?: (headers: Record<string, string>) => void;
     requestInit?: RequestInit;
 }

package/docs/0-intro.tsx

@@ -1,6 +1,6 @@
 import { md } from '@atlaskit/docs';
 
-export default md`
+const _default_1: any = md`
 	# Util Service Support
 
 	A library of support classes for integrating React components with REST HTTP services, including
@@ -20,3 +20,4 @@ export default md`
 
 	import { AbstractResource } from '@atlaskit/util-service-support';
 `;
+export default _default_1;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/util-service-support",
-	"version": "6.3.3",
+	"version": "6.3.5",
 	"description": "A library of support classes for integrating React components with REST HTTP services",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -21,12 +21,6 @@
 		}
 	},
 	"atlaskit:src": "src/index.ts",
-	"af:exports": {
-		".": "./src/index.ts",
-		"./serviceResources": "./src/serviceResources.ts",
-		"./serviceUtils": "./src/serviceUtils.ts",
-		"./types": "./src/types.ts"
-	},
 	"atlassian": {
 		"team": "Build Infra"
 	},
@@ -35,7 +29,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/react-ufo": "^4.4.0",
+		"@atlaskit/react-ufo": "^5.2.0",
 		"@babel/runtime": "^7.0.0",
 		"meros": "^1.3.0"
 	},
@@ -54,9 +48,5 @@
 			"tree-shaking": []
 		}
 	},
-	"platform-feature-flags": {
-		"platform_collab_provider_tracingheaders": {
-			"type": "boolean"
-		}
-	}
+	"platform-feature-flags": {}
 }

package/tsconfig.json

@@ -1,11 +1,4 @@
 {
-  "extends": "../../../tsconfig.json",
-  "compilerOptions": {
-  },
-  "include": [
-    "./src/**/*.ts",
-    "./src/**/*.tsx",
-    "./docs/**/*.ts",
-    "./docs/**/*.tsx"
-  ]
+	"extends": "../../../tsconfig.json",
+	"include": ["./src/**/*.ts", "./src/**/*.tsx", "./docs/**/*.ts", "./docs/**/*.tsx"]
 }

package/afm-dev-agents/tsconfig.json

@@ -1,33 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.dev-agents.json",
-	"compilerOptions": {
-		"declaration": true,
-		"target": "es5",
-		"outDir": "../../../../../dev-agents/tsDist/@atlaskit__util-service-support/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../platform/feature-flags/afm-dev-agents/tsconfig.json"
-		},
-		{
-			"path": "../../../react-ufo/atlaskit/afm-dev-agents/tsconfig.json"
-		}
-	]
-}

package/afm-passionfruit/tsconfig.json

@@ -1,33 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.passionfruit.json",
-	"compilerOptions": {
-		"declaration": true,
-		"target": "es5",
-		"outDir": "../../../../../passionfruit/tsDist/@atlaskit__util-service-support/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../platform/feature-flags/afm-passionfruit/tsconfig.json"
-		},
-		{
-			"path": "../../../react-ufo/atlaskit/afm-passionfruit/tsconfig.json"
-		}
-	]
-}

package/afm-post-office/tsconfig.json

@@ -1,33 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.post-office.json",
-	"compilerOptions": {
-		"declaration": true,
-		"target": "es5",
-		"outDir": "../../../../../post-office/tsDist/@atlaskit__util-service-support/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../platform/feature-flags/afm-post-office/tsconfig.json"
-		},
-		{
-			"path": "../../../react-ufo/atlaskit/afm-post-office/tsconfig.json"
-		}
-	]
-}

package/afm-rovo-extension/tsconfig.json

@@ -1,33 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.rovo-extension.json",
-	"compilerOptions": {
-		"declaration": true,
-		"target": "es5",
-		"outDir": "../../../../../rovo-extension/tsDist/@atlaskit__util-service-support/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../platform/feature-flags/afm-rovo-extension/tsconfig.json"
-		},
-		{
-			"path": "../../../react-ufo/atlaskit/afm-rovo-extension/tsconfig.json"
-		}
-	]
-}

package/afm-townsquare/tsconfig.json

@@ -1,33 +0,0 @@
-{
-	"extends": "../../../../tsconfig.entry-points.townsquare.json",
-	"compilerOptions": {
-		"declaration": true,
-		"target": "es5",
-		"outDir": "../../../../../townsquare/tsDist/@atlaskit__util-service-support/app",
-		"rootDir": "../",
-		"composite": true
-	},
-	"include": [
-		"../src/**/*.ts",
-		"../src/**/*.tsx"
-	],
-	"exclude": [
-		"../src/**/__tests__/*",
-		"../src/**/*.test.*",
-		"../src/**/test.*",
-		"../src/**/examples.*",
-		"../src/**/examples/*",
-		"../src/**/examples/**/*",
-		"../src/**/*.stories.*",
-		"../src/**/stories/*",
-		"../src/**/stories/**/*"
-	],
-	"references": [
-		{
-			"path": "../../../platform/feature-flags/afm-townsquare/tsconfig.json"
-		},
-		{
-			"path": "../../../react-ufo/atlaskit/afm-townsquare/tsconfig.json"
-		}
-	]
-}

package/build/tsconfig.json

@@ -1,23 +0,0 @@
-{
-  "extends": "../tsconfig",
-  "compilerOptions": {
-    "declaration": true,
-    "target": "es5",
-    "paths": {}
-  },
-  "include": [
-    "../src/**/*.ts",
-    "../src/**/*.tsx"
-  ],
-  "exclude": [
-    "../src/**/__tests__/*",
-    "../src/**/*.test.*",
-    "../src/**/test.*",
-    "../src/**/examples.*",
-    "../src/**/examples/*",
-    "../src/**/examples/**/*",
-    "../src/**/*.stories.*",
-    "../src/**/stories/*",
-    "../src/**/stories/**/*"
-  ]
-}