@itwin/core-backend 3.7.0 → 3.7.2

package/lib/cjs/domains/GenericSchema.js

@@ -1,29 +1,29 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
-/** @packageDocumentation
- * @module Schema
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GenericSchema = void 0;
-const path = require("path");
-const ClassRegistry_1 = require("../ClassRegistry");
-const IModelHost_1 = require("../IModelHost");
-const Schema_1 = require("../Schema");
-const elementsModule = require("./GenericElements");
-/** @public */
-class GenericSchema extends Schema_1.Schema {
-    static get schemaName() { return "Generic"; }
-    static get schemaFilePath() { return path.join(IModelHost_1.KnownLocations.nativeAssetsDir, "ECSchemas", "Dgn", `${GenericSchema.schemaName}.ecschema.xml`); }
-    static registerSchema() {
-        if (this !== Schema_1.Schemas.getRegisteredSchema(this.schemaName)) {
-            Schema_1.Schemas.unregisterSchema(this.schemaName);
-            Schema_1.Schemas.registerSchema(this);
-            ClassRegistry_1.ClassRegistry.registerModule(elementsModule, this);
-        }
-    }
-}
-exports.GenericSchema = GenericSchema;
+"use strict";
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module Schema
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GenericSchema = void 0;
+const path = require("path");
+const ClassRegistry_1 = require("../ClassRegistry");
+const IModelHost_1 = require("../IModelHost");
+const Schema_1 = require("../Schema");
+const elementsModule = require("./GenericElements");
+/** @public */
+class GenericSchema extends Schema_1.Schema {
+    static get schemaName() { return "Generic"; }
+    static get schemaFilePath() { return path.join(IModelHost_1.KnownLocations.nativeAssetsDir, "ECSchemas", "Dgn", `${GenericSchema.schemaName}.ecschema.xml`); }
+    static registerSchema() {
+        if (this !== Schema_1.Schemas.getRegisteredSchema(this.schemaName)) {
+            Schema_1.Schemas.unregisterSchema(this.schemaName);
+            Schema_1.Schemas.registerSchema(this);
+            ClassRegistry_1.ClassRegistry.registerModule(elementsModule, this);
+        }
+    }
+}
+exports.GenericSchema = GenericSchema;
 //# sourceMappingURL=GenericSchema.js.map

package/lib/cjs/domains/GenericSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"GenericSchema.js","sourceRoot":"","sources":["../../../src/domains/GenericSchema.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,6BAA6B;AAC7B,oDAAiD;AACjD,8CAA+C;AAC/C,sCAA4C;AAC5C,oDAAoD;AAEpD,cAAc;AACd,MAAa,aAAc,SAAQ,eAAM;IAChC,MAAM,KAAc,UAAU,KAAa,OAAO,SAAS,CAAC,CAAC,CAAC;IAC9D,MAAM,KAAK,cAAc,KAAa,OAAO,IAAI,CAAC,IAAI,CAAC,2BAAc,CAAC,eAAe,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,UAAU,eAAe,CAAC,CAAC,CAAC,CAAC;IACzJ,MAAM,CAAC,cAAc;QAC1B,IAAI,IAAI,KAAK,gBAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YACzD,gBAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1C,gBAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAC7B,6BAAa,CAAC,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;SACpD;IACH,CAAC;CACF;AAVD,sCAUC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Schema\n */\n\nimport * as path from \"path\";\nimport { ClassRegistry } from \"../ClassRegistry\";\nimport { KnownLocations } from \"../IModelHost\";\nimport { Schema, Schemas } from \"../Schema\";\nimport * as elementsModule from \"./GenericElements\";\n\n/** @public */\nexport class GenericSchema extends Schema {\n  public static override get schemaName(): string { return \"Generic\"; }\n  public static get schemaFilePath(): string { return path.join(KnownLocations.nativeAssetsDir, \"ECSchemas\", \"Dgn\", `${GenericSchema.schemaName}.ecschema.xml`); }\n  public static registerSchema() {\n    if (this !== Schemas.getRegisteredSchema(this.schemaName)) {\n      Schemas.unregisterSchema(this.schemaName);\n      Schemas.registerSchema(this);\n      ClassRegistry.registerModule(elementsModule, this);\n    }\n  }\n}\n"]}
+{"version":3,"file":"GenericSchema.js","sourceRoot":"","sources":["../../../src/domains/GenericSchema.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,6BAA6B;AAC7B,oDAAiD;AACjD,8CAA+C;AAC/C,sCAA4C;AAC5C,oDAAoD;AAEpD,cAAc;AACd,MAAa,aAAc,SAAQ,eAAM;IAChC,MAAM,KAAc,UAAU,KAAa,OAAO,SAAS,CAAC,CAAC,CAAC;IAC9D,MAAM,KAAK,cAAc,KAAa,OAAO,IAAI,CAAC,IAAI,CAAC,2BAAc,CAAC,eAAe,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,UAAU,eAAe,CAAC,CAAC,CAAC,CAAC;IACzJ,MAAM,CAAC,cAAc;QAC1B,IAAI,IAAI,KAAK,gBAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YACzD,gBAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1C,gBAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAC7B,6BAAa,CAAC,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;SACpD;IACH,CAAC;CACF;AAVD,sCAUC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module Schema\r\n */\r\n\r\nimport * as path from \"path\";\r\nimport { ClassRegistry } from \"../ClassRegistry\";\r\nimport { KnownLocations } from \"../IModelHost\";\r\nimport { Schema, Schemas } from \"../Schema\";\r\nimport * as elementsModule from \"./GenericElements\";\r\n\r\n/** @public */\r\nexport class GenericSchema extends Schema {\r\n  public static override get schemaName(): string { return \"Generic\"; }\r\n  public static get schemaFilePath(): string { return path.join(KnownLocations.nativeAssetsDir, \"ECSchemas\", \"Dgn\", `${GenericSchema.schemaName}.ecschema.xml`); }\r\n  public static registerSchema() {\r\n    if (this !== Schemas.getRegisteredSchema(this.schemaName)) {\r\n      Schemas.unregisterSchema(this.schemaName);\r\n      Schemas.registerSchema(this);\r\n      ClassRegistry.registerModule(elementsModule, this);\r\n    }\r\n  }\r\n}\r\n"]}

