@edirect/trace 9.0.0 → 9.0.2

package/.editorconfig

@@ -1,14 +1,14 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
-
-[*.js]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-
-[*.md]
-trim_trailing_whitespace = false
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+[*.js]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

package/.eslintignore

@@ -1 +1 @@
-/node_modules
+/node_modules

package/.eslintrc.js

@@ -1,44 +1,44 @@
-module.exports = {
-  env: {
-    browser: true,
-    es6: true,
-    node: true,
-  },
-  extends: [
-    'plugin:@typescript-eslint/recommended',
-    'prettier'
-  ],
-  globals: {
-    Atomics: 'readonly',
-    SharedArrayBuffer: 'readonly',
-  },
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    ecmaFeatures: {
-      jsx: true,
-    },
-    ecmaVersion: 2018,
-    sourceType: 'module',
-    project: './tsconfig.json',
-    tsconfigRootDir: __dirname,
-  },
-  plugins: ['@typescript-eslint', 'prettier'],
-  rules: {
-    'no-unused-vars': 0,
-    '@typescript-eslint/no-unused-vars': [
-      'error',
-      { argsIgnorePattern: '^_', varsIgnorePattern: '^_' },
-    ],
-    '@typescript-eslint/no-explicit-any': 0,
-    '@typescript-eslint/ban-ts-ignore': 0,
-    '@typescript-eslint/explicit-function-return-type': [
-      'warn',
-      {
-        allowExpressions: true,
-        allowTypedFunctionExpressions: true,
-        allowHigherOrderFunctions: true,
-      },
-    ],
-    '@typescript-eslint/no-floating-promises': 1,
-  },
-};
+module.exports = {
+  env: {
+    browser: true,
+    es6: true,
+    node: true,
+  },
+  extends: [
+    'plugin:@typescript-eslint/recommended',
+    'prettier'
+  ],
+  globals: {
+    Atomics: 'readonly',
+    SharedArrayBuffer: 'readonly',
+  },
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true,
+    },
+    ecmaVersion: 2018,
+    sourceType: 'module',
+    project: './tsconfig.json',
+    tsconfigRootDir: __dirname,
+  },
+  plugins: ['@typescript-eslint', 'prettier'],
+  rules: {
+    'no-unused-vars': 0,
+    '@typescript-eslint/no-unused-vars': [
+      'error',
+      { argsIgnorePattern: '^_', varsIgnorePattern: '^_' },
+    ],
+    '@typescript-eslint/no-explicit-any': 0,
+    '@typescript-eslint/ban-ts-ignore': 0,
+    '@typescript-eslint/explicit-function-return-type': [
+      'warn',
+      {
+        allowExpressions: true,
+        allowTypedFunctionExpressions: true,
+        allowHigherOrderFunctions: true,
+      },
+    ],
+    '@typescript-eslint/no-floating-promises': 1,
+  },
+};

package/.eslintrc.json

