From 8fa33813547aa4623d69857c0cce9f0542e63a47 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Thu, 21 Sep 2023 12:17:58 +0200
Subject: [PATCH] ref(node-experimental): Reorder files into `opentelemetry`
 folder

To keep things better together, and in preparation for follow up PRs with more OTEL-specific stuff.
---
 packages/node-experimental/src/constants.ts                 | 3 +++
 .../contextManager.ts}                                      | 6 ++----
 packages/node-experimental/src/sdk/initOtel.ts              | 2 +-
 .../node-experimental/src/sdk/otelAsyncContextStrategy.ts   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 packages/node-experimental/src/constants.ts
 rename packages/node-experimental/src/{sdk/otelContextManager.ts => opentelemetry/contextManager.ts} (91%)

diff --git a/packages/node-experimental/src/constants.ts b/packages/node-experimental/src/constants.ts
new file mode 100644
index 000000000000..dc714590556a
--- /dev/null
+++ b/packages/node-experimental/src/constants.ts
@@ -0,0 +1,3 @@
+import { createContextKey } from '@opentelemetry/api';
+
+export const OTEL_CONTEXT_HUB_KEY = createContextKey('sentry_hub');
diff --git a/packages/node-experimental/src/sdk/otelContextManager.ts b/packages/node-experimental/src/opentelemetry/contextManager.ts
similarity index 91%
rename from packages/node-experimental/src/sdk/otelContextManager.ts
rename to packages/node-experimental/src/opentelemetry/contextManager.ts
index c8eadfb85f65..438a2c49fac7 100644
--- a/packages/node-experimental/src/sdk/otelContextManager.ts
+++ b/packages/node-experimental/src/opentelemetry/contextManager.ts
@@ -1,11 +1,9 @@
 import type { Context } from '@opentelemetry/api';
-import * as api from '@opentelemetry/api';
 import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
 import type { Carrier, Hub } from '@sentry/core';
 
-import { ensureHubOnCarrier, getCurrentHub, getHubFromCarrier } from './hub';
-
-export const OTEL_CONTEXT_HUB_KEY = api.createContextKey('sentry_hub');
+import { OTEL_CONTEXT_HUB_KEY } from '../constants';
+import { ensureHubOnCarrier, getCurrentHub, getHubFromCarrier } from './../sdk/hub';
 
 function createNewHub(parent: Hub | undefined): Hub {
   const carrier: Carrier = {};
diff --git a/packages/node-experimental/src/sdk/initOtel.ts b/packages/node-experimental/src/sdk/initOtel.ts
index eaa5937b1ddb..b58eec81880e 100644
--- a/packages/node-experimental/src/sdk/initOtel.ts
+++ b/packages/node-experimental/src/sdk/initOtel.ts
@@ -5,7 +5,7 @@ import { SentryPropagator, SentrySpanProcessor } from '@sentry/opentelemetry-nod
 import { logger } from '@sentry/utils';
 
 import type { NodeExperimentalClient } from '../types';
-import { SentryContextManager } from './otelContextManager';
+import { SentryContextManager } from './../opentelemetry/contextManager';
 
 /**
  * Initialize OpenTelemetry for Node.
diff --git a/packages/node-experimental/src/sdk/otelAsyncContextStrategy.ts b/packages/node-experimental/src/sdk/otelAsyncContextStrategy.ts
index 455dc4717422..7e4ca5cd4da0 100644
--- a/packages/node-experimental/src/sdk/otelAsyncContextStrategy.ts
+++ b/packages/node-experimental/src/sdk/otelAsyncContextStrategy.ts
@@ -2,7 +2,7 @@ import * as api from '@opentelemetry/api';
 import type { Hub, RunWithAsyncContextOptions } from '@sentry/core';
 import { setAsyncContextStrategy } from '@sentry/core';
 
-import { OTEL_CONTEXT_HUB_KEY } from './otelContextManager';
+import { OTEL_CONTEXT_HUB_KEY } from '../constants';
 
 /**
  * Sets the async context strategy to use follow the OTEL context under the hood.