drop considering passing through a includeTraceContext option

open-telemetry/opentelemetry-js#3817 seems to have mostly dropped that.
trentm · Oct 3, 2023 · 4ffc91e · 4ffc91e
1 parent d5a67bc
commit 4ffc91e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-bunyan/src/instrumentation.ts
@@ -29,7 +29,6 @@ import type * as BunyanLogger from 'bunyan';
 const DEFAULT_CONFIG: BunyanInstrumentationConfig = {
   enableLogsBridge: true,
   enableInjection: true,
-  includeTraceContext: true,
 };
 
 export class BunyanInstrumentation extends InstrumentationBase<
@@ -130,11 +129,9 @@ export class BunyanInstrumentation extends InstrumentationBase<
         }
 
         const record = args[0] as Record<string, string>;
-        if (config.includeTraceContext) {
-          record['trace_id'] = spanContext.traceId;
-          record['span_id'] = spanContext.spanId;
-          record['trace_flags'] = `0${spanContext.traceFlags.toString(16)}`;
-        }
+        record['trace_id'] = spanContext.traceId;
+        record['span_id'] = spanContext.spanId;
+        record['trace_flags'] = `0${spanContext.traceFlags.toString(16)}`;
 
         instrumentation._callHook(span, record);
 
@@ -147,6 +144,7 @@ export class BunyanInstrumentation extends InstrumentationBase<
     return (original: (...args: unknown[]) => void) => {
       const instrumentation = this;
       return function patchedCreateLogger(...args: unknown[]) {
+        // XXX type error here on not using spread, but no complaint from same above. Wassup?
         const logger = original.apply(null, args);
         instrumentation._addStream(logger);
         return logger;
@@ -160,7 +158,7 @@ export class BunyanInstrumentation extends InstrumentationBase<
       return;
     }
     this._diag.debug('Adding OpenTelemetryBunyanStream to logger');
-    // XXX includeTraceContext pass in, and test
+    // XXX pass in any args to the stream?
     logger.addStream({ type: 'raw', stream: new OpenTelemetryBunyanStream() });
   }
 

diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/src/types.ts b/plugins/node/opentelemetry-instrumentation-bunyan/src/types.ts
@@ -42,12 +42,4 @@ export interface BunyanInstrumentationConfig extends InstrumentationConfig {
    * span context. It requires both `enableInjection` to be true.
    */
   logHook?: LogHookFunction;
-
-  /**
-   * Whether to include trace-context in (a) fields injected into log records
-   * (see `enableInjection`); and (b) in records from the OpenTelemetry Bunyan
-   * stream (see `enableLogsBridge`).
-   * @default true
-   */
-  includeTraceContext?: boolean;
 }
diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/test/bunyan.test.ts b/plugins/node/opentelemetry-instrumentation-bunyan/test/bunyan.test.ts
@@ -264,8 +264,6 @@ describe('BunyanInstrumentation', () => {
         span.end();
       });
     });
-
-    // XXX test includeTraceContext=false
   });
 
   describe('disabled instrumentation', () => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -264,8 +264,6 @@ describe('BunyanInstrumentation', () => { @@
             span.end();
           });
         });
-        // XXX test includeTraceContext=false
       });
       describe('disabled instrumentation', () => {
@@ Expand Down @@