Skip to content

Commit 6bd07a6

Browse files
authored
fix(remix): align span operations to new operations (#5889)
Signed-off-by: Outsider <[email protected]>
1 parent 912f5f1 commit 6bd07a6

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

packages/remix/src/utils/instrumentServer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ function makeWrappedDocumentRequestFunction(
115115

116116
try {
117117
const span = activeTransaction?.startChild({
118-
op: 'remix.server.documentRequest',
118+
op: 'function.remix.document_request',
119119
description: activeTransaction.name,
120120
tags: {
121121
method: request.method,
@@ -147,7 +147,7 @@ function makeWrappedDataFunction(origFn: DataFunction, id: string, name: 'action
147147

148148
try {
149149
const span = activeTransaction?.startChild({
150-
op: `remix.server.${name}`,
150+
op: `function.remix.${name}`,
151151
description: id,
152152
tags: {
153153
name,

packages/remix/test/integration/test/server/action.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
1515
spans: [
1616
{
1717
description: 'routes/action-json-response/$id',
18-
op: 'remix.server.action',
18+
op: 'function.remix.action',
1919
},
2020
{
2121
description: 'root',
22-
op: 'remix.server.loader',
22+
op: 'function.remix.loader',
2323
},
2424
{
2525
description: 'routes/action-json-response/$id',
26-
op: 'remix.server.loader',
26+
op: 'function.remix.loader',
2727
},
2828
{
2929
description: 'routes/action-json-response/$id',
30-
op: 'remix.server.documentRequest',
30+
op: 'function.remix.document_request',
3131
},
3232
],
3333
});

packages/remix/test/integration/test/server/loader.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
6161
spans: [
6262
{
6363
description: 'root',
64-
op: 'remix.server.loader',
64+
op: 'function.remix.loader',
6565
},
6666
{
6767
description: 'routes/loader-json-response/$id',
68-
op: 'remix.server.loader',
68+
op: 'function.remix.loader',
6969
},
7070
{
7171
description: 'routes/loader-json-response/$id',
72-
op: 'remix.server.documentRequest',
72+
op: 'function.remix.document_request',
7373
},
7474
],
7575
});

0 commit comments

Comments
 (0)