Merge branch 'main' into upd-aws-detector

CONTRIBUTING.md

@@ -238,7 +238,7 @@ features for unmaintained components. At least one sponsor is needed to lift the
 adding the requested feature. Sponsors are expected to provide reviews for that feature and be responsive on the issue.
 
 Components marked as unmaintained still receive semantic conventions updates and bugfixes where possible.
-[@open-telemetry/javascript-triagers](https://github.com/orgs/open-telemetry/teams/javascript-triagers) may add the
+[@open-telemetry/javascript-contrib-triagers](https://github.com/orgs/open-telemetry/teams/javascript-contrib-triagers) may add the
 `type:semconv-update` or `bug` label to mark them as exempt from being auto-closed within two weeks.
 
 A component which is unmaintained may be deprecated if there is a problem that is not fixed in a timely manner.

plugins/node/opentelemetry-instrumentation-pino/src/instrumentation.ts

@@ -109,8 +109,9 @@ export class PinoInstrumentation extends InstrumentationBase<PinoInstrumentation
             const origStream = logger[moduleExports.symbols.streamSym];
             logger[moduleExports.symbols.streamSym] = moduleExports.multistream(
               [
-                { level: logger.level, stream: origStream },
-                { level: logger.level, stream: otelStream },
+                // Use level `0` to never not log a record given to the stream.
+                { level: 0, stream: origStream },
+                { level: 0, stream: otelStream },
               ],
               { levels: logger.levels.values }
             );

plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts

@@ -473,6 +473,49 @@ describe('PinoInstrumentation', () => {
       });
     });
 
+    it('emits log records to a lower level after level change', () => {
+      const logRecords = memExporter.getFinishedLogRecords();
+
+      logger.debug('first msg at debug');
+      logger.trace('first msg at trace'); // Should *not* see this.
+
+      logger.level = 'trace';
+      logger.debug('second msg at debug');
+      logger.trace('second msg at trace'); // *Should* see this.
+
+      assert.strictEqual(logRecords.length, 3);
+      assert.strictEqual(logRecords[0].severityNumber, SeverityNumber.DEBUG);
+      assert.strictEqual(logRecords[0].severityText, 'debug');
+      assert.strictEqual(logRecords[0].body, 'first msg at debug');
+      assert.strictEqual(logRecords[1].severityNumber, SeverityNumber.DEBUG);
+      assert.strictEqual(logRecords[1].severityText, 'debug');
+      assert.strictEqual(logRecords[1].body, 'second msg at debug');
+      assert.strictEqual(logRecords[2].severityNumber, SeverityNumber.TRACE);
+      assert.strictEqual(logRecords[2].severityText, 'trace');
+      assert.strictEqual(logRecords[2].body, 'second msg at trace');
+    });
+
+    it('emits log records from child logger at lower level', () => {
+      const logRecords = memExporter.getFinishedLogRecords();
+
+      const child = logger.child({ childField: 42 }, { level: 'trace' });
+
+      logger.debug('logger at debug level');
+      logger.trace('logger at trace level'); // Should *not* see this one.
+      child.debug('child at debug level');
+      child.trace('child at trace level'); // *Should* see this one.
+      assert.strictEqual(logRecords.length, 3);
+      assert.strictEqual(logRecords[0].severityNumber, SeverityNumber.DEBUG);
+      assert.strictEqual(logRecords[0].severityText, 'debug');
+      assert.strictEqual(logRecords[0].body, 'logger at debug level');
+      assert.strictEqual(logRecords[1].severityNumber, SeverityNumber.DEBUG);
+      assert.strictEqual(logRecords[1].severityText, 'debug');
+      assert.strictEqual(logRecords[1].body, 'child at debug level');
+      assert.strictEqual(logRecords[2].severityNumber, SeverityNumber.TRACE);
+      assert.strictEqual(logRecords[2].severityText, 'trace');
+      assert.strictEqual(logRecords[2].body, 'child at trace level');
+    });
+
     it('does not emit to the Logs SDK if disableLogSending=true', () => {
       instrumentation.setConfig({ disableLogSending: true });