ref(server-utils): Streamline mysql2 integration (#23331)

Combine into a single folder, remove unused exports, streamline into
singular integration.

Author: mydea

packages/server-utils/src/index.ts

@@ -1,7 +1,6 @@
 export * from './exports';
 
 // Exports using diagnostics channels
-export { mysql2Integration } from './mysql2';
 export { instrumentPrisma, prismaIntegration } from './prisma';
 export type { PrismaInstrumentationConfig, PrismaOptions } from './prisma';
 export { bindTracingChannelToSpan } from './tracing-channel';

…/server-utils/src/integrations/mysql2.ts …r-utils/src/integrations/mysql2/index.tspackages/server-utils/src/integrations/mysql2.ts renamed to packages/server-utils/src/integrations/mysql2/index.ts packages/server-utils/src/integrations/mysql2.ts renamed to packages/server-utils/src/integrations/mysql2/index.ts

@@ -8,12 +8,12 @@ import {
   startInactiveSpan,
   waitForTracingChannelBinding,
 } from '@sentry/core';
-import { subscribeMysql2DiagnosticChannels } from '../mysql2/mysql2-dc-subscriber';
-import type { ChannelName } from '../orchestrion/channels';
-import { CHANNELS } from '../orchestrion/channels';
-import { bindTracingChannelToSpan } from '../tracing-channel';
-import { mysql2ModuleNames } from '../orchestrion/config/mysql2';
-import { invokeOrchestrionInstrumentation } from '../orchestrion/instrumentation';
+import { subscribeMysql2DiagnosticChannels } from './mysql2-dc-subscriber';
+import type { ChannelName } from '../../orchestrion/channels';
+import { CHANNELS } from '../../orchestrion/channels';
+import { bindTracingChannelToSpan } from '../../tracing-channel';
+import { mysql2ModuleNames } from '../../orchestrion/config/mysql2';
+import { invokeOrchestrionInstrumentation } from '../../orchestrion/instrumentation';
 import {
   DB_NAME,
   DB_STATEMENT,

…utils/src/mysql2/mysql2-dc-subscriber.ts …egrations/mysql2/mysql2-dc-subscriber.tspackages/server-utils/src/mysql2/mysql2-dc-subscriber.ts renamed to packages/server-utils/src/integrations/mysql2/mysql2-dc-subscriber.ts packages/server-utils/src/mysql2/mysql2-dc-subscriber.ts renamed to packages/server-utils/src/integrations/mysql2/mysql2-dc-subscriber.ts

@@ -13,7 +13,7 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   startInactiveSpan,
 } from '@sentry/core';
-import { bindTracingChannelToSpan } from '../tracing-channel';
+import { bindTracingChannelToSpan } from '../../tracing-channel';
 
 // Channel names published by mysql2 >= 3.20.0 (see mysql2 `lib/tracing.js`).
 // Hardcoded so the subscriber does not have to import mysql2 — the channels

packages/server-utils/src/mysql2/index.ts

@@ -25,7 +25,7 @@ import {
   MYSQL2_DC_CHANNEL_QUERY,
   type MySQL2TracingChannelFactory,
   subscribeMysql2DiagnosticChannels,
-} from '../../src/mysql2/mysql2-dc-subscriber';
+} from '../../src/integrations/mysql2/mysql2-dc-subscriber';
 
 interface TestStore {
   scope: Scope;