Merge pull request #251216 from hectorhdzg/hectorhdzg/addmodify

[Azure Monitor] Update add modify JS sample code

Author: prmerger-automator[bot]

articles/azure-monitor/app/opentelemetry-add-modify.md

@@ -233,12 +233,21 @@ You can't extend the Java Distro with community instrumentation libraries. To re
 Other OpenTelemetry Instrumentations are available [here](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node) and could be added using TraceHandler in ApplicationInsightsClient.
 
  ```javascript
-    const { ApplicationInsightsClient, ApplicationInsightsConfig } = require("applicationinsights");
+    const { useAzureMonitor } = require("@azure/monitor-opentelemetry");
+    const { metrics, trace } = require("@opentelemetry/api");
+    const { registerInstrumentations } = require( "@opentelemetry/instrumentation");
     const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
 
-    const appInsights = new ApplicationInsightsClient(new ApplicationInsightsConfig());
-    const traceHandler = appInsights.getTraceHandler();
-    traceHandler.addInstrumentation(new ExpressInstrumentation());
+    useAzureMonitor();
+    const tracerProvider = trace.getTracerProvider().getDelegate();
+    const meterProvider = metrics.getMeterProvider();
+    registerInstrumentations({
+        instrumentations: [
+            new ExpressInstrumentation(),
+        ],
+        tracerProvider: tracerProvider,
+        meterProvider: meterProvider
+    });
 ```
 
 ### [Python](#tab/python)
