@itwin/core-i18n 4.2.0-dev.24 → 4.2.0-dev.26

package/lib/cjs/test/webpack/bundled-tests.js

@@ -21535,18 +21535,38 @@ class Tracing {
     static enableOpenTelemetry(tracer, api) {
         Tracing._tracer = tracer;
         Tracing._openTelemetry = api;
-        _Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logTrace = Tracing.withOpenTelemetry(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logTrace.bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger)).bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger);
-        _Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logInfo = Tracing.withOpenTelemetry(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logInfo.bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger)).bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger);
-        _Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logWarning = Tracing.withOpenTelemetry(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logWarning.bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger)).bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger);
-        _Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logError = Tracing.withOpenTelemetry(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logError.bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger)).bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger);
+        _Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logTrace = Tracing.withOpenTelemetry(_Logger__WEBPACK_IMPORTED_MODULE_0__.LogLevel.Trace, _Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logTrace.bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger)).bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger);
+        _Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logInfo = Tracing.withOpenTelemetry(_Logger__WEBPACK_IMPORTED_MODULE_0__.LogLevel.Info, _Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logInfo.bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger)).bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger);
+        _Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logWarning = Tracing.withOpenTelemetry(_Logger__WEBPACK_IMPORTED_MODULE_0__.LogLevel.Warning, _Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logWarning.bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger)).bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger);
+        _Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logError = Tracing.withOpenTelemetry(_Logger__WEBPACK_IMPORTED_MODULE_0__.LogLevel.Error, _Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.logError.bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger)).bind(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger);
     }
-    static withOpenTelemetry(base, isError = false) {
+    static withOpenTelemetry(level, base, isError = false) {
         return (category, message, metaData) => {
-            try {
-                Tracing._openTelemetry?.trace.getSpan(Tracing._openTelemetry.context.active())?.addEvent(message, { ...flattenObject(_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.getMetaData(metaData)), error: isError });
+            const oTelContext = Tracing._openTelemetry?.context.active();
+            if (Tracing._openTelemetry === undefined || oTelContext === undefined)
+                return base(category, message, metaData);
+            const serializedMetadata = _Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.getMetaData(metaData);
+            if (_Logger__WEBPACK_IMPORTED_MODULE_0__.Logger.isEnabled(category, level)) {
+                try {
+                    Tracing._openTelemetry?.trace
+                        .getSpan(Tracing._openTelemetry.context.active())
+                        ?.addEvent(message, {
+                        ...flattenObject(serializedMetadata),
+                        error: isError,
+                        loggerCategory: category,
+                    });
+                }
+                catch (_e) { } // avoid throwing random errors (with stack trace mangled by async hooks) when openTelemetry collector doesn't work
+                const spanContext = Tracing._openTelemetry.trace.getSpan(oTelContext)?.spanContext();
+                base(category, message, {
+                    ...serializedMetadata,
+                    /* eslint-disable @typescript-eslint/naming-convention */
+                    trace_id: spanContext?.traceId,
+                    span_id: spanContext?.spanId,
+                    trace_flags: spanContext?.traceFlags,
+                    /* eslint-enable @typescript-eslint/naming-convention */
+                });
             }
-            catch (_e) { } // avoid throwing random errors (with stack trace mangled by async hooks) when openTelemetry collector doesn't work
-            base(category, message, metaData);
         };
     }
     /** Set attributes on currently active openTelemetry span. Doesn't do anything if openTelemetry logging is not initialized.