From 3341bb6cb0a4c8397a64ca08045a1f65fbdb5642 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Wed, 28 Jun 2023 15:40:40 -0400 Subject: [PATCH 1/3] update tests --- .../suites/replay/captureReplay/test.ts | 4 ++++ .../suites/replay/captureReplayFromReplayPackage/test.ts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/packages/browser-integration-tests/suites/replay/captureReplay/test.ts b/packages/browser-integration-tests/suites/replay/captureReplay/test.ts index 421e725bb3e4..f1aff48ac9df 100644 --- a/packages/browser-integration-tests/suites/replay/captureReplay/test.ts +++ b/packages/browser-integration-tests/suites/replay/captureReplay/test.ts @@ -56,6 +56,10 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT version: SDK_VERSION, name: 'sentry.javascript.browser', }, +<<<<<<< HEAD +======= + sdkProcessingMetadata: expect.any(Object), +>>>>>>> 929289c22 (update tests) request: { url: expect.stringContaining('/dist/index.html'), headers: { diff --git a/packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts b/packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts index c42bfc692018..2509bb764020 100644 --- a/packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts +++ b/packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts @@ -56,6 +56,10 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe version: SDK_VERSION, name: 'sentry.javascript.browser', }, +<<<<<<< HEAD +======= + sdkProcessingMetadata: expect.any(Object), +>>>>>>> 929289c22 (update tests) request: { url: expect.stringContaining('/dist/index.html'), headers: { From 4f7ac257b3f0f22b44a399ff09e3ea7465c31f43 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Wed, 28 Jun 2023 16:01:56 -0400 Subject: [PATCH 2/3] remove sdkProcessingMetadata from replay fixtures --- .../suites/replay/captureReplay/test.ts | 4 ---- .../suites/replay/captureReplayFromReplayPackage/test.ts | 4 ---- 2 files changed, 8 deletions(-) diff --git a/packages/browser-integration-tests/suites/replay/captureReplay/test.ts b/packages/browser-integration-tests/suites/replay/captureReplay/test.ts index f1aff48ac9df..421e725bb3e4 100644 --- a/packages/browser-integration-tests/suites/replay/captureReplay/test.ts +++ b/packages/browser-integration-tests/suites/replay/captureReplay/test.ts @@ -56,10 +56,6 @@ sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalT version: SDK_VERSION, name: 'sentry.javascript.browser', }, -<<<<<<< HEAD -======= - sdkProcessingMetadata: expect.any(Object), ->>>>>>> 929289c22 (update tests) request: { url: expect.stringContaining('/dist/index.html'), headers: { diff --git a/packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts b/packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts index 2509bb764020..c42bfc692018 100644 --- a/packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts +++ b/packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts @@ -56,10 +56,6 @@ sentryTest('should capture replays (@sentry/replay export)', async ({ getLocalTe version: SDK_VERSION, name: 'sentry.javascript.browser', }, -<<<<<<< HEAD -======= - sdkProcessingMetadata: expect.any(Object), ->>>>>>> 929289c22 (update tests) request: { url: expect.stringContaining('/dist/index.html'), headers: { From 824a592a030da672a46b046a2f80cb5b2747d810 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Thu, 29 Jun 2023 12:31:57 -0400 Subject: [PATCH 3/3] ref(remix): Extract propagation context in request handler --- packages/remix/src/utils/instrumentServer.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/remix/src/utils/instrumentServer.ts b/packages/remix/src/utils/instrumentServer.ts index 5e0f300bf82e..210212af1108 100644 --- a/packages/remix/src/utils/instrumentServer.ts +++ b/packages/remix/src/utils/instrumentServer.ts @@ -5,13 +5,12 @@ import { captureException, getCurrentHub } from '@sentry/node'; import type { Transaction, TransactionSource, WrappedFunction } from '@sentry/types'; import { addExceptionMechanism, - baggageHeaderToDynamicSamplingContext, dynamicSamplingContextToSentryBaggageHeader, - extractTraceparentData, fill, isNodeEnv, loadModule, logger, + tracingContextFromHeaders, } from '@sentry/utils'; import type { @@ -290,9 +289,11 @@ export function startRequestHandlerTransaction( method: string; }, ): Transaction { - // If there is a trace header set, we extract the data from it (parentSpanId, traceId, and sampling decision) - const traceparentData = extractTraceparentData(request.headers['sentry-trace']); - const dynamicSamplingContext = baggageHeaderToDynamicSamplingContext(request.headers.baggage); + const { traceparentData, dynamicSamplingContext, propagationContext } = tracingContextFromHeaders( + request.headers['sentry-trace'], + request.headers.baggage, + ); + hub.getScope().setPropagationContext(propagationContext); const transaction = hub.startTransaction({ name,