Skip to content
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

Jump to bottom

feat(node): Add tracing without performance to Node http integration #8450

Merged
merged 2 commits into from
Jul 11, 2023
Merged

feat(node): Add tracing without performance to Node http integration #8450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e9f389
feat(node): Add tracing without performance to Node http integration
AbhiPrasad Jul 4, 2023
a38d24d
refactor how we do integration options
AbhiPrasad Jul 10, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ jobs:
needs: [job_get_metadata, job_build]
if: needs.job_get_metadata.outputs.changed_node == 'true' || github.event_name != 'pull_request'
runs-on: ubuntu-20.04
timeout-minutes: 10
timeout-minutes: 15
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/test/integration/sentry.client.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Integrations } from '@sentry/tracing';

Sentry.init({
dsn: 'https://[email protected]/1337',
tracesSampleRate: 1,
tracesSampler: () => true,
debug: process.env.SDK_DEBUG,

integrations: [
Expand Down
3 changes: 2 additions & 1 deletion packages/nextjs/test/integration/sentry.edge.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as Sentry from '@sentry/nextjs';

Sentry.init({
dsn: 'https://[email protected]/1337',
tracesSampleRate: 1,
tracesSampleRate: 1.0,
tracePropagationTargets: ['http://example.com'],
debug: process.env.SDK_DEBUG,
});
3 changes: 2 additions & 1 deletion packages/nextjs/test/integration/sentry.server.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import * as Sentry from '@sentry/nextjs';

Sentry.init({
dsn: 'https://[email protected]/1337',
tracesSampleRate: 1,
tracesSampleRate: 1.0,
tracePropagationTargets: ['http://example.com'],
debug: process.env.SDK_DEBUG,

integrations: defaults => [
Expand Down
1 change: 1 addition & 0 deletions packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Sentry.init({
dsn: 'https://[email protected]/1337',
release: '1.0',
environment: 'prod',
tracePropagationTargets: [/^(?!.*express).*$/],
// eslint-disable-next-line deprecation/deprecation
integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })],
tracesSampleRate: 1.0,
Expand Down
2 changes: 2 additions & 0 deletions ...ion-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Sentry.init({
dsn: 'https://[email protected]/1337',
release: '1.0',
environment: 'prod',
// disable requests to /express
tracePropagationTargets: [/^(?!.*express).*$/],
// eslint-disable-next-line deprecation/deprecation
integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })],
tracesSampleRate: 1.0,
Expand Down
2 changes: 2 additions & 0 deletions packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Sentry.init({
dsn: 'https://[email protected]/1337',
release: '1.0',
environment: 'prod',
// disable requests to /express
tracePropagationTargets: [/^(?!.*express).*$/],
// eslint-disable-next-line deprecation/deprecation
integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })],
tracesSampleRate: 1.0,
Expand Down
2 changes: 2 additions & 0 deletions ...ges/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Sentry.init({
dsn: 'https://[email protected]/1337',
release: '1.0',
environment: 'prod',
// disable requests to /express
tracePropagationTargets: [/^(?!.*express).*$/],
// eslint-disable-next-line deprecation/deprecation
integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })],
tracesSampleRate: 1.0,
Expand Down
1 change: 1 addition & 0 deletions packages/node-integration-tests/suites/express/sentry-trace/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Sentry.init({
dsn: 'https://[email protected]/1337',
release: '1.0',
environment: 'prod',
tracePropagationTargets: [/^(?!.*express).*$/],
// eslint-disable-next-line deprecation/deprecation
integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })],
tracesSampleRate: 1.0,
Expand Down
2 changes: 2 additions & 0 deletions packages/node-integration-tests/suites/express/tracing/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ const app = express();
Sentry.init({
dsn: 'https://[email protected]/1337',
release: '1.0',
// disable attaching headers to /test/* endpoints
tracePropagationTargets: [/^(?!.*test).*$/],
integrations: [new Sentry.Integrations.Http({ tracing: true }), new Sentry.Integrations.Express({ app })],
tracesSampleRate: 1.0,
});
Expand Down
4 changes: 2 additions & 2 deletions packages/node-integration-tests/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,11 @@ export class TestEnv {
*/
public async getAPIResponse(
url?: string,
headers?: Record<string, string>,
headers: Record<string, string> = {},
endServer: boolean = true,
): Promise<unknown> {
try {
const { data } = await axios.get(url || this.url, { headers: headers || {} });
const { data } = await axios.get(url || this.url, { headers });
return data;
} finally {
await Sentry.flush();
Expand Down
Loading