@@ -1,159 +1,159 @@
-{
-  "extends": [
-    "standard",
-    "plugin:node/recommended",
-    "plugin:promise/recommended",
-    "plugin:import/errors",
-    "plugin:import/warnings"
-  ],
-  "plugins": [
-    "standard"
-  ],
-  "rules": {
-    "camelcase": [
-      0
-    ],
-    "indent": [
-      2,
-      2,
-      {
-        "SwitchCase": 2
-      }
-    ],
-    "object-curly-spacing": [
-      "error",
-      "always"
-    ],
-    "array-bracket-spacing": [
-      "error",
-      "always"
-    ],
-    "eqeqeq": [
-      "error",
-      "always"
-    ],
-    "no-else-return": [
-      "error",
-      {
-        "allowElseIf": false
-      }
-    ],
-    "no-multi-spaces": "error",
-    "no-new-wrappers": "error",
-    "no-redeclare": "error",
-    "no-undef-init": "error",
-    "no-unused-vars": "error",
-    "no-use-before-define": [
-      "error",
-      {
-        "functions": false
-      }
-    ],
-    "comma-dangle": [
-      "error",
-      "never"
-    ],
-    "comma-spacing": [
-      "error",
-      {
-        "before": false,
-        "after": true
-      }
-    ],
-    "comma-style": [
-      "error",
-      "last"
-    ],
-    "no-implied-eval": "error",
-    "no-mixed-operators": "off",
-    "node/exports-style": [
-      "error",
-      "module.exports"
-    ],
-    "node/no-unpublished-require": "off",
-    "promise/no-callback-in-promise": "off",
-    "promise/no-nesting": "off",
-    "max-len": [
-      "error",
-      {
-        "code": 120,
-        "tabWidth": 2,
-        "comments": 100,
-        "ignoreTrailingComments": true,
-        "ignoreUrls": true,
-        "ignoreStrings": true,
-        "ignoreTemplateLiterals": true,
-        "ignoreRegExpLiterals": true
-      }
-    ],
-    "max-lines": [
-      "error",
-      {
-        "max": 350,
-        "skipBlankLines": true,
-        "skipComments": true
-      }
-    ],
-    "complexity": [
-      "error",
-      {
-        "max": 20
-      }
-    ],
-    "prefer-arrow-callback": [
-      "error",
-      {
-        "allowNamedFunctions": false,
-        "allowUnboundThis": true
-      }
-    ],
-    "arrow-parens": [
-      2,
-      "as-needed"
-    ],
-    "dot-notation": [
-      "error",
-      {
-        "allowKeywords": true
-      }
-    ],
-    "require-atomic-updates": "error",
-    "no-regex-spaces": "error",
-    "no-template-curly-in-string": "error",
-    "no-unreachable": "error",
-    "no-return-await": "error",
-    "no-return-assign": "error",
-    "no-unused-expressions": "error",
-    "no-useless-return": "error",
-    "no-throw-literal": "error",
-    "handle-callback-err": "error",
-    "key-spacing": [
-      "error",
-      {
-        "beforeColon": false,
-        "afterColon": true,
-        "mode": "strict"
-      }
-    ],
-    "linebreak-style": [
-      "error",
-      "unix"
-    ],
-    "no-trailing-spaces": "error",
-    "no-whitespace-before-property": "error",
-    "no-unneeded-ternary": "error",
-    "prefer-object-spread": "error",
-    "array-callback-return": "error",
-    "arrow-body-style": [
-      "error",
-      "as-needed"
-    ],
-    "semi": [
-      "error",
-      "always"
-    ]
-  },
-  "globals": {
-    "logs": true
-  }
-}
+{
+  "extends": [
+    "standard",
+    "plugin:node/recommended",
+    "plugin:promise/recommended",
+    "plugin:import/errors",
+    "plugin:import/warnings"
+  ],
+  "plugins": [
+    "standard"
+  ],
+  "rules": {
+    "camelcase": [
+      0
+    ],
+    "indent": [
+      2,
+      2,
+      {
+        "SwitchCase": 2
+      }
+    ],
+    "object-curly-spacing": [
+      "error",
+      "always"
+    ],
+    "array-bracket-spacing": [
+      "error",
+      "always"
+    ],
+    "eqeqeq": [
+      "error",
+      "always"
+    ],
+    "no-else-return": [
+      "error",
+      {
+        "allowElseIf": false
+      }
+    ],
+    "no-multi-spaces": "error",
+    "no-new-wrappers": "error",
+    "no-redeclare": "error",
+    "no-undef-init": "error",
+    "no-unused-vars": "error",
+    "no-use-before-define": [
+      "error",
+      {
+        "functions": false
+      }
+    ],
+    "comma-dangle": [
+      "error",
+      "never"
+    ],
+    "comma-spacing": [
+      "error",
+      {
+        "before": false,
+        "after": true
+      }
+    ],
+    "comma-style": [
+      "error",
+      "last"
+    ],
+    "no-implied-eval": "error",
+    "no-mixed-operators": "off",
+    "node/exports-style": [
+      "error",
+      "module.exports"
+    ],
+    "node/no-unpublished-require": "off",
+    "promise/no-callback-in-promise": "off",
+    "promise/no-nesting": "off",
+    "max-len": [
+      "error",
+      {
+        "code": 120,
+        "tabWidth": 2,
+        "comments": 100,
+        "ignoreTrailingComments": true,
+        "ignoreUrls": true,
+        "ignoreStrings": true,
+        "ignoreTemplateLiterals": true,
+        "ignoreRegExpLiterals": true
+      }
+    ],
+    "max-lines": [
+      "error",
+      {
+        "max": 350,
+        "skipBlankLines": true,
+        "skipComments": true
+      }
+    ],
+    "complexity": [
+      "error",
+      {
+        "max": 20
+      }
+    ],
+    "prefer-arrow-callback": [
+      "error",
+      {
+        "allowNamedFunctions": false,
+        "allowUnboundThis": true
+      }
+    ],
+    "arrow-parens": [
+      2,
+      "as-needed"
+    ],
+    "dot-notation": [
+      "error",
+      {
+        "allowKeywords": true
+      }
+    ],
+    "require-atomic-updates": "error",
+    "no-regex-spaces": "error",
+    "no-template-curly-in-string": "error",
+    "no-unreachable": "error",
+    "no-return-await": "error",
+    "no-return-assign": "error",
+    "no-unused-expressions": "error",
+    "no-useless-return": "error",
+    "no-throw-literal": "error",
+    "handle-callback-err": "error",
+    "key-spacing": [
+      "error",
+      {
+        "beforeColon": false,
+        "afterColon": true,
+        "mode": "strict"
+      }
+    ],
+    "linebreak-style": [
+      "error",
+      "unix"
+    ],
+    "no-trailing-spaces": "error",
+    "no-whitespace-before-property": "error",
+    "no-unneeded-ternary": "error",
+    "prefer-object-spread": "error",
+    "array-callback-return": "error",
+    "arrow-body-style": [
+      "error",
+      "as-needed"
+    ],
+    "semi": [
+      "error",
+      "always"
+    ]
+  },
+  "globals": {
+    "logs": true
+  }
+}

