Merge pull request #269362 from hectorhdzg/hectorhdzg/updatespanlog

[Azure Monitor] Update docs to align with latest config in distro

Author: prmerger-automator[bot]

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

@@ -1725,17 +1725,9 @@ Adding one or more span attributes populates the `customDimensions` field in the
 ```typescript
 // Import the necessary packages.
 const { useAzureMonitor } = require("@azure/monitor-opentelemetry");
-const { trace, ProxyTracerProvider } = require("@opentelemetry/api");
 const { ReadableSpan, Span, SpanProcessor } = require("@opentelemetry/sdk-trace-base");
-const { NodeTracerProvider } = require("@opentelemetry/sdk-trace-node");
 const { SemanticAttributes } = require("@opentelemetry/semantic-conventions");
 
-// Enable Azure Monitor integration.
-useAzureMonitor();
-
-// Get the NodeTracerProvider instance.
-const tracerProvider = ((trace.getTracerProvider() as ProxyTracerProvider).getDelegate() as NodeTracerProvider);
-
 // Create a new SpanEnrichingProcessor class.
 class SpanEnrichingProcessor implements SpanProcessor {
   forceFlush(): Promise<void> {
@@ -1755,8 +1747,13 @@ class SpanEnrichingProcessor implements SpanProcessor {
   }
 }
 
-// Add the SpanEnrichingProcessor instance to the NodeTracerProvider instance.
-tracerProvider.addSpanProcessor(new SpanEnrichingProcessor());
+// Enable Azure Monitor integration.
+const options: AzureMonitorOpenTelemetryOptions = {
+    // Add the SpanEnrichingProcessor
+    spanProcessors: [new SpanEnrichingProcessor()] 
+}
+useAzureMonitor(options);
+
 ```
 
 ##### [Python](#tab/python)
@@ -1960,29 +1957,27 @@ Logback, Log4j, and java.util.logging are [autoinstrumented](#logs). Attaching c
 #### [Node.js](#tab/nodejs)
 
 ```typescript
-    // Import the useAzureMonitor function and the logs module from the @azure/monitor-opentelemetry and @opentelemetry/api-logs packages, respectively.
     const { useAzureMonitor } = require("@azure/monitor-opentelemetry");
-    const { logs } = require("@opentelemetry/api-logs");
-    import { Logger } from "@opentelemetry/sdk-logs";
+    const bunyan = require('bunyan');
 
-    // Enable Azure Monitor integration.
-    useAzureMonitor();
+    // Instrumentations configuration
+    const options: AzureMonitorOpenTelemetryOptions = {
+        instrumentationOptions: {
+            // Instrumentations generating logs
+            bunyan: { enabled: true },
+        }
+    };
 
-    // Get the logger for the "testLogger" logger name.
-    const logger = (logs.getLogger("testLogger") as Logger);
+    // Enable Azure Monitor integration
+    useAzureMonitor(options);
 
-    // Create a new log record.
-    const logRecord = {
-      body: "testEvent",
-      attributes: {
+    var log = bunyan.createLogger({ name: 'testApp' });
+    log.info({
         "testAttribute1": "testValue1",
         "testAttribute2": "testValue2",
         "testAttribute3": "testValue3"
-      }
-    };
+    }, 'testEvent');
 
-    // Emit the log record.
-    logger.emit(logRecord);
 ```
 
 #### [Python](#tab/python)
@@ -2147,18 +2142,28 @@ See [sampling overrides](java-standalone-config.md#sampling-overrides-preview) a
 Use the add [custom property example](#add-a-custom-property-to-a-span), but replace the following lines of code:
 
     ```typescript
-    // Import the SpanKind and TraceFlags classes from the @opentelemetry/api package.
+    // Import the necessary packages.
     const { SpanKind, TraceFlags } = require("@opentelemetry/api");
+    const { ReadableSpan, Span, SpanProcessor } = require("@opentelemetry/sdk-trace-base");
 
     // Create a new SpanEnrichingProcessor class.
-    class SpanEnrichingProcessor {
+    class SpanEnrichingProcessor implements SpanProcessor {
+        forceFlush(): Promise<void> {
+            return Promise.resolve();
+        }
 
-      onEnd(span) {
-        // If the span is an internal span, set the trace flags to NONE.
-        if(span.kind == SpanKind.INTERNAL){
-          span.spanContext().traceFlags = TraceFlags.NONE;
+        shutdown(): Promise<void> {
+            return Promise.resolve();
+        }
+
+        onStart(_span: Span): void {}
+
+        onEnd(span) {
+            // If the span is an internal span, set the trace flags to NONE.
+            if(span.kind == SpanKind.INTERNAL){
+            span.spanContext().traceFlags = TraceFlags.NONE;
+            }
         }
-      }
     }
     ```
 

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

@@ -783,22 +783,18 @@ For more information about Java, see the [Java supplemental documentation](java-
     ```typescript
     // Import the useAzureMonitor function, the AzureMonitorOpenTelemetryOptions class, the trace module, the ProxyTracerProvider class, the BatchSpanProcessor class, the NodeTracerProvider class, and the OTLPTraceExporter class from the @azure/monitor-opentelemetry, @opentelemetry/api, @opentelemetry/sdk-trace-base, @opentelemetry/sdk-trace-node, and @opentelemetry/exporter-trace-otlp-http packages, respectively.
     const { useAzureMonitor, AzureMonitorOpenTelemetryOptions } = require("@azure/monitor-opentelemetry");
-    const { trace, ProxyTracerProvider } = require("@opentelemetry/api");
     const { BatchSpanProcessor } = require('@opentelemetry/sdk-trace-base');
-    const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
     const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http');
 
-    // Enable Azure Monitor integration.
-    useAzureMonitor();
-
     // Create a new OTLPTraceExporter object.
     const otlpExporter = new OTLPTraceExporter();
 
-    // Get the NodeTracerProvider instance.
-    const tracerProvider = ((trace.getTracerProvider() as ProxyTracerProvider).getDelegate() as NodeTracerProvider);
-
-    // Add a BatchSpanProcessor to the NodeTracerProvider instance.
-    tracerProvider.addSpanProcessor(new BatchSpanProcessor(otlpExporter));
+    // Enable Azure Monitor integration.
+    const options: AzureMonitorOpenTelemetryOptions = {
+        // Add the SpanEnrichingProcessor
+        spanProcessors: [new BatchSpanProcessor(otlpExporter)] 
+    }
+    useAzureMonitor(options);
     ```
 
 #### [Python](#tab/python)