[sdk-logs] remove includeTraceContext configuration and use LogRecord context when available

experimental/CHANGELOG.md

@@ -15,6 +15,7 @@ All notable changes to experimental packages in this project will be documented
 ### :bug: (Bug Fix)
 
 * fix(sdk-node): use resource interface instead of concrete class [#3803](https://github.com/open-telemetry/opentelemetry-js/pull/3803) @blumamir
+* fix(sdk-logs): logger includeTraceContext setting not defaulting to true  [#3817](https://github.com/open-telemetry/opentelemetry-js/pull/3817) @hectorhdzg
 
 ### :books: (Refine Doc)
 

experimental/packages/sdk-logs/src/Logger.ts

@@ -39,9 +39,7 @@ export class Logger implements logsAPI.Logger {
   }
 
   public emit(logRecord: logsAPI.LogRecord): void {
-    const currentContext = this._loggerConfig.includeTraceContext
-      ? context.active()
-      : undefined;
+    const currentContext = logRecord.context || context.active();
     /**
      * If a Logger was obtained with include_trace_context=true,
      * the LogRecords it emits MUST automatically include the Trace Context from the active Context,

experimental/packages/sdk-logs/src/LoggerProvider.ts

@@ -84,7 +84,6 @@ export class LoggerProvider implements logsAPI.LoggerProvider {
           { name: loggerName, version, schemaUrl: options?.schemaUrl },
           {
             logRecordLimits: this._config.logRecordLimits,
-            includeTraceContext: options?.includeTraceContext,
           },
           this
         )

experimental/packages/sdk-logs/src/index.ts

@@ -16,6 +16,7 @@
 
 export {
   LoggerConfig,
+  LoggerProviderConfig,
   LogRecordLimits,
   BufferConfig,
   BatchLogRecordProcessorBrowserConfig,

experimental/packages/sdk-logs/src/types.ts

@@ -33,9 +33,6 @@ export interface LoggerProviderConfig {
 export interface LoggerConfig {
   /** Log Record Limits*/
   logRecordLimits?: LogRecordLimits;
-
-  /** include Trace Context */
-  includeTraceContext?: boolean;
 }
 
 export interface LogRecordLimits {

experimental/packages/sdk-logs/test/common/Logger.test.ts

@@ -18,8 +18,8 @@ import * as assert from 'assert';
 import * as sinon from 'sinon';
 
 import { LogRecord, Logger, LoggerConfig, LoggerProvider } from '../../src';
-import { loadDefaultConfig } from '../../src/config';
-import { context } from '@opentelemetry/api';
+import { ROOT_CONTEXT, TraceFlags, context, trace } from '@opentelemetry/api';
+import * as logsAPI from '@opentelemetry/api-logs';
 
 const setup = (loggerConfig: LoggerConfig = {}) => {
   const logger = new Logger(
@@ -40,14 +40,6 @@ describe('Logger', () => {
       const { logger } = setup();
       assert.ok(logger instanceof Logger);
     });
-
-    it('should a default value with config.includeTraceContext', () => {
-      const { logger } = setup();
-      assert.ok(
-        logger['_loggerConfig'].includeTraceContext ===
-          loadDefaultConfig().includeTraceContext
-      );
-    });
   });
 
   describe('emit', () => {
@@ -69,22 +61,30 @@ describe('Logger', () => {
       assert.ok(makeOnlySpy.called);
     });
 
-    it('should emit with current Context when includeTraceContext is true', () => {
-      const { logger } = setup({ includeTraceContext: true });
+    it('should emit with current Context', () => {
+      const { logger } = setup({});
       const callSpy = sinon.spy(logger.getActiveLogRecordProcessor(), 'onEmit');
       logger.emit({
         body: 'test log body',
       });
       assert.ok(callSpy.calledWith(sinon.match.any, context.active()));
     });
 
-    it('should emit with empty Context when includeTraceContext is false', () => {
-      const { logger } = setup({ includeTraceContext: false });
+    it('should emit with Context specifie in LogRecord', () => {
+      const { logger } = setup({});
+      const spanContext = {
+        traceId: 'd4cda95b652f4a1592b449d5929fda1b',
+        spanId: '6e0c63257de34c92',
+        traceFlags: TraceFlags.SAMPLED,
+      };
+      const activeContext = trace.setSpanContext(ROOT_CONTEXT, spanContext);
+      const logRecordData: logsAPI.LogRecord = {
+        context: activeContext,
+      };
+
       const callSpy = sinon.spy(logger.getActiveLogRecordProcessor(), 'onEmit');
-      logger.emit({
-        body: 'test log body',
-      });
-      assert.ok(callSpy.calledWith(sinon.match.any, undefined));
+      logger.emit(logRecordData);
+      assert.ok(callSpy.calledWith(sinon.match.any, activeContext));
     });
   });
 });