Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mydea wants to merge 1 commit into from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/server-utils/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 { redisIntegration, type RedisDiagnosticChannelsOptions } from './redis';
Expand Down
12 changes: 6 additions & 6 deletions ...s/server-utils/src/integrations/mysql2.ts → ...er-utils/src/integrations/mysql2/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ...-utils/src/mysql2/mysql2-dc-subscriber.ts → ...tegrations/mysql2/mysql2-dc-subscriber.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 0 additions & 30 deletions packages/server-utils/src/mysql2/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/server-utils/test/mysql2/mysql2-dc-subscriber.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading