From d982dd371847d3c16788f32ddce518802a66cbee Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Mon, 8 Jul 2024 15:50:18 +0200
Subject: [PATCH] ref(otel): Ensure we never swallow args for ContextManager

This is more a safety thing that we do not swallow this accidentally in the future.
---
 packages/opentelemetry/src/contextManager.ts | 4 ++--
 packages/opentelemetry/src/propagator.ts     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/opentelemetry/src/contextManager.ts b/packages/opentelemetry/src/contextManager.ts
index 46561e3242fd..27ef6e5d5cda 100644
--- a/packages/opentelemetry/src/contextManager.ts
+++ b/packages/opentelemetry/src/contextManager.ts
@@ -31,8 +31,8 @@ export function wrapContextManagerClass<ContextManagerInstance extends ContextMa
 
   // @ts-expect-error TS does not like this, but we know this is fine
   class SentryContextManager extends ContextManagerClass {
-    public constructor() {
-      super();
+    public constructor(...args: unknown[]) {
+      super(...args);
       setIsSetup('SentryContextManager');
     }
     /**
diff --git a/packages/opentelemetry/src/propagator.ts b/packages/opentelemetry/src/propagator.ts
index ac8340bdc66a..2fa125e86b86 100644
--- a/packages/opentelemetry/src/propagator.ts
+++ b/packages/opentelemetry/src/propagator.ts
@@ -155,7 +155,7 @@ export class SentryPropagator extends W3CBaggagePropagator {
 
     const propagationContext = propagationContextFromHeaders(sentryTrace, baggage);
 
-    // Add remote parent span context,
+    // Add remote parent span context
     const ctxWithSpanContext = getContextWithRemoteActiveSpan(context, { sentryTrace, baggage });
 
     // Also update the scope on the context (to be sure this is picked up everywhere)