package/lib/cjs/rpc/multipart.d.ts

@@ -1,12 +1,12 @@
-/** @packageDocumentation
- * @module RpcInterface
- */
-import { FormDataCommon, HttpServerRequest, RpcSerializedValue } from "@itwin/core-common";
-import * as FormData from "form-data";
-/** @internal */
-export declare function createMultipartStream(value: RpcSerializedValue): FormData;
-/** @internal */
-export declare function parseMultipartRequest(req: HttpServerRequest): Promise<RpcSerializedValue>;
-/** @internal */
-export declare function appendToMultipartForm(i: number, form: FormDataCommon, value: RpcSerializedValue): void;
+/** @packageDocumentation
+ * @module RpcInterface
+ */
+import { FormDataCommon, HttpServerRequest, RpcSerializedValue } from "@itwin/core-common";
+import * as FormData from "form-data";
+/** @internal */
+export declare function createMultipartStream(value: RpcSerializedValue): FormData;
+/** @internal */
+export declare function parseMultipartRequest(req: HttpServerRequest): Promise<RpcSerializedValue>;
+/** @internal */
+export declare function appendToMultipartForm(i: number, form: FormDataCommon, value: RpcSerializedValue): void;
 //# sourceMappingURL=multipart.d.ts.map

package/lib/cjs/rpc/multipart.js

@@ -1,72 +1,72 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
-/** @packageDocumentation
- * @module RpcInterface
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.appendToMultipartForm = exports.parseMultipartRequest = exports.createMultipartStream = void 0;
-const core_common_1 = require("@itwin/core-common");
-const FormData = require("form-data");
-const multiparty = require("multiparty");
-/* eslint-disable deprecation/deprecation */
-/** @internal */
-function createMultipartStream(value) {
-    const form = new FormData();
-    core_common_1.RpcMultipart.writeValueToForm(form, value);
-    // Type information for FormData is lying. It actually extends Stream but not Readable, although it appears to work
-    // fine for now.
-    return form;
-}
-exports.createMultipartStream = createMultipartStream;
-/** @internal */
-async function parseMultipartRequest(req) {
-    return new Promise((resolve, reject) => {
-        const form = new multiparty.Form({ maxFieldsSize: Infinity });
-        form.on("error", (err) => {
-            reject(err);
-        });
-        const value = core_common_1.RpcSerializedValue.create();
-        const data = {};
-        form.on("part", (part) => {
-            part.on("data", (chunk) => {
-                if (part.name === "objects") {
-                    value.objects += chunk.toString();
-                }
-                else if (Buffer.isBuffer(chunk)) {
-                    if (!data[part.name]) {
-                        data[part.name] = { size: 0, chunks: [] };
-                    }
-                    data[part.name].size += chunk.byteLength;
-                    data[part.name].chunks.push(chunk);
-                }
-                else {
-                    throw new core_common_1.IModelError(core_common_1.BentleyStatus.ERROR, "Unknown input.");
-                }
-            });
-        });
-        form.on("close", () => {
-            let i = 0;
-            for (;;) {
-                const part = data[`data-${i}`];
-                if (!part) {
-                    break;
-                }
-                value.data.push(Buffer.concat(part.chunks, part.size));
-                ++i;
-            }
-            resolve(value);
-        });
-        form.parse(req);
-    });
-}
-exports.parseMultipartRequest = parseMultipartRequest;
-/** @internal */
-function appendToMultipartForm(i, form, value) {
-    const buf = value.data[i];
-    form.append(`data-${i}`, Buffer.from(buf.buffer, buf.byteOffset, buf.byteLength));
-}
-exports.appendToMultipartForm = appendToMultipartForm;
+"use strict";
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module RpcInterface
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.appendToMultipartForm = exports.parseMultipartRequest = exports.createMultipartStream = void 0;
+const core_common_1 = require("@itwin/core-common");
+const FormData = require("form-data");
+const multiparty = require("multiparty");
+/* eslint-disable deprecation/deprecation */
+/** @internal */
+function createMultipartStream(value) {
+    const form = new FormData();
+    core_common_1.RpcMultipart.writeValueToForm(form, value);
+    // Type information for FormData is lying. It actually extends Stream but not Readable, although it appears to work
+    // fine for now.
+    return form;
+}
+exports.createMultipartStream = createMultipartStream;
+/** @internal */
+async function parseMultipartRequest(req) {
+    return new Promise((resolve, reject) => {
+        const form = new multiparty.Form({ maxFieldsSize: Infinity });
+        form.on("error", (err) => {
+            reject(err);
+        });
+        const value = core_common_1.RpcSerializedValue.create();
+        const data = {};
+        form.on("part", (part) => {
+            part.on("data", (chunk) => {
+                if (part.name === "objects") {
+                    value.objects += chunk.toString();
+                }
+                else if (Buffer.isBuffer(chunk)) {
+                    if (!data[part.name]) {
+                        data[part.name] = { size: 0, chunks: [] };
+                    }
+                    data[part.name].size += chunk.byteLength;
+                    data[part.name].chunks.push(chunk);
+                }
+                else {
+                    throw new core_common_1.IModelError(core_common_1.BentleyStatus.ERROR, "Unknown input.");
+                }
+            });
+        });
+        form.on("close", () => {
+            let i = 0;
+            for (;;) {
+                const part = data[`data-${i}`];
+                if (!part) {
+                    break;
+                }
+                value.data.push(Buffer.concat(part.chunks, part.size));
+                ++i;
+            }
+            resolve(value);
+        });
+        form.parse(req);
+    });
+}
+exports.parseMultipartRequest = parseMultipartRequest;
+/** @internal */
+function appendToMultipartForm(i, form, value) {
+    const buf = value.data[i];
+    form.append(`data-${i}`, Buffer.from(buf.buffer, buf.byteOffset, buf.byteLength));
+}
+exports.appendToMultipartForm = appendToMultipartForm;
 //# sourceMappingURL=multipart.js.map

