From 997d796eb79b4024457f7f85cf821441bba5706a Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Fri, 30 Dec 2022 13:42:22 -0500
Subject: [PATCH] chore: Remove anomalous serviceName from traces

---
 server/commands/accountProvisioner.ts   | 1 -
 server/commands/collectionExporter.ts   | 1 -
 server/commands/documentImporter.ts     | 1 -
 server/commands/documentMover.ts        | 1 -
 server/commands/teamCreator.ts          | 1 -
 server/commands/teamPermanentDeleter.ts | 1 -
 server/commands/teamProvisioner.ts      | 1 -
 server/presenters/collection.ts         | 8 +-------
 server/presenters/document.ts           | 3 +--
 server/presenters/policy.ts             | 3 +--
 server/presenters/slackAttachment.ts    | 3 +--
 11 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/server/commands/accountProvisioner.ts b/server/commands/accountProvisioner.ts
index a833bcb63..bc788c8c8 100644
--- a/server/commands/accountProvisioner.ts
+++ b/server/commands/accountProvisioner.ts
@@ -185,6 +185,5 @@ async function accountProvisioner({
 }
 
 export default APM.traceFunction({
-  serviceName: "command",
   spanName: "accountProvisioner",
 })(accountProvisioner);
diff --git a/server/commands/collectionExporter.ts b/server/commands/collectionExporter.ts
index c5dafd63b..8c97cff39 100644
--- a/server/commands/collectionExporter.ts
+++ b/server/commands/collectionExporter.ts
@@ -72,6 +72,5 @@ async function collectionExporter({
 }
 
 export default APM.traceFunction({
-  serviceName: "command",
   spanName: "collectionExporter",
 })(collectionExporter);
diff --git a/server/commands/documentImporter.ts b/server/commands/documentImporter.ts
index 974fc0ca8..2283eaffd 100644
--- a/server/commands/documentImporter.ts
+++ b/server/commands/documentImporter.ts
@@ -230,6 +230,5 @@ async function documentImporter({
 }
 
 export default APM.traceFunction({
-  serviceName: "command",
   spanName: "documentImporter",
 })(documentImporter);
diff --git a/server/commands/documentMover.ts b/server/commands/documentMover.ts
index d1c232204..510e16db1 100644
--- a/server/commands/documentMover.ts
+++ b/server/commands/documentMover.ts
@@ -204,6 +204,5 @@ async function documentMover({
 }
 
 export default APM.traceFunction({
-  serviceName: "command",
   spanName: "documentMover",
 })(documentMover);
diff --git a/server/commands/teamCreator.ts b/server/commands/teamCreator.ts
index c0b3a89cb..61cde4184 100644
--- a/server/commands/teamCreator.ts
+++ b/server/commands/teamCreator.ts
@@ -104,6 +104,5 @@ async function findAvailableSubdomain(team: Team, requestedSubdomain: string) {
 }
 
 export default APM.traceFunction({
-  serviceName: "command",
   spanName: "teamCreator",
 })(teamCreator);
diff --git a/server/commands/teamPermanentDeleter.ts b/server/commands/teamPermanentDeleter.ts
index 20b527c09..83a3d111f 100644
--- a/server/commands/teamPermanentDeleter.ts
+++ b/server/commands/teamPermanentDeleter.ts
@@ -199,6 +199,5 @@ async function teamPermanentDeleter(team: Team) {
 }
 
 export default APM.traceFunction({
-  serviceName: "command",
   spanName: "teamPermanentDeleter",
 })(teamPermanentDeleter);
diff --git a/server/commands/teamProvisioner.ts b/server/commands/teamProvisioner.ts
index 3ea66d265..18526f2ce 100644
--- a/server/commands/teamProvisioner.ts
+++ b/server/commands/teamProvisioner.ts
@@ -126,6 +126,5 @@ async function teamProvisioner({
 }
 
 export default APM.traceFunction({
-  serviceName: "command",
   spanName: "teamProvisioner",
 })(teamProvisioner);
diff --git a/server/presenters/collection.ts b/server/presenters/collection.ts
index a29ed6db3..f90d861a9 100644
--- a/server/presenters/collection.ts
+++ b/server/presenters/collection.ts
@@ -1,7 +1,6 @@
-import { APM } from "@server/logging/tracing";
 import Collection from "@server/models/Collection";
 
-function present(collection: Collection) {
+export default function present(collection: Collection) {
   return {
     id: collection.id,
     url: collection.url,
@@ -20,8 +19,3 @@ function present(collection: Collection) {
     documents: collection.documentStructure || [],
   };
 }
-
-export default APM.traceFunction({
-  serviceName: "presenter",
-  spanName: "collection",
-})(present);
diff --git a/server/presenters/document.ts b/server/presenters/document.ts
index 67402206b..26bedf161 100644
--- a/server/presenters/document.ts
+++ b/server/presenters/document.ts
@@ -64,6 +64,5 @@ async function present(
 }
 
 export default APM.traceFunction({
-  serviceName: "presenter",
-  spanName: "document",
+  spanName: "presentDocument",
 })(present);
diff --git a/server/presenters/policy.ts b/server/presenters/policy.ts
index 3d237e6a0..47faa40f6 100644
--- a/server/presenters/policy.ts
+++ b/server/presenters/policy.ts
@@ -17,6 +17,5 @@ function present(user: User, objects: Record<string, any>[]): Policy[] {
 }
 
 export default APM.traceFunction({
-  serviceName: "presenter",
-  spanName: "policy",
+  spanName: "presentPolicy",
 })(present);
diff --git a/server/presenters/slackAttachment.ts b/server/presenters/slackAttachment.ts
index 586b8526f..303866887 100644
--- a/server/presenters/slackAttachment.ts
+++ b/server/presenters/slackAttachment.ts
@@ -34,6 +34,5 @@ function present(
 }
 
 export default APM.traceFunction({
-  serviceName: "presenter",
-  spanName: "slackAttachment",
+  spanName: "presentSlackAttachment",
 })(present);