Merge remote-tracking branch 'upstream/main' into sigv4_logs

Author: liustve

aws-distro-opentelemetry-node-autoinstrumentation/package.json

@@ -100,6 +100,9 @@
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/auto-configuration-propagators": "0.3.2",
     "@opentelemetry/auto-instrumentations-node": "0.56.0",
+    "@opentelemetry/api-events": "0.57.1",
+    "@opentelemetry/sdk-events": "0.57.1",
+    "@opentelemetry/sdk-logs": "0.57.1",
     "@opentelemetry/core": "1.30.1",
     "@opentelemetry/exporter-metrics-otlp-grpc": "0.57.1",
     "@opentelemetry/exporter-metrics-otlp-http": "0.57.1",

aws-distro-opentelemetry-node-autoinstrumentation/src/aws-metric-attributes-span-exporter.ts

@@ -13,6 +13,7 @@ import {
   MetricAttributeGenerator,
   SERVICE_METRIC,
 } from './metric-attribute-generator';
+import { Mutable } from './utils';
 
 /**
  * This exporter will update a span with metric attributes before exporting. It depends on a
@@ -125,9 +126,6 @@ export class AwsMetricAttributesSpanExporter implements SpanExporter {
     }
 
     // Bypass `readonly` restriction of ReadableSpan's attributes.
-    // Workaround provided from official TypeScript docs:
-    // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-8.html#improved-control-over-mapped-type-modifiers
-    type Mutable<T> = { -readonly [P in keyof T]: T[P] };
     const mutableSpan: Mutable<ReadableSpan> = span;
     mutableSpan.attributes = updateAttributes;
 

aws-distro-opentelemetry-node-autoinstrumentation/src/exporter/otlp/aws/traces/otlp-aws-span-exporter.ts

@@ -5,6 +5,12 @@ import { CompressionAlgorithm, OTLPExporterNodeConfigBase } from '@opentelemetry
 import { IExportTraceServiceResponse, ProtobufTraceSerializer } from '@opentelemetry/otlp-transformer';
 import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base';
 import { OTLPAwsBaseExporter } from '../common/otlp-aws-base-exporter';
+import { LLOHandler } from '../../../../llo-handler';
+import { LoggerProvider as APILoggerProvider, logs } from '@opentelemetry/api-logs';
+import { ExportResult } from '@opentelemetry/core';
+import { isAgentObservabilityEnabled } from '../../../../utils';
+import { diag } from '@opentelemetry/api';
+import { LoggerProvider } from '@opentelemetry/sdk-logs';
 
 /**
  * This exporter extends the functionality of the OTLPProtoTraceExporter to allow spans to be exported
@@ -21,13 +27,52 @@ export class OTLPAwsSpanExporter
   extends OTLPAwsBaseExporter<ReadableSpan[], IExportTraceServiceResponse>
   implements SpanExporter
 {
-  constructor(endpoint: string, config?: OTLPExporterNodeConfigBase) {
+  private loggerProvider: APILoggerProvider | undefined;
+  private lloHandler: LLOHandler | undefined;
+
+  constructor(endpoint: string, config?: OTLPExporterNodeConfigBase, loggerProvider?: APILoggerProvider) {
     const modifiedConfig: OTLPExporterNodeConfigBase = {
       ...config,
       url: endpoint,
       compression: CompressionAlgorithm.NONE,
     };
 
     super(endpoint, 'xray', new OTLPProtoTraceExporter(modifiedConfig), ProtobufTraceSerializer, config?.compression);
+
+    this.lloHandler = undefined;
+    this.loggerProvider = loggerProvider;
+  }
+
+  // Lazily initialize LLO handler when needed to avoid initialization order issues
+  private ensureLloHandler(): boolean {
+    if (!this.lloHandler && isAgentObservabilityEnabled()) {
+      // If loggerProvider wasn't provided, try to get the current one
+      if (!this.loggerProvider) {
+        try {
+          this.loggerProvider = logs.getLoggerProvider();
+        } catch (e: unknown) {
+          diag.debug('Failed to get logger provider', e);
+          return false;
+        }
+      }
+
+      if (this.loggerProvider instanceof LoggerProvider) {
+        this.lloHandler = new LLOHandler(this.loggerProvider);
+        return true;
+      }
+    }
+
+    return !!this.lloHandler;
+  }
+
+  public override async export(items: ReadableSpan[], resultCallback: (result: ExportResult) => void): Promise<void> {
+    let itemsToSerialize: ReadableSpan[] = items;
+    if (isAgentObservabilityEnabled() && this.ensureLloHandler() && this.lloHandler) {
+      // items to serialize are now the lloProcessedSpans
+      itemsToSerialize = this.lloHandler.processSpans(items);
+      itemsToSerialize = this.lloHandler.processSpans(items);
+    }
+
+    return super.export(itemsToSerialize, resultCallback);
   }
 }