From 98e779398fc481b44eb9690cb1c7084b5d29bb78 Mon Sep 17 00:00:00 2001 From: Andrei <168741329+andreiborza@users.noreply.github.com> Date: Tue, 11 Jun 2024 15:12:44 +0200 Subject: [PATCH 1/4] =?UTF-8?q?chore(e2e):=20Reduce=20solid=20e2e=20tests?= =?UTF-8?q?=20flakines=20by=20waiting=20for=20more=20speci=E2=80=A6=20(#12?= =?UTF-8?q?455)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test-applications/solid/tests/errorboundary.test.ts | 6 +++--- .../e2e-tests/test-applications/solid/tests/errors.test.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/solid/tests/errorboundary.test.ts b/dev-packages/e2e-tests/test-applications/solid/tests/errorboundary.test.ts index 279eec70c059..287642424850 100644 --- a/dev-packages/e2e-tests/test-applications/solid/tests/errorboundary.test.ts +++ b/dev-packages/e2e-tests/test-applications/solid/tests/errorboundary.test.ts @@ -3,7 +3,7 @@ import { waitForError } from '@sentry-internal/test-utils'; test('captures an exception', async ({ page }) => { const errorEventPromise = waitForError('solid', errorEvent => { - return !errorEvent.type; + return !errorEvent.type && errorEvent.transaction === '/error-boundary-example'; }); const [, errorEvent] = await Promise.all([page.goto('/error-boundary-example'), errorEventPromise]); @@ -27,7 +27,7 @@ test('captures an exception', async ({ page }) => { test('captures a second exception after resetting the boundary', async ({ page }) => { const firstErrorEventPromise = waitForError('solid', errorEvent => { - return !errorEvent.type; + return !errorEvent.type && errorEvent.transaction === '/error-boundary-example'; }); const [, firstErrorEvent] = await Promise.all([page.goto('/error-boundary-example'), firstErrorEventPromise]); @@ -49,7 +49,7 @@ test('captures a second exception after resetting the boundary', async ({ page } }); const secondErrorEventPromise = waitForError('solid', errorEvent => { - return !errorEvent.type; + return !errorEvent.type && errorEvent.transaction === '/error-boundary-example'; }); const [, secondErrorEvent] = await Promise.all([ diff --git a/dev-packages/e2e-tests/test-applications/solid/tests/errors.test.ts b/dev-packages/e2e-tests/test-applications/solid/tests/errors.test.ts index b55a9192ab1c..8fb9d3d2513a 100644 --- a/dev-packages/e2e-tests/test-applications/solid/tests/errors.test.ts +++ b/dev-packages/e2e-tests/test-applications/solid/tests/errors.test.ts @@ -3,7 +3,7 @@ import { waitForError } from '@sentry-internal/test-utils'; test('sends an error', async ({ page }) => { const errorPromise = waitForError('solid', async errorEvent => { - return !errorEvent.type; + return !errorEvent.type && errorEvent.transaction === '/'; }); await Promise.all([page.goto(`/`), page.locator('#errorBtn').click()]); From 136f49665484a2720f42f2d9e8c94fe14801775b Mon Sep 17 00:00:00 2001 From: Andrei <168741329+andreiborza@users.noreply.github.com> Date: Tue, 11 Jun 2024 17:48:50 +0200 Subject: [PATCH 2/4] =?UTF-8?q?feat(solid):=20Add=20release=20registry=20t?= =?UTF-8?q?arget=20entry=20for=20Solid=20SDK=20to=20craft=E2=80=A6=20(#124?= =?UTF-8?q?49)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .craft.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.craft.yml b/.craft.yml index 77bfdfcd14b7..b65e012eb5e7 100644 --- a/.craft.yml +++ b/.craft.yml @@ -184,6 +184,8 @@ targets: onlyIfPresent: /^sentry-nextjs-\d.*\.tgz$/ 'npm:@sentry/remix': onlyIfPresent: /^sentry-remix-\d.*\.tgz$/ + 'npm:@sentry/solid': + onlyIfPresent: /^sentry-solid-\d.*\.tgz$/ 'npm:@sentry/svelte': onlyIfPresent: /^sentry-svelte-\d.*\.tgz$/ 'npm:@sentry/sveltekit': From ef4c06e49d07a5f2d3f91f50675194799709b6fd Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Wed, 12 Jun 2024 02:19:03 -0400 Subject: [PATCH 3/4] fix(profiling): Update exports so types generate properly (#12469) resolves https://github.com/getsentry/sentry-javascript/issues/12468 --- packages/profiling-node/src/utils.ts | 4 ++-- packages/types/src/index.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/profiling-node/src/utils.ts b/packages/profiling-node/src/utils.ts index 5661129791bb..107debae5c8b 100644 --- a/packages/profiling-node/src/utils.ts +++ b/packages/profiling-node/src/utils.ts @@ -3,6 +3,7 @@ import * as os from 'os'; import type { Client, Context, + ContinuousThreadCpuProfile, DebugImage, DsnComponents, Envelope, @@ -11,6 +12,7 @@ import type { Profile, ProfileChunk, ProfileChunkEnvelope, + ProfileChunkItem, SdkInfo, StackFrame, StackParser, @@ -21,8 +23,6 @@ import { GLOBAL_OBJ, createEnvelope, dsnToString, forEachEnvelopeItem, logger, u import { env, versions } from 'process'; import { isMainThread, threadId } from 'worker_threads'; -import type { ProfileChunkItem } from '@sentry/types/build/types/envelope'; -import type { ContinuousThreadCpuProfile } from '../../types/src/profiling'; import { DEBUG_BUILD } from './debug-build'; import type { RawChunkCpuProfile, RawThreadCpuProfile } from './types'; diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 8fbfd37e95ab..257620abc9f7 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -46,6 +46,7 @@ export type { StatsdEnvelope, ProfileItem, ProfileChunkEnvelope, + ProfileChunkItem, SpanEnvelope, SpanItem, } from './envelope'; From 024f5ea417f24c8450c046336836f901745553c5 Mon Sep 17 00:00:00 2001 From: Andrei Borza Date: Wed, 12 Jun 2024 08:22:44 +0200 Subject: [PATCH 4/4] meta(changelog): Update changelog for 8.9.2 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa9abad81755..fafc53349b60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott +## 8.9.2 + +- fix(profiling): Update exports so types generate properly (#12469) + ## 8.9.1 ### Important changes