rename function, delete optional chaining

Author: s1gr1d

packages/core/src/tracing/dynamicSamplingContext.ts

@@ -10,7 +10,7 @@ import {
 import type { DynamicSamplingContext } from '../types-hoist/envelope';
 import type { Span } from '../types-hoist/span';
 import { baggageHeaderToDynamicSamplingContext, dynamicSamplingContextToSentryBaggageHeader } from '../utils/baggage';
-import { deriveOrgIdFromClient } from '../utils/dsn';
+import { extractOrgIdFromClient } from '../utils/dsn';
 import { hasSpansEnabled } from '../utils/hasSpansEnabled';
 import { addNonEnumerableProperty } from '../utils/object';
 import { getRootSpan, spanIsSampled, spanToJSON } from '../utils/spanUtils';
@@ -51,7 +51,7 @@ export function getDynamicSamplingContextFromClient(trace_id: string, client: Cl
     release: options.release,
     public_key,
     trace_id,
-    org_id: deriveOrgIdFromClient(client),
+    org_id: extractOrgIdFromClient(client),
   };
 
   client.emit('createDsc', dsc);

packages/core/src/utils/dsn.ts

@@ -135,14 +135,14 @@ export function extractOrgIdFromDsnHost(host: string): string | undefined {
  *
  *  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): string | undefined {
+export function extractOrgIdFromClient(client: Client): string | undefined {
   const options = client.getOptions();
 
   const { host } = client.getDsn() || {};
 
   let org_id: string | undefined;
 
-  if (options?.orgId) {
+  if (options.orgId) {
     org_id = String(options.orgId);
   } else if (host) {
     org_id = extractOrgIdFromDsnHost(host);

packages/core/src/utils/tracing.ts

@@ -4,7 +4,7 @@ import type { PropagationContext } from '../types-hoist/tracing';
 import type { TraceparentData } from '../types-hoist/transaction';
 import { debug } from '../utils/debug-logger';
 import { baggageHeaderToDynamicSamplingContext } from './baggage';
-import { deriveOrgIdFromClient } from './dsn';
+import { extractOrgIdFromClient } from './dsn';
 import { parseSampleRate } from './parseSampleRate';
 import { generateSpanId, generateTraceId } from './propagationContext';
 
@@ -136,7 +136,7 @@ function getSampleRandFromTraceparentAndDsc(
  * See https://develop.sentry.dev/sdk/telemetry/traces/#stricttracecontinuation
  */
 export function shouldContinueTrace(client: Client, baggageOrgId?: string): boolean {
-  const clientOrgId = deriveOrgIdFromClient(client);
+  const clientOrgId = extractOrgIdFromClient(client);
 
   // Case: baggage orgID and Client orgID don't match - always start new trace
   if (baggageOrgId && clientOrgId && baggageOrgId !== clientOrgId) {
@@ -146,7 +146,7 @@ export function shouldContinueTrace(client: Client, baggageOrgId?: string): bool
     return false;
   }
 
-  const strictTraceContinuation = client.getOptions()?.strictTraceContinuation || false; // default for `strictTraceContinuation` is `false`
+  const strictTraceContinuation = client.getOptions().strictTraceContinuation || false; // default for `strictTraceContinuation` is `false`
 
   if (strictTraceContinuation) {
     // With strict continuation enabled, don't continue trace if:

packages/core/test/lib/utils/dsn.test.ts

@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, test, vi } from 'vitest';
 import { DEBUG_BUILD } from '../../../src/debug-build';
 import { debug } from '../../../src/utils/debug-logger';
-import { deriveOrgIdFromClient, dsnToString, extractOrgIdFromDsnHost, makeDsn } from '../../../src/utils/dsn';
+import { dsnToString, extractOrgIdFromClient, extractOrgIdFromDsnHost, makeDsn } from '../../../src/utils/dsn';
 import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
 
 function testIf(condition: boolean) {
@@ -249,7 +249,7 @@ describe('extractOrgIdFromDsnHost', () => {
   });
 });
 
-describe('deriveOrgIdFromClient', () => {
+describe('extractOrgIdFromClient', () => {
   let client: TestClient;
 
   beforeEach(() => {
@@ -264,7 +264,7 @@ describe('deriveOrgIdFromClient', () => {
       }),
     );
 
-    const result = deriveOrgIdFromClient(client);
+    const result = extractOrgIdFromClient(client);
     expect(result).toBe('00222111');
   });
 
@@ -276,7 +276,7 @@ describe('deriveOrgIdFromClient', () => {
       }),
     );
 
-    const result = deriveOrgIdFromClient(client);
+    const result = extractOrgIdFromClient(client);
     expect(result).toBe('12345');
   });
 
@@ -287,14 +287,14 @@ describe('deriveOrgIdFromClient', () => {
       }),
     );
 
-    const result = deriveOrgIdFromClient(client);
+    const result = extractOrgIdFromClient(client);
     expect(result).toBe('012300');
   });
 
   test('returns undefined when neither options.orgId nor DSN host are available', () => {
     client = new TestClient(getDefaultTestClientOptions({}));
 
-    const result = deriveOrgIdFromClient(client);
+    const result = extractOrgIdFromClient(client);
     expect(result).toBeUndefined();
   });
 });