FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

ref: Remove orchestrion references from customer-facing surfaces (#23… · getsentry/sentry-javascript@63119eb · GitHub

/ sentry-javascript Public

Commit 63119eb

Browse files
timfish
and
claude
authored
ref: Remove orchestrion references from customer-facing surfaces (#23507)
Orchestrion is internal tooling, so this rewords debug-log prefixes (`[orchestrion:express]` → `[instrumentation:express]`), JSDoc on publicly re-exported integrations, and the `@sentry/deno` README so the name no longer shows up in customer terminals, IDE hover text, or npm-rendered docs. The `@sentry/node` bundler plugin types are now derived explicitly so the emitted `.d.ts` stops referencing `@sentry/server-utils/orchestrion` symbols. No identifiers, export subpaths, client hook names, or diagnostics channel names change. --- _Generated by [Claude Code](https://claude.ai/code/session_01H8UfMdJmd1kxCRkT9XC9uf)_ --------- Co-authored-by: Claude <noreply@anthropic.com>
1 parent 6154b37 commit 63119eb

46 files changed

Lines changed: 113 additions & 108 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/bun/src/plugin.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* orchestrion code-transform plugin for Bun's bundler (`bun build`).
2+
* Sentry code-transform plugin for Bun's bundler (`bun build`).
33
*
44
* Usage:
55
*
@@ -17,7 +17,7 @@
1717
*
1818
* When https://github.com/oven-sh/bun/pull/31770 lands, we can revisit.
1919
*
20-
* Until then, Bun apps must bundle to get orchestrion instrumentation. In dev
20+
* Until then, Bun apps must bundle to get build-time instrumentation. In dev
2121
* (ie, `bun run`) there is simply no instrumentation, which is clearer than
2222
* partial/inconsistent coverage.
2323
*
@@ -52,7 +52,7 @@ interface BunPluginBuilder {
5252
}
5353

5454
/**
55-
* Returns the orchestrion code-transform plugin for Bun's bundler, configured
55+
* Returns the Sentry code-transform plugin for Bun's bundler, configured
5656
* with the central `SENTRY_INSTRUMENTATIONS`. The plugin injects
5757
* `diagnostics_channel.tracingChannel` calls into the instrumented libraries as
5858
* `bun build` bundles them — plus, via the module-injected transform, the

‎packages/core/src/client.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
974974
public on(hook: 'stopUIProfiler', callback: () => void): () => void;
975975

976976
/**
977-
* A hook that is called when an orchestrion-instrumented module is injected —
977+
* A hook that is called when an instrumented module is injected —
978978
* at runtime by the module hook, or at load of a bundler-transformed module.
979979
* Channel-based integrations use it to subscribe their diagnostics-channel
980980
* listeners lazily, only once the module they instrument is actually loaded.
@@ -1262,7 +1262,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
12621262
public emit(hook: 'stopUIProfiler'): void;
12631263

12641264
/**
1265-
* Emit a hook when an orchestrion-instrumented module is injected (runtime
1265+
* Emit a hook when an instrumented module is injected (runtime
12661266
* module hook or bundler-transformed module load).
12671267
*/
12681268
public emit(hook: 'orchestrion.module-injected', moduleName: string): void;

‎packages/core/src/integrations/postgresjs.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ export function _sanitizeSqlQuery(sqlQuery: string | undefined): string {
401401
/**
402402
* Sets connection context attributes on a span.
403403
*
404-
* @internal Exported for the orchestrion (diagnostics-channel) integration.
404+
* @internal Exported for the diagnostics-channel integration.
405405
*/
406406
export function _setConnectionAttributes(span: Span, connectionContext: PostgresConnectionContext | undefined): void {
407407
if (!connectionContext) {
@@ -426,7 +426,7 @@ export function _setConnectionAttributes(span: Span, connectionContext: Postgres
426426
/**
427427
* Extracts DB operation name from SQL query and sets it on the span.
428428
*
429-
* @internal Exported for the orchestrion (diagnostics-channel) integration.
429+
* @internal Exported for the diagnostics-channel integration.
430430
*/
431431
export function _setOperationName(span: Span, sanitizedQuery: string | undefined, command?: string): void {
432432
if (command) {
@@ -444,7 +444,7 @@ export function _setOperationName(span: Span, sanitizedQuery: string | undefined
444444
* Builds a {@link PostgresConnectionContext} from postgres.js' parsed options
445445
* (which store `host`/`port` as arrays). Defaults to 'localhost'/5432.
446446
*
447-
* @internal Exported for the orchestrion (diagnostics-channel) integration.
447+
* @internal Exported for the diagnostics-channel integration.
448448
*/
449449
export function _buildConnectionContext(options: {
450450
host?: string[];

‎packages/core/src/utils/worldwide.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export type InternalGlobal = {
5656
_sentryModuleMetadata?: Record<string, any>;
5757
_sentryWrappedDepth?: number;
5858
/**
59-
* Orchestrion bundler and runtime detection.
59+
* Bundler and runtime instrumentation detection.
6060
*/
6161
__SENTRY_ORCHESTRION__?: {
6262
/** Empty array signifies runtime hooked */

‎packages/deno/README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ Sentry.captureEvent({
6060
## Auto-instrumentation (experimental)
6161

6262
Some libraries (e.g. `mysql`) don't emit tracing signals on their
63-
own. To instrument them, Sentry uses
64-
[orchestrion](https://github.com/apm-js-collab/tracing-hooks) to
65-
transform them at load time so they publish to
66-
`node:diagnostics_channel`.
63+
own. To instrument them, Sentry transforms them at load time so they
64+
publish to `node:diagnostics_channel`.
6765

6866
Use the `--import` or `--preload` argument to `deno run` to enable
6967
these instrumentations.

‎packages/nestjs/src/integrations/orchestrion-subscriber.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export function subscribeToNestChannels(): void {
121121
return;
122122
}
123123

124-
DEBUG_BUILD && debug.log('[orchestrion:nestjs] subscribing to @nestjs channels');
124+
DEBUG_BUILD && debug.log('[instrumentation:nestjs] subscribing to @nestjs channels');
125125

126126
// App-creation span: `bindTracingChannelToSpan` opens the span on
127127
// `start`, makes it the active context for the bootstrap, and ends it

‎packages/node/src/bundler-plugin/esbuild.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import { sentryEsbuildPlugin as sentryEsbuildBundlerPlugin } from '@sentry/bundler-plugins/esbuild';
22
import type { SentryEsbuildPluginOptions as SentryEsbuildPluginOptionsBase } from '@sentry/bundler-plugins/esbuild';
3+
import type { InstrumentationConfig } from '@sentry/server-utils';
34
import { sentryOrchestrionPlugin } from '@sentry/server-utils/orchestrion/esbuild';
5+
import type { EsbuildPlugin } from '@sentry/server-utils/orchestrion/esbuild';
46

57
export type SentryEsbuildPluginOptions = SentryEsbuildPluginOptionsBase & {
68
/**
79
* @ignore This is for internal use only when this plugin is consumed by a framework SDK
810
*/
9-
instrumentations?: NonNullable<Parameters<typeof sentryOrchestrionPlugin>[0]>['instrumentations'];
11+
instrumentations?: InstrumentationConfig[];
1012

1113
/**
1214
* Automatic instrumentation of server-side dependencies at build time.
@@ -18,8 +20,6 @@ export type SentryEsbuildPluginOptions = SentryEsbuildPluginOptionsBase & {
1820
buildTimeInstrumentation?: boolean;
1921
};
2022

21-
type EsbuildPlugin = ReturnType<typeof sentryOrchestrionPlugin>;
22-
2323
/**
2424
* esbuild plugin that bundles the Sentry esbuild bundler plugin (source maps,
2525
* release injection, …) together with the code transformer

‎packages/node/src/bundler-plugin/rollup.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import { sentryRollupPlugin as sentryRollupBundlerPlugin } from '@sentry/bundler-plugins/rollup';
22
import type { SentryRollupPluginOptions as SentryRollupPluginOptionsBase } from '@sentry/bundler-plugins/rollup';
3+
import type { InstrumentationConfig } from '@sentry/server-utils';
34
import { sentryOrchestrionPlugin } from '@sentry/server-utils/orchestrion/rollup';
5+
import type { RollupPlugin } from '@sentry/server-utils/orchestrion/rollup';
46

57
export type SentryRollupPluginOptions = SentryRollupPluginOptionsBase & {
68
/**
79
* @ignore This is for internal use only when this plugin is consumed by a framework SDK
810
*/
9-
instrumentations?: NonNullable<Parameters<typeof sentryOrchestrionPlugin>[0]>['instrumentations'];
11+
instrumentations?: InstrumentationConfig[];
1012

1113
/**
1214
* Automatic instrumentation of server-side dependencies at build time.
@@ -18,8 +20,6 @@ export type SentryRollupPluginOptions = SentryRollupPluginOptionsBase & {
1820
buildTimeInstrumentation?: boolean;
1921
};
2022

21-
type RollupPlugin = ReturnType<typeof sentryOrchestrionPlugin>;
22-
2323
/**
2424
* Rollup plugin that bundles the Sentry Rollup bundler plugin (source maps,
2525
* release injection, bundle size optimizations, …) together with the

‎packages/node/src/bundler-plugin/vite.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import { sentryVitePlugin as sentryViteBundlerPlugin } from '@sentry/bundler-plugins/vite';
22
import type { SentryVitePluginOptions as SentryVitePluginOptionsBase } from '@sentry/bundler-plugins/vite';
3+
import type { InstrumentationConfig } from '@sentry/server-utils';
34
import { sentryOrchestrionPlugin } from '@sentry/server-utils/orchestrion/vite';
5+
import type { VitePlugin } from '@sentry/server-utils/orchestrion/vite';
46

57
export type SentryVitePluginOptions = SentryVitePluginOptionsBase & {
68
/**
79
* @ignore This is for internal use only when this plugin is consumed by a framework SDK
810
*/
9-
instrumentations?: NonNullable<Parameters<typeof sentryOrchestrionPlugin>[0]>['instrumentations'];
11+
instrumentations?: InstrumentationConfig[];
1012

1113
/**
1214
* Automatic instrumentation of server-side dependencies at build time.
@@ -18,8 +20,6 @@ export type SentryVitePluginOptions = SentryVitePluginOptionsBase & {
1820
buildTimeInstrumentation?: boolean;
1921
};
2022

21-
type VitePlugin = ReturnType<typeof sentryOrchestrionPlugin>;
22-
2323
/**
2424
* Vite plugin that bundles the Sentry Vite bundler plugin (source maps, release
2525
* injection, bundle size optimizations, …) together with the code

‎packages/node/src/bundler-plugin/webpack.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import { sentryWebpackPlugin as sentryWebpackBundlerPlugin } from '@sentry/bundler-plugins/webpack';
22
import type { SentryWebpackPluginOptions as SentryWebpackPluginOptionsBase } from '@sentry/bundler-plugins/webpack';
3+
import type { InstrumentationConfig } from '@sentry/server-utils';
34
import { sentryOrchestrionWebpackPlugin } from '@sentry/server-utils/orchestrion/webpack';
45

56
export type SentryWebpackPluginOptions = SentryWebpackPluginOptionsBase & {
67
/**
78
* @ignore This is for internal use only when this plugin is consumed by a framework SDK
89
*/
9-
instrumentations?: NonNullable<Parameters<typeof sentryOrchestrionWebpackPlugin>[0]>['instrumentations'];
10+
instrumentations?: InstrumentationConfig[];
1011

1112
/**
1213
* Automatic instrumentation of server-side dependencies at build time.

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL