Skip to content

Commit 1506e18

Browse files
authored
Merge branch 'develop' into cg-update-t3
2 parents 46fc24a + f64ed15 commit 1506e18

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.size-limit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ module.exports = [
148148
import: createImport('init', 'ErrorBoundary', 'reactRouterV6BrowserTracingIntegration'),
149149
ignore: ['react/jsx-runtime'],
150150
gzip: true,
151-
limit: '44.5 KB',
151+
limit: '44.6 KB',
152152
},
153153
// Vue SDK (ESM)
154154
{

dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/middleware.test.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,27 @@ test('Sends spans for multiple middlewares and verifies they are siblings under
2222
// Find both middleware spans
2323
const serverFnMiddlewareSpan = transactionEvent?.spans?.find(
2424
(span: { description?: string; origin?: string }) =>
25-
span.description === 'serverFnMiddleware' && span.origin === 'manual.middleware.tanstackstart',
25+
span.description === 'serverFnMiddleware' && span.origin === 'auto.middleware.tanstackstart',
2626
);
2727
const globalFunctionMiddlewareSpan = transactionEvent?.spans?.find(
2828
(span: { description?: string; origin?: string }) =>
29-
span.description === 'globalFunctionMiddleware' && span.origin === 'manual.middleware.tanstackstart',
29+
span.description === 'globalFunctionMiddleware' && span.origin === 'auto.middleware.tanstackstart',
3030
);
3131

3232
// Verify both middleware spans exist with expected properties
3333
expect(serverFnMiddlewareSpan).toEqual(
3434
expect.objectContaining({
3535
description: 'serverFnMiddleware',
3636
op: 'middleware.tanstackstart',
37-
origin: 'manual.middleware.tanstackstart',
37+
origin: 'auto.middleware.tanstackstart',
3838
status: 'ok',
3939
}),
4040
);
4141
expect(globalFunctionMiddlewareSpan).toEqual(
4242
expect.objectContaining({
4343
description: 'globalFunctionMiddleware',
4444
op: 'middleware.tanstackstart',
45-
origin: 'manual.middleware.tanstackstart',
45+
origin: 'auto.middleware.tanstackstart',
4646
status: 'ok',
4747
}),
4848
);
@@ -73,7 +73,7 @@ test('Sends spans for global function middleware', async ({ page }) => {
7373
expect.objectContaining({
7474
description: 'globalFunctionMiddleware',
7575
op: 'middleware.tanstackstart',
76-
origin: 'manual.middleware.tanstackstart',
76+
origin: 'auto.middleware.tanstackstart',
7777
status: 'ok',
7878
}),
7979
]),
@@ -100,7 +100,7 @@ test('Sends spans for global request middleware', async ({ page }) => {
100100
expect.objectContaining({
101101
description: 'globalRequestMiddleware',
102102
op: 'middleware.tanstackstart',
103-
origin: 'manual.middleware.tanstackstart',
103+
origin: 'auto.middleware.tanstackstart',
104104
status: 'ok',
105105
}),
106106
]),
@@ -127,7 +127,7 @@ test('Sends spans for server route request middleware', async ({ page }) => {
127127
expect.objectContaining({
128128
description: 'serverRouteRequestMiddleware',
129129
op: 'middleware.tanstackstart',
130-
origin: 'manual.middleware.tanstackstart',
130+
origin: 'auto.middleware.tanstackstart',
131131
status: 'ok',
132132
}),
133133
]),
@@ -156,7 +156,7 @@ test('Sends span for middleware that returns early without calling next()', asyn
156156
expect.objectContaining({
157157
description: 'earlyReturnMiddleware',
158158
op: 'middleware.tanstackstart',
159-
origin: 'manual.middleware.tanstackstart',
159+
origin: 'auto.middleware.tanstackstart',
160160
status: 'ok',
161161
}),
162162
]),
@@ -185,7 +185,7 @@ test('Sends span for middleware that throws an error', async ({ page }) => {
185185
expect.objectContaining({
186186
description: 'errorMiddleware',
187187
op: 'middleware.tanstackstart',
188-
origin: 'manual.middleware.tanstackstart',
188+
origin: 'auto.middleware.tanstackstart',
189189
}),
190190
]),
191191
);

dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/transaction.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ test('Sends a server function transaction for a nested server function only if i
8787
// Verify that globalFunctionMiddleware and testNestedLog are sibling spans under the root
8888
const functionMiddlewareSpan = transactionEvent?.spans?.find(
8989
(span: { description?: string; origin?: string }) =>
90-
span.description === 'globalFunctionMiddleware' && span.origin === 'manual.middleware.tanstackstart',
90+
span.description === 'globalFunctionMiddleware' && span.origin === 'auto.middleware.tanstackstart',
9191
);
9292
const nestedSpan = transactionEvent?.spans?.find(
9393
(span: { description?: string; origin?: string }) =>

packages/tanstackstart-react/src/server/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export function getMiddlewareSpanOptions(name: string): StartSpanOptions {
2222
op: 'middleware.tanstackstart',
2323
name,
2424
attributes: {
25-
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual.middleware.tanstackstart',
25+
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.middleware.tanstackstart',
2626
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'middleware.tanstackstart',
2727
},
2828
};

0 commit comments

Comments
 (0)