package/lib/cjs/rpc/multipart.js.map

@@ -1 +1 @@
-{"version":3,"file":"multipart.js","sourceRoot":"","sources":["../../../src/rpc/multipart.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module RpcInterface\n */\n\nimport { BentleyStatus, FormDataCommon, HttpServerRequest, IModelError, RpcMultipart, RpcSerializedValue } from \"@itwin/core-common\";\nimport * as FormData from \"form-data\";\nimport * as multiparty from \"multiparty\";\n\n/* eslint-disable deprecation/deprecation */\n\n/** @internal */\nexport function createMultipartStream(value: RpcSerializedValue) {\n  const form = new FormData();\n  RpcMultipart.writeValueToForm(form, value);\n  // Type information for FormData is lying. It actually extends Stream but not Readable, although it appears to work\n  // fine for now.\n  return form;\n}\n\n/** @internal */\nexport async function parseMultipartRequest(req: HttpServerRequest) {\n  return new Promise<RpcSerializedValue>((resolve, reject) => {\n    const form = new multiparty.Form({ maxFieldsSize: Infinity });\n    form.on(\"error\", (err) => {\n      reject(err);\n    });\n\n    const value = RpcSerializedValue.create();\n    const data: { [index: string]: { size: number, chunks: Buffer[] } } = {};\n\n    form.on(\"part\", (part: multiparty.Part) => {\n      part.on(\"data\", (chunk: string | Buffer) => {\n        if (part.name === \"objects\") {\n          value.objects += chunk.toString();\n        } else if (Buffer.isBuffer(chunk)) {\n          if (!data[part.name]) {\n            data[part.name] = { size: 0, chunks: [] };\n          }\n\n          data[part.name].size += chunk.byteLength;\n          data[part.name].chunks.push(chunk);\n        } else {\n          throw new IModelError(BentleyStatus.ERROR, \"Unknown input.\");\n        }\n      });\n    });\n\n    form.on(\"close\", () => {\n      let i = 0;\n      for (; ;) {\n        const part = data[`data-${i}`];\n        if (!part) {\n          break;\n        }\n\n        value.data.push(Buffer.concat(part.chunks, part.size));\n        ++i;\n      }\n\n      resolve(value);\n    });\n\n    form.parse(req);\n  });\n}\n\n/** @internal */\nexport function appendToMultipartForm(i: number, form: FormDataCommon, value: RpcSerializedValue) {\n  const buf = value.data[i];\n  form.append(`data-${i}`, Buffer.from(buf.buffer, buf.byteOffset, buf.byteLength));\n}\n"]}
+{"version":3,"file":"multipart.js","sourceRoot":"","sources":["../../../src/rpc/multipart.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module RpcInterface\r\n */\r\n\r\nimport { BentleyStatus, FormDataCommon, HttpServerRequest, IModelError, RpcMultipart, RpcSerializedValue } from \"@itwin/core-common\";\r\nimport * as FormData from \"form-data\";\r\nimport * as multiparty from \"multiparty\";\r\n\r\n/* eslint-disable deprecation/deprecation */\r\n\r\n/** @internal */\r\nexport function createMultipartStream(value: RpcSerializedValue) {\r\n  const form = new FormData();\r\n  RpcMultipart.writeValueToForm(form, value);\r\n  // Type information for FormData is lying. It actually extends Stream but not Readable, although it appears to work\r\n  // fine for now.\r\n  return form;\r\n}\r\n\r\n/** @internal */\r\nexport async function parseMultipartRequest(req: HttpServerRequest) {\r\n  return new Promise<RpcSerializedValue>((resolve, reject) => {\r\n    const form = new multiparty.Form({ maxFieldsSize: Infinity });\r\n    form.on(\"error\", (err) => {\r\n      reject(err);\r\n    });\r\n\r\n    const value = RpcSerializedValue.create();\r\n    const data: { [index: string]: { size: number, chunks: Buffer[] } } = {};\r\n\r\n    form.on(\"part\", (part: multiparty.Part) => {\r\n      part.on(\"data\", (chunk: string | Buffer) => {\r\n        if (part.name === \"objects\") {\r\n          value.objects += chunk.toString();\r\n        } else if (Buffer.isBuffer(chunk)) {\r\n          if (!data[part.name]) {\r\n            data[part.name] = { size: 0, chunks: [] };\r\n          }\r\n\r\n          data[part.name].size += chunk.byteLength;\r\n          data[part.name].chunks.push(chunk);\r\n        } else {\r\n          throw new IModelError(BentleyStatus.ERROR, \"Unknown input.\");\r\n        }\r\n      });\r\n    });\r\n\r\n    form.on(\"close\", () => {\r\n      let i = 0;\r\n      for (; ;) {\r\n        const part = data[`data-${i}`];\r\n        if (!part) {\r\n          break;\r\n        }\r\n\r\n        value.data.push(Buffer.concat(part.chunks, part.size));\r\n        ++i;\r\n      }\r\n\r\n      resolve(value);\r\n    });\r\n\r\n    form.parse(req);\r\n  });\r\n}\r\n\r\n/** @internal */\r\nexport function appendToMultipartForm(i: number, form: FormDataCommon, value: RpcSerializedValue) {\r\n  const buf = value.data[i];\r\n  form.append(`data-${i}`, Buffer.from(buf.buffer, buf.byteOffset, buf.byteLength));\r\n}\r\n"]}

