Skip to content

Commit de44fe0

Browse files
lforstlforst
authored
Merge branch 'develop' into lforst-rm-sentry-nextjs-prop
2 parents 4c059e1 + bc28240 commit de44fe0

File tree

55 files changed

+909
-309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+909
-309
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,17 +267,12 @@ jobs:
267267
needs.job_get_metadata.outputs.force_skip_cache == 'false'
268268
with:
269269
path: .nxcache
270-
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT }}
270+
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT || github.sha }}
271271
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
272272
restore-keys:
273273
${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
274274

275275
- name: Build packages
276-
# Under normal circumstances, using the git SHA as a cache key, there shouldn't ever be a cache hit on the built
277-
# packages, and so `yarn build` should always run. This `if` check is therefore only there for testing CI issues
278-
# where the built packages are beside the point. In that case, you can change `BUILD_CACHE_KEY` (at the top of
279-
# this file) to a constant and skip rebuilding all of the packages each time CI runs.
280-
if: steps.cache_built_packages.outputs.cache-hit == ''
281276
run: yarn build
282277
outputs:
283278
# this needs to be passed on, because the `needs` context only looks at direct ancestors (so steps which depend on

‎MIGRATION.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Upgrading from 7.x to 8.x
22

3+
## Removal of Client-Side health check transaction filters
4+
5+
The SDK no longer filters out health check transactions by default. Instead, they are sent to Sentry but still dropped
6+
by the Sentry backend by default. You can disable dropping them in your Sentry project settings. If you still want to
7+
drop specific transactions within the SDK you can either use the `ignoreTransactions` SDK option.
8+
39
## Removal of the `MetricsAggregator` integration class and `metricsAggregatorIntegration`
410

511
The SDKs now support metrics features without any additional configuration.

‎dev-packages/browser-integration-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {
7-
"node": ">=10"
7+
"node": ">=14.8"
88
},
99
"private": true,
1010
"scripts": {

‎dev-packages/e2e-tests/test-applications/create-remix-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"typescript": "^5.0.4"
3131
},
3232
"engines": {
33-
"node": ">=14"
33+
"node": ">=14.8"
3434
},
3535
"volta": {
3636
"extends": "../../package.json"

‎dev-packages/node-integration-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "7.100.0",
44
"license": "MIT",
55
"engines": {
6-
"node": ">=10"
6+
"node": ">=14.8"
77
},
88
"private": true,
99
"main": "build/cjs/index.js",

‎dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/scenario.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import '@sentry/tracing';
2-
31
import * as Sentry from '@sentry/node';
42

53
Sentry.init({

‎nx.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"namedInputs": {
1212
"default": ["{projectRoot}/**/*", "sharedGlobals"],
13-
"sharedGlobals": ["{workspaceRoot}/*.js", "{workspaceRoot}/*.json"],
13+
"sharedGlobals": ["{workspaceRoot}/*.js", "{workspaceRoot}/*.json", "{workspaceRoot}/yarn.lock"],
1414
"production": ["default", "!{projectRoot}/test/**/*", "!{projectRoot}/**/*.md", "!{projectRoot}/*.tgz"]
1515
},
1616
"targetDefaults": {

‎packages/angular-ivy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"author": "Sentry",
88
"license": "MIT",
99
"engines": {
10-
"node": ">=12"
10+
"node": ">=14.8"
1111
},
1212
"main": "build/bundles/sentry-angular.umd.js",
1313
"module": "build/fesm2015/sentry-angular.js",

‎packages/angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"author": "Sentry",
88
"license": "MIT",
99
"engines": {
10-
"node": ">=14"
10+
"node": ">=14.8"
1111
},
1212
"main": "build/bundles/sentry-angular.umd.js",
1313
"module": "build/fesm2015/sentry-angular.js",

‎packages/astro/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@sentry/node-experimental": "7.100.0",
5555
"@sentry/types": "7.100.0",
5656
"@sentry/utils": "7.100.0",
57-
"@sentry/vite-plugin": "^2.8.0"
57+
"@sentry/vite-plugin": "^2.14.2"
5858
},
5959
"devDependencies": {
6060
"astro": "^3.5.0",

‎packages/browser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"author": "Sentry",
88
"license": "MIT",
99
"engines": {
10-
"node": ">=14"
10+
"node": ">=14.8"
1111
},
1212
"files": [
1313
"cjs",

‎packages/bun/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"author": "Sentry",
88
"license": "MIT",
99
"engines": {
10-
"node": ">=14"
10+
"node": ">=14.8"
1111
},
1212
"files": [
1313
"cjs",

‎packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"author": "Sentry",
88
"license": "MIT",
99
"engines": {
10-
"node": ">=14"
10+
"node": ">=14.8"
1111
},
1212
"files": [
1313
"cjs",

‎packages/core/src/integrations/inboundfilters.ts

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@ import { convertIntegrationFnToClass, defineIntegration } from '../integration';
88
// this is the result of a script being pulled in from an external domain and CORS.
99
const DEFAULT_IGNORE_ERRORS = [/^Script error\.?$/, /^Javascript error: Script error\.? on line 0$/];
1010

11-
const DEFAULT_IGNORE_TRANSACTIONS = [
12-
/^.*\/healthcheck$/,
13-
/^.*\/healthy$/,
14-
/^.*\/live$/,
15-
/^.*\/ready$/,
16-
/^.*\/heartbeat$/,
17-
/^.*\/health$/,
18-
/^.*\/healthz$/,
19-
];
20-
2111
/** Options for the InboundFilters integration */
2212
export interface InboundFiltersOptions {
2313
allowUrls: Array<string | RegExp>;
@@ -26,7 +16,6 @@ export interface InboundFiltersOptions {
2616
ignoreTransactions: Array<string | RegExp>;
2717
ignoreInternal: boolean;
2818
disableErrorDefaults: boolean;
29-
disableTransactionDefaults: boolean;
3019
}
3120

3221
const INTEGRATION_NAME = 'InboundFilters';
@@ -77,11 +66,7 @@ function _mergeOptions(
7766
...(clientOptions.ignoreErrors || []),
7867
...(internalOptions.disableErrorDefaults ? [] : DEFAULT_IGNORE_ERRORS),
7968
],
80-
ignoreTransactions: [
81-
...(internalOptions.ignoreTransactions || []),
82-
...(clientOptions.ignoreTransactions || []),
83-
...(internalOptions.disableTransactionDefaults ? [] : DEFAULT_IGNORE_TRANSACTIONS),
84-
],
69+
ignoreTransactions: [...(internalOptions.ignoreTransactions || []), ...(clientOptions.ignoreTransactions || [])],
8570
ignoreInternal: internalOptions.ignoreInternal !== undefined ? internalOptions.ignoreInternal : true,
8671
};
8772
}

‎packages/core/test/lib/integrations/inboundfilters.test.ts

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -216,21 +216,6 @@ const TRANSACTION_EVENT_3: Event = {
216216
type: 'transaction',
217217
};
218218

219-
const TRANSACTION_EVENT_HEALTH: Event = {
220-
transaction: 'GET /health',
221-
type: 'transaction',
222-
};
223-
224-
const TRANSACTION_EVENT_HEALTH_2: Event = {
225-
transaction: 'GET /healthy',
226-
type: 'transaction',
227-
};
228-
229-
const TRANSACTION_EVENT_HEALTH_3: Event = {
230-
transaction: 'GET /live',
231-
type: 'transaction',
232-
};
233-
234219
describe('InboundFilters', () => {
235220
describe('_isSentryError', () => {
236221
it('should work as expected', () => {
@@ -408,39 +393,12 @@ describe('InboundFilters', () => {
408393
const eventProcessor = createInboundFiltersEventProcessor();
409394
expect(eventProcessor(SCRIPT_ERROR_EVENT, {})).toBe(null);
410395
expect(eventProcessor(TRANSACTION_EVENT, {})).toBe(TRANSACTION_EVENT);
411-
expect(eventProcessor(TRANSACTION_EVENT_HEALTH, {})).toBe(null);
412-
expect(eventProcessor(TRANSACTION_EVENT_HEALTH_2, {})).toBe(null);
413-
expect(eventProcessor(TRANSACTION_EVENT_HEALTH_3, {})).toBe(null);
414396
});
415397

416398
it('disable default error filters', () => {
417399
const eventProcessor = createInboundFiltersEventProcessor({ disableErrorDefaults: true });
418400
expect(eventProcessor(SCRIPT_ERROR_EVENT, {})).toBe(SCRIPT_ERROR_EVENT);
419-
expect(eventProcessor(TRANSACTION_EVENT_HEALTH, {})).toBe(null);
420-
expect(eventProcessor(TRANSACTION_EVENT_HEALTH_2, {})).toBe(null);
421-
expect(eventProcessor(TRANSACTION_EVENT_HEALTH_3, {})).toBe(null);
422401
});
423-
424-
it('disable default transaction filters', () => {
425-
const eventProcessor = createInboundFiltersEventProcessor({ disableTransactionDefaults: true });
426-
expect(eventProcessor(SCRIPT_ERROR_EVENT, {})).toBe(null);
427-
expect(eventProcessor(TRANSACTION_EVENT, {})).toBe(TRANSACTION_EVENT);
428-
expect(eventProcessor(TRANSACTION_EVENT_HEALTH, {})).toBe(TRANSACTION_EVENT_HEALTH);
429-
expect(eventProcessor(TRANSACTION_EVENT_HEALTH_2, {})).toBe(TRANSACTION_EVENT_HEALTH_2);
430-
expect(eventProcessor(TRANSACTION_EVENT_HEALTH_3, {})).toBe(TRANSACTION_EVENT_HEALTH_3);
431-
});
432-
433-
it.each(['/delivery', '/already', '/healthysnacks'])(
434-
"doesn't filter out transactions that have similar names to health check ones (%s)",
435-
transaction => {
436-
const eventProcessor = createInboundFiltersEventProcessor();
437-
const evt: Event = {
438-
transaction,
439-
type: 'transaction',
440-
};
441-
expect(eventProcessor(evt, {})).toBe(evt);
442-
},
443-
);
444402
});
445403

446404
describe('denyUrls/allowUrls', () => {

‎packages/ember/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ ENV['@sentry/ember'] = {
173173
### Supported Versions
174174

175175
* **Ember.js**: v4.0 or above
176-
* **Node**: v14 or above
176+
* **Node**: v14.8 or above
177177

178178
### Previous Integration
179179

‎packages/ember/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"webpack": "~5.74.0"
8484
},
8585
"engines": {
86-
"node": "14.* || 16.* || >= 18"
86+
"node": ">=14.8"
8787
},
8888
"ember": {
8989
"edition": "octane"

‎packages/eslint-config-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"sentry"
1313
],
1414
"engines": {
15-
"node": ">=14"
15+
"node": ">=14.8"
1616
},
1717
"files": [
1818
"src"

‎packages/eslint-plugin-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"sentry"
1313
],
1414
"engines": {
15-
"node": ">=14"
15+
"node": ">=14.8"
1616
},
1717
"files": [
1818
"src"

‎packages/feedback/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"author": "Sentry",
88
"license": "MIT",
99
"engines": {
10-
"node": ">=12"
10+
"node": ">=14.8"
1111
},
1212
"files": [
1313
"cjs",

‎packages/gatsby/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"gatsby-plugin"
1212
],
1313
"engines": {
14-
"node": ">=14"
14+
"node": ">=14.8"
1515
},
1616
"files": [
1717
"cjs",

‎packages/integration-shims/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@sentry/utils": "7.100.0"
4545
},
4646
"engines": {
47-
"node": ">=12"
47+
"node": ">=14.8"
4848
},
4949
"volta": {
5050
"extends": "../../package.json"

‎packages/nextjs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"author": "Sentry",
88
"license": "MIT",
99
"engines": {
10-
"node": ">=14"
10+
"node": ">=14.8"
1111
},
1212
"main": "build/cjs/index.server.js",
1313
"module": "build/esm/index.server.js",

‎packages/node-experimental/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"author": "Sentry",
88
"license": "MIT",
99
"engines": {
10-
"node": ">=14"
10+
"node": ">=14.8"
1111
},
1212
"files": [
1313
"cjs",

‎packages/node-experimental/test/integration/transactions.test.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ describe('Integration | Transactions', () => {
7070
otel: {
7171
attributes: {
7272
'test.outer': 'test value',
73+
'sentry.op': 'test op',
74+
'sentry.origin': 'auto.test',
75+
'sentry.source': 'task',
7376
},
7477
resource: {
7578
'service.name': 'node-experimental',
@@ -241,6 +244,9 @@ describe('Integration | Transactions', () => {
241244
otel: expect.objectContaining({
242245
attributes: {
243246
'test.outer': 'test value',
247+
'sentry.op': 'test op',
248+
'sentry.origin': 'auto.test',
249+
'sentry.source': 'task',
244250
},
245251
}),
246252
trace: {
@@ -283,6 +289,7 @@ describe('Integration | Transactions', () => {
283289
otel: expect.objectContaining({
284290
attributes: {
285291
'test.outer': 'test value b',
292+
'sentry.op': 'test op b',
286293
},
287294
}),
288295
trace: {
@@ -513,7 +520,11 @@ describe('Integration | Transactions', () => {
513520
expect.objectContaining({
514521
contexts: expect.objectContaining({
515522
otel: expect.objectContaining({
516-
attributes: {},
523+
attributes: {
524+
'sentry.op': 'test op',
525+
'sentry.origin': 'auto.test',
526+
'sentry.source': 'task',
527+
},
517528
}),
518529
trace: {
519530
data: {

‎packages/node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"author": "Sentry",
88
"license": "MIT",
99
"engines": {
10-
"node": ">=14"
10+
"node": ">=14.8"
1111
},
1212
"files": [
1313
"cjs",

‎packages/opentelemetry-node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"author": "Sentry",
88
"license": "MIT",
99
"engines": {
10-
"node": ">=14"
10+
"node": ">=14.8"
1111
},
1212
"files": [
1313
"cjs",

‎packages/opentelemetry/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"author": "Sentry",
88
"license": "MIT",
99
"engines": {
10-
"node": ">=14"
10+
"node": ">=14.8"
1111
},
1212
"files": [
1313
"cjs",

‎packages/opentelemetry/src/semanticAttributes.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,5 @@
33
* No guarantees apply to these attributes, and the may change/disappear at any time.
44
*/
55
export const InternalSentrySemanticAttributes = {
6-
ORIGIN: 'sentry.origin',
7-
OP: 'sentry.op',
8-
SOURCE: 'sentry.source',
96
PARENT_SAMPLED: 'sentry.parentSampled',
10-
BREADCRUMB_TYPE: 'sentry.breadcrumb.type',
11-
BREADCRUMB_LEVEL: 'sentry.breadcrumb.level',
12-
BREADCRUMB_EVENT_ID: 'sentry.breadcrumb.event_id',
13-
BREADCRUMB_CATEGORY: 'sentry.breadcrumb.category',
14-
BREADCRUMB_DATA: 'sentry.breadcrumb.data',
157
} as const;

0 commit comments

Comments
 (0)