more cleanup

Author: Lms24

packages/node-core/src/utils/outgoingFetchRequest.ts

@@ -97,7 +97,7 @@ function stringToArrayHeaders(requestHeaders: string): string[] {
       }
       const key = header.slice(0, colonIndex).trim();
       const value = header.slice(colonIndex + 1).trim();
-      if (key != null && value != null) {
+      if (key && value) {
         headers.push(key, value);
       }
     } catch {}

packages/node-core/src/utils/outgoingHttpRequest.ts

@@ -112,7 +112,6 @@ export function addTracePropagationHeadersToOutgoingRequest(
       cleanedExistingBaggage = objectToBaggageHeader(baggageWithoutSentry);
     }
 
-    // If a sentry-trace header was already added, we don't add our baggage at all.
     const newBaggage = mergeBaggageHeaders(cleanedExistingBaggage, baggage);
     if (newBaggage) {
       try {

packages/opentelemetry/src/propagator.ts

@@ -75,6 +75,9 @@ export class SentryPropagator extends W3CBaggagePropagator {
       if (baggageEntries) {
         Object.entries(baggageEntries).forEach(([key, value]) => {
           if (!existingSentryTraceHeader && key.startsWith(SENTRY_BAGGAGE_KEY_PREFIX)) {
+            // Edge case: A baggage header with sentry- keys was added previously but no
+            // sentry-trace header. In this case we remove the old sentry-keys and add new
+            // ones below.
             return;
           }
           baggage = baggage.setEntry(key, { value });