Skip to content

fix(remix): align span operations to new operations#5889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AbhiPrasad merged 2 commits into from
Oct 6, 2022
Merged

fix(remix): align span operations to new operations #5889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44e1356
fix(remix): align span operations to new operations
outsideris Oct 4, 2022
d02defd
fix(remix): fix failed tests
outsideris Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/remix/src/utils/instrumentServer.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ function makeWrappedDocumentRequestFunction(

try {
const span = activeTransaction?.startChild({
op: 'remix.server.documentRequest',
op: 'function.remix.document_request',
description: activeTransaction.name,
tags: {
method: request.method,
Expand DownExpand Up@@ -147,7 +147,7 @@ function makeWrappedDataFunction(origFn: DataFunction, id: string, name: 'action

try {
const span = activeTransaction?.startChild({
op: `remix.server.${name}`,
op: `function.remix.${name}`,
description: id,
tags: {
name,
Expand Down
8 changes: 4 additions & 4 deletions packages/remix/test/integration/test/server/action.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,19 +15,19 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
spans: [
{
description: 'routes/action-json-response/$id',
op: 'remix.server.action',
op: 'function.remix.action',
},
{
description: 'root',
op: 'remix.server.loader',
op: 'function.remix.loader',
},
{
description: 'routes/action-json-response/$id',
op: 'remix.server.loader',
op: 'function.remix.loader',
},
{
description: 'routes/action-json-response/$id',
op: 'remix.server.documentRequest',
op: 'function.remix.document_request',
},
],
});
Expand Down
6 changes: 3 additions & 3 deletions packages/remix/test/integration/test/server/loader.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,15 +61,15 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
spans: [
{
description: 'root',
op: 'remix.server.loader',
op: 'function.remix.loader',
},
{
description: 'routes/loader-json-response/$id',
op: 'remix.server.loader',
op: 'function.remix.loader',
},
{
description: 'routes/loader-json-response/$id',
op: 'remix.server.documentRequest',
op: 'function.remix.document_request',
},
],
});
Expand Down