package/lib/cjs/rpc/tracing.d.ts

@@ -1,29 +1,29 @@
-/** @packageDocumentation
- * @module RpcInterface
- */
-import { RpcActivity } from "@itwin/core-common";
-/**
- * Utility for tracing Rpc activity processing. When multiple Rpc requests are being processed asynchronously, this
- * class can be used to correlate the current calltrace with the originating RpcActivity. This is used for automatic appending
- * of RpcActivity to log messages emitted during Rpc processing. It may also be used to retrieve the user accessToken
- * from the RpcActivity.
- * @public
- */
-export declare class RpcTrace {
-    private static _storage;
-    /** Get the [RpcActivity]($common) for the currently executing async, or `undefined` if there is no
-     * RpcActivity in the current call stack.
-     * */
-    static get currentActivity(): RpcActivity | undefined;
-    /** Get the [RpcActivity]($common) for the currently executing async. Asserts that the RpcActivity
-     * exists in the current call stack.
-     * */
-    static get expectCurrentActivity(): RpcActivity;
-    /** Start the processing of an RpcActivity. */
-    static run<T>(activity: RpcActivity, fn: () => Promise<T>): Promise<T>;
-    /** Start the processing of an RpcActivity inside an OpenTelemetry span */
-    static runWithSpan<T>(activity: RpcActivity, fn: () => Promise<T>): Promise<T>;
-}
-/** @internal */
-export declare function initializeTracing(enableOpenTelemetry?: boolean): void;
+/** @packageDocumentation
+ * @module RpcInterface
+ */
+import { RpcActivity } from "@itwin/core-common";
+/**
+ * Utility for tracing Rpc activity processing. When multiple Rpc requests are being processed asynchronously, this
+ * class can be used to correlate the current calltrace with the originating RpcActivity. This is used for automatic appending
+ * of RpcActivity to log messages emitted during Rpc processing. It may also be used to retrieve the user accessToken
+ * from the RpcActivity.
+ * @public
+ */
+export declare class RpcTrace {
+    private static _storage;
+    /** Get the [RpcActivity]($common) for the currently executing async, or `undefined` if there is no
+     * RpcActivity in the current call stack.
+     * */
+    static get currentActivity(): RpcActivity | undefined;
+    /** Get the [RpcActivity]($common) for the currently executing async. Asserts that the RpcActivity
+     * exists in the current call stack.
+     * */
+    static get expectCurrentActivity(): RpcActivity;
+    /** Start the processing of an RpcActivity. */
+    static run<T>(activity: RpcActivity, fn: () => Promise<T>): Promise<T>;
+    /** Start the processing of an RpcActivity inside an OpenTelemetry span */
+    static runWithSpan<T>(activity: RpcActivity, fn: () => Promise<T>): Promise<T>;
+}
+/** @internal */
+export declare function initializeTracing(enableOpenTelemetry?: boolean): void;
 //# sourceMappingURL=tracing.d.ts.map

package/lib/cjs/rpc/tracing.js

@@ -1,75 +1,75 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
-/** @packageDocumentation
- * @module RpcInterface
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeTracing = exports.RpcTrace = void 0;
-// cspell:ignore calltrace
-const core_bentley_1 = require("@itwin/core-bentley");
-const core_common_1 = require("@itwin/core-common");
-const async_hooks_1 = require("async_hooks");
-const BackendLoggerCategory_1 = require("../BackendLoggerCategory");
-const IModelHost_1 = require("../IModelHost");
-/* eslint-disable deprecation/deprecation */
-/**
- * Utility for tracing Rpc activity processing. When multiple Rpc requests are being processed asynchronously, this
- * class can be used to correlate the current calltrace with the originating RpcActivity. This is used for automatic appending
- * of RpcActivity to log messages emitted during Rpc processing. It may also be used to retrieve the user accessToken
- * from the RpcActivity.
- * @public
- */
-class RpcTrace {
-    /** Get the [RpcActivity]($common) for the currently executing async, or `undefined` if there is no
-     * RpcActivity in the current call stack.
-     * */
-    static get currentActivity() {
-        return RpcTrace._storage.getStore();
-    }
-    /** Get the [RpcActivity]($common) for the currently executing async. Asserts that the RpcActivity
-     * exists in the current call stack.
-     * */
-    static get expectCurrentActivity() {
-        (0, core_bentley_1.assert)(undefined !== RpcTrace.currentActivity);
-        return RpcTrace.currentActivity;
-    }
-    /** Start the processing of an RpcActivity. */
-    static async run(activity, fn) {
-        return RpcTrace._storage.run(activity, fn);
-    }
-    /** Start the processing of an RpcActivity inside an OpenTelemetry span */
-    static async runWithSpan(activity, fn) {
-        var _a;
-        return core_bentley_1.Tracing.withSpan((_a = activity.rpcMethod) !== null && _a !== void 0 ? _a : "unknown RPC method", async () => RpcTrace.run(activity, fn), {
-            attributes: { ...core_common_1.RpcInvocation.sanitizeForLog(activity) },
-            kind: core_bentley_1.SpanKind.SERVER,
-        });
-    }
-}
-exports.RpcTrace = RpcTrace;
-RpcTrace._storage = new async_hooks_1.AsyncLocalStorage();
-/** @internal */
-function initializeTracing(enableOpenTelemetry = false) {
-    core_common_1.RpcInvocation.runActivity = RpcTrace.run; // redirect the invocation processing to the tracer
-    if (enableOpenTelemetry) {
-        try {
-            // eslint-disable-next-line @typescript-eslint/no-var-requires
-            const api = require("@opentelemetry/api");
-            const tracer = api.trace.getTracer("@itwin/core-backend", IModelHost_1.IModelHost.backendVersion);
-            core_bentley_1.Tracing.enableOpenTelemetry(tracer, api);
-            core_common_1.RpcInvocation.runActivity = RpcTrace.runWithSpan; // wrap invocation in an OpenTelemetry span in addition to RpcTrace
-        }
-        catch (e) {
-            // eslint-disable-next-line @typescript-eslint/naming-convention
-            core_bentley_1.Logger.logError(BackendLoggerCategory_1.BackendLoggerCategory.IModelHost, "Failed to initialize OpenTelemetry");
-            core_bentley_1.Logger.logException(BackendLoggerCategory_1.BackendLoggerCategory.IModelHost, e);
-        }
-    }
-    // set up static logger metadata to include current RpcActivity information for logs during rpc processing
-    core_bentley_1.Logger.staticMetaData.set("rpc", () => core_common_1.RpcInvocation.sanitizeForLog(RpcTrace.currentActivity));
-}
-exports.initializeTracing = initializeTracing;
+"use strict";
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module RpcInterface
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initializeTracing = exports.RpcTrace = void 0;
+// cspell:ignore calltrace
+const core_bentley_1 = require("@itwin/core-bentley");
+const core_common_1 = require("@itwin/core-common");
+const async_hooks_1 = require("async_hooks");
+const BackendLoggerCategory_1 = require("../BackendLoggerCategory");
+const IModelHost_1 = require("../IModelHost");
+/* eslint-disable deprecation/deprecation */
+/**
+ * Utility for tracing Rpc activity processing. When multiple Rpc requests are being processed asynchronously, this
+ * class can be used to correlate the current calltrace with the originating RpcActivity. This is used for automatic appending
+ * of RpcActivity to log messages emitted during Rpc processing. It may also be used to retrieve the user accessToken
+ * from the RpcActivity.
+ * @public
+ */
+class RpcTrace {
+    /** Get the [RpcActivity]($common) for the currently executing async, or `undefined` if there is no
+     * RpcActivity in the current call stack.
+     * */
+    static get currentActivity() {
+        return RpcTrace._storage.getStore();
+    }
+    /** Get the [RpcActivity]($common) for the currently executing async. Asserts that the RpcActivity
+     * exists in the current call stack.
+     * */
+    static get expectCurrentActivity() {
+        (0, core_bentley_1.assert)(undefined !== RpcTrace.currentActivity);
+        return RpcTrace.currentActivity;
+    }
+    /** Start the processing of an RpcActivity. */
+    static async run(activity, fn) {
+        return RpcTrace._storage.run(activity, fn);
+    }
+    /** Start the processing of an RpcActivity inside an OpenTelemetry span */
+    static async runWithSpan(activity, fn) {
+        var _a;
+        return core_bentley_1.Tracing.withSpan((_a = activity.rpcMethod) !== null && _a !== void 0 ? _a : "unknown RPC method", async () => RpcTrace.run(activity, fn), {
+            attributes: { ...core_common_1.RpcInvocation.sanitizeForLog(activity) },
+            kind: core_bentley_1.SpanKind.SERVER,
+        });
+    }
+}
+exports.RpcTrace = RpcTrace;
+RpcTrace._storage = new async_hooks_1.AsyncLocalStorage();
+/** @internal */
+function initializeTracing(enableOpenTelemetry = false) {
+    core_common_1.RpcInvocation.runActivity = RpcTrace.run; // redirect the invocation processing to the tracer
+    if (enableOpenTelemetry) {
+        try {
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            const api = require("@opentelemetry/api");
+            const tracer = api.trace.getTracer("@itwin/core-backend", IModelHost_1.IModelHost.backendVersion);
+            core_bentley_1.Tracing.enableOpenTelemetry(tracer, api);
+            core_common_1.RpcInvocation.runActivity = RpcTrace.runWithSpan; // wrap invocation in an OpenTelemetry span in addition to RpcTrace
+        }
+        catch (e) {
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            core_bentley_1.Logger.logError(BackendLoggerCategory_1.BackendLoggerCategory.IModelHost, "Failed to initialize OpenTelemetry");
+            core_bentley_1.Logger.logException(BackendLoggerCategory_1.BackendLoggerCategory.IModelHost, e);
+        }
+    }
+    // set up static logger metadata to include current RpcActivity information for logs during rpc processing
+    core_bentley_1.Logger.staticMetaData.set("rpc", () => core_common_1.RpcInvocation.sanitizeForLog(RpcTrace.currentActivity));
+}
+exports.initializeTracing = initializeTracing;
 //# sourceMappingURL=tracing.js.map

package/lib/cjs/rpc/tracing.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../../src/rpc/tracing.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,0BAA0B;AAE1B,sDAAwE;AACxE,oDAAgE;AAChE,6CAAgD;AAChD,oEAAiE;AACjE,8CAA2C;AAE3C,4CAA4C;AAE5C;;;;;;GAMG;AACH,MAAa,QAAQ;IAGnB;;SAEK;IACE,MAAM,KAAK,eAAe;QAC/B,OAAO,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAA6B,CAAC;IACjE,CAAC;IAED;;SAEK;IACE,MAAM,KAAK,qBAAqB;QACrC,IAAA,qBAAM,EAAC,SAAS,KAAK,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC/C,OAAO,QAAQ,CAAC,eAAe,CAAC;IAClC,CAAC;IAED,8CAA8C;IACvC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAI,QAAqB,EAAE,EAAoB;QACpE,OAAO,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,0EAA0E;IACnE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAI,QAAqB,EAAE,EAAoB;;QAC5E,OAAO,sBAAO,CAAC,QAAQ,CAAC,MAAA,QAAQ,CAAC,SAAS,mCAAI,oBAAoB,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE;YAC1G,UAAU,EAAE,EAAE,GAAG,2BAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE;YACzD,IAAI,EAAE,uBAAQ,CAAC,MAAM;SACtB,CAAC,CAAC;IACL,CAAC;;AA7BH,4BA8BC;AA7BgB,iBAAQ,GAAG,IAAI,+BAAiB,EAAE,CAAC;AA+BpD,gBAAgB;AAChB,SAAgB,iBAAiB,CAAC,sBAA+B,KAAK;IACpE,2BAAa,CAAC,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,mDAAmD;IAE7F,IAAI,mBAAmB,EAAE;QACvB,IAAI;YACF,8DAA8D;YAC9D,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,qBAAqB,EAAE,uBAAU,CAAC,cAAc,CAAC,CAAC;YACrF,sBAAO,CAAC,mBAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACzC,2BAAa,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,mEAAmE;SACtH;QAAC,OAAO,CAAC,EAAE;YACV,gEAAgE;YAChE,qBAAM,CAAC,QAAQ,CAAC,6CAAqB,CAAC,UAAU,EAAE,oCAAoC,CAAC,CAAC;YACxF,qBAAM,CAAC,YAAY,CAAC,6CAAqB,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;SAC1D;KACF;IAED,0GAA0G;IAC1G,qBAAM,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,2BAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;AACjG,CAAC;AAnBD,8CAmBC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module RpcInterface\n */\n\n// cspell:ignore calltrace\n\nimport { assert, Logger, SpanKind, Tracing } from \"@itwin/core-bentley\";\nimport { RpcActivity, RpcInvocation } from \"@itwin/core-common\";\nimport { AsyncLocalStorage } from \"async_hooks\";\nimport { BackendLoggerCategory } from \"../BackendLoggerCategory\";\nimport { IModelHost } from \"../IModelHost\";\n\n/* eslint-disable deprecation/deprecation */\n\n/**\n * Utility for tracing Rpc activity processing. When multiple Rpc requests are being processed asynchronously, this\n * class can be used to correlate the current calltrace with the originating RpcActivity. This is used for automatic appending\n * of RpcActivity to log messages emitted during Rpc processing. It may also be used to retrieve the user accessToken\n * from the RpcActivity.\n * @public\n */\nexport class RpcTrace {\n  private static _storage = new AsyncLocalStorage();\n\n  /** Get the [RpcActivity]($common) for the currently executing async, or `undefined` if there is no\n   * RpcActivity in the current call stack.\n   * */\n  public static get currentActivity(): RpcActivity | undefined {\n    return RpcTrace._storage.getStore() as RpcActivity | undefined;\n  }\n\n  /** Get the [RpcActivity]($common) for the currently executing async. Asserts that the RpcActivity\n   * exists in the current call stack.\n   * */\n  public static get expectCurrentActivity(): RpcActivity {\n    assert(undefined !== RpcTrace.currentActivity);\n    return RpcTrace.currentActivity;\n  }\n\n  /** Start the processing of an RpcActivity. */\n  public static async run<T>(activity: RpcActivity, fn: () => Promise<T>): Promise<T> {\n    return RpcTrace._storage.run(activity, fn);\n  }\n\n  /** Start the processing of an RpcActivity inside an OpenTelemetry span */\n  public static async runWithSpan<T>(activity: RpcActivity, fn: () => Promise<T>): Promise<T> {\n    return Tracing.withSpan(activity.rpcMethod ?? \"unknown RPC method\", async () => RpcTrace.run(activity, fn), {\n      attributes: { ...RpcInvocation.sanitizeForLog(activity) },\n      kind: SpanKind.SERVER,\n    });\n  }\n}\n\n/** @internal */\nexport function initializeTracing(enableOpenTelemetry: boolean = false) {\n  RpcInvocation.runActivity = RpcTrace.run; // redirect the invocation processing to the tracer\n\n  if (enableOpenTelemetry) {\n    try {\n      // eslint-disable-next-line @typescript-eslint/no-var-requires\n      const api = require(\"@opentelemetry/api\");\n      const tracer = api.trace.getTracer(\"@itwin/core-backend\", IModelHost.backendVersion);\n      Tracing.enableOpenTelemetry(tracer, api);\n      RpcInvocation.runActivity = RpcTrace.runWithSpan; // wrap invocation in an OpenTelemetry span in addition to RpcTrace\n    } catch (e) {\n      // eslint-disable-next-line @typescript-eslint/naming-convention\n      Logger.logError(BackendLoggerCategory.IModelHost, \"Failed to initialize OpenTelemetry\");\n      Logger.logException(BackendLoggerCategory.IModelHost, e);\n    }\n  }\n\n  // set up static logger metadata to include current RpcActivity information for logs during rpc processing\n  Logger.staticMetaData.set(\"rpc\", () => RpcInvocation.sanitizeForLog(RpcTrace.currentActivity));\n}\n"]}
+{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../../src/rpc/tracing.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,0BAA0B;AAE1B,sDAAwE;AACxE,oDAAgE;AAChE,6CAAgD;AAChD,oEAAiE;AACjE,8CAA2C;AAE3C,4CAA4C;AAE5C;;;;;;GAMG;AACH,MAAa,QAAQ;IAGnB;;SAEK;IACE,MAAM,KAAK,eAAe;QAC/B,OAAO,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAA6B,CAAC;IACjE,CAAC;IAED;;SAEK;IACE,MAAM,KAAK,qBAAqB;QACrC,IAAA,qBAAM,EAAC,SAAS,KAAK,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC/C,OAAO,QAAQ,CAAC,eAAe,CAAC;IAClC,CAAC;IAED,8CAA8C;IACvC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAI,QAAqB,EAAE,EAAoB;QACpE,OAAO,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,0EAA0E;IACnE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAI,QAAqB,EAAE,EAAoB;;QAC5E,OAAO,sBAAO,CAAC,QAAQ,CAAC,MAAA,QAAQ,CAAC,SAAS,mCAAI,oBAAoB,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE;YAC1G,UAAU,EAAE,EAAE,GAAG,2BAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE;YACzD,IAAI,EAAE,uBAAQ,CAAC,MAAM;SACtB,CAAC,CAAC;IACL,CAAC;;AA7BH,4BA8BC;AA7BgB,iBAAQ,GAAG,IAAI,+BAAiB,EAAE,CAAC;AA+BpD,gBAAgB;AAChB,SAAgB,iBAAiB,CAAC,sBAA+B,KAAK;IACpE,2BAAa,CAAC,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,mDAAmD;IAE7F,IAAI,mBAAmB,EAAE;QACvB,IAAI;YACF,8DAA8D;YAC9D,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,qBAAqB,EAAE,uBAAU,CAAC,cAAc,CAAC,CAAC;YACrF,sBAAO,CAAC,mBAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACzC,2BAAa,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,mEAAmE;SACtH;QAAC,OAAO,CAAC,EAAE;YACV,gEAAgE;YAChE,qBAAM,CAAC,QAAQ,CAAC,6CAAqB,CAAC,UAAU,EAAE,oCAAoC,CAAC,CAAC;YACxF,qBAAM,CAAC,YAAY,CAAC,6CAAqB,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;SAC1D;KACF;IAED,0GAA0G;IAC1G,qBAAM,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,2BAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;AACjG,CAAC;AAnBD,8CAmBC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module RpcInterface\r\n */\r\n\r\n// cspell:ignore calltrace\r\n\r\nimport { assert, Logger, SpanKind, Tracing } from \"@itwin/core-bentley\";\r\nimport { RpcActivity, RpcInvocation } from \"@itwin/core-common\";\r\nimport { AsyncLocalStorage } from \"async_hooks\";\r\nimport { BackendLoggerCategory } from \"../BackendLoggerCategory\";\r\nimport { IModelHost } from \"../IModelHost\";\r\n\r\n/* eslint-disable deprecation/deprecation */\r\n\r\n/**\r\n * Utility for tracing Rpc activity processing. When multiple Rpc requests are being processed asynchronously, this\r\n * class can be used to correlate the current calltrace with the originating RpcActivity. This is used for automatic appending\r\n * of RpcActivity to log messages emitted during Rpc processing. It may also be used to retrieve the user accessToken\r\n * from the RpcActivity.\r\n * @public\r\n */\r\nexport class RpcTrace {\r\n  private static _storage = new AsyncLocalStorage();\r\n\r\n  /** Get the [RpcActivity]($common) for the currently executing async, or `undefined` if there is no\r\n   * RpcActivity in the current call stack.\r\n   * */\r\n  public static get currentActivity(): RpcActivity | undefined {\r\n    return RpcTrace._storage.getStore() as RpcActivity | undefined;\r\n  }\r\n\r\n  /** Get the [RpcActivity]($common) for the currently executing async. Asserts that the RpcActivity\r\n   * exists in the current call stack.\r\n   * */\r\n  public static get expectCurrentActivity(): RpcActivity {\r\n    assert(undefined !== RpcTrace.currentActivity);\r\n    return RpcTrace.currentActivity;\r\n  }\r\n\r\n  /** Start the processing of an RpcActivity. */\r\n  public static async run<T>(activity: RpcActivity, fn: () => Promise<T>): Promise<T> {\r\n    return RpcTrace._storage.run(activity, fn);\r\n  }\r\n\r\n  /** Start the processing of an RpcActivity inside an OpenTelemetry span */\r\n  public static async runWithSpan<T>(activity: RpcActivity, fn: () => Promise<T>): Promise<T> {\r\n    return Tracing.withSpan(activity.rpcMethod ?? \"unknown RPC method\", async () => RpcTrace.run(activity, fn), {\r\n      attributes: { ...RpcInvocation.sanitizeForLog(activity) },\r\n      kind: SpanKind.SERVER,\r\n    });\r\n  }\r\n}\r\n\r\n/** @internal */\r\nexport function initializeTracing(enableOpenTelemetry: boolean = false) {\r\n  RpcInvocation.runActivity = RpcTrace.run; // redirect the invocation processing to the tracer\r\n\r\n  if (enableOpenTelemetry) {\r\n    try {\r\n      // eslint-disable-next-line @typescript-eslint/no-var-requires\r\n      const api = require(\"@opentelemetry/api\");\r\n      const tracer = api.trace.getTracer(\"@itwin/core-backend\", IModelHost.backendVersion);\r\n      Tracing.enableOpenTelemetry(tracer, api);\r\n      RpcInvocation.runActivity = RpcTrace.runWithSpan; // wrap invocation in an OpenTelemetry span in addition to RpcTrace\r\n    } catch (e) {\r\n      // eslint-disable-next-line @typescript-eslint/naming-convention\r\n      Logger.logError(BackendLoggerCategory.IModelHost, \"Failed to initialize OpenTelemetry\");\r\n      Logger.logException(BackendLoggerCategory.IModelHost, e);\r\n    }\r\n  }\r\n\r\n  // set up static logger metadata to include current RpcActivity information for logs during rpc processing\r\n  Logger.staticMetaData.set(\"rpc\", () => RpcInvocation.sanitizeForLog(RpcTrace.currentActivity));\r\n}\r\n"]}

package/lib/cjs/rpc/web/logging.d.ts

@@ -1,10 +1,10 @@
-/** @packageDocumentation
- * @module RpcInterface
- */
-import { RpcInvocation, RpcProtocolEvent, WebAppRpcLogging } from "@itwin/core-common";
-export declare class WebAppRpcLoggingBackend extends WebAppRpcLogging {
-    protected logProtocolEvent(event: RpcProtocolEvent, object: RpcInvocation): Promise<void>;
-    protected getHostname(): string;
-    private logErrorBackend;
-}
+/** @packageDocumentation
+ * @module RpcInterface
+ */
+import { RpcInvocation, RpcProtocolEvent, WebAppRpcLogging } from "@itwin/core-common";
+export declare class WebAppRpcLoggingBackend extends WebAppRpcLogging {
+    protected logProtocolEvent(event: RpcProtocolEvent, object: RpcInvocation): Promise<void>;
+    protected getHostname(): string;
+    private logErrorBackend;
+}
 //# sourceMappingURL=logging.d.ts.map

package/lib/cjs/rpc/web/logging.js

@@ -1,44 +1,44 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
-/** @packageDocumentation
- * @module RpcInterface
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebAppRpcLoggingBackend = void 0;
-const core_bentley_1 = require("@itwin/core-bentley");
-const core_common_1 = require("@itwin/core-common");
-const os = require("os");
-/* eslint-disable deprecation/deprecation */
-class WebAppRpcLoggingBackend extends core_common_1.WebAppRpcLogging {
-    async logProtocolEvent(event, object) {
-        switch (event) {
-            case core_common_1.RpcProtocolEvent.RequestReceived: return this.logRequest(core_common_1.CommonLoggerCategory.RpcInterfaceBackend, "RpcInterface.backend.request", object.request);
-            case core_common_1.RpcProtocolEvent.BackendErrorOccurred: return this.logErrorBackend("RpcInterface.backend.error", object);
-            case core_common_1.RpcProtocolEvent.BackendResponseCreated: return this.logResponse(core_common_1.CommonLoggerCategory.RpcInterfaceBackend, "RpcInterface.backend.response", object.request, object.status, object.elapsed);
-        }
-    }
-    getHostname() {
-        return os.hostname();
-    }
-    async logErrorBackend(message, invocation) {
-        const operationDescriptor = this.buildOperationDescriptor(invocation.operation);
-        const pathIds = this.findPathIds(invocation.request.path);
-        const result = await invocation.result;
-        const errorMessage = result.message ? result.message : result.objects; // Can be an error or an RpcSerializedValue
-        core_bentley_1.Logger.logInfo(core_common_1.CommonLoggerCategory.RpcInterfaceBackend, `${message}.${operationDescriptor}`, () => ({
-            method: invocation.request.method,
-            path: invocation.request.path,
-            status: invocation.status,
-            errorMessage,
-            // Alert! The following properties are required by Bentley DevOps standards. Do not change their names!
-            ActivityId: invocation.request.id,
-            MachineName: this.getHostname(),
-            ...pathIds,
-        }));
-    }
-}
-exports.WebAppRpcLoggingBackend = WebAppRpcLoggingBackend;
+"use strict";
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module RpcInterface
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebAppRpcLoggingBackend = void 0;
+const core_bentley_1 = require("@itwin/core-bentley");
+const core_common_1 = require("@itwin/core-common");
+const os = require("os");
+/* eslint-disable deprecation/deprecation */
+class WebAppRpcLoggingBackend extends core_common_1.WebAppRpcLogging {
+    async logProtocolEvent(event, object) {
+        switch (event) {
+            case core_common_1.RpcProtocolEvent.RequestReceived: return this.logRequest(core_common_1.CommonLoggerCategory.RpcInterfaceBackend, "RpcInterface.backend.request", object.request);
+            case core_common_1.RpcProtocolEvent.BackendErrorOccurred: return this.logErrorBackend("RpcInterface.backend.error", object);
+            case core_common_1.RpcProtocolEvent.BackendResponseCreated: return this.logResponse(core_common_1.CommonLoggerCategory.RpcInterfaceBackend, "RpcInterface.backend.response", object.request, object.status, object.elapsed);
+        }
+    }
+    getHostname() {
+        return os.hostname();
+    }
+    async logErrorBackend(message, invocation) {
+        const operationDescriptor = this.buildOperationDescriptor(invocation.operation);
+        const pathIds = this.findPathIds(invocation.request.path);
+        const result = await invocation.result;
+        const errorMessage = result.message ? result.message : result.objects; // Can be an error or an RpcSerializedValue
+        core_bentley_1.Logger.logInfo(core_common_1.CommonLoggerCategory.RpcInterfaceBackend, `${message}.${operationDescriptor}`, () => ({
+            method: invocation.request.method,
+            path: invocation.request.path,
+            status: invocation.status,
+            errorMessage,
+            // Alert! The following properties are required by Bentley DevOps standards. Do not change their names!
+            ActivityId: invocation.request.id,
+            MachineName: this.getHostname(),
+            ...pathIds,
+        }));
+    }
+}
+exports.WebAppRpcLoggingBackend = WebAppRpcLoggingBackend;
 //# sourceMappingURL=logging.js.map