package/.prettierrc

@@ -1,5 +1,5 @@
-{
-  "singleQuote": true,
-  "tabWidth": 2,
-  "trailingComma": "all"
+{
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "all"
 }

package/dist/constants/index.d.ts

@@ -1,2 +1 @@
 export { default as HEADERS } from './headers';
-export { default as TRACE_SERVER } from './servers';

package/dist/constants/index.js

@@ -3,9 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TRACE_SERVER = exports.HEADERS = void 0;
+exports.HEADERS = void 0;
 var headers_1 = require("./headers");
 Object.defineProperty(exports, "HEADERS", { enumerable: true, get: function () { return __importDefault(headers_1).default; } });
-var servers_1 = require("./servers");
-Object.defineProperty(exports, "TRACE_SERVER", { enumerable: true, get: function () { return __importDefault(servers_1).default; } });
 //# sourceMappingURL=index.js.map

package/dist/constants/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":";;;;;;AAAA,qCAA+C;AAAtC,mHAAA,OAAO,OAAW;AAC3B,qCAAmD;AAA1C,wHAAA,OAAO,OAAgB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":";;;;;;AAAA,qCAA+C;AAAtC,mHAAA,OAAO,OAAW"}

package/dist/middlewares/body.d.ts

@@ -1,5 +1,7 @@
 import { NextFunction, Request, Response } from 'express';
 declare class Body {
+    private propertiesToArray;
+    private getValue;
     body: (req: Request, _: Response, next: NextFunction) => void;
 }
 export default Body;

package/dist/middlewares/body.js

@@ -6,20 +6,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const api_1 = __importDefault(require("@opentelemetry/api"));
 class Body {
     constructor() {
+        this.propertiesToArray = (obj) => {
+            const isObject = (val) => val && typeof val === "object" && !Array.isArray(val);
+            const addDelimiter = (a, b) => (a ? `${a}.${b}` : b);
+            const paths = (obj, head = "") => {
+                return Object.entries(obj).reduce((product, [key, value]) => {
+                    const fullPath = addDelimiter(head, key);
+                    return isObject(value)
+                        ? product.concat(paths(value, fullPath))
+                        : product.concat(fullPath);
+                }, []);
+            };
+            return paths(obj);
+        };
+        this.getValue = (path, obj) => path.split(".").reduce((acc, c) => acc && acc[c], obj);
         this.body = (req, _, next) => {
+            var _a, _b;
             let span = api_1.default.trace.getSpan(api_1.default.context.active());
+            const url = ((_b = (_a = req === null || req === void 0 ? void 0 : req.originalUrl) === null || _a === void 0 ? void 0 : _a.split("?")) === null || _b === void 0 ? void 0 : _b.shift()) || "";
             if (!span)
-                span = api_1.default.trace.getTracer("edirect/trace", "1").startSpan(req.originalUrl.split('?').shift());
-            const bodyString = JSON.stringify(req.body);
-            const charsLength = bodyString.length;
-            const chunks = [];
-            for (let i = 0; i < charsLength; i += 1000) {
-                chunks.push(bodyString.substring(i, i + 1000));
+                span = api_1.default.trace.getTracer("edirect/trace", "1").startSpan(url);
+            const attrs = this.propertiesToArray(req.body);
+            for (let x = 0; x < attrs.length; x++) {
+                span.setAttribute(`http@body.${attrs[x]}`, this.getValue(attrs[x], req.body));
             }
-            span.setAttribute('http_request_body', chunks);
-            if (req.query)
-                span.setAttribute('http_request_url_query', new URLSearchParams(req.query).toString());
-            span.setAttribute('http_request_url_full', req.originalUrl);
             next();
         };
     }

package/dist/middlewares/body.js.map

@@ -1 +1 @@
-{"version":3,"file":"body.js","sourceRoot":"","sources":["../../src/middlewares/body.ts"],"names":[],"mappings":";;;;;AACA,6DAA+C;AAE/C,MAAM,IAAI;IAAV;QAOS,SAAI,GAAG,CAAC,GAAY,EAAE,CAAW,EAAE,IAAkB,EAAQ,EAAE;YACpE,IAAI,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YACvE,IAAI,CAAC,IAAI;gBACP,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;YAE3G,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC;YAEtC,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,IAAI,IAAI,EAAE;gBAC1C,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;aAChD;YAED,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAC/C,IAAI,GAAG,CAAC,KAAK;gBACX,IAAI,CAAC,YAAY,CACf,wBAAwB,EACxB,IAAI,eAAe,CAAC,GAAG,CAAC,KAA+B,CAAC,CAAC,QAAQ,EAAE,CACpE,CAAC;YAEJ,IAAI,CAAC,YAAY,CAAC,uBAAuB,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;YAE5D,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,kBAAe,IAAI,CAAC"}
+{"version":3,"file":"body.js","sourceRoot":"","sources":["../../src/middlewares/body.ts"],"names":[],"mappings":";;;;;AACA,6DAA+C;AAE/C,MAAM,IAAI;IAAV;QAEU,sBAAiB,GAAG,CAAC,GAAY,EAAY,EAAE;YACrD,MAAM,QAAQ,GAAG,CAAC,GAAY,EAAQ,EAAE,CACtC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAExD,MAAM,YAAY,GAAG,CAAC,CAAS,EAAE,CAAS,EAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE9E,MAAM,KAAK,GAAG,CAAC,GAAQ,EAAE,IAAI,GAAG,EAAE,EAAY,EAAE;gBAC9C,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAC/B,CAAC,OAAiB,EAAE,CAAC,GAAG,EAAE,KAAK,CAAmB,EAAE,EAAE;oBACpD,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;oBACzC,OAAO,QAAQ,CAAC,KAAK,CAAC;wBACpB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;wBACxC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC/B,CAAC,EACD,EAAE,CACH,CAAC;YACJ,CAAC,CAAC;YAEF,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC,CAAC;QAEM,aAAQ,GAAG,CAAC,IAAY,EAAE,GAAY,EAAQ,EAAE,CACtD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAQlD,SAAI,GAAG,CAAC,GAAY,EAAE,CAAW,EAAE,IAAkB,EAAQ,EAAE;;YACpE,IAAI,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YACvE,MAAM,GAAG,GAAG,CAAA,MAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,0CAAE,KAAK,CAAC,GAAG,CAAC,0CAAE,KAAK,EAAE,KAAI,EAAE,CAAC;YACxD,IAAI,CAAC,IAAI;gBACP,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAE5E,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACrC,IAAI,CAAC,YAAY,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;aAC/E;YAED,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,kBAAe,IAAI,CAAC"}

package/dist/services/APM.d.ts

@@ -1,10 +1,14 @@
 declare class APM {
-    serviceName: string;
-    serverUrl: string;
-    traceServer: string;
-    constructor(serviceName?: string, serverUrl?: string, traceServer?: string);
-    private startElastic;
-    private startOtlp;
+    private serverUrl;
+    private scope;
+    private environment;
+    private cluster;
+    private tenant;
+    private service;
+    private version;
+    private owner;
+    private serviceName;
+    constructor(serverUrl?: string, scope?: string, environment?: string, cluster?: string, tenant?: string, service?: string, version?: string, owner?: string, serviceName?: string);
     startTrace(): void;
 }
 export default APM;