From 44e1356d464a7afb73cca6f914202e2138ca0ef7 Mon Sep 17 00:00:00 2001
From: Outsider <outsideris@gmail.com>
Date: Wed, 5 Oct 2022 02:01:15 +0900
Subject: [PATCH 1/2] fix(remix): align span operations to new operations

Signed-off-by: Outsider <outsideris@gmail.com>
---
 packages/remix/src/utils/instrumentServer.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/remix/src/utils/instrumentServer.ts b/packages/remix/src/utils/instrumentServer.ts
index f985b1866b4f..5c44d3802ff4 100644
--- a/packages/remix/src/utils/instrumentServer.ts
+++ b/packages/remix/src/utils/instrumentServer.ts
@@ -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,
@@ -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,

From d02defd126edb0529ffa431ea4f914d3655d4752 Mon Sep 17 00:00:00 2001
From: Outsider <outsideris@gmail.com>
Date: Thu, 6 Oct 2022 02:34:20 +0900
Subject: [PATCH 2/2] fix(remix): fix failed tests

Signed-off-by: Outsider <outsideris@gmail.com>
---
 .../remix/test/integration/test/server/action.test.ts     | 8 ++++----
 .../remix/test/integration/test/server/loader.test.ts     | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/remix/test/integration/test/server/action.test.ts b/packages/remix/test/integration/test/server/action.test.ts
index 65dc04220112..ada76c62929c 100644
--- a/packages/remix/test/integration/test/server/action.test.ts
+++ b/packages/remix/test/integration/test/server/action.test.ts
@@ -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',
         },
       ],
     });
diff --git a/packages/remix/test/integration/test/server/loader.test.ts b/packages/remix/test/integration/test/server/loader.test.ts
index b3e84528edcf..f2cb90962d88 100644
--- a/packages/remix/test/integration/test/server/loader.test.ts
+++ b/packages/remix/test/integration/test/server/loader.test.ts
@@ -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',
         },
       ],
     });