@@ -422,10 +431,11 @@ public class Program {
 #### [Node.js](#tab/nodejs)
 
  ```javascript
-    const { ApplicationInsightsClient, ApplicationInsightsConfig } = require("applicationinsights");
-    const appInsights = new ApplicationInsightsClient(new ApplicationInsightsConfig());
-    const customMetricsHandler = appInsights.getMetricHandler().getCustomMetricsHandler();
-    const meter =  customMetricsHandler.getMeter();
+    const { useAzureMonitor } = require("@azure/monitor-opentelemetry");
+    const { metrics } = require("@opentelemetry/api");
+
+    useAzureMonitor();
+    const meter =  metrics.getMeter("testMeter");
     let histogram = meter.createHistogram("histogram");
     histogram.record(1, { "testKey": "testValue" });
     histogram.record(30, { "testKey": "testValue2" });
@@ -544,10 +554,11 @@ public class Program {
 #### [Node.js](#tab/nodejs)
 
 ```javascript
-    const { ApplicationInsightsClient, ApplicationInsightsConfig } = require("applicationinsights");
-    const appInsights = new ApplicationInsightsClient(new ApplicationInsightsConfig());
-    const customMetricsHandler = appInsights.getMetricHandler().getCustomMetricsHandler();
-    const meter =  customMetricsHandler.getMeter();
+    const { useAzureMonitor } = require("@azure/monitor-opentelemetry");
+    const { metrics } = require("@opentelemetry/api");
+
+    useAzureMonitor();
+    const meter =  metrics.getMeter("testMeter");
     let counter = meter.createCounter("counter");
     counter.add(1, { "testKey": "testValue" });
     counter.add(5, { "testKey2": "testValue" });
@@ -667,10 +678,11 @@ public class Program {
 #### [Node.js](#tab/nodejs)
 
 ```typescript
-    const { ApplicationInsightsClient, ApplicationInsightsConfig } = require("applicationinsights");
-    const appInsights = new ApplicationInsightsClient(new ApplicationInsightsConfig());
-    const customMetricsHandler = appInsights.getMetricHandler().getCustomMetricsHandler();
-    const meter =  customMetricsHandler.getMeter();
+    const { useAzureMonitor } = require("@azure/monitor-opentelemetry");
+    const { metrics } = require("@opentelemetry/api");
+
+    useAzureMonitor();
+    const meter =  metrics.getMeter("testMeter");
     let gauge = meter.createObservableGauge("gauge");
     gauge.addCallback((observableResult: ObservableResult) => {
         let randomNumber = Math.floor(Math.random() * 100);
@@ -818,17 +830,18 @@ You can use `opentelemetry-api` to update the status of a span and record except
 #### [Node.js](#tab/nodejs)
 
 ```javascript
-const { ApplicationInsightsClient, ApplicationInsightsConfig } = require("applicationinsights");
-
-const appInsights = new ApplicationInsightsClient(new ApplicationInsightsConfig());
-const tracer = appInsights.getTraceHandler().getTracer();
-let span = tracer.startSpan("hello");
-try{
-    throw new Error("Test Error");
-}
-catch(error){
-    span.recordException(error);
-}
+    const { useAzureMonitor } = require("@azure/monitor-opentelemetry");
+    const { trace } = require("@opentelemetry/api");
+
+    useAzureMonitor();
+    const tracer = trace.getTracer("testTracer");
+    let span = tracer.startSpan("hello");
+    try{
+        throw new Error("Test Error");
+    }
+    catch(error){
+        span.recordException(error);
+    }
 ```
 
 #### [Python](#tab/python)
@@ -1003,12 +1016,13 @@ you can add your spans by using the OpenTelemetry API.
 #### [Node.js](#tab/nodejs)
 
 ```javascript
-const { ApplicationInsightsClient, ApplicationInsightsConfig } = require("applicationinsights");
+    const { useAzureMonitor } = require("@azure/monitor-opentelemetry");
+    const { trace } = require("@opentelemetry/api");
 
-const appInsights = new ApplicationInsightsClient(new ApplicationInsightsConfig());
-const tracer = appInsights.getTraceHandler().getTracer();
-let span = tracer.startSpan("hello");
-span.end();
+    useAzureMonitor();
+    const tracer = trace.getTracer("testTracer");
+    let span = tracer.startSpan("hello");
+    span.end();
 ```
 
 
@@ -1183,47 +1197,47 @@ Not available in .NET.
 #### [Node.js](#tab/nodejs)
 
 
-First, get the `LogHandler`:
+You need to use `applicationinsights` v3 Beta package to achieve this. (https://www.npmjs.com/package/applicationinsights/v/beta)
 
 ```javascript
-const { ApplicationInsightsClient, ApplicationInsightsConfig } = require("applicationinsights");
-const appInsights = new ApplicationInsightsClient(new ApplicationInsightsConfig());
-const logHandler = appInsights.getLogHandler();
+    const { TelemetryClient } = require("applicationinsights");
+
+    const appInsights = new TelemetryClient();
 ```
 
-Then use the `LogHandler` to send custom telemetry:
+Then use the `TelemetryClient` to send custom telemetry:
 
 ##### Events
 
 ```javascript
-let eventTelemetry = {
-    name: "testEvent"
-};
-logHandler.trackEvent(eventTelemetry);
+    let eventTelemetry = {
+        name: "testEvent"
+    };
+    appInsights.trackEvent(eventTelemetry);
 ```
 
 ##### Logs
 
 ```javascript
-let traceTelemetry = {
-    message: "testMessage",
-    severity: "Information"
-};
-logHandler.trackTrace(traceTelemetry);
+    let traceTelemetry = {
+        message: "testMessage",
+        severity: "Information"
+    };
+    appInsights.trackTrace(traceTelemetry);
 ```
 
 ##### Exceptions
 
 ```javascript
-try {
-    ...
-} catch (error) {
-    let exceptionTelemetry = {
-        exception: error,
-        severity: "Critical"
-    };
-    logHandler.trackException(exceptionTelemetry);
-}
+    try {
+        ...
+    } catch (error) {
+        let exceptionTelemetry = {
+            exception: error,
+            severity: "Critical"
+        };
+        appInsights.trackException(exceptionTelemetry);
+    }
 ```
 
 #### [Python](#tab/python)
@@ -1361,27 +1375,29 @@ Adding one or more span attributes populates the `customDimensions` field in the
 ##### [Node.js](#tab/nodejs)
 
 ```typescript
-const { ApplicationInsightsClient, ApplicationInsightsConfig } = require("applicationinsights");
-const { ReadableSpan, Span, SpanProcessor } = require("@opentelemetry/sdk-trace-base");
-const { SemanticAttributes } = require("@opentelemetry/semantic-conventions");
+    const { useAzureMonitor } = require("@azure/monitor-opentelemetry");
+    const { trace } = require("@opentelemetry/api");
+    const { ReadableSpan, Span, SpanProcessor } = require("@opentelemetry/sdk-trace-base");
+    const { SemanticAttributes } = require("@opentelemetry/semantic-conventions");
 
-const appInsights = new ApplicationInsightsClient(new ApplicationInsightsConfig());
+    useAzureMonitor();
+    const tracerProvider = trace.getTracerProvider().getDelegate();
 
-class SpanEnrichingProcessor implements SpanProcessor{
-    forceFlush(): Promise<void>{
-        return Promise.resolve();
-    }
-    shutdown(): Promise<void>{
-        return Promise.resolve();
-    }
-    onStart(_span: Span): void{}
-    onEnd(span: ReadableSpan){
-        span.attributes["CustomDimension1"] = "value1";
-        span.attributes["CustomDimension2"] = "value2";
+    class SpanEnrichingProcessor implements SpanProcessor{
+        forceFlush(): Promise<void>{
+            return Promise.resolve();
+        }
+        shutdown(): Promise<void>{
+            return Promise.resolve();
+        }
+        onStart(_span: Span): void{}
+        onEnd(span: ReadableSpan){
+            span.attributes["CustomDimension1"] = "value1";
+            span.attributes["CustomDimension2"] = "value2";
+        }
     }
-}
 
-appInsights.getTraceHandler().addSpanProcessor(new SpanEnrichingProcessor());
+    tracerProvider.addSpanProcessor(new SpanEnrichingProcessor());
 ```
 
 ##### [Python](#tab/python)
@@ -1449,15 +1465,15 @@ Use the add [custom property example](#add-a-custom-property-to-a-span), but rep
 
 ```typescript
 ...
-const { SemanticAttributes } = require("@opentelemetry/semantic-conventions");
+    const { SemanticAttributes } = require("@opentelemetry/semantic-conventions");
 
-class SpanEnrichingProcessor implements SpanProcessor{
-    ...
+    class SpanEnrichingProcessor implements SpanProcessor{
+        ...
 
-    onEnd(span){
-        span.attributes[SemanticAttributes.HTTP_CLIENT_IP] = "<IP Address>";
+        onEnd(span){
+            span.attributes[SemanticAttributes.HTTP_CLIENT_IP] = "<IP Address>";
+        }
     }
-}
 ```
 
 ##### [Python](#tab/python)
@@ -1521,15 +1537,15 @@ Use the add [custom property example](#add-a-custom-property-to-a-span), but rep
 
 ```typescript
 ...
-import { SemanticAttributes } from "@opentelemetry/semantic-conventions";
+    import { SemanticAttributes } from "@opentelemetry/semantic-conventions";
 
-class SpanEnrichingProcessor implements SpanProcessor{
-    ...
+    class SpanEnrichingProcessor implements SpanProcessor{
+        ...
 
-    onEnd(span: ReadableSpan){
-        span.attributes[SemanticAttributes.ENDUSER_ID] = "<User ID>";
+        onEnd(span: ReadableSpan){
+            span.attributes[SemanticAttributes.ENDUSER_ID] = "<User ID>";
+        }
     }
-}
 ```
 
 ##### [Python](#tab/python)
@@ -1566,20 +1582,24 @@ Logback, Log4j, and java.util.logging are [autoinstrumented](#logs). Attaching c
 
 Attributes could be added only when calling manual track APIs only. Log attributes for console, bunyan and Winston are currently not supported.
 
-```javascript
-const config = new ApplicationInsightsConfig();
-config.instrumentations.http = httpInstrumentationConfig;
-const appInsights = new ApplicationInsightsClient(config);
-const logHandler = appInsights.getLogHandler();
-const attributes = {
-    "testAttribute1": "testValue1",
-    "testAttribute2": "testValue2",
-    "testAttribute3": "testValue3"
-};
-logHandler.trackEvent({
-    name: "testEvent",
-    properties: attributes
-});
+```typescript
+    const { useAzureMonitor } = require("@azure/monitor-opentelemetry");
+    const { logs } = require("@opentelemetry/api-logs");
+
+    useAzureMonitor();
+    const logger = logs.getLogger("testLogger");
+    const logRecord = {
+        body : "testEvent",
+        attributes:  {
+            "testAttribute1": "testValue1",
+            "testAttribute2": "testValue2",
+            "testAttribute3": "testValue3"
+        }
+    };
+    logger.emit({
+        name: "testEvent",
+        properties: attributes
+    });
 ```
 
 #### [Python](#tab/python)
@@ -1687,7 +1707,7 @@ See [sampling overrides](java-standalone-config.md#sampling-overrides-preview) a
     The following example shows how to exclude a certain URL from being tracked by using the [HTTP/HTTPS instrumentation library](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http):
     
     ```typescript
-    const { ApplicationInsightsClient, ApplicationInsightsConfig } = require("applicationinsights");
+    const { useAzureMonitor, ApplicationInsightsOptions } = require("@azure/monitor-opentelemetry");
     const { IncomingMessage } = require("http");
     const { RequestOptions } = require("https");
     const { HttpInstrumentationConfig }= require("@opentelemetry/instrumentation-http");
@@ -1709,9 +1729,14 @@ See [sampling overrides](java-standalone-config.md#sampling-overrides-preview) a
             return false;
         }
     };
-    const config = new ApplicationInsightsConfig();
-    config.instrumentations.http = httpInstrumentationConfig;
-    const appInsights = new ApplicationInsightsClient(config);
+    const config: ApplicationInsightsOptions = {
+        instrumentationOptions: {
+            http: {
+                httpInstrumentationConfig
+            },
+        },
+    };
+    useAzureMonitor(config);
     ```
 
 2. Use a custom processor. You can use a custom span processor to exclude certain spans from being exported. To mark spans to not be exported, set `TraceFlag` to `DEFAULT`.
@@ -1903,8 +1928,8 @@ Get the request trace ID and the span ID in your code:
 
 ### [Node.js](#tab/nodejs)
 
-- To review the source code, see the [Application Insights Beta GitHub repository](https://github.com/microsoft/ApplicationInsights-node.js/tree/beta).
-- To install the npm package and check for updates, see the [`applicationinsights` npm Package](https://www.npmjs.com/package/applicationinsights/v/beta) page.
+- To review the source code, see the [Azure Monitor OpenTelemetry GitHub repository](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/monitor/monitor-opentelemetry).
+- To install the npm package and check for updates, see the [`@azure/monitor-opentelemetry` npm Package](https://www.npmjs.com/package/@azure/monitor-opentelemetry) page.
 - To become more familiar with Azure Monitor Application Insights and OpenTelemetry, see the [Azure Monitor Example Application](https://github.com/Azure-Samples/azure-monitor-opentelemetry-node.js).
 - To learn more about OpenTelemetry and its community, see the [OpenTelemetry JavaScript GitHub repository](https://github.com/open-telemetry/opentelemetry-js).
 - To enable usage experiences, [enable web or browser user monitoring](javascript.md).

articles/azure-monitor/app/opentelemetry-configuration.md

@@ -637,6 +637,7 @@ For more information about Java, see the [Java supplemental documentation](java-
 
     ```typescript
     const { useAzureMonitor, AzureMonitorOpenTelemetryOptions } = require("@azure/monitor-opentelemetry");
+    const { trace } = require("@opentelemetry/api");
     const { BatchSpanProcessor } = require('@opentelemetry/sdk-trace-base');
     const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http');
 

articles/azure-monitor/app/opentelemetry-enable.md

@@ -312,8 +312,8 @@ As part of using Application Insights instrumentation, we collect and send diagn
 ### [Node.js](#tab/nodejs)
 
 - For details on adding and modifying Azure Monitor OpenTelemetry, see [Add and modify Azure Monitor OpenTelemetry](opentelemetry-add-modify.md)
-- To review the source code, see the [Application Insights Beta GitHub repository](https://github.com/microsoft/ApplicationInsights-node.js/tree/beta).
-- To install the npm package and check for updates, see the [`applicationinsights` npm Package](https://www.npmjs.com/package/applicationinsights/v/beta) page.
+- To review the source code, see the [Azure Monitor OpenTelemetry GitHub repository](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/monitor/monitor-opentelemetry).
+- To install the npm package and check for updates, see the [`@azure/monitor-opentelemetry` npm Package](https://www.npmjs.com/package/@azure/monitor-opentelemetry) page.
 - To become more familiar with Azure Monitor Application Insights and OpenTelemetry, see the [Azure Monitor Example Application](https://github.com/Azure-Samples/azure-monitor-opentelemetry-node.js).
 - To learn more about OpenTelemetry and its community, see the [OpenTelemetry JavaScript GitHub repository](https://github.com/open-telemetry/opentelemetry-js).
 - To enable usage experiences, [enable web or browser user monitoring](javascript.md).