Skip to content

Commit 880f65e

Browse files
committed
feat: Request id trace span
1 parent 1fdd8e9 commit 880f65e

File tree

8 files changed

+15838
-15689
lines changed

8 files changed

+15838
-15689
lines changed

packages/cubejs-client-core/dist/cubejs-client-core.esm.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import _objectSpread from '@babel/runtime/helpers/objectSpread';
21
import _regeneratorRuntime from '@babel/runtime/regenerator';
32
import 'regenerator-runtime/runtime';
43
import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
4+
import _objectSpread from '@babel/runtime/helpers/objectSpread';
55
import _typeof from '@babel/runtime/helpers/typeof';
66
import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
77
import _createClass from '@babel/runtime/helpers/createClass';
88
import 'core-js/modules/es6.promise';
9+
import uuid from 'uuid/v4';
910
import 'core-js/modules/es6.number.constructor';
1011
import 'core-js/modules/es6.number.parse-float';
1112
import 'core-js/modules/web.dom.iterable';
@@ -849,20 +850,25 @@ function () {
849850

850851
_createClass(HttpTransport, [{
851852
key: "request",
852-
value: function request(method, params) {
853+
value: function request(method, _ref2) {
853854
var _this = this;
854855

856+
var baseRequestId = _ref2.baseRequestId,
857+
params = _objectWithoutProperties(_ref2, ["baseRequestId"]);
858+
855859
var searchParams = new URLSearchParams(params && Object.keys(params).map(function (k) {
856860
return _defineProperty({}, k, _typeof(params[k]) === 'object' ? JSON.stringify(params[k]) : params[k]);
857861
}).reduce(function (a, b) {
858862
return _objectSpread({}, a, b);
859863
}, {}));
864+
var spanCounter = 1;
860865

861866
var runRequest = function runRequest() {
862867
return fetch("".concat(_this.apiUrl, "/").concat(method).concat(searchParams.toString().length ? "?".concat(searchParams) : ''), {
863-
headers: Object.assign({
868+
headers: _objectSpread({
864869
Authorization: _this.authorization,
865-
'Content-Type': 'application/json'
870+
'Content-Type': 'application/json',
871+
'x-request-id': baseRequestId && "".concat(baseRequestId, "-span-").concat(spanCounter++)
866872
}, _this.headers)
867873
});
868874
};
@@ -952,7 +958,9 @@ function () {
952958
_createClass(CubejsApi, [{
953959
key: "request",
954960
value: function request(method, params) {
955-
return this.transport.request(method, params);
961+
return this.transport.request(method, _objectSpread({
962+
baseRequestId: uuid()
963+
}, params));
956964
}
957965
}, {
958966
key: "loadMethod",

packages/cubejs-client-core/dist/cubejs-client-core.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
44

55
function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
66

7-
var _objectSpread = _interopDefault(require('@babel/runtime/helpers/objectSpread'));
87
var _regeneratorRuntime = _interopDefault(require('@babel/runtime/regenerator'));
98
require('regenerator-runtime/runtime');
109
var _asyncToGenerator = _interopDefault(require('@babel/runtime/helpers/asyncToGenerator'));
10+
var _objectSpread = _interopDefault(require('@babel/runtime/helpers/objectSpread'));
1111
var _typeof = _interopDefault(require('@babel/runtime/helpers/typeof'));
1212
var _classCallCheck = _interopDefault(require('@babel/runtime/helpers/classCallCheck'));
1313
var _createClass = _interopDefault(require('@babel/runtime/helpers/createClass'));
1414
require('core-js/modules/es6.promise');
15+
var uuid = _interopDefault(require('uuid/v4'));
1516
require('core-js/modules/es6.number.constructor');
1617
require('core-js/modules/es6.number.parse-float');
1718
require('core-js/modules/web.dom.iterable');
@@ -855,20 +856,25 @@ function () {
855856

856857
_createClass(HttpTransport, [{
857858
key: "request",
858-
value: function request(method, params) {
859+
value: function request(method, _ref2) {
859860
var _this = this;
860861

862+
var baseRequestId = _ref2.baseRequestId,
863+
params = _objectWithoutProperties(_ref2, ["baseRequestId"]);
864+
861865
var searchParams = new URLSearchParams(params && Object.keys(params).map(function (k) {
862866
return _defineProperty({}, k, _typeof(params[k]) === 'object' ? JSON.stringify(params[k]) : params[k]);
863867
}).reduce(function (a, b) {
864868
return _objectSpread({}, a, b);
865869
}, {}));
870+
var spanCounter = 1;
866871

867872
var runRequest = function runRequest() {
868873
return fetch("".concat(_this.apiUrl, "/").concat(method).concat(searchParams.toString().length ? "?".concat(searchParams) : ''), {
869-
headers: Object.assign({
874+
headers: _objectSpread({
870875
Authorization: _this.authorization,
871-
'Content-Type': 'application/json'
876+
'Content-Type': 'application/json',
877+
'x-request-id': baseRequestId && "".concat(baseRequestId, "-span-").concat(spanCounter++)
872878
}, _this.headers)
873879
});
874880
};
@@ -958,7 +964,9 @@ function () {
958964
_createClass(CubejsApi, [{
959965
key: "request",
960966
value: function request(method, params) {
961-
return this.transport.request(method, params);
967+
return this.transport.request(method, _objectSpread({
968+
baseRequestId: uuid()
969+
}, params));
962970
}
963971
}, {
964972
key: "loadMethod",

0 commit comments

Comments
 (0)