yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: More tracing cleanup

Browse Source
This commit is contained in:
Tom Moor
2022-04-11 08:04:13 -07:00
parent 27597727ee
commit f399c9d38c
11 changed files with 4 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/emails/mailer.tsx
View File

@@ -2,6 +2,7 @@ import nodemailer, { Transporter } from "nodemailer";
import Oy from "oy-vey"; import Oy from "oy-vey";
import * as React from "react"; import * as React from "react";
import Logger from "@server/logging/logger"; import Logger from "@server/logging/logger";
import { APM } from "@server/logging/tracing";
import { baseStyles } from "./templates/components/EmailLayout"; import { baseStyles } from "./templates/components/EmailLayout";
const useTestEmailService = const useTestEmailService =
@@ -19,6 +20,9 @@ type SendMailOptions = {
/** /**
* Mailer class to send emails. * Mailer class to send emails.
*/ */
@APM.trace({
spanName: "mailer",
})
export class Mailer { export class Mailer {
transporter: Transporter | undefined; transporter: Transporter | undefined;

4
server/queues/processors/BacklinksProcessor.ts
View File

@@ -1,14 +1,10 @@
import { Op } from "sequelize"; import { Op } from "sequelize";
import { APM } from "@server/logging/tracing";
import { Document, Backlink, Team } from "@server/models"; import { Document, Backlink, Team } from "@server/models";
import { Event, DocumentEvent, RevisionEvent } from "@server/types"; import { Event, DocumentEvent, RevisionEvent } from "@server/types";
import parseDocumentIds from "@server/utils/parseDocumentIds"; import parseDocumentIds from "@server/utils/parseDocumentIds";
import slugify from "@server/utils/slugify"; import slugify from "@server/utils/slugify";
import BaseProcessor from "./BaseProcessor"; import BaseProcessor from "./BaseProcessor";
@APM.trace({
spanName: "processor",
})
export default class BacklinksProcessor extends BaseProcessor { export default class BacklinksProcessor extends BaseProcessor {
static applicableEvents: Event["name"][] = [ static applicableEvents: Event["name"][] = [
"documents.publish", "documents.publish",

4
server/queues/processors/DebounceProcessor.ts
View File

@@ -1,12 +1,8 @@
import { APM } from "@server/logging/tracing";
import Document from "@server/models/Document"; import Document from "@server/models/Document";
import { Event } from "@server/types"; import { Event } from "@server/types";
import { globalEventQueue } from ".."; import { globalEventQueue } from "..";
import BaseProcessor from "./BaseProcessor"; import BaseProcessor from "./BaseProcessor";
@APM.trace({
spanName: "processor",
})
export default class DebounceProcessor extends BaseProcessor { export default class DebounceProcessor extends BaseProcessor {
static applicableEvents: Event["name"][] = [ static applicableEvents: Event["name"][] = [
"documents.update", "documents.update",

4
server/queues/processors/NotificationsProcessor.ts
View File

@@ -2,7 +2,6 @@ import { Op } from "sequelize";
import CollectionNotificationEmail from "@server/emails/templates/CollectionNotificationEmail"; import CollectionNotificationEmail from "@server/emails/templates/CollectionNotificationEmail";
import DocumentNotificationEmail from "@server/emails/templates/DocumentNotificationEmail"; import DocumentNotificationEmail from "@server/emails/templates/DocumentNotificationEmail";
import Logger from "@server/logging/logger"; import Logger from "@server/logging/logger";
import { APM } from "@server/logging/tracing";
import { import {
View, View,
Document, Document,
@@ -19,9 +18,6 @@ import {
} from "@server/types"; } from "@server/types";
import BaseProcessor from "./BaseProcessor"; import BaseProcessor from "./BaseProcessor";
@APM.trace({
spanName: "processor",
})
export default class NotificationsProcessor extends BaseProcessor { export default class NotificationsProcessor extends BaseProcessor {
static applicableEvents: Event["name"][] = [ static applicableEvents: Event["name"][] = [
"documents.publish", "documents.publish",

4
server/queues/processors/RevisionsProcessor.ts
View File

@@ -1,13 +1,9 @@
import invariant from "invariant"; import invariant from "invariant";
import revisionCreator from "@server/commands/revisionCreator"; import revisionCreator from "@server/commands/revisionCreator";
import { APM } from "@server/logging/tracing";
import { Revision, Document, User } from "@server/models"; import { Revision, Document, User } from "@server/models";
import { DocumentEvent, RevisionEvent, Event } from "@server/types"; import { DocumentEvent, RevisionEvent, Event } from "@server/types";
import BaseProcessor from "./BaseProcessor"; import BaseProcessor from "./BaseProcessor";
@APM.trace({
spanName: "processor",
})
export default class RevisionsProcessor extends BaseProcessor { export default class RevisionsProcessor extends BaseProcessor {
static applicableEvents: Event["name"][] = ["documents.update.debounced"]; static applicableEvents: Event["name"][] = ["documents.update.debounced"];

4
server/queues/processors/SlackProcessor.ts
View File

@@ -1,6 +1,5 @@
import fetch from "fetch-with-proxy"; import fetch from "fetch-with-proxy";
import { Op } from "sequelize"; import { Op } from "sequelize";
import { APM } from "@server/logging/tracing";
import { Document, Integration, Collection, Team } from "@server/models"; import { Document, Integration, Collection, Team } from "@server/models";
import { presentSlackAttachment } from "@server/presenters"; import { presentSlackAttachment } from "@server/presenters";
import { import {
@@ -11,9 +10,6 @@ import {
} from "@server/types"; } from "@server/types";
import BaseProcessor from "./BaseProcessor"; import BaseProcessor from "./BaseProcessor";
@APM.trace({
spanName: "processor",
})
export default class SlackProcessor extends BaseProcessor { export default class SlackProcessor extends BaseProcessor {
static applicableEvents: Event["name"][] = [ static applicableEvents: Event["name"][] = [
"documents.publish", "documents.publish",

4
server/queues/processors/WebsocketsProcessor.ts
View File

@@ -1,7 +1,6 @@
import { subHours } from "date-fns"; import { subHours } from "date-fns";
import { Op } from "sequelize"; import { Op } from "sequelize";
import { Server } from "socket.io"; import { Server } from "socket.io";
import { APM } from "@server/logging/tracing";
import { import {
Document, Document,
Collection, Collection,
@@ -19,9 +18,6 @@ import {
} from "@server/presenters"; } from "@server/presenters";
import { Event } from "../../types"; import { Event } from "../../types";
@APM.trace({
spanName: "processor",
})
export default class WebsocketsProcessor { export default class WebsocketsProcessor {
async perform(event: Event, socketio: Server) { async perform(event: Event, socketio: Server) {
switch (event.name) { switch (event.name) {

4
server/queues/tasks/CleanupDeletedDocumentsTask.ts
View File

@@ -2,7 +2,6 @@ import { subDays } from "date-fns";
import { Op } from "sequelize"; import { Op } from "sequelize";
import documentPermanentDeleter from "@server/commands/documentPermanentDeleter"; import documentPermanentDeleter from "@server/commands/documentPermanentDeleter";
import Logger from "@server/logging/logger"; import Logger from "@server/logging/logger";
import { APM } from "@server/logging/tracing";
import { Document } from "@server/models"; import { Document } from "@server/models";
import BaseTask, { TaskPriority } from "./BaseTask"; import BaseTask, { TaskPriority } from "./BaseTask";
@@ -10,9 +9,6 @@ type Props = {
limit: number; limit: number;
}; };
@APM.trace({
spanName: "task",
})
export default class CleanupDeletedDocumentsTask extends BaseTask<Props> { export default class CleanupDeletedDocumentsTask extends BaseTask<Props> {
public async perform({ limit }: Props) { public async perform({ limit }: Props) {
Logger.info( Logger.info(

4
server/queues/tasks/CleanupDeletedTeamsTask.ts
View File

@@ -2,7 +2,6 @@ import { subDays } from "date-fns";
import { Op } from "sequelize"; import { Op } from "sequelize";
import teamPermanentDeleter from "@server/commands/teamPermanentDeleter"; import teamPermanentDeleter from "@server/commands/teamPermanentDeleter";
import Logger from "@server/logging/logger"; import Logger from "@server/logging/logger";
import { APM } from "@server/logging/tracing";
import { Team } from "@server/models"; import { Team } from "@server/models";
import BaseTask, { TaskPriority } from "./BaseTask"; import BaseTask, { TaskPriority } from "./BaseTask";
@@ -10,9 +9,6 @@ type Props = {
limit: number; limit: number;
}; };
@APM.trace({
spanName: "task",
})
export default class CleanupDeletedTeamsTask extends BaseTask<Props> { export default class CleanupDeletedTeamsTask extends BaseTask<Props> {
public async perform({ limit }: Props) { public async perform({ limit }: Props) {
Logger.info( Logger.info(

4
server/queues/tasks/CleanupExpiredFileOperationsTask.ts
View File

@@ -1,7 +1,6 @@
import { subDays } from "date-fns"; import { subDays } from "date-fns";
import { Op } from "sequelize"; import { Op } from "sequelize";
import Logger from "@server/logging/logger"; import Logger from "@server/logging/logger";
import { APM } from "@server/logging/tracing";
import { FileOperation } from "@server/models"; import { FileOperation } from "@server/models";
import BaseTask, { TaskPriority } from "./BaseTask"; import BaseTask, { TaskPriority } from "./BaseTask";
@@ -9,9 +8,6 @@ type Props = {
limit: number; limit: number;
}; };
@APM.trace({
spanName: "task",
})
export default class CleanupExpiredFileOperationsTask extends BaseTask<Props> { export default class CleanupExpiredFileOperationsTask extends BaseTask<Props> {
public async perform({ limit }: Props) { public async perform({ limit }: Props) {
Logger.info("task", `Expiring export file operations older than 30 days…`); Logger.info("task", `Expiring export file operations older than 30 days…`);

4
server/queues/tasks/EmailTask.ts
View File

@@ -1,5 +1,4 @@
import emails from "@server/emails/templates"; import emails from "@server/emails/templates";
import { APM } from "@server/logging/tracing";
import BaseTask from "./BaseTask"; import BaseTask from "./BaseTask";
type Props = { type Props = {
@@ -7,9 +6,6 @@ type Props = {
props: Record<string, any>; props: Record<string, any>;
}; };
@APM.trace({
spanName: "task",
})
export default class EmailTask extends BaseTask<Props> { export default class EmailTask extends BaseTask<Props> {
public async perform({ templateName, props }: Props) { public async perform({ templateName, props }: Props) {
const EmailClass = emails[templateName]; const EmailClass = emails[templateName];