From b7ddbd954629923c8e8c8ddc881b0e05d2046948 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Mon, 5 Dec 2022 11:27:59 +0100
Subject: [PATCH 1/2] fix(node): Move `profilesSampleRate` into Node Client
 Options

---
 packages/node/src/types.ts                    | 12 ++---
 .../test/spanprocessor-eventprocessor.test.ts | 51 +++++++++++++++++++
 2 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 packages/opentelemetry-node/test/spanprocessor-eventprocessor.test.ts

diff --git a/packages/node/src/types.ts b/packages/node/src/types.ts
index 72bcba1d7a46..d4ca5dd4900d 100644
--- a/packages/node/src/types.ts
+++ b/packages/node/src/types.ts
@@ -3,6 +3,11 @@ import { ClientOptions, Options, TracePropagationTargets } from '@sentry/types';
 import { NodeTransportOptions } from './transports';
 
 export interface BaseNodeOptions {
+  /**
+   * Sets profiling sample rate when @sentry/profiling-node is installed
+   */
+  profilesSampleRate?: number;
+
   /** Sets an optional server name (device name) */
   serverName?: string;
 
@@ -56,9 +61,4 @@ export interface NodeOptions extends Options<NodeTransportOptions>, BaseNodeOpti
  * Configuration options for the Sentry Node SDK Client class
  * @see NodeClient for more information.
  */
-export interface NodeClientOptions extends ClientOptions<NodeTransportOptions>, BaseNodeOptions {
-  /**
-   * Sets profiling sample rate when @sentry/profiling-node is installed
-   */
-  profilesSampleRate?: number;
-}
+export interface NodeClientOptions extends ClientOptions<NodeTransportOptions>, BaseNodeOptions {}
diff --git a/packages/opentelemetry-node/test/spanprocessor-eventprocessor.test.ts b/packages/opentelemetry-node/test/spanprocessor-eventprocessor.test.ts
new file mode 100644
index 000000000000..2c45e70daed5
--- /dev/null
+++ b/packages/opentelemetry-node/test/spanprocessor-eventprocessor.test.ts
@@ -0,0 +1,51 @@
+import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
+import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { createTransport, Hub, makeMain } from '@sentry/core';
+import { NodeClient } from '@sentry/node';
+import { Resource } from '@opentelemetry/resources';
+
+import { addExtensionMethods } from '@sentry/tracing';
+import { resolvedSyncPromise } from '@sentry/utils';
+import { SentrySpanProcessor } from '../src/spanprocessor';
+
+const SENTRY_DSN = 'https://0@0.ingest.sentry.io/0';
+
+const DEFAULT_NODE_CLIENT_OPTIONS = {
+  dsn: SENTRY_DSN,
+  integrations: [],
+  transport: () => createTransport({ recordDroppedEvent: () => undefined }, _ => resolvedSyncPromise({})),
+  stackParser: () => [],
+};
+
+// Integration Test of SentrySpanProcessor
+
+beforeAll(() => {
+  addExtensionMethods();
+});
+
+describe('SentrySpanProcessor', () => {
+  let hub: Hub;
+  let client: NodeClient;
+  let provider: NodeTracerProvider;
+  let spanProcessor: SentrySpanProcessor;
+
+  beforeEach(() => {
+    client = new NodeClient(DEFAULT_NODE_CLIENT_OPTIONS);
+    hub = new Hub(client);
+    makeMain(hub);
+
+    spanProcessor = new SentrySpanProcessor();
+    provider = new NodeTracerProvider({
+      resource: new Resource({
+        [SemanticResourceAttributes.SERVICE_NAME]: 'test-service',
+      }),
+    });
+    provider.addSpanProcessor(spanProcessor);
+    provider.register();
+  });
+
+  afterEach(async () => {
+    await provider.forceFlush();
+    await provider.shutdown();
+  });
+});

From e9d56b0a7f4c055341ac094b148869574194c866 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Mon, 5 Dec 2022 11:33:01 +0100
Subject: [PATCH 2/2] remove file

---
 .../test/spanprocessor-eventprocessor.test.ts | 51 -------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 packages/opentelemetry-node/test/spanprocessor-eventprocessor.test.ts

diff --git a/packages/opentelemetry-node/test/spanprocessor-eventprocessor.test.ts b/packages/opentelemetry-node/test/spanprocessor-eventprocessor.test.ts
deleted file mode 100644
index 2c45e70daed5..000000000000
--- a/packages/opentelemetry-node/test/spanprocessor-eventprocessor.test.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
-import { createTransport, Hub, makeMain } from '@sentry/core';
-import { NodeClient } from '@sentry/node';
-import { Resource } from '@opentelemetry/resources';
-
-import { addExtensionMethods } from '@sentry/tracing';
-import { resolvedSyncPromise } from '@sentry/utils';
-import { SentrySpanProcessor } from '../src/spanprocessor';
-
-const SENTRY_DSN = 'https://0@0.ingest.sentry.io/0';
-
-const DEFAULT_NODE_CLIENT_OPTIONS = {
-  dsn: SENTRY_DSN,
-  integrations: [],
-  transport: () => createTransport({ recordDroppedEvent: () => undefined }, _ => resolvedSyncPromise({})),
-  stackParser: () => [],
-};
-
-// Integration Test of SentrySpanProcessor
-
-beforeAll(() => {
-  addExtensionMethods();
-});
-
-describe('SentrySpanProcessor', () => {
-  let hub: Hub;
-  let client: NodeClient;
-  let provider: NodeTracerProvider;
-  let spanProcessor: SentrySpanProcessor;
-
-  beforeEach(() => {
-    client = new NodeClient(DEFAULT_NODE_CLIENT_OPTIONS);
-    hub = new Hub(client);
-    makeMain(hub);
-
-    spanProcessor = new SentrySpanProcessor();
-    provider = new NodeTracerProvider({
-      resource: new Resource({
-        [SemanticResourceAttributes.SERVICE_NAME]: 'test-service',
-      }),
-    });
-    provider.addSpanProcessor(spanProcessor);
-    provider.register();
-  });
-
-  afterEach(async () => {
-    await provider.forceFlush();
-    await provider.shutdown();
-  });
-});