Merge branch 'main' into main

Author: johnbley

metapackages/auto-configuration-propagators/src/utils.ts

@@ -30,7 +30,7 @@ type PropagatorFactoryFunction = () => TextMapPropagator;
 
 const propagatorMap = new Map<string, PropagatorFactoryFunction>([
   ['tracecontext', () => new W3CTraceContextPropagator()],
-  ['baggage', () => new W3CTraceContextPropagator()],
+  ['baggage', () => new W3CBaggagePropagator()],
   [
     'b3',
     () => new B3Propagator({ injectEncoding: B3InjectEncoding.SINGLE_HEADER }),

plugins/node/opentelemetry-instrumentation-express/test/fixtures/use-express-regex.mjs

@@ -61,7 +61,7 @@ app.get(['/test/array1', /\/test\/array[2-9]/], (_req, res) => {
   res.send({ response: 'response 3' });
 });
 
-app.get(['/test', 6, /test/], (_req, res) => {
+app.get(['/test', '6', /test/], (_req, res) => {
   res.send({ response: 'response 4' });
 });