From f05cdeb13faf5b9e3b6782994cc0774b46a89850 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Thu, 3 Nov 2022 16:44:35 +0100
Subject: [PATCH] feat(otel): Move instrumenter option to base ClientOptions

---
 packages/node/src/types.ts    | 11 +----------
 packages/types/src/options.ts | 10 ++++++++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/node/src/types.ts b/packages/node/src/types.ts
index c78741e39230..4d890d8e10b8 100644
--- a/packages/node/src/types.ts
+++ b/packages/node/src/types.ts
@@ -1,4 +1,4 @@
-import { ClientOptions, Instrumenter, Options, TracePropagationTargets } from '@sentry/types';
+import { ClientOptions, Options, TracePropagationTargets } from '@sentry/types';
 
 import { NodeTransportOptions } from './transports';
 
@@ -19,15 +19,6 @@ export interface BaseNodeOptions {
    */
   tracePropagationTargets?: TracePropagationTargets;
 
-  /**
-   * The instrumenter to use. Defaults to `sentry`.
-   * When not set to `sentry`, auto-instrumentation inside of Sentry will be disabled,
-   * in favor of using external auto instrumentation.
-   *
-   * NOTE: Any option except for `sentry` is highly experimental and subject to change!
-   */
-  instrumenter?: Instrumenter;
-
   /** Callback that is executed when a fatal global error occurs. */
   onFatalError?(error: Error): void;
 }
diff --git a/packages/types/src/options.ts b/packages/types/src/options.ts
index e4641b97aab1..455d9da881a9 100644
--- a/packages/types/src/options.ts
+++ b/packages/types/src/options.ts
@@ -1,5 +1,6 @@
 import { Breadcrumb, BreadcrumbHint } from './breadcrumb';
 import { Event, EventHint } from './event';
+import { Instrumenter } from './instrumenter';
 import { Integration } from './integration';
 import { CaptureContext } from './scope';
 import { SdkMetadata } from './sdkmetadata';
@@ -58,6 +59,15 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
    */
   integrations: Integration[];
 
+  /**
+   * The instrumenter to use. Defaults to `sentry`.
+   * When not set to `sentry`, auto-instrumentation inside of Sentry will be disabled,
+   * in favor of using external auto instrumentation.
+   *
+   * NOTE: Any option except for `sentry` is highly experimental and subject to change!
+   */
+  instrumenter?: Instrumenter;
+
   /**
    * A function that takes transport options and returns the Transport object which is used to send events to Sentry.
    * The function is invoked internally when the client is initialized.