shuffle around util functions

Author: s1gr1d

packages/core/src/index.ts

@@ -127,7 +127,7 @@ export type { FeatureFlag } from './featureFlags';
 export { applyAggregateErrorsToEvent } from './utils-hoist/aggregate-errors';
 export { getBreadcrumbLogLevelFromHttpStatusCode } from './utils-hoist/breadcrumb-log-level';
 export { getComponentName, getLocationHref, htmlTreeAsString } from './utils-hoist/browser';
-export { dsnFromString, dsnToString, makeDsn } from './utils-hoist/dsn';
+export { dsnFromString, dsnToString, makeDsn, deriveOrgIdFromClient } from './utils-hoist/dsn';
 // eslint-disable-next-line deprecation/deprecation
 export { SentryError } from './utils-hoist/error';
 export { GLOBAL_OBJ } from './utils-hoist/worldwide';

packages/core/src/tracing/dynamicSamplingContext.ts

@@ -15,8 +15,9 @@ import {
   baggageHeaderToDynamicSamplingContext,
   dynamicSamplingContextToSentryBaggageHeader,
 } from '../utils-hoist/baggage';
+import { deriveOrgIdFromClient } from '../utils-hoist/dsn';
 import { addNonEnumerableProperty } from '../utils-hoist/object';
-import { deriveOrgIdFromClient, getCapturedScopesOnSpan } from './utils';
+import { getCapturedScopesOnSpan } from './utils';
 
 /**
  * If you change this value, also update the terser plugin config to

packages/core/src/tracing/trace.ts

@@ -26,7 +26,7 @@ import { sampleSpan } from './sampling';
 import { SentryNonRecordingSpan } from './sentryNonRecordingSpan';
 import { SentrySpan } from './sentrySpan';
 import { SPAN_STATUS_ERROR } from './spanstatus';
-import { deriveOrgIdFromClient, setCapturedScopesOnSpan } from './utils';
+import { setCapturedScopesOnSpan } from './utils';
 
 const SUPPRESS_TRACING_KEY = '__SENTRY_SUPPRESS_TRACING__';
 

packages/core/src/tracing/utils.ts

@@ -1,7 +1,5 @@
-import type { Client } from '../client';
 import type { Scope } from '../scope';
 import type { Span } from '../types-hoist/span';
-import { extractOrgIdFromDsnHost } from '../utils-hoist/dsn';
 import { addNonEnumerableProperty } from '../utils-hoist/object';
 
 const SCOPE_ON_START_SPAN_FIELD = '_sentryScope';
@@ -29,24 +27,3 @@ export function getCapturedScopesOnSpan(span: Span): { scope?: Scope; isolationS
     isolationScope: (span as SpanWithScopes)[ISOLATION_SCOPE_ON_START_SPAN_FIELD],
   };
 }
-
-/**
- *  Returns the organization ID of the client.
- *
- *  The organization ID is extracted from the DSN. If the client options include a `orgId`, this will always take precedence.
- */
-export function deriveOrgIdFromClient(client: Client | undefined): string | undefined {
-  const options = client?.getOptions();
-
-  const { host } = client?.getDsn() || {};
-
-  let org_id: string | undefined;
-
-  if (options?.orgId) {
-    org_id = String(options.orgId);
-  } else if (host) {
-    org_id = extractOrgIdFromDsnHost(host);
-  }
-
-  return org_id;
-}

packages/core/src/utils-hoist/dsn.ts

@@ -1,3 +1,4 @@
+import type { Client } from '../client';
 import type { DsnComponents, DsnLike, DsnProtocol } from '../types-hoist/dsn';
 import { DEBUG_BUILD } from './../debug-build';
 import { consoleSandbox, logger } from './logger';
@@ -129,6 +130,27 @@ export function extractOrgIdFromDsnHost(host: string): string | undefined {
   return match?.[1];
 }
 
+/**
+ *  Returns the organization ID of the client.
+ *
+ *  The organization ID is extracted from the DSN. If the client options include a `orgId`, this will always take precedence.
+ */
+export function deriveOrgIdFromClient(client: Client | undefined): string | undefined {
+  const options = client?.getOptions();
+
+  const { host } = client?.getDsn() || {};
+
+  let org_id: string | undefined;
+
+  if (options?.orgId) {
+    org_id = String(options.orgId);
+  } else if (host) {
+    org_id = extractOrgIdFromDsnHost(host);
+  }
+
+  return org_id;
+}
+
 /**
  * Creates a valid Sentry Dsn object, identifying a Sentry instance and project.
  * @returns a valid DsnComponents object or `undefined` if @param from is an invalid DSN source

packages/core/src/utils-hoist/tracing.ts

@@ -1,10 +1,10 @@
 import type { Client } from '../client';
 import { DEBUG_BUILD } from '../debug-build';
-import { deriveOrgIdFromClient } from '../tracing/utils';
 import type { DynamicSamplingContext } from '../types-hoist/envelope';
 import type { PropagationContext } from '../types-hoist/tracing';
 import type { TraceparentData } from '../types-hoist/transaction';
 import { parseSampleRate } from '../utils/parseSampleRate';
+import { deriveOrgIdFromClient } from '../utils-hoist/dsn';
 import { logger } from '../utils-hoist/logger';
 import { baggageHeaderToDynamicSamplingContext } from './baggage';
 import { generateSpanId, generateTraceId } from './propagationContext';

packages/opentelemetry/src/propagator.ts

@@ -15,9 +15,11 @@ import {
   parseBaggageHeader,
   propagationContextFromHeaders,
   SENTRY_BAGGAGE_KEY_PREFIX,
+  shouldContinueTrace,
   spanToJSON,
   stringMatchesSomePattern,
 } from '@sentry/core';
+import { baggageHeaderToDynamicSamplingContext } from '@sentry/core/src';
 import { SENTRY_BAGGAGE_HEADER, SENTRY_TRACE_HEADER, SENTRY_TRACE_STATE_URL } from './constants';
 import { DEBUG_BUILD } from './debug-build';
 import { getScopesFromContext, setScopesOnContext } from './utils/contextData';
@@ -210,10 +212,11 @@ function getContextWithRemoteActiveSpan(
   const propagationContext = propagationContextFromHeaders(sentryTrace, baggage);
 
   const { traceId, parentSpanId, sampled, dsc } = propagationContext;
+  const incomingDsc = baggageHeaderToDynamicSamplingContext(baggage);
 
   // We only want to set the virtual span if we are continuing a concrete trace
   // Otherwise, we ignore the incoming trace here, e.g. if we have no trace headers
-  if (!parentSpanId) {
+  if (!parentSpanId || !shouldContinueTrace(getClient(), incomingDsc?.org_id)) {
     return ctx;
   }
 

packages/opentelemetry/src/trace.ts

@@ -259,7 +259,7 @@ export function continueTrace<T>(options: Parameters<typeof baseContinueTrace>[0
 
 /**
  * Get the trace context for a given scope.
- * We have a custom implemention here because we need an OTEL-specific way to get the span from a scope.
+ * We have a custom implementation here because we need an OTEL-specific way to get the span from a scope.
  */
 export function getTraceContextForScope(
   client: Client,