diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
index 259a4fa5a..6fc9865ac 100644
--- a/server/emails/mailer.tsx
+++ b/server/emails/mailer.tsx
@@ -2,6 +2,7 @@ import nodemailer, { Transporter } from "nodemailer";
 import Oy from "oy-vey";
 import * as React from "react";
 import Logger from "@server/logging/logger";
+import { APM } from "@server/logging/tracing";
 import { baseStyles } from "./templates/components/EmailLayout";
 
 const useTestEmailService =
@@ -19,6 +20,9 @@ type SendMailOptions = {
 /**
  * Mailer class to send emails.
  */
+@APM.trace({
+  spanName: "mailer",
+})
 export class Mailer {
   transporter: Transporter | undefined;
 
diff --git a/server/queues/processors/BacklinksProcessor.ts b/server/queues/processors/BacklinksProcessor.ts
index c4c3c4d45..b90ce6f03 100644
--- a/server/queues/processors/BacklinksProcessor.ts
+++ b/server/queues/processors/BacklinksProcessor.ts
@@ -1,14 +1,10 @@
 import { Op } from "sequelize";
-import { APM } from "@server/logging/tracing";
 import { Document, Backlink, Team } from "@server/models";
 import { Event, DocumentEvent, RevisionEvent } from "@server/types";
 import parseDocumentIds from "@server/utils/parseDocumentIds";
 import slugify from "@server/utils/slugify";
 import BaseProcessor from "./BaseProcessor";
 
-@APM.trace({
-  spanName: "processor",
-})
 export default class BacklinksProcessor extends BaseProcessor {
   static applicableEvents: Event["name"][] = [
     "documents.publish",
diff --git a/server/queues/processors/DebounceProcessor.ts b/server/queues/processors/DebounceProcessor.ts
index 362ca908b..1984532b5 100644
--- a/server/queues/processors/DebounceProcessor.ts
+++ b/server/queues/processors/DebounceProcessor.ts
@@ -1,12 +1,8 @@
-import { APM } from "@server/logging/tracing";
 import Document from "@server/models/Document";
 import { Event } from "@server/types";
 import { globalEventQueue } from "..";
 import BaseProcessor from "./BaseProcessor";
 
-@APM.trace({
-  spanName: "processor",
-})
 export default class DebounceProcessor extends BaseProcessor {
   static applicableEvents: Event["name"][] = [
     "documents.update",
diff --git a/server/queues/processors/NotificationsProcessor.ts b/server/queues/processors/NotificationsProcessor.ts
index 30a19699b..175757541 100644
--- a/server/queues/processors/NotificationsProcessor.ts
+++ b/server/queues/processors/NotificationsProcessor.ts
@@ -2,7 +2,6 @@ import { Op } from "sequelize";
 import CollectionNotificationEmail from "@server/emails/templates/CollectionNotificationEmail";
 import DocumentNotificationEmail from "@server/emails/templates/DocumentNotificationEmail";
 import Logger from "@server/logging/logger";
-import { APM } from "@server/logging/tracing";
 import {
   View,
   Document,
@@ -19,9 +18,6 @@ import {
 } from "@server/types";
 import BaseProcessor from "./BaseProcessor";
 
-@APM.trace({
-  spanName: "processor",
-})
 export default class NotificationsProcessor extends BaseProcessor {
   static applicableEvents: Event["name"][] = [
     "documents.publish",
diff --git a/server/queues/processors/RevisionsProcessor.ts b/server/queues/processors/RevisionsProcessor.ts
index 7fe1e3551..9e252490c 100644
--- a/server/queues/processors/RevisionsProcessor.ts
+++ b/server/queues/processors/RevisionsProcessor.ts
@@ -1,13 +1,9 @@
 import invariant from "invariant";
 import revisionCreator from "@server/commands/revisionCreator";
-import { APM } from "@server/logging/tracing";
 import { Revision, Document, User } from "@server/models";
 import { DocumentEvent, RevisionEvent, Event } from "@server/types";
 import BaseProcessor from "./BaseProcessor";
 
-@APM.trace({
-  spanName: "processor",
-})
 export default class RevisionsProcessor extends BaseProcessor {
   static applicableEvents: Event["name"][] = ["documents.update.debounced"];
 
diff --git a/server/queues/processors/SlackProcessor.ts b/server/queues/processors/SlackProcessor.ts
index 36808a575..748b39480 100644
--- a/server/queues/processors/SlackProcessor.ts
+++ b/server/queues/processors/SlackProcessor.ts
@@ -1,6 +1,5 @@
 import fetch from "fetch-with-proxy";
 import { Op } from "sequelize";
-import { APM } from "@server/logging/tracing";
 import { Document, Integration, Collection, Team } from "@server/models";
 import { presentSlackAttachment } from "@server/presenters";
 import {
@@ -11,9 +10,6 @@ import {
 } from "@server/types";
 import BaseProcessor from "./BaseProcessor";
 
-@APM.trace({
-  spanName: "processor",
-})
 export default class SlackProcessor extends BaseProcessor {
   static applicableEvents: Event["name"][] = [
     "documents.publish",
diff --git a/server/queues/processors/WebsocketsProcessor.ts b/server/queues/processors/WebsocketsProcessor.ts
index 1584ce7c7..bd20f9b84 100644
--- a/server/queues/processors/WebsocketsProcessor.ts
+++ b/server/queues/processors/WebsocketsProcessor.ts
@@ -1,7 +1,6 @@
 import { subHours } from "date-fns";
 import { Op } from "sequelize";
 import { Server } from "socket.io";
-import { APM } from "@server/logging/tracing";
 import {
   Document,
   Collection,
@@ -19,9 +18,6 @@ import {
 } from "@server/presenters";
 import { Event } from "../../types";
 
-@APM.trace({
-  spanName: "processor",
-})
 export default class WebsocketsProcessor {
   async perform(event: Event, socketio: Server) {
     switch (event.name) {
diff --git a/server/queues/tasks/CleanupDeletedDocumentsTask.ts b/server/queues/tasks/CleanupDeletedDocumentsTask.ts
index a8867beb9..fcf65a429 100644
--- a/server/queues/tasks/CleanupDeletedDocumentsTask.ts
+++ b/server/queues/tasks/CleanupDeletedDocumentsTask.ts
@@ -2,7 +2,6 @@ import { subDays } from "date-fns";
 import { Op } from "sequelize";
 import documentPermanentDeleter from "@server/commands/documentPermanentDeleter";
 import Logger from "@server/logging/logger";
-import { APM } from "@server/logging/tracing";
 import { Document } from "@server/models";
 import BaseTask, { TaskPriority } from "./BaseTask";
 
@@ -10,9 +9,6 @@ type Props = {
   limit: number;
 };
 
-@APM.trace({
-  spanName: "task",
-})
 export default class CleanupDeletedDocumentsTask extends BaseTask<Props> {
   public async perform({ limit }: Props) {
     Logger.info(
diff --git a/server/queues/tasks/CleanupDeletedTeamsTask.ts b/server/queues/tasks/CleanupDeletedTeamsTask.ts
index b8c350746..063f7123d 100644
--- a/server/queues/tasks/CleanupDeletedTeamsTask.ts
+++ b/server/queues/tasks/CleanupDeletedTeamsTask.ts
@@ -2,7 +2,6 @@ import { subDays } from "date-fns";
 import { Op } from "sequelize";
 import teamPermanentDeleter from "@server/commands/teamPermanentDeleter";
 import Logger from "@server/logging/logger";
-import { APM } from "@server/logging/tracing";
 import { Team } from "@server/models";
 import BaseTask, { TaskPriority } from "./BaseTask";
 
@@ -10,9 +9,6 @@ type Props = {
   limit: number;
 };
 
-@APM.trace({
-  spanName: "task",
-})
 export default class CleanupDeletedTeamsTask extends BaseTask<Props> {
   public async perform({ limit }: Props) {
     Logger.info(
diff --git a/server/queues/tasks/CleanupExpiredFileOperationsTask.ts b/server/queues/tasks/CleanupExpiredFileOperationsTask.ts
index 7cc3b7b0e..bb1a29660 100644
--- a/server/queues/tasks/CleanupExpiredFileOperationsTask.ts
+++ b/server/queues/tasks/CleanupExpiredFileOperationsTask.ts
@@ -1,7 +1,6 @@
 import { subDays } from "date-fns";
 import { Op } from "sequelize";
 import Logger from "@server/logging/logger";
-import { APM } from "@server/logging/tracing";
 import { FileOperation } from "@server/models";
 import BaseTask, { TaskPriority } from "./BaseTask";
 
@@ -9,9 +8,6 @@ type Props = {
   limit: number;
 };
 
-@APM.trace({
-  spanName: "task",
-})
 export default class CleanupExpiredFileOperationsTask extends BaseTask<Props> {
   public async perform({ limit }: Props) {
     Logger.info("task", `Expiring export file operations older than 30 days…`);
diff --git a/server/queues/tasks/EmailTask.ts b/server/queues/tasks/EmailTask.ts
index c089ce64c..1d666096e 100644
--- a/server/queues/tasks/EmailTask.ts
+++ b/server/queues/tasks/EmailTask.ts
@@ -1,5 +1,4 @@
 import emails from "@server/emails/templates";
-import { APM } from "@server/logging/tracing";
 import BaseTask from "./BaseTask";
 
 type Props = {
@@ -7,9 +6,6 @@ type Props = {
   props: Record<string, any>;
 };
 
-@APM.trace({
-  spanName: "task",
-})
 export default class EmailTask extends BaseTask<Props> {
   public async perform({ templateName, props }: Props) {
     const EmailClass = emails[templateName];