Skip to content

fix(tracing): Don't set method multiple times #8014

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 11 commits into from
May 3, 2023
Merged

fix(tracing): Don't set method multiple times #8014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
76f5398
fix(tracing): Don't set method multiple times
AbhiPrasad May 2, 2023
999b4dc
only run nextjs integration tests on Node 16
AbhiPrasad May 2, 2023
b54a285
fix bash script
AbhiPrasad May 2, 2023
d43e4e7
adjust again
AbhiPrasad May 3, 2023
df3035f
re add app dir skip
May 3, 2023
41b127a
attempt at fixing component tracing
May 3, 2023
836ef65
...
May 3, 2023
7d6d88a
.
May 3, 2023
a01ef5d
skip nextjs e2e and integration tests
AbhiPrasad May 3, 2023
aa169d1
woops run nextjs integration tests
AbhiPrasad May 3, 2023
70a5438
disable CI action
AbhiPrasad May 3, 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
25 changes: 13 additions & 12 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,18 +783,19 @@ jobs:
id: versions
run: |
echo "echo node=$(jq -r '.volta.node' package.json)" >> $GITHUB_OUTPUT
- name: Run E2E tests
env:
E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}
E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
E2E_TEST_DSN: ${{ secrets.E2E_TEST_DSN }}
E2E_TEST_SENTRY_ORG_SLUG: 'sentry-javascript-sdks'
E2E_TEST_SENTRY_TEST_PROJECT: 'sentry-javascript-e2e-tests'
E2E_TEST_SHARD: ${{ matrix.shard }}
E2E_TEST_SHARD_AMOUNT: 3
run: |
cd packages/e2e-tests
yarn test:e2e
# Temporarily disabling e2e tests
# - name: Run E2E tests
# env:
# E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}
# E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
# E2E_TEST_DSN: ${{ secrets.E2E_TEST_DSN }}
# E2E_TEST_SENTRY_ORG_SLUG: 'sentry-javascript-sdks'
# E2E_TEST_SENTRY_TEST_PROJECT: 'sentry-javascript-e2e-tests'
# E2E_TEST_SHARD: ${{ matrix.shard }}
# E2E_TEST_SHARD_AMOUNT: 3
# run: |
# cd packages/e2e-tests
# yarn test:e2e

job_required_tests:
name: All required tests passed or skipped
Expand Down
7 changes: 7 additions & 0 deletions packages/nextjs/test/integration/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export default function Layout({ children }: { children: React.ReactNode }) {
return (
<html lang="en">
<body>{children}</body>
</html>
);
}
2 changes: 1 addition & 1 deletion packages/nextjs/test/integration/test/client/tracingFetch.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ test('should correctly instrument `fetch` for performance tracing', async ({ pag
expect(transaction[0].spans).toEqual(
expect.arrayContaining([
expect.objectContaining({
data: { method: 'GET', url: 'http://example.com', type: 'fetch' },
data: { 'http.method': 'GET', url: 'http://example.com', type: 'fetch' },
description: 'GET http://example.com',
op: 'http.client',
parent_span_id: expect.any(String),
Expand Down
4 changes: 2 additions & 2 deletions packages/nextjs/test/run-integration-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ for NEXTJS_VERSION in 10 11 12 13; do
exit 0
fi

# Next.js v13 requires at least Node v14
if [ "$NODE_MAJOR" -lt "14" ] && [ "$NEXTJS_VERSION" -ge "13" ]; then
# Next.js v13 requires at least Node v16
if [ "$NODE_MAJOR" -lt "16" ] && [ "$NEXTJS_VERSION" -ge "13" ]; then
echo "[nextjs@$NEXTJS_VERSION] Not compatible with Node $NODE_MAJOR"
exit 0
fi
Expand Down
7 changes: 4 additions & 3 deletions packages/tracing-internal/src/browser/request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,14 @@ export function fetchCallback(
const activeTransaction = currentSpan && currentSpan.transaction;

if (currentSpan && activeTransaction) {
const { method, url } = handlerData.fetchData;
const span = currentSpan.startChild({
data: {
...handlerData.fetchData,
url,
type: 'fetch',
'http.method': handlerData.fetchData.method,
'http.method': method,
},
description: `${handlerData.fetchData.method} ${handlerData.fetchData.url}`,
description: `${method} ${url}`,
op: 'http.client',
});

Expand Down