diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/subject.js b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/subject.js index a86616cd52dc..3553e4dcd9fd 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/subject.js +++ b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/subject.js @@ -1,6 +1,4 @@ -import { parameterize } from '@sentry/utils'; - const x = 'first'; const y = 'second'; -Sentry.captureMessage(parameterize`This is a log statement with ${x} and ${y} params`); +Sentry.captureMessage(Sentry.parameterize`This is a log statement with ${x} and ${y} params`); diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/test.ts index 4c948d439bff..db84460b85b5 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/test.ts @@ -5,12 +5,6 @@ import { sentryTest } from '../../../../utils/fixtures'; import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers'; sentryTest('should capture a parameterized representation of the message', async ({ getLocalTestPath, page }) => { - const bundle = process.env.PW_BUNDLE; - - if (bundle && bundle.startsWith('bundle_')) { - sentryTest.skip(); - } - const url = await getLocalTestPath({ testDir: __dirname }); const eventData = await getFirstSentryEnvelopeRequest(page, url); diff --git a/dev-packages/node-integration-tests/suites/public-api/captureMessage/parameterized_message/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/captureMessage/parameterized_message/scenario.ts index db81bb18d331..1d92f9dcd769 100644 --- a/dev-packages/node-integration-tests/suites/public-api/captureMessage/parameterized_message/scenario.ts +++ b/dev-packages/node-integration-tests/suites/public-api/captureMessage/parameterized_message/scenario.ts @@ -1,5 +1,4 @@ import * as Sentry from '@sentry/node'; -import { parameterize } from '@sentry/utils'; Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', @@ -9,4 +8,4 @@ Sentry.init({ const x = 'first'; const y = 'second'; -Sentry.captureMessage(parameterize`This is a log statement with ${x} and ${y} params`); +Sentry.captureMessage(Sentry.parameterize`This is a log statement with ${x} and ${y} params`); diff --git a/packages/astro/src/index.server.ts b/packages/astro/src/index.server.ts index 61e2bf2f6c98..3074a061a2d8 100644 --- a/packages/astro/src/index.server.ts +++ b/packages/astro/src/index.server.ts @@ -77,6 +77,7 @@ export { startSpanManual, continueTrace, cron, + parameterize, } from '@sentry/node'; // We can still leave this for the carrier init and type exports diff --git a/packages/browser/src/exports.ts b/packages/browser/src/exports.ts index 41338b4047df..50a282cd1406 100644 --- a/packages/browser/src/exports.ts +++ b/packages/browser/src/exports.ts @@ -72,6 +72,7 @@ export { metrics, functionToStringIntegration, inboundFiltersIntegration, + parameterize, } from '@sentry/core'; export { WINDOW } from './helpers'; diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts index 725eecb24753..5d5abce58f48 100644 --- a/packages/bun/src/index.ts +++ b/packages/bun/src/index.ts @@ -83,6 +83,7 @@ export { inboundFiltersIntegration, linkedErrorsIntegration, requestDataIntegration, + parameterize, } from '@sentry/core'; export type { SpanStatusType } from '@sentry/core'; export { autoDiscoverNodePerformanceMonitoringIntegrations, cron } from '@sentry/node'; diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 3eec5fe4ca0a..f2f33a884123 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -80,6 +80,7 @@ export { createCheckInEnvelope } from './checkin'; export { hasTracingEnabled } from './utils/hasTracingEnabled'; export { isSentryRequestUrl } from './utils/isSentryRequestUrl'; export { handleCallbackErrors } from './utils/handleCallbackErrors'; +export { parameterize } from './utils/parameterize'; export { spanToTraceHeader, spanToJSON, diff --git a/packages/utils/src/parameterize.ts b/packages/core/src/utils/parameterize.ts similarity index 86% rename from packages/utils/src/parameterize.ts rename to packages/core/src/utils/parameterize.ts index 2cfa63e92677..5783a61fa3c9 100644 --- a/packages/utils/src/parameterize.ts +++ b/packages/core/src/utils/parameterize.ts @@ -3,8 +3,8 @@ import type { ParameterizedString } from '@sentry/types'; /** * Tagged template function which returns paramaterized representation of the message * For example: parameterize`This is a log statement with ${x} and ${y} params`, would return: - * "__sentry_template_string__": "My raw message with interpreted strings like %s", - * "__sentry_template_values__": ["this"] + * "__sentry_template_string__": 'This is a log statement with %s and %s params', + * "__sentry_template_values__": ['first', 'second'] * @param strings An array of string values splitted between expressions * @param values Expressions extracted from template string * @returns String with template information in __sentry_template_string__ and __sentry_template_values__ properties diff --git a/packages/utils/test/parameterize.test.ts b/packages/core/test/lib/utils/parameterize.test.ts similarity index 94% rename from packages/utils/test/parameterize.test.ts rename to packages/core/test/lib/utils/parameterize.test.ts index a199e0939271..413ba8043c49 100644 --- a/packages/utils/test/parameterize.test.ts +++ b/packages/core/test/lib/utils/parameterize.test.ts @@ -1,6 +1,6 @@ import type { ParameterizedString } from '@sentry/types'; -import { parameterize } from '../src/parameterize'; +import { parameterize } from '../../../src/utils/parameterize'; describe('parameterize()', () => { test('works with empty string', () => { diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts index a48bc13a6d4b..86ee3e78b961 100644 --- a/packages/node/src/index.ts +++ b/packages/node/src/index.ts @@ -79,6 +79,7 @@ export { startInactiveSpan, startSpanManual, continueTrace, + parameterize, metrics, functionToStringIntegration, inboundFiltersIntegration, diff --git a/packages/remix/src/index.server.ts b/packages/remix/src/index.server.ts index 240a7d3787e1..1cd04720b4dc 100644 --- a/packages/remix/src/index.server.ts +++ b/packages/remix/src/index.server.ts @@ -68,6 +68,7 @@ export { Integrations, Handlers, cron, + parameterize, } from '@sentry/node'; // Keeping the `*` exports for backwards compatibility and types diff --git a/packages/serverless/src/index.ts b/packages/serverless/src/index.ts index 5edbde50fa6c..3fe65ee74ea1 100644 --- a/packages/serverless/src/index.ts +++ b/packages/serverless/src/index.ts @@ -76,4 +76,5 @@ export { startInactiveSpan, startSpanManual, continueTrace, + parameterize, } from '@sentry/node'; diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts index 87bd11c8b7eb..91fb9e2d7771 100644 --- a/packages/sveltekit/src/server/index.ts +++ b/packages/sveltekit/src/server/index.ts @@ -74,6 +74,7 @@ export { startSpanManual, continueTrace, cron, + parameterize, } from '@sentry/node'; // We can still leave this for the carrier init and type exports diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 5483f2aa7e41..d19991b7d401 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -32,7 +32,6 @@ export * from './url'; export * from './userIntegrations'; export * from './cache'; export * from './eventbuilder'; -export * from './parameterize'; export * from './anr'; export * from './lru'; export * from './buildPolyfills';