Skip to content

feat(node): Vendor in @fastify/otel #16328

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

Merged
merged 5 commits into from
May 20, 2025
Merged

feat(node): Vendor in @fastify/otel #16328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34ecefa
feat(node): Vendor in `@fastify/otel`
onurtemizkan May 19, 2025
d2763a1
Remove commonjs plugin, configure eslint
onurtemizkan May 19, 2025
9f974df
Fix formatting
onurtemizkan May 19, 2025
0db99e0
Remove local `tsconfig`
onurtemizkan May 19, 2025
0a4e6de
Use `instrumentation._logger` instead
onurtemizkan May 20, 2025
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
4 changes: 2 additions & 2 deletions packages/node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
"access": "public"
},
"dependencies": {
"@fastify/otel": "https://codeload.github.com/getsentry/fastify-otel/tar.gz/ae3088d65e286bdc94ac5d722573537d6a6671bb",
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/context-async-hooks": "^1.30.1",
"@opentelemetry/core": "^1.30.1",
Expand Down Expand Up @@ -98,7 +97,8 @@
"@prisma/instrumentation": "6.7.0",
"@sentry/core": "9.20.0",
"@sentry/opentelemetry": "9.20.0",
"import-in-the-middle": "^1.13.1"
"import-in-the-middle": "^1.13.1",
"minimatch": "^9.0.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@onurtemizkan I guess adding this dependency was a mistake?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was intentional at the time of this PR to keep the same behaviour as the vendored origin (and to keep Node 18 support), fastify/otel#57 (comment). We can replace it, though, if we find an identically working alternative.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks for the context!

},
"devDependencies": {
"@types/node": "^18.19.1"
Expand Down
9 changes: 9 additions & 0 deletions packages/node/src/integrations/tracing/fastify/fastify-otel/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module.exports = {
env: {
node: true,
},
parserOptions: {
sourceType: 'module',
ecmaVersion: 2020,
},
};
29 changes: 29 additions & 0 deletions packages/node/src/integrations/tracing/fastify/fastify-otel/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* eslint-disable @typescript-eslint/explicit-member-accessibility */
/// <reference types="node" />

import type { InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import { InstrumentationBase } from '@opentelemetry/instrumentation';
import type { FastifyPluginCallback } from 'fastify';
import type { FastifyOtelInstrumentationOpts, FastifyOtelOptions, FastifyOtelRequestContext } from './types';

declare module 'fastify' {
interface FastifyRequest {
opentelemetry(): FastifyOtelRequestContext;
}
}

declare class FastifyOtelInstrumentation<
Config extends FastifyOtelInstrumentationOpts = FastifyOtelInstrumentationOpts,
> extends InstrumentationBase<Config> {
servername: string;
constructor(config?: FastifyOtelInstrumentationOpts);
init(): InstrumentationNodeModuleDefinition[];
plugin(): FastifyPluginCallback<FastifyOtelOptions>;
}

declare namespace exported {
export type { FastifyOtelInstrumentationOpts };
export { FastifyOtelInstrumentation };
}

export = exported;
Loading
Loading