@azure/monitor-opentelemetry 1.19.0 → 1.20.1

package/README.md

@@ -40,6 +40,7 @@ useAzureMonitor(options);
 ```
 
 - Connection String can be set via `APPLICATIONINSIGHTS_CONNECTION_STRING`.
+- Batch span processing can be configured with the standard OpenTelemetry environment variables `OTEL_BSP_MAX_QUEUE_SIZE`, `OTEL_BSP_MAX_EXPORT_BATCH_SIZE`, `OTEL_BSP_SCHEDULE_DELAY`, and `OTEL_BSP_EXPORT_TIMEOUT`.
 - Sampler can be set via the OpenTelemetry env vars `OTEL_TRACES_SAMPLER` and `OTEL_TRACES_SAMPLER_ARG` (takes precedence over the `samplingRatio` option). Supported sampler values: `microsoft.rate_limited`, `microsoft.fixed_percentage`, `always_on`, `always_off`, `trace_id_ratio`, `parentbased_always_on`, `parentbased_always_off`, `parentbased_trace_id_ratio`. For `microsoft.rate_limited`, the arg is spans per second; for `trace_id_ratio`/parentbased, the arg is a probability in [0,1]. When the arg is omitted, defaults apply (rate limit disabled; probability defaults to 1). See the upstream OpenTelemetry environment variable spec for full context: https://opentelemetry.io/docs/specs/otel/configuration/sdk-environment-variables/.
 - To use the **fixed percentage sampler** (instead of the default rate-limited sampler), you can either:
   - Set the environment variable `OTEL_TRACES_SAMPLER=microsoft.fixed_percentage` with an optional `OTEL_TRACES_SAMPLER_ARG` for the sampling probability (e.g., `0.5` for 50%).
@@ -86,6 +87,7 @@ For CommonJS applications, no additional flags are needed - the loader is automa
 ```ts snippet:ReadmeSampleConfiguration
 import { resourceFromAttributes } from "@opentelemetry/resources";
 import { AzureMonitorOpenTelemetryOptions, useAzureMonitor } from "@azure/monitor-opentelemetry";
+import { SeverityNumber } from "@opentelemetry/api-logs";
 
 const resource = resourceFromAttributes({ testAttribute: "testValue" });
 const options: AzureMonitorOpenTelemetryOptions = {
@@ -111,8 +113,10 @@ const options: AzureMonitorOpenTelemetryOptions = {
     // Instrumentations generating logs
     bunyan: { enabled: true },
     winston: { enabled: true },
-    // Console log collection is opt-in (disabled by default)
-    console: { enabled: false },
+    // Console log collection is opt-in (disabled by default).
+    // `logSeverity` takes precedence over the
+    // APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL environment variable.
+    console: { enabled: false, logSeverity: SeverityNumber.WARN },
   },
   enableLiveMetrics: true,
   enableStandardMetrics: true,
@@ -278,7 +282,7 @@ The following OpenTelemetry Instrumentation libraries are included as part of Az
 
 - [Console](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-console) (disabled by default; enable with `instrumentationOptions: { console: { enabled: true } }`)
 
-  Once enabled, the set of `console` methods collected is filtered by the `APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL` environment variable (`NONE`, `ERROR`, `WARN`, `INFO`, `DEBUG`, `VERBOSE`, `ALL`; see [Self-diagnostics](#self-diagnostics)). For example, `WARN` collects only `console.warn` and `console.error`, while `NONE` disables collection of `console` (and all other) logs entirely.
+  Once enabled, the set of `console` methods collected is filtered by the `logSeverity` value on the `console` instrumentation options, falling back to the `APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL` environment variable (`NONE`, `ERROR`, `WARN`, `INFO`, `DEBUG`, `VERBOSE`, `ALL`; see [Self-diagnostics](#self-diagnostics)) when `logSeverity` is not set. For example, `WARN` collects only `console.warn` and `console.error`, while `NONE` disables collection of `console` (and all other) logs entirely.
 
 Other OpenTelemetry Instrumentations are available [here](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages) and could be added using TracerProvider in AzureMonitorOpenTelemetryClient.
 

package/dist/commonjs/browserSdkLoader/browserSdkLoaderHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browserSdkLoaderHelper.d.ts","sourceRoot":"","sources":["../../../src/browserSdkLoader/browserSdkLoaderHelper.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,oBAAY,qBAAqB;IAC/B,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,EAAE,OAAO;CACV;AAGD,eAAO,MAAM,mBAAmB,UAS/B,CAAC;AAGF,eAAO,MAAM,iBAAiB,QAAO,OAGpC,CAAC;AAEF,eAAO,MAAM,SAAS,gCAAuB,CAAC;AAC9C,eAAO,MAAM,WAAW,kCAAyB,CAAC;AAClD,eAAO,MAAM,YAAY,mCAA0B,CAAC;AACpD,eAAO,MAAM,YAAY,mCAA0B,CAAC;AAGpD,eAAO,MAAM,sBAAsB,GAAI,YAAY,GAAG,KAAG,QAAQ,GAAG,IAMnE,CAAC;AAGF,eAAO,MAAM,qBAAqB,GAAI,YAAY,GAAG,KAAG,QAAQ,GAAG,IAOlE,CAAC;AAGF,eAAO,MAAM,wBAAwB,GAAI,YAAY,GAAG,KAAG,QAAQ,GAAG,IAMrE,CAAC;AAGF,eAAO,MAAM,uBAAuB,GAAI,YAAY,GAAG,KAAG,QAAQ,GAAG,IAOpE,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,GAAG,IAStE,CAAC;AAEF,eAAO,MAAM,sBAAsB,GAAI,QAAQ,MAAM,KAAG,MAAM,GAAG,IAShE,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,gBAAgB,MAAM,KACrB,qBAAqB,GAAG,IAe1B,CAAC;AAIF,eAAO,MAAM,6BAA6B,GACxC,UAAU,IAAI,CAAC,cAAc,KAC5B,qBAAqB,EAAE,GAAG,IAW5B,CAAC;AAEF,eAAO,MAAM,6BAA6B,GACxC,OAAO,MAAM,EACb,MAAM,MAAM,EACZ,SAAS,MAAM,KACd,MAAM,GAAG,IAOX,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,UAAU,IAAI,CAAC,cAAc,KAAG,OAWvE,CAAC"}
+{"version":3,"file":"browserSdkLoaderHelper.d.ts","sourceRoot":"","sources":["../../../src/browserSdkLoader/browserSdkLoaderHelper.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,oBAAY,qBAAqB;IAC/B,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,EAAE,OAAO;CACV;AAGD,eAAO,MAAM,mBAAmB,UAS/B,CAAC;AAGF,eAAO,MAAM,iBAAiB,QAAO,OAGpC,CAAC;AAEF,eAAO,MAAM,SAAS,gCAAuB,CAAC;AAC9C,eAAO,MAAM,WAAW,kCAAyB,CAAC;AAClD,eAAO,MAAM,YAAY,mCAA0B,CAAC;AACpD,eAAO,MAAM,YAAY,mCAA0B,CAAC;AAGpD,eAAO,MAAM,sBAAsB,GAAI,YAAY,GAAG,KAAG,QAAQ,GAAG,IAMnE,CAAC;AAGF,eAAO,MAAM,qBAAqB,GAAI,YAAY,GAAG,KAAG,QAAQ,GAAG,IAOlE,CAAC;AAGF,eAAO,MAAM,wBAAwB,GAAI,YAAY,GAAG,KAAG,QAAQ,GAAG,IAMrE,CAAC;AAGF,eAAO,MAAM,uBAAuB,GAAI,YAAY,GAAG,KAAG,QAAQ,GAAG,IAOpE,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,GAAG,IAStE,CAAC;AAEF,eAAO,MAAM,sBAAsB,GAAI,QAAQ,MAAM,KAAG,MAAM,GAAG,IAShE,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,gBAAgB,MAAM,KACrB,qBAAqB,GAAG,IAe1B,CAAC;AAIF,eAAO,MAAM,6BAA6B,GACxC,UAAU,IAAI,CAAC,cAAc,KAC5B,qBAAqB,EAAE,GAAG,IAW5B,CAAC;AAEF,eAAO,MAAM,6BAA6B,GACxC,OAAO,MAAM,EACb,MAAM,MAAM,EACZ,SAAS,MAAM,KACd,MAAM,GAAG,IAMX,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,UAAU,IAAI,CAAC,cAAc,KAAG,OAWvE,CAAC"}

package/dist/commonjs/browserSdkLoader/browserSdkLoaderHelper.js

@@ -130,10 +130,9 @@ exports.getContentEncodingFromHeaders = getContentEncodingFromHeaders;
 const insertBrowserSdkLoaderByIndex = (index, html, snippet) => {
     if (index < 0)
         return null;
-    let newHtml = null;
     const subStart = html.substring(0, index);
     const subEnd = html.substring(index);
-    newHtml = subStart + '<script type="text/javascript">' + snippet + "</script>" + subEnd;
+    const newHtml = subStart + '<script type="text/javascript">' + snippet + "</script>" + subEnd;
     return newHtml;
 };
 exports.insertBrowserSdkLoaderByIndex = insertBrowserSdkLoaderByIndex;

package/dist/commonjs/browserSdkLoader/browserSdkLoaderHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"browserSdkLoaderHelper.js","sourceRoot":"","sources":["../../../src/browserSdkLoader/browserSdkLoaderHelper.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\n/* eslint-disable @typescript-eslint/explicit-module-boundary-types */\n\nimport * as zlib from \"zlib\";\nimport { promisify } from \"node:util\";\nimport type http from \"node:http\";\n\n// currently support the following encoding types\nexport enum contentEncodingMethod {\n  GZIP = \"gzip\",\n  DEFLATE = \"deflate\",\n  BR = \"br\",\n}\n\n// current supported encoding types\nexport const bufferEncodingTypes = [\n  \"utf8\",\n  \"utf16le\",\n  \"latin1\",\n  \"base64\",\n  \"hex\",\n  \"ascii\",\n  \"binary\",\n  \"ucs2\",\n];\n\n// for node version under 10, Brotli compression is not supported.\nexport const isBrotliSupported = (): boolean => {\n  const majVer = process.versions.node.split(\".\")[0];\n  return parseInt(majVer) >= 10;\n};\n\nexport const gzipAsync = promisify(zlib.gzip);\nexport const gunzipAsync = promisify(zlib.gunzip);\nexport const deflateAsync = promisify(zlib.deflate);\nexport const inflateAsync = promisify(zlib.inflate);\n\n// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type\nexport const getBrotliCompressAsync = (zlibObject: any): Function | null => {\n  const isMajorVer = isBrotliSupported();\n  if (isMajorVer && typeof zlibObject.brotliCompress === \"function\") {\n    return promisify(zlibObject.brotliCompress);\n  }\n  return null;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type\nexport const getBrotliCompressSync = (zlibObject: any): Function | null => {\n  const isMajorVer = isBrotliSupported();\n  if (isMajorVer && typeof zlibObject.brotliCompressSync === \"function\") {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n    return zlibObject.brotliCompressSync;\n  }\n  return null;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type\nexport const getBrotliDecompressAsync = (zlibObject: any): Function | null => {\n  const isMajorVer = isBrotliSupported();\n  if (isMajorVer && typeof zlibObject.brotliDecompress === \"function\") {\n    return promisify(zlibObject.brotliDecompress);\n  }\n  return null;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type\nexport const getBrotliDecompressSync = (zlibObject: any): Function | null => {\n  const isMajorVer = isBrotliSupported();\n  if (isMajorVer && typeof zlibObject.brotliDecompressSync === \"function\") {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n    return zlibObject.brotliDecompressSync;\n  }\n  return null;\n};\n\nexport const isBufferType = (buffer: Buffer, type?: string): boolean | null => {\n  const encodingType = type ? type : \"utf8\";\n  let result = false;\n  if (Buffer.isEncoding(encodingType)) {\n    const newBuffer = Buffer.from(buffer.toString(encodingType), encodingType);\n    result = newBuffer.toJSON().data.toString() === buffer.toJSON().data.toString();\n  }\n\n  return result;\n};\n\nexport const findBufferEncodingType = (buffer: Buffer): string | null => {\n  let bufferType = null;\n  for (const type of bufferEncodingTypes) {\n    if (Buffer.isEncoding(type) && isBufferType(buffer, type)) {\n      bufferType = type;\n      break;\n    }\n  }\n  return bufferType;\n};\n\nexport const isSupportedContentEncoding = (\n  encodingMethod: string,\n): contentEncodingMethod | null => {\n  let encodingType = null;\n  switch (encodingMethod) {\n    case \"gzip\":\n      encodingType = contentEncodingMethod.GZIP;\n      break;\n    case \"br\":\n      encodingType = contentEncodingMethod.BR;\n      break;\n    case \"deflate\":\n      encodingType = contentEncodingMethod.DEFLATE;\n      break;\n    default:\n  }\n  return encodingType;\n};\n\n// mutiple content-encoding is not supported\n// for mutiple content-encoding, this method will return any empty array\nexport const getContentEncodingFromHeaders = (\n  response: http.ServerResponse,\n): contentEncodingMethod[] | null => {\n  const headers: contentEncodingMethod[] = [];\n  const contentEncodingHeaders = response.getHeader(\"Content-Encoding\");\n  if (!contentEncodingHeaders) return null;\n  if (typeof contentEncodingHeaders === \"string\") {\n    const supportedContentEncoding = isSupportedContentEncoding(contentEncodingHeaders);\n    if (supportedContentEncoding) {\n      headers.push(supportedContentEncoding);\n    }\n  }\n  return headers;\n};\n\nexport const insertBrowserSdkLoaderByIndex = (\n  index: number,\n  html: string,\n  snippet: string,\n): string | null => {\n  if (index < 0) return null;\n  let newHtml = null;\n  const subStart = html.substring(0, index);\n  const subEnd = html.substring(index);\n  newHtml = subStart + '<script type=\"text/javascript\">' + snippet + \"</script>\" + subEnd;\n  return newHtml;\n};\n\nexport const isContentTypeHeaderHtml = (response: http.ServerResponse): boolean => {\n  let isHtml = false;\n  const contentType = response.getHeader(\"Content-Type\");\n  if (contentType) {\n    if (typeof contentType === \"string\") {\n      isHtml = contentType.indexOf(\"html\") >= 0;\n    } else {\n      isHtml = contentType.toString().indexOf(\"html\") >= 0;\n    }\n  }\n  return isHtml;\n};\n"]}
+{"version":3,"file":"browserSdkLoaderHelper.js","sourceRoot":"","sources":["../../../src/browserSdkLoader/browserSdkLoaderHelper.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\n/* eslint-disable @typescript-eslint/explicit-module-boundary-types */\n\nimport * as zlib from \"zlib\";\nimport { promisify } from \"node:util\";\nimport type http from \"node:http\";\n\n// currently support the following encoding types\nexport enum contentEncodingMethod {\n  GZIP = \"gzip\",\n  DEFLATE = \"deflate\",\n  BR = \"br\",\n}\n\n// current supported encoding types\nexport const bufferEncodingTypes = [\n  \"utf8\",\n  \"utf16le\",\n  \"latin1\",\n  \"base64\",\n  \"hex\",\n  \"ascii\",\n  \"binary\",\n  \"ucs2\",\n];\n\n// for node version under 10, Brotli compression is not supported.\nexport const isBrotliSupported = (): boolean => {\n  const majVer = process.versions.node.split(\".\")[0];\n  return parseInt(majVer) >= 10;\n};\n\nexport const gzipAsync = promisify(zlib.gzip);\nexport const gunzipAsync = promisify(zlib.gunzip);\nexport const deflateAsync = promisify(zlib.deflate);\nexport const inflateAsync = promisify(zlib.inflate);\n\n// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type\nexport const getBrotliCompressAsync = (zlibObject: any): Function | null => {\n  const isMajorVer = isBrotliSupported();\n  if (isMajorVer && typeof zlibObject.brotliCompress === \"function\") {\n    return promisify(zlibObject.brotliCompress);\n  }\n  return null;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type\nexport const getBrotliCompressSync = (zlibObject: any): Function | null => {\n  const isMajorVer = isBrotliSupported();\n  if (isMajorVer && typeof zlibObject.brotliCompressSync === \"function\") {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n    return zlibObject.brotliCompressSync;\n  }\n  return null;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type\nexport const getBrotliDecompressAsync = (zlibObject: any): Function | null => {\n  const isMajorVer = isBrotliSupported();\n  if (isMajorVer && typeof zlibObject.brotliDecompress === \"function\") {\n    return promisify(zlibObject.brotliDecompress);\n  }\n  return null;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type\nexport const getBrotliDecompressSync = (zlibObject: any): Function | null => {\n  const isMajorVer = isBrotliSupported();\n  if (isMajorVer && typeof zlibObject.brotliDecompressSync === \"function\") {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n    return zlibObject.brotliDecompressSync;\n  }\n  return null;\n};\n\nexport const isBufferType = (buffer: Buffer, type?: string): boolean | null => {\n  const encodingType = type ? type : \"utf8\";\n  let result = false;\n  if (Buffer.isEncoding(encodingType)) {\n    const newBuffer = Buffer.from(buffer.toString(encodingType), encodingType);\n    result = newBuffer.toJSON().data.toString() === buffer.toJSON().data.toString();\n  }\n\n  return result;\n};\n\nexport const findBufferEncodingType = (buffer: Buffer): string | null => {\n  let bufferType = null;\n  for (const type of bufferEncodingTypes) {\n    if (Buffer.isEncoding(type) && isBufferType(buffer, type)) {\n      bufferType = type;\n      break;\n    }\n  }\n  return bufferType;\n};\n\nexport const isSupportedContentEncoding = (\n  encodingMethod: string,\n): contentEncodingMethod | null => {\n  let encodingType = null;\n  switch (encodingMethod) {\n    case \"gzip\":\n      encodingType = contentEncodingMethod.GZIP;\n      break;\n    case \"br\":\n      encodingType = contentEncodingMethod.BR;\n      break;\n    case \"deflate\":\n      encodingType = contentEncodingMethod.DEFLATE;\n      break;\n    default:\n  }\n  return encodingType;\n};\n\n// mutiple content-encoding is not supported\n// for mutiple content-encoding, this method will return any empty array\nexport const getContentEncodingFromHeaders = (\n  response: http.ServerResponse,\n): contentEncodingMethod[] | null => {\n  const headers: contentEncodingMethod[] = [];\n  const contentEncodingHeaders = response.getHeader(\"Content-Encoding\");\n  if (!contentEncodingHeaders) return null;\n  if (typeof contentEncodingHeaders === \"string\") {\n    const supportedContentEncoding = isSupportedContentEncoding(contentEncodingHeaders);\n    if (supportedContentEncoding) {\n      headers.push(supportedContentEncoding);\n    }\n  }\n  return headers;\n};\n\nexport const insertBrowserSdkLoaderByIndex = (\n  index: number,\n  html: string,\n  snippet: string,\n): string | null => {\n  if (index < 0) return null;\n  const subStart = html.substring(0, index);\n  const subEnd = html.substring(index);\n  const newHtml = subStart + '<script type=\"text/javascript\">' + snippet + \"</script>\" + subEnd;\n  return newHtml;\n};\n\nexport const isContentTypeHeaderHtml = (response: http.ServerResponse): boolean => {\n  let isHtml = false;\n  const contentType = response.getHeader(\"Content-Type\");\n  if (contentType) {\n    if (typeof contentType === \"string\") {\n      isHtml = contentType.indexOf(\"html\") >= 0;\n    } else {\n      isHtml = contentType.toString().indexOf(\"html\") >= 0;\n    }\n  }\n  return isHtml;\n};\n"]}

package/dist/commonjs/index.d.ts

@@ -1,6 +1,6 @@
 import { NodeSDK } from "@opentelemetry/sdk-node";
-import type { AzureMonitorOpenTelemetryOptions, InstrumentationOptions, BrowserSdkLoaderOptions } from "./types.js";
-export type { AzureMonitorOpenTelemetryOptions, InstrumentationOptions, BrowserSdkLoaderOptions };
+import type { AzureMonitorOpenTelemetryOptions, InstrumentationOptions, ConsoleInstrumentationOptions, BrowserSdkLoaderOptions } from "./types.js";
+export type { AzureMonitorOpenTelemetryOptions, InstrumentationOptions, ConsoleInstrumentationOptions, BrowserSdkLoaderOptions, };
 /**
  * Initialize Azure Monitor Distro
  * @param options - Azure Monitor OpenTelemetry Options

package/dist/commonjs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAMlD,OAAO,KAAK,EAGV,gCAAgC,EAChC,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,YAAY,CAAC;AAwBpB,YAAY,EAAE,gCAAgC,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,CAAC;AA4BlG;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,gCAAgC,GAAG,IAAI,CA0GhF;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAMpD;AAED;;;GAGG;AAEH,wBAAgB,eAAe,IAAI,OAAO,GAAG,SAAS,CAErD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAMlD,OAAO,KAAK,EAGV,gCAAgC,EAChC,sBAAsB,EACtB,6BAA6B,EAC7B,uBAAuB,EACxB,MAAM,YAAY,CAAC;AAgBpB,YAAY,EACV,gCAAgC,EAChC,sBAAsB,EACtB,6BAA6B,EAC7B,uBAAuB,GACxB,CAAC;AAoCF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,gCAAgC,GAAG,IAAI,CA6FhF;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAIpD;AAED;;;GAGG;AAEH,wBAAgB,eAAe,IAAI,OAAO,GAAG,SAAS,CAErD"}

package/dist/commonjs/index.js

@@ -17,22 +17,22 @@ const browserSdkLoader_js_1 = require("./browserSdkLoader/browserSdkLoader.js");
 const utils_js_1 = require("./metrics/quickpulse/utils.js");
 const statsbeat_js_1 = require("./utils/statsbeat.js");
 const opentelemetryInstrumentationPatcher_js_1 = require("./utils/opentelemetryInstrumentationPatcher.js");
-const azureSdkTracingBridge_js_1 = require("./utils/azureSdkTracingBridge.js");
 const common_js_1 = require("./utils/common.js");
 const logUtils_js_1 = require("./utils/logUtils.js");
 const index_js_3 = require("./shared/logging/index.js");
 const types_js_2 = require("./types.js");
-const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
-/**
- * Semantic attribute for cloud resource ID, defined by \@opentelemetry/resource-detector-azure
- * @internal
- */
-const CLOUD_RESOURCE_ID_ATTRIBUTE = "cloud.resource_id";
 process.env["AZURE_MONITOR_DISTRO_VERSION"] = types_js_1.AZURE_MONITOR_OPENTELEMETRY_VERSION;
 let sdk;
 let browserSdkLoader;
-// Track the global console patch because NodeSDK does not disable instrumentations.
-let consoleInstrumentation;
+// NodeSDK shuts down providers, but leaves instrumentation hooks enabled.
+let instrumentations = [];
+const instrumentationCache = new Map();
+function disableInstrumentations() {
+    for (const instrumentation of instrumentations) {
+        instrumentation.disable();
+    }
+    instrumentations = [];
+}
 /**
  * Check if auto-attach (autoinstrumentation) is enabled and warn about double instrumentation.
  */
@@ -56,6 +56,7 @@ function sendAttachWarning() {
  */
 function useAzureMonitor(options) {
     const config = new config_js_1.InternalConfig(options);
+    disableInstrumentations();
     (0, opentelemetryInstrumentationPatcher_js_1.patchOpenTelemetryInstrumentationEnable)();
     // Omit disabled log instrumentations from Statsbeat.
     const logInstrumentationsEnabled = !(0, logUtils_js_1.isLogCollectionDisabled)();
@@ -70,18 +71,15 @@ function useAzureMonitor(options) {
         winston: logInstrumentationsEnabled && config.instrumentationOptions?.winston?.enabled,
         console: logInstrumentationsEnabled && config.instrumentationOptions?.console?.enabled,
     };
-    // Check if the AKS resource detector successfully populated specific resource attributes
-    // (k8s.cluster.name or cloud.resource_id) beyond the basic cloud.platform/cloud.provider
-    // Derive from config.resource.attributes which already includes the AKS detector results
-    const resourceAttributes = config.resource.attributes;
-    const aksResourceDetected = semantic_conventions_1.SEMRESATTRS_K8S_CLUSTER_NAME in resourceAttributes ||
-        CLOUD_RESOURCE_ID_ATTRIBUTE in resourceAttributes;
+    // Only report this feature when the AKS resource detector itself was able to populate the AKS
+    // cluster attributes, which requires the customer to have configured access to the
+    // aks-cluster-metadata ConfigMap (RBAC + env var or mounted file).
     const statsbeatFeatures = {
         browserSdkLoader: config.browserSdkLoaderOptions.enabled,
         aadHandling: !!config.azureMonitorExporterOptions?.credential,
         diskRetry: !config.azureMonitorExporterOptions?.disableOfflineStorage,
         customerSdkStats: process.env[types_js_1.APPLICATIONINSIGHTS_SDKSTATS_DISABLED]?.toLowerCase() === "true",
-        aksResourceDetectorPopulation: aksResourceDetected,
+        aksResourceDetectorPopulation: config.aksResourceDetectorPopulated,
     };
     (0, statsbeat_js_1.getInstance)().setStatsbeatFeatures(statsbeatInstrumentations, statsbeatFeatures);
     if (config.browserSdkLoaderOptions.enabled) {
@@ -91,9 +89,6 @@ function useAzureMonitor(options) {
     api_1.metrics.disable();
     api_1.trace.disable();
     api_logs_1.logs.disable();
-    // Restore any console patch from the previous initialization.
-    consoleInstrumentation?.disable();
-    consoleInstrumentation = undefined;
     // Clear the entire OpenTelemetry API global state to avoid version conflicts.
     // The disable() calls above remove individual providers but leave the `version` field
     // on the global object intact. If a different version of @opentelemetry/api was loaded
@@ -105,12 +100,9 @@ function useAzureMonitor(options) {
     Reflect.deleteProperty(globalThis, globalOpentelemetryApiKey);
     // Create internal handlers
     const metricHandler = new index_js_1.MetricHandler(config);
-    const traceHandler = new handler_js_1.TraceHandler(config, metricHandler);
-    const logHandler = new index_js_2.LogHandler(config, metricHandler);
-    const instrumentations = traceHandler
-        .getInstrumentations()
-        .concat(logHandler.getInstrumentations());
-    consoleInstrumentation = logHandler.getConsoleInstrumentation();
+    const traceHandler = new handler_js_1.TraceHandler(config, metricHandler, instrumentationCache);
+    const logHandler = new index_js_2.LogHandler(config, metricHandler, instrumentationCache);
+    instrumentations = traceHandler.getInstrumentations().concat(logHandler.getInstrumentations());
     const resourceDetectorsList = (0, common_js_1.parseResourceDetectorsFromEnvVar)();
     // Add extra SpanProcessors, and logRecordProcessors from user configuration
     const spanProcessors = options?.spanProcessors || [];
@@ -146,9 +138,6 @@ function useAzureMonitor(options) {
     (0, utils_js_1.setSdkPrefix)();
     sendAttachWarning();
     sdk.start();
-    // Eagerly install the Azure SDK tracing bridge in case @azure/core-tracing
-    // was loaded before useAzureMonitor() (the RITM hook misses it otherwise).
-    (0, azureSdkTracingBridge_js_1.ensureAzureSdkTracingBridge)();
 }
 /**
  * Shutdown Azure Monitor Open Telemetry Distro
@@ -156,9 +145,7 @@ function useAzureMonitor(options) {
  */
 function shutdownAzureMonitor() {
     browserSdkLoader?.dispose();
-    // NodeSDK.shutdown() does not restore the global console.
-    consoleInstrumentation?.disable();
-    consoleInstrumentation = undefined;
+    disableInstrumentations();
     return sdk?.shutdown();
 }
 /**

package/dist/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport { metrics, trace } from \"@opentelemetry/api\";\nimport { logs } from \"@opentelemetry/api-logs\";\nimport type { Instrumentation } from \"@opentelemetry/instrumentation\";\nimport type { NodeSDKConfiguration } from \"@opentelemetry/sdk-node\";\nimport { NodeSDK } from \"@opentelemetry/sdk-node\";\nimport type { MetricReader, ViewOptions } from \"@opentelemetry/sdk-metrics\";\nimport { InternalConfig } from \"./shared/config.js\";\nimport { MetricHandler } from \"./metrics/index.js\";\nimport { TraceHandler } from \"./traces/handler.js\";\nimport { LogHandler } from \"./logs/index.js\";\nimport type {\n  StatsbeatFeatures,\n  StatsbeatInstrumentations,\n  AzureMonitorOpenTelemetryOptions,\n  InstrumentationOptions,\n  BrowserSdkLoaderOptions,\n} from \"./types.js\";\nimport {\n  AZURE_MONITOR_OPENTELEMETRY_VERSION,\n  APPLICATIONINSIGHTS_SDKSTATS_DISABLED,\n} from \"./types.js\";\nimport { BrowserSdkLoader } from \"./browserSdkLoader/browserSdkLoader.js\";\nimport { setSdkPrefix } from \"./metrics/quickpulse/utils.js\";\nimport type { SpanProcessor } from \"@opentelemetry/sdk-trace-base\";\nimport type { LogRecordProcessor } from \"@opentelemetry/sdk-logs\";\nimport { getInstance } from \"./utils/statsbeat.js\";\nimport { patchOpenTelemetryInstrumentationEnable } from \"./utils/opentelemetryInstrumentationPatcher.js\";\nimport { ensureAzureSdkTracingBridge } from \"./utils/azureSdkTracingBridge.js\";\nimport { isFunctionApp, parseResourceDetectorsFromEnvVar } from \"./utils/common.js\";\nimport { isLogCollectionDisabled } from \"./utils/logUtils.js\";\nimport { Logger } from \"./shared/logging/index.js\";\nimport { AZURE_MONITOR_AUTO_ATTACH } from \"./types.js\";\nimport { SEMRESATTRS_K8S_CLUSTER_NAME } from \"@opentelemetry/semantic-conventions\";\n\n/**\n * Semantic attribute for cloud resource ID, defined by \\@opentelemetry/resource-detector-azure\n * @internal\n */\nconst CLOUD_RESOURCE_ID_ATTRIBUTE = \"cloud.resource_id\";\n\nexport type { AzureMonitorOpenTelemetryOptions, InstrumentationOptions, BrowserSdkLoaderOptions };\n\nprocess.env[\"AZURE_MONITOR_DISTRO_VERSION\"] = AZURE_MONITOR_OPENTELEMETRY_VERSION;\n\nlet sdk: NodeSDK;\nlet browserSdkLoader: BrowserSdkLoader | undefined;\n// Track the global console patch because NodeSDK does not disable instrumentations.\nlet consoleInstrumentation: Instrumentation | undefined;\n\n/**\n * Check if auto-attach (autoinstrumentation) is enabled and warn about double instrumentation.\n */\nfunction sendAttachWarning(): void {\n  if (process.env[AZURE_MONITOR_AUTO_ATTACH] === \"true\" && !isFunctionApp()) {\n    // TODO: When AKS attach is public, update this message with disablement instructions for AKS\n    const message =\n      \"Distro detected that automatic instrumentation may have occurred. Only use autoinstrumentation if you \" +\n      \"are not using manual instrumentation of OpenTelemetry in your code, such as with \" +\n      \"@azure/monitor-opentelemetry or @azure/monitor-opentelemetry-exporter. For App Service resources, disable \" +\n      \"autoinstrumentation in the Application Insights experience on your App Service resource or by setting \" +\n      \"the ApplicationInsightsAgent_EXTENSION_VERSION app setting to 'disabled'.\";\n    // Surface in the log stream\n    console.warn(message);\n    // Also log via diagnostic logging\n    Logger.getInstance().warn(message);\n  }\n}\n\n/**\n * Initialize Azure Monitor Distro\n * @param options - Azure Monitor OpenTelemetry Options\n */\nexport function useAzureMonitor(options?: AzureMonitorOpenTelemetryOptions): void {\n  const config = new InternalConfig(options);\n  patchOpenTelemetryInstrumentationEnable();\n  // Omit disabled log instrumentations from Statsbeat.\n  const logInstrumentationsEnabled = !isLogCollectionDisabled();\n  const statsbeatInstrumentations: StatsbeatInstrumentations = {\n    // Instrumentations\n    azureSdk: config.instrumentationOptions?.azureSdk?.enabled,\n    mongoDb: config.instrumentationOptions?.mongoDb?.enabled,\n    mySql: config.instrumentationOptions?.mySql?.enabled,\n    postgreSql: config.instrumentationOptions?.postgreSql?.enabled,\n    redis: config.instrumentationOptions?.redis?.enabled,\n    bunyan: logInstrumentationsEnabled && config.instrumentationOptions?.bunyan?.enabled,\n    winston: logInstrumentationsEnabled && config.instrumentationOptions?.winston?.enabled,\n    console: logInstrumentationsEnabled && config.instrumentationOptions?.console?.enabled,\n  };\n  // Check if the AKS resource detector successfully populated specific resource attributes\n  // (k8s.cluster.name or cloud.resource_id) beyond the basic cloud.platform/cloud.provider\n  // Derive from config.resource.attributes which already includes the AKS detector results\n  const resourceAttributes = config.resource.attributes;\n  const aksResourceDetected =\n    SEMRESATTRS_K8S_CLUSTER_NAME in resourceAttributes ||\n    CLOUD_RESOURCE_ID_ATTRIBUTE in resourceAttributes;\n  const statsbeatFeatures: StatsbeatFeatures = {\n    browserSdkLoader: config.browserSdkLoaderOptions.enabled,\n    aadHandling: !!config.azureMonitorExporterOptions?.credential,\n    diskRetry: !config.azureMonitorExporterOptions?.disableOfflineStorage,\n    customerSdkStats: process.env[APPLICATIONINSIGHTS_SDKSTATS_DISABLED]?.toLowerCase() === \"true\",\n    aksResourceDetectorPopulation: aksResourceDetected,\n  };\n  getInstance().setStatsbeatFeatures(statsbeatInstrumentations, statsbeatFeatures);\n\n  if (config.browserSdkLoaderOptions.enabled) {\n    browserSdkLoader = new BrowserSdkLoader(config);\n  }\n  // Remove global providers in OpenTelemetry, these would be overridden if present\n  metrics.disable();\n  trace.disable();\n  logs.disable();\n  // Restore any console patch from the previous initialization.\n  consoleInstrumentation?.disable();\n  consoleInstrumentation = undefined;\n\n  // Clear the entire OpenTelemetry API global state to avoid version conflicts.\n  // The disable() calls above remove individual providers but leave the `version` field\n  // on the global object intact. If a different version of @opentelemetry/api was loaded\n  // first (e.g. by a VS Code extension host or another extension), the stale version\n  // causes registerGlobal() in sdk.start() to fail with \"All API registration versions\n  // must match\", resulting in Noop providers. Deleting the global object forces\n  // registerGlobal() to create a fresh one with the correct version.\n  const globalOpentelemetryApiKey = Symbol.for(\"opentelemetry.js.api.1\");\n  Reflect.deleteProperty(globalThis, globalOpentelemetryApiKey);\n\n  // Create internal handlers\n  const metricHandler = new MetricHandler(config);\n  const traceHandler = new TraceHandler(config, metricHandler);\n  const logHandler = new LogHandler(config, metricHandler);\n\n  const instrumentations = traceHandler\n    .getInstrumentations()\n    .concat(logHandler.getInstrumentations());\n  consoleInstrumentation = logHandler.getConsoleInstrumentation();\n\n  const resourceDetectorsList = parseResourceDetectorsFromEnvVar();\n\n  // Add extra SpanProcessors, and logRecordProcessors from user configuration\n  const spanProcessors: SpanProcessor[] = options?.spanProcessors || [];\n  const logRecordProcessors: LogRecordProcessor[] = options?.logRecordProcessors || [];\n  const customViews: ViewOptions[] = options?.views || [];\n\n  // Prepare metric readers - always include Azure Monitor\n  const metricReaders: MetricReader[] = [\n    metricHandler.getMetricReader(),\n    ...(options?.metricReaders || []),\n  ];\n\n  const views: ViewOptions[] = metricHandler.getViews().concat(customViews);\n\n  // Initialize OpenTelemetry SDK\n  const sdkConfig: Partial<NodeSDKConfiguration> = {\n    autoDetectResources: true,\n    metricReaders: metricReaders,\n    views,\n    instrumentations: instrumentations,\n    logRecordProcessors: [\n      logHandler.getAzureLogRecordProcessor(),\n      ...logRecordProcessors,\n      logHandler.getBatchLogRecordProcessor(),\n    ],\n    resource: config.resource,\n    sampler: traceHandler.getSampler(),\n    spanProcessors: [\n      traceHandler.getAzureMonitorSpanProcessor(),\n      ...spanProcessors,\n      traceHandler.getBatchSpanProcessor(),\n    ],\n    resourceDetectors: resourceDetectorsList,\n  };\n  sdk = new NodeSDK(sdkConfig);\n  setSdkPrefix();\n  sendAttachWarning();\n  sdk.start();\n\n  // Eagerly install the Azure SDK tracing bridge in case @azure/core-tracing\n  // was loaded before useAzureMonitor() (the RITM hook misses it otherwise).\n  ensureAzureSdkTracingBridge();\n}\n\n/**\n * Shutdown Azure Monitor Open Telemetry Distro\n * @see https://github.com/open-telemetry/opentelemetry-js/blob/0229434cb5a3179f63c021105f36270ae7897929/experimental/packages/opentelemetry-sdk-node/src/sdk.ts#L398\n */\nexport function shutdownAzureMonitor(): Promise<void> {\n  browserSdkLoader?.dispose();\n  // NodeSDK.shutdown() does not restore the global console.\n  consoleInstrumentation?.disable();\n  consoleInstrumentation = undefined;\n  return sdk?.shutdown();\n}\n\n/**\n * Get the internal SDK instance for testing purposes\n * @internal\n */\n// eslint-disable-next-line no-underscore-dangle\nexport function _getSdkInstance(): NodeSDK | undefined {\n  return sdk;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport { metrics, trace } from \"@opentelemetry/api\";\nimport { logs } from \"@opentelemetry/api-logs\";\nimport type { Instrumentation } from \"@opentelemetry/instrumentation\";\nimport type { NodeSDKConfiguration } from \"@opentelemetry/sdk-node\";\nimport { NodeSDK } from \"@opentelemetry/sdk-node\";\nimport type { MetricReader, ViewOptions } from \"@opentelemetry/sdk-metrics\";\nimport { InternalConfig } from \"./shared/config.js\";\nimport { MetricHandler } from \"./metrics/index.js\";\nimport { TraceHandler } from \"./traces/handler.js\";\nimport { LogHandler } from \"./logs/index.js\";\nimport type {\n  StatsbeatFeatures,\n  StatsbeatInstrumentations,\n  AzureMonitorOpenTelemetryOptions,\n  InstrumentationOptions,\n  ConsoleInstrumentationOptions,\n  BrowserSdkLoaderOptions,\n} from \"./types.js\";\nimport {\n  AZURE_MONITOR_OPENTELEMETRY_VERSION,\n  APPLICATIONINSIGHTS_SDKSTATS_DISABLED,\n} from \"./types.js\";\nimport { BrowserSdkLoader } from \"./browserSdkLoader/browserSdkLoader.js\";\nimport { setSdkPrefix } from \"./metrics/quickpulse/utils.js\";\nimport type { SpanProcessor } from \"@opentelemetry/sdk-trace-base\";\nimport type { LogRecordProcessor } from \"@opentelemetry/sdk-logs\";\nimport { getInstance } from \"./utils/statsbeat.js\";\nimport { patchOpenTelemetryInstrumentationEnable } from \"./utils/opentelemetryInstrumentationPatcher.js\";\nimport { isFunctionApp, parseResourceDetectorsFromEnvVar } from \"./utils/common.js\";\nimport { isLogCollectionDisabled } from \"./utils/logUtils.js\";\nimport { Logger } from \"./shared/logging/index.js\";\nimport { AZURE_MONITOR_AUTO_ATTACH } from \"./types.js\";\n\nexport type {\n  AzureMonitorOpenTelemetryOptions,\n  InstrumentationOptions,\n  ConsoleInstrumentationOptions,\n  BrowserSdkLoaderOptions,\n};\n\nprocess.env[\"AZURE_MONITOR_DISTRO_VERSION\"] = AZURE_MONITOR_OPENTELEMETRY_VERSION;\n\nlet sdk: NodeSDK;\nlet browserSdkLoader: BrowserSdkLoader | undefined;\n// NodeSDK shuts down providers, but leaves instrumentation hooks enabled.\nlet instrumentations: Instrumentation[] = [];\nconst instrumentationCache = new Map<string, Instrumentation>();\n\nfunction disableInstrumentations(): void {\n  for (const instrumentation of instrumentations) {\n    instrumentation.disable();\n  }\n  instrumentations = [];\n}\n\n/**\n * Check if auto-attach (autoinstrumentation) is enabled and warn about double instrumentation.\n */\nfunction sendAttachWarning(): void {\n  if (process.env[AZURE_MONITOR_AUTO_ATTACH] === \"true\" && !isFunctionApp()) {\n    // TODO: When AKS attach is public, update this message with disablement instructions for AKS\n    const message =\n      \"Distro detected that automatic instrumentation may have occurred. Only use autoinstrumentation if you \" +\n      \"are not using manual instrumentation of OpenTelemetry in your code, such as with \" +\n      \"@azure/monitor-opentelemetry or @azure/monitor-opentelemetry-exporter. For App Service resources, disable \" +\n      \"autoinstrumentation in the Application Insights experience on your App Service resource or by setting \" +\n      \"the ApplicationInsightsAgent_EXTENSION_VERSION app setting to 'disabled'.\";\n    // Surface in the log stream\n    console.warn(message);\n    // Also log via diagnostic logging\n    Logger.getInstance().warn(message);\n  }\n}\n\n/**\n * Initialize Azure Monitor Distro\n * @param options - Azure Monitor OpenTelemetry Options\n */\nexport function useAzureMonitor(options?: AzureMonitorOpenTelemetryOptions): void {\n  const config = new InternalConfig(options);\n  disableInstrumentations();\n  patchOpenTelemetryInstrumentationEnable();\n  // Omit disabled log instrumentations from Statsbeat.\n  const logInstrumentationsEnabled = !isLogCollectionDisabled();\n  const statsbeatInstrumentations: StatsbeatInstrumentations = {\n    // Instrumentations\n    azureSdk: config.instrumentationOptions?.azureSdk?.enabled,\n    mongoDb: config.instrumentationOptions?.mongoDb?.enabled,\n    mySql: config.instrumentationOptions?.mySql?.enabled,\n    postgreSql: config.instrumentationOptions?.postgreSql?.enabled,\n    redis: config.instrumentationOptions?.redis?.enabled,\n    bunyan: logInstrumentationsEnabled && config.instrumentationOptions?.bunyan?.enabled,\n    winston: logInstrumentationsEnabled && config.instrumentationOptions?.winston?.enabled,\n    console: logInstrumentationsEnabled && config.instrumentationOptions?.console?.enabled,\n  };\n  // Only report this feature when the AKS resource detector itself was able to populate the AKS\n  // cluster attributes, which requires the customer to have configured access to the\n  // aks-cluster-metadata ConfigMap (RBAC + env var or mounted file).\n  const statsbeatFeatures: StatsbeatFeatures = {\n    browserSdkLoader: config.browserSdkLoaderOptions.enabled,\n    aadHandling: !!config.azureMonitorExporterOptions?.credential,\n    diskRetry: !config.azureMonitorExporterOptions?.disableOfflineStorage,\n    customerSdkStats: process.env[APPLICATIONINSIGHTS_SDKSTATS_DISABLED]?.toLowerCase() === \"true\",\n    aksResourceDetectorPopulation: config.aksResourceDetectorPopulated,\n  };\n  getInstance().setStatsbeatFeatures(statsbeatInstrumentations, statsbeatFeatures);\n\n  if (config.browserSdkLoaderOptions.enabled) {\n    browserSdkLoader = new BrowserSdkLoader(config);\n  }\n  // Remove global providers in OpenTelemetry, these would be overridden if present\n  metrics.disable();\n  trace.disable();\n  logs.disable();\n\n  // Clear the entire OpenTelemetry API global state to avoid version conflicts.\n  // The disable() calls above remove individual providers but leave the `version` field\n  // on the global object intact. If a different version of @opentelemetry/api was loaded\n  // first (e.g. by a VS Code extension host or another extension), the stale version\n  // causes registerGlobal() in sdk.start() to fail with \"All API registration versions\n  // must match\", resulting in Noop providers. Deleting the global object forces\n  // registerGlobal() to create a fresh one with the correct version.\n  const globalOpentelemetryApiKey = Symbol.for(\"opentelemetry.js.api.1\");\n  Reflect.deleteProperty(globalThis, globalOpentelemetryApiKey);\n\n  // Create internal handlers\n  const metricHandler = new MetricHandler(config);\n  const traceHandler = new TraceHandler(config, metricHandler, instrumentationCache);\n  const logHandler = new LogHandler(config, metricHandler, instrumentationCache);\n\n  instrumentations = traceHandler.getInstrumentations().concat(logHandler.getInstrumentations());\n\n  const resourceDetectorsList = parseResourceDetectorsFromEnvVar();\n\n  // Add extra SpanProcessors, and logRecordProcessors from user configuration\n  const spanProcessors: SpanProcessor[] = options?.spanProcessors || [];\n  const logRecordProcessors: LogRecordProcessor[] = options?.logRecordProcessors || [];\n  const customViews: ViewOptions[] = options?.views || [];\n\n  // Prepare metric readers - always include Azure Monitor\n  const metricReaders: MetricReader[] = [\n    metricHandler.getMetricReader(),\n    ...(options?.metricReaders || []),\n  ];\n\n  const views: ViewOptions[] = metricHandler.getViews().concat(customViews);\n\n  // Initialize OpenTelemetry SDK\n  const sdkConfig: Partial<NodeSDKConfiguration> = {\n    autoDetectResources: true,\n    metricReaders: metricReaders,\n    views,\n    instrumentations: instrumentations,\n    logRecordProcessors: [\n      logHandler.getAzureLogRecordProcessor(),\n      ...logRecordProcessors,\n      logHandler.getBatchLogRecordProcessor(),\n    ],\n    resource: config.resource,\n    sampler: traceHandler.getSampler(),\n    spanProcessors: [\n      traceHandler.getAzureMonitorSpanProcessor(),\n      ...spanProcessors,\n      traceHandler.getBatchSpanProcessor(),\n    ],\n    resourceDetectors: resourceDetectorsList,\n  };\n  sdk = new NodeSDK(sdkConfig);\n  setSdkPrefix();\n  sendAttachWarning();\n  sdk.start();\n}\n\n/**\n * Shutdown Azure Monitor Open Telemetry Distro\n * @see https://github.com/open-telemetry/opentelemetry-js/blob/0229434cb5a3179f63c021105f36270ae7897929/experimental/packages/opentelemetry-sdk-node/src/sdk.ts#L398\n */\nexport function shutdownAzureMonitor(): Promise<void> {\n  browserSdkLoader?.dispose();\n  disableInstrumentations();\n  return sdk?.shutdown();\n}\n\n/**\n * Get the internal SDK instance for testing purposes\n * @internal\n */\n// eslint-disable-next-line no-underscore-dangle\nexport function _getSdkInstance(): NodeSDK | undefined {\n  return sdk;\n}\n"]}

package/dist/commonjs/logs/handler.d.ts

@@ -7,6 +7,7 @@ import { AzureLogRecordProcessor } from "./logRecordProcessor.js";
  * Azure Monitor OpenTelemetry Log Handler
  */
 export declare class LogHandler {
+    private readonly instrumentationCache?;
     private _azureExporter;
     private _azureLogRecordProcessor;
     private _azureBatchLogRecordProcessor;
@@ -19,7 +20,7 @@ export declare class LogHandler {
      * @param _config - Distro configuration.
      * @param _metricHandler - MetricHandler.
      */
-    constructor(config: InternalConfig, metricHandler: MetricHandler);
+    constructor(config: InternalConfig, metricHandler: MetricHandler, instrumentationCache?: Map<string, Instrumentation> | undefined);
     getAzureLogRecordProcessor(): AzureLogRecordProcessor;
     getBatchLogRecordProcessor(): BatchLogRecordProcessor;
     getInstrumentations(): Instrumentation[];

package/dist/commonjs/logs/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/logs/handler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAItE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAIlE;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,cAAc,CAA0B;IAChD,OAAO,CAAC,wBAAwB,CAA0B;IAC1D,OAAO,CAAC,6BAA6B,CAA+B;IACpE,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,uBAAuB,CAA8B;IAE7D;;;;OAIG;gBACS,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa;IAYzD,0BAA0B,IAAI,uBAAuB;IAIrD,0BAA0B,IAAI,uBAAuB;IAIrD,mBAAmB,IAAI,eAAe,EAAE;IAI/C,6EAA6E;IACtE,yBAAyB,IAAI,eAAe,GAAG,SAAS;IAI/D;;OAEG;IACH,OAAO,CAAC,2BAA2B;CAmCpC"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/logs/handler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAItE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAKlE;;GAEG;AACH,qBAAa,UAAU;IAiBnB,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC;IAhBxC,OAAO,CAAC,cAAc,CAA0B;IAChD,OAAO,CAAC,wBAAwB,CAA0B;IAC1D,OAAO,CAAC,6BAA6B,CAA+B;IACpE,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,uBAAuB,CAA8B;IAE7D;;;;OAIG;gBAED,MAAM,EAAE,cAAc,EACtB,aAAa,EAAE,aAAa,EACX,oBAAoB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,YAAA;IAa/D,0BAA0B,IAAI,uBAAuB;IAIrD,0BAA0B,IAAI,uBAAuB;IAIrD,mBAAmB,IAAI,eAAe,EAAE;IAI/C,6EAA6E;IACtE,yBAAyB,IAAI,eAAe,GAAG,SAAS;IAI/D;;OAEG;IACH,OAAO,CAAC,2BAA2B;CAgDpC"}

package/dist/commonjs/logs/handler.js

@@ -10,10 +10,12 @@ const instrumentation_winston_1 = require("@opentelemetry/instrumentation-winsto
 const logRecordProcessor_js_1 = require("./logRecordProcessor.js");
 const batchLogRecordProcessor_js_1 = require("./batchLogRecordProcessor.js");
 const logUtils_js_1 = require("../utils/logUtils.js");
+const instrumentation_js_1 = require("../utils/instrumentation.js");
 /**
  * Azure Monitor OpenTelemetry Log Handler
  */
 class LogHandler {
+    instrumentationCache;
     _azureExporter;
     _azureLogRecordProcessor;
     _azureBatchLogRecordProcessor;
@@ -26,7 +28,8 @@ class LogHandler {
      * @param _config - Distro configuration.
      * @param _metricHandler - MetricHandler.
      */
-    constructor(config, metricHandler) {
+    constructor(config, metricHandler, instrumentationCache) {
+        this.instrumentationCache = instrumentationCache;
         this._config = config;
         this._metricHandler = metricHandler;
         this._azureExporter = new monitor_opentelemetry_exporter_1.AzureMonitorLogExporter(config.azureMonitorExporterOptions);
@@ -60,23 +63,26 @@ class LogHandler {
         const logLevelEnv = process.env.APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL;
         const logSeverity = logLevelEnv ? (0, logUtils_js_1.logLevelToSeverityNumber)(logLevelEnv) : undefined;
         if (this._config.instrumentationOptions.bunyan?.enabled) {
-            this._instrumentations.push(new instrumentation_bunyan_1.BunyanInstrumentation({
+            this._instrumentations.push((0, instrumentation_js_1.configureInstrumentation)(this.instrumentationCache, "bunyan", {
                 ...this._config.instrumentationOptions.bunyan,
                 logSeverity,
-            }));
+            }, (options) => new instrumentation_bunyan_1.BunyanInstrumentation(options)));
         }
         if (this._config.instrumentationOptions.winston?.enabled) {
-            this._instrumentations.push(new instrumentation_winston_1.WinstonInstrumentation({
+            this._instrumentations.push((0, instrumentation_js_1.configureInstrumentation)(this.instrumentationCache, "winston", {
                 ...this._config.instrumentationOptions.winston,
                 logSeverity,
-            }));
+            }, (options) => new instrumentation_winston_1.WinstonInstrumentation(options)));
         }
-        if (this._config.instrumentationOptions.console?.enabled) {
+        const consoleOptions = this._config.instrumentationOptions.console;
+        if (consoleOptions?.enabled) {
             // Defer patching until registration so construction preserves the original methods.
+            // Console patches globals rather than module hooks and caches its logger,
+            // so each SDK lifetime needs a fresh instance.
             const consoleInstrumentation = new instrumentation_console_1.ConsoleInstrumentation({
-                ...this._config.instrumentationOptions.console,
+                ...consoleOptions,
                 enabled: false,
-                logSeverity,
+                logSeverity: consoleOptions.logSeverity ?? logSeverity,
             });
             this._consoleInstrumentation = consoleInstrumentation;
             this._instrumentations.push(consoleInstrumentation);

package/dist/commonjs/logs/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/logs/handler.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAAgF;AAEhF,kFAA8E;AAC9E,oFAAgF;AAChF,oFAAgF;AAIhF,mEAAkE;AAClE,6EAA4E;AAC5E,sDAAyF;AAEzF;;GAEG;AACH,MAAa,UAAU;IACb,cAAc,CAA0B;IACxC,wBAAwB,CAA0B;IAClD,6BAA6B,CAA+B;IAC5D,cAAc,CAAgB;IAC9B,OAAO,CAAiB;IACxB,iBAAiB,CAAoB;IACrC,uBAAuB,CAA8B;IAE7D;;;;OAIG;IACH,YAAY,MAAsB,EAAE,aAA4B;QAC9D,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,IAAI,wDAAuB,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;QACtF,IAAI,CAAC,6BAA6B,GAAG,IAAI,yDAA4B,CAAC,IAAI,CAAC,cAAc,EAAE;YACzF,+BAA+B,EAAE,IAAI,CAAC,OAAO,CAAC,+BAA+B;SAC9E,CAAC,CAAC;QACH,IAAI,CAAC,wBAAwB,GAAG,IAAI,+CAAuB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACjF,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,2BAA2B,EAAE,CAAC;IACrC,CAAC;IAEM,0BAA0B;QAC/B,OAAO,IAAI,CAAC,wBAAwB,CAAC;IACvC,CAAC;IAEM,0BAA0B;QAC/B,OAAO,IAAI,CAAC,6BAA6B,CAAC;IAC5C,CAAC;IAEM,mBAAmB;QACxB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,6EAA6E;IACtE,yBAAyB;QAC9B,OAAO,IAAI,CAAC,uBAAuB,CAAC;IACtC,CAAC;IAED;;OAEG;IACK,2BAA2B;QACjC,IAAI,IAAA,qCAAuB,GAAE,EAAE,CAAC;YAC9B,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC;QAClF,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,IAAA,sCAAwB,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEpF,IAAI,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;YACxD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CACzB,IAAI,8CAAqB,CAAC;gBACxB,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,MAAM;gBAC7C,WAAW;aACZ,CAAC,CACH,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;YACzD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CACzB,IAAI,gDAAsB,CAAC;gBACzB,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,OAAO;gBAC9C,WAAW;aACZ,CAAC,CACH,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;YACzD,oFAAoF;YACpF,MAAM,sBAAsB,GAAG,IAAI,gDAAsB,CAAC;gBACxD,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,OAAO;gBAC9C,OAAO,EAAE,KAAK;gBACd,WAAW;aACZ,CAAC,CAAC;YACH,IAAI,CAAC,uBAAuB,GAAG,sBAAsB,CAAC;YACtD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;CACF;AAjFD,gCAiFC","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport { AzureMonitorLogExporter } from \"@azure/monitor-opentelemetry-exporter\";\nimport type { Instrumentation } from \"@opentelemetry/instrumentation\";\nimport { BunyanInstrumentation } from \"@opentelemetry/instrumentation-bunyan\";\nimport { ConsoleInstrumentation } from \"@opentelemetry/instrumentation-console\";\nimport { WinstonInstrumentation } from \"@opentelemetry/instrumentation-winston\";\nimport type { BatchLogRecordProcessor } from \"@opentelemetry/sdk-logs\";\nimport type { InternalConfig } from \"../shared/config.js\";\nimport type { MetricHandler } from \"../metrics/handler.js\";\nimport { AzureLogRecordProcessor } from \"./logRecordProcessor.js\";\nimport { AzureBatchLogRecordProcessor } from \"./batchLogRecordProcessor.js\";\nimport { isLogCollectionDisabled, logLevelToSeverityNumber } from \"../utils/logUtils.js\";\n\n/**\n * Azure Monitor OpenTelemetry Log Handler\n */\nexport class LogHandler {\n  private _azureExporter: AzureMonitorLogExporter;\n  private _azureLogRecordProcessor: AzureLogRecordProcessor;\n  private _azureBatchLogRecordProcessor: AzureBatchLogRecordProcessor;\n  private _metricHandler: MetricHandler;\n  private _config: InternalConfig;\n  private _instrumentations: Instrumentation[];\n  private _consoleInstrumentation: Instrumentation | undefined;\n\n  /**\n   * Initializes a new instance of the TraceHandler class.\n   * @param _config - Distro configuration.\n   * @param _metricHandler - MetricHandler.\n   */\n  constructor(config: InternalConfig, metricHandler: MetricHandler) {\n    this._config = config;\n    this._metricHandler = metricHandler;\n    this._azureExporter = new AzureMonitorLogExporter(config.azureMonitorExporterOptions);\n    this._azureBatchLogRecordProcessor = new AzureBatchLogRecordProcessor(this._azureExporter, {\n      enableTraceBasedSamplingForLogs: this._config.enableTraceBasedSamplingForLogs,\n    });\n    this._azureLogRecordProcessor = new AzureLogRecordProcessor(this._metricHandler);\n    this._instrumentations = [];\n    this._initializeInstrumentations();\n  }\n\n  public getAzureLogRecordProcessor(): AzureLogRecordProcessor {\n    return this._azureLogRecordProcessor;\n  }\n\n  public getBatchLogRecordProcessor(): BatchLogRecordProcessor {\n    return this._azureBatchLogRecordProcessor;\n  }\n\n  public getInstrumentations(): Instrumentation[] {\n    return this._instrumentations;\n  }\n\n  /** Returns the console instrumentation for explicit lifecycle management. */\n  public getConsoleInstrumentation(): Instrumentation | undefined {\n    return this._consoleInstrumentation;\n  }\n\n  /**\n   * Start auto collection of telemetry\n   */\n  private _initializeInstrumentations(): void {\n    if (isLogCollectionDisabled()) {\n      return;\n    }\n\n    const logLevelEnv = process.env.APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL;\n    const logSeverity = logLevelEnv ? logLevelToSeverityNumber(logLevelEnv) : undefined;\n\n    if (this._config.instrumentationOptions.bunyan?.enabled) {\n      this._instrumentations.push(\n        new BunyanInstrumentation({\n          ...this._config.instrumentationOptions.bunyan,\n          logSeverity,\n        }),\n      );\n    }\n    if (this._config.instrumentationOptions.winston?.enabled) {\n      this._instrumentations.push(\n        new WinstonInstrumentation({\n          ...this._config.instrumentationOptions.winston,\n          logSeverity,\n        }),\n      );\n    }\n    if (this._config.instrumentationOptions.console?.enabled) {\n      // Defer patching until registration so construction preserves the original methods.\n      const consoleInstrumentation = new ConsoleInstrumentation({\n        ...this._config.instrumentationOptions.console,\n        enabled: false,\n        logSeverity,\n      });\n      this._consoleInstrumentation = consoleInstrumentation;\n      this._instrumentations.push(consoleInstrumentation);\n    }\n  }\n}\n"]}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/logs/handler.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport { AzureMonitorLogExporter } from \"@azure/monitor-opentelemetry-exporter\";\nimport type { Instrumentation } from \"@opentelemetry/instrumentation\";\nimport { BunyanInstrumentation } from \"@opentelemetry/instrumentation-bunyan\";\nimport { ConsoleInstrumentation } from \"@opentelemetry/instrumentation-console\";\nimport { WinstonInstrumentation } from \"@opentelemetry/instrumentation-winston\";\nimport type { BatchLogRecordProcessor } from \"@opentelemetry/sdk-logs\";\nimport type { InternalConfig } from \"../shared/config.js\";\nimport type { MetricHandler } from \"../metrics/handler.js\";\nimport { AzureLogRecordProcessor } from \"./logRecordProcessor.js\";\nimport { AzureBatchLogRecordProcessor } from \"./batchLogRecordProcessor.js\";\nimport { isLogCollectionDisabled, logLevelToSeverityNumber } from \"../utils/logUtils.js\";\nimport { configureInstrumentation } from \"../utils/instrumentation.js\";\n\n/**\n * Azure Monitor OpenTelemetry Log Handler\n */\nexport class LogHandler {\n  private _azureExporter: AzureMonitorLogExporter;\n  private _azureLogRecordProcessor: AzureLogRecordProcessor;\n  private _azureBatchLogRecordProcessor: AzureBatchLogRecordProcessor;\n  private _metricHandler: MetricHandler;\n  private _config: InternalConfig;\n  private _instrumentations: Instrumentation[];\n  private _consoleInstrumentation: Instrumentation | undefined;\n\n  /**\n   * Initializes a new instance of the TraceHandler class.\n   * @param _config - Distro configuration.\n   * @param _metricHandler - MetricHandler.\n   */\n  constructor(\n    config: InternalConfig,\n    metricHandler: MetricHandler,\n    private readonly instrumentationCache?: Map<string, Instrumentation>,\n  ) {\n    this._config = config;\n    this._metricHandler = metricHandler;\n    this._azureExporter = new AzureMonitorLogExporter(config.azureMonitorExporterOptions);\n    this._azureBatchLogRecordProcessor = new AzureBatchLogRecordProcessor(this._azureExporter, {\n      enableTraceBasedSamplingForLogs: this._config.enableTraceBasedSamplingForLogs,\n    });\n    this._azureLogRecordProcessor = new AzureLogRecordProcessor(this._metricHandler);\n    this._instrumentations = [];\n    this._initializeInstrumentations();\n  }\n\n  public getAzureLogRecordProcessor(): AzureLogRecordProcessor {\n    return this._azureLogRecordProcessor;\n  }\n\n  public getBatchLogRecordProcessor(): BatchLogRecordProcessor {\n    return this._azureBatchLogRecordProcessor;\n  }\n\n  public getInstrumentations(): Instrumentation[] {\n    return this._instrumentations;\n  }\n\n  /** Returns the console instrumentation for explicit lifecycle management. */\n  public getConsoleInstrumentation(): Instrumentation | undefined {\n    return this._consoleInstrumentation;\n  }\n\n  /**\n   * Start auto collection of telemetry\n   */\n  private _initializeInstrumentations(): void {\n    if (isLogCollectionDisabled()) {\n      return;\n    }\n\n    const logLevelEnv = process.env.APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL;\n    const logSeverity = logLevelEnv ? logLevelToSeverityNumber(logLevelEnv) : undefined;\n\n    if (this._config.instrumentationOptions.bunyan?.enabled) {\n      this._instrumentations.push(\n        configureInstrumentation(\n          this.instrumentationCache,\n          \"bunyan\",\n          {\n            ...this._config.instrumentationOptions.bunyan,\n            logSeverity,\n          },\n          (options) => new BunyanInstrumentation(options),\n        ),\n      );\n    }\n    if (this._config.instrumentationOptions.winston?.enabled) {\n      this._instrumentations.push(\n        configureInstrumentation(\n          this.instrumentationCache,\n          \"winston\",\n          {\n            ...this._config.instrumentationOptions.winston,\n            logSeverity,\n          },\n          (options) => new WinstonInstrumentation(options),\n        ),\n      );\n    }\n    const consoleOptions = this._config.instrumentationOptions.console;\n    if (consoleOptions?.enabled) {\n      // Defer patching until registration so construction preserves the original methods.\n      // Console patches globals rather than module hooks and caches its logger,\n      // so each SDK lifetime needs a fresh instance.\n      const consoleInstrumentation = new ConsoleInstrumentation({\n        ...consoleOptions,\n        enabled: false,\n        logSeverity: consoleOptions.logSeverity ?? logSeverity,\n      });\n      this._consoleInstrumentation = consoleInstrumentation;\n      this._instrumentations.push(consoleInstrumentation);\n    }\n  }\n}\n"]}

package/dist/commonjs/metrics/performanceCounters.d.ts

@@ -34,6 +34,9 @@ export declare class PerformanceCounterMetrics {
     private lastHrtime;
     private lastCpus;
     private lastCpusProcess;
+    private lastAppCpuUsageNormalized;
+    private lastHrtimeNormalized;
+    private lastCpusProcessNormalized;
     private totalExceptionCount;
     /**
      * Creates performance counter instruments.

package/dist/commonjs/metrics/performanceCounters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"performanceCounters.d.ts","sourceRoot":"","sources":["../../../src/metrics/performanceCounters.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAM5D,OAAO,EAAE,aAAa,EAAiC,MAAM,4BAA4B,CAAC;AAC1F,OAAO,KAAK,EAAE,YAAY,EAAc,MAAM,+BAA+B,CAAC;AAG9E,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,aAAa,CAAC;AAOpE;;GAEG;AACH,qBAAa,yBAAyB;IACpC,OAAO,CAAC,cAAc,CAAmC;IACzD,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,wBAAwB,CAAY;IAC5C,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,uBAAuB,CAAkB;IACjD,OAAO,CAAC,+BAA+B,CAAqB;IAC5D,OAAO,CAAC,yBAAyB,CAAkB;IACnD,OAAO,CAAC,iCAAiC,CAAqB;IAC9D,OAAO,CAAC,kBAAkB,CAAkB;IAC5C,OAAO,CAAC,0BAA0B,CAAqB;IACvD,OAAO,CAAC,0BAA0B,CAAkB;IACpD,OAAO,CAAC,kCAAkC,CAAqB;IAC/D,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,mBAAmB,CAAkB;IAC7C,OAAO,CAAC,2BAA2B,CAAqB;IACxD,OAAO,CAAC,iBAAiB,CAA0D;IACnF,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,qBAAqB,CAAK;IAClC,OAAO,CAAC,eAAe,CAA6D;IACpF,OAAO,CAAC,eAAe,CAAmC;IAC1D,OAAO,CAAC,UAAU,CAAW;IAC7B,OAAO,CAAC,QAAQ,CAIZ;IACJ,OAAO,CAAC,eAAe,CAInB;IACJ,OAAO,CAAC,mBAAmB,CAAa;IAExC;;;;OAIG;gBACS,MAAM,EAAE,gCAAgC,EAAE,OAAO,CAAC,EAAE;QAAE,kBAAkB,EAAE,MAAM,CAAA;KAAE;IAgG9F;;OAEG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAInC;;OAEG;IACI,gBAAgB,IAAI,aAAa;IAIxC;;;OAGG;IACI,UAAU,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IAkB3C;;;OAGG;IACI,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI;IAO/C,OAAO,CAAC,cAAc;IAgBtB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,mBAAmB;IAwC3B,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,wBAAwB;IAwChC,OAAO,CAAC,cAAc;IA2CtB,OAAO,CAAC,gBAAgB;CAgBzB"}
+{"version":3,"file":"performanceCounters.d.ts","sourceRoot":"","sources":["../../../src/metrics/performanceCounters.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAM5D,OAAO,EAAE,aAAa,EAAiC,MAAM,4BAA4B,CAAC;AAC1F,OAAO,KAAK,EAAE,YAAY,EAAc,MAAM,+BAA+B,CAAC;AAG9E,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,aAAa,CAAC;AAOpE;;GAEG;AACH,qBAAa,yBAAyB;IACpC,OAAO,CAAC,cAAc,CAAmC;IACzD,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,wBAAwB,CAAY;IAC5C,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,uBAAuB,CAAkB;IACjD,OAAO,CAAC,+BAA+B,CAAqB;IAC5D,OAAO,CAAC,yBAAyB,CAAkB;IACnD,OAAO,CAAC,iCAAiC,CAAqB;IAC9D,OAAO,CAAC,kBAAkB,CAAkB;IAC5C,OAAO,CAAC,0BAA0B,CAAqB;IACvD,OAAO,CAAC,0BAA0B,CAAkB;IACpD,OAAO,CAAC,kCAAkC,CAAqB;IAC/D,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,mBAAmB,CAAkB;IAC7C,OAAO,CAAC,2BAA2B,CAAqB;IACxD,OAAO,CAAC,iBAAiB,CAAkC;IAC3D,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,qBAAqB,CAAK;IAClC,OAAO,CAAC,eAAe,CAA6D;IACpF,OAAO,CAAC,eAAe,CAAmC;IAC1D,OAAO,CAAC,UAAU,CAAW;IAC7B,OAAO,CAAC,QAAQ,CAIZ;IACJ,OAAO,CAAC,eAAe,CAInB;IACJ,OAAO,CAAC,yBAAyB,CAAmC;IACpE,OAAO,CAAC,oBAAoB,CAAW;IACvC,OAAO,CAAC,yBAAyB,CAI7B;IACJ,OAAO,CAAC,mBAAmB,CAAa;IAExC;;;;OAIG;gBACS,MAAM,EAAE,gCAAgC,EAAE,OAAO,CAAC,EAAE;QAAE,kBAAkB,EAAE,MAAM,CAAA;KAAE;IAkG9F;;OAEG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAInC;;OAEG;IACI,gBAAgB,IAAI,aAAa;IAIxC;;;OAGG;IACI,UAAU,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IAkB3C;;;OAGG;IACI,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI;IAO/C,OAAO,CAAC,cAAc;IAgBtB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,mBAAmB;IAwC3B,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,wBAAwB;IA0ChC,OAAO,CAAC,cAAc;IAyCtB,OAAO,CAAC,gBAAgB;CAgBzB"}

package/dist/commonjs/metrics/performanceCounters.js

@@ -38,7 +38,7 @@ class PerformanceCounterMetrics {
     processTimeGaugeCallback;
     exceptionCountGauge;
     exceptionCountGaugeCallback;
-    lastExceptionRate = { count: 0, time: 0 };
+    lastExceptionRate;
     totalCount = 0;
     intervalExecutionTime = 0;
     lastRequestRate;
@@ -46,6 +46,9 @@ class PerformanceCounterMetrics {
     lastHrtime;
     lastCpus;
     lastCpusProcess;
+    lastAppCpuUsageNormalized;
+    lastHrtimeNormalized;
+    lastCpusProcessNormalized;
     totalExceptionCount = 0;
     /**
      * Creates performance counter instruments.
@@ -58,11 +61,15 @@ class PerformanceCounterMetrics {
         this.lastCpusProcess = node_os_1.default.cpus();
         this.lastAppCpuUsage = node_process_1.default.cpuUsage();
         this.lastHrtime = node_process_1.default.hrtime();
+        this.lastCpusProcessNormalized = node_os_1.default.cpus();
+        this.lastAppCpuUsageNormalized = node_process_1.default.cpuUsage();
+        this.lastHrtimeNormalized = node_process_1.default.hrtime();
         this.lastRequestRate = {
             count: this.totalCount,
             time: +new Date(),
             executionInterval: this.intervalExecutionTime,
         };
+        this.lastExceptionRate = { count: this.totalExceptionCount, time: +new Date() };
         this.azureExporter = new monitor_opentelemetry_exporter_1.AzureMonitorMetricExporter(this.internalConfig.azureMonitorExporterOptions);
         const metricReaderOptions = {
             exporter: this.azureExporter,
@@ -74,7 +81,6 @@ class PerformanceCounterMetrics {
         };
         this.meterProvider = new sdk_metrics_1.MeterProvider(meterProviderConfig);
         this.meter = this.meterProvider.getMeter("AzureMonitorPerformanceCountersMeter");
-        this.lastRequestRate = { count: 0, time: 0, executionInterval: 0 };
         // Create Instruments
         this.requestDurationHistogram = this.meter.createHistogram(types_js_1.PerformanceCounterMetricNames.REQUEST_DURATION, { valueType: api_1.ValueType.DOUBLE });
         this.requestRateGauge = this.meter.createObservableGauge(types_js_1.PerformanceCounterMetricNames.REQUEST_RATE, {
@@ -248,33 +254,31 @@ class PerformanceCounterMetrics {
         const cpus = node_os_1.default.cpus();
         if (cpus &&
             cpus.length &&
-            this.lastCpusProcess &&
-            cpus.length === this.lastCpusProcess.length) {
+            this.lastCpusProcessNormalized &&
+            cpus.length === this.lastCpusProcessNormalized.length) {
             // Calculate % of total cpu time (user + system) this App Process used (Only supported by node v6.1.0+)
             let appCpuPercent = undefined;
             const appCpuUsage = node_process_1.default.cpuUsage();
             const hrtime = node_process_1.default.hrtime();
             const totalApp = appCpuUsage.user -
-                this.lastAppCpuUsage.user +
-                (appCpuUsage.system - this.lastAppCpuUsage.system) || 0;
-            if (typeof this.lastHrtime !== "undefined" && this.lastHrtime.length === 2) {
-                const elapsedTime = (hrtime[0] - this.lastHrtime[0]) * 1e6 + (hrtime[1] - this.lastHrtime[1]) / 1e3 || 0; // convert to microseconds
+                this.lastAppCpuUsageNormalized.user +
+                (appCpuUsage.system - this.lastAppCpuUsageNormalized.system) || 0;
+            if (typeof this.lastHrtimeNormalized !== "undefined" &&
+                this.lastHrtimeNormalized.length === 2) {
+                const elapsedTime = (hrtime[0] - this.lastHrtimeNormalized[0]) * 1e6 +
+                    (hrtime[1] - this.lastHrtimeNormalized[1]) / 1e3 || 0; // convert to microseconds
                 appCpuPercent = (100 * totalApp) / (elapsedTime * cpus.length);
             }
             // Set previous
-            this.lastAppCpuUsage = appCpuUsage;
-            this.lastHrtime = hrtime;
-            const cpuTotals = this.getTotalCombinedCpu(cpus, this.lastCpusProcess);
-            let value = 0;
-            if (appCpuPercent !== undefined) {
-                value = appCpuPercent;
-            }
-            else {
-                value = (cpuTotals.totalUser / cpuTotals.combinedTotal) * 100;
-            }
+            this.lastAppCpuUsageNormalized = appCpuUsage;
+            this.lastHrtimeNormalized = hrtime;
+            const cpuTotals = this.getTotalCombinedCpu(cpus, this.lastCpusProcessNormalized);
+            const value = appCpuPercent !== undefined
+                ? appCpuPercent
+                : (cpuTotals.totalUser / cpuTotals.combinedTotal) * 100;
             observableResult.observe(value);
         }
-        this.lastCpusProcess = cpus;
+        this.lastCpusProcessNormalized = cpus;
     }
     getProcessTime(observableResult) {
         // this reports total ms spent in each category since the OS was booted, to calculate percent it is necessary
@@ -300,13 +304,9 @@ class PerformanceCounterMetrics {
                 this.lastAppCpuUsage = appCpuUsage;
                 this.lastHrtime = hrtime;
                 const cpuTotals = this.getTotalCombinedCpu(cpus, this.lastCpusProcess);
-                let value = 0;
-                if (appCpuPercent !== undefined) {
-                    value = appCpuPercent;
-                }
-                else {
-                    value = (cpuTotals.totalUser / cpuTotals.combinedTotal) * 100;
-                }
+                const value = appCpuPercent !== undefined
+                    ? appCpuPercent
+                    : (cpuTotals.totalUser / cpuTotals.combinedTotal) * 100;
                 observableResult.observe(value);
             }
             this.lastCpusProcess = cpus;