Skip to content
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.

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

chore: add Sentry transaction monitoring to formatting #623

Merged
merged 3 commits into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
coverage:
status:
project:
default:
threshold: 50%
base: development
patch:
default:
threshold: 50%
changes:
default:
threshold: 10%
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: "latest"
node-version: "20"

- name: Cache Node Modules
id: cache-node-modules
Expand Down Expand Up @@ -84,5 +84,5 @@ jobs:
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
files: ./server/coverage/lcov.info # __LCOV_RESULTS_INFO_FILE__ (keep in sync)
files: ./server/coverage/lcov.info # __LCOV_RESULTS_INFO_FILE__ (keep in sync)
disable_search: true
95 changes: 69 additions & 26 deletions server/src/services/formatting/onDocumentFormatting.ts
Original file line number Diff line number Diff line change
@@ -1,46 +1,89 @@
import { DocumentFormattingParams } from "vscode-languageserver/node";
import { TextEdit } from "vscode-languageserver-types";
import { TextDocument } from "vscode-languageserver-textdocument";
import { Logger } from "@utils/Logger";
import { Transaction } from "@sentry/types";
import { ServerState } from "../../types";
import { TrackingResult } from "../../telemetry/types";
import { prettierFormat } from "./prettierFormat";
import { forgeFormat } from "./forgeFormat";

type OnDocumentFormattingResult = TextEdit[] | null;

export function onDocumentFormatting(serverState: ServerState) {
return async (
params: DocumentFormattingParams
): Promise<TextEdit[] | null> => {
const { logger } = serverState;
): Promise<OnDocumentFormattingResult> => {
const { telemetry, logger } = serverState;
return telemetry.trackTiming(
"onDocumentFormatting",
async (
transaction
): Promise<TrackingResult<OnDocumentFormattingResult>> => {
const formatter = serverState.extensionConfig.formatter ?? "prettier";
const uri = params.textDocument.uri;
const document = serverState.documents.get(uri);

const formatter = serverState.extensionConfig.formatter ?? "prettier";
const uri = params.textDocument.uri;
const document = serverState.documents.get(uri);
if (document === undefined) {
logger.error(`Failed to format, uri ${uri} not indexed`);

if (document === undefined) {
logger.error(`Failed to format, uri ${uri} not indexed`);
return { status: "internal_error", result: null };
}

return null;
}
logger.trace(`Formatter: ${formatter}`);

logger.trace(`Formatter: ${formatter}`);
const text = document.getText();

const text = document.getText();
try {
switch (formatter) {
case "forge":
return await runForgeFormat(text, document, logger, transaction);

try {
switch (formatter) {
case "forge":
return await forgeFormat(text, document, logger);
case "prettier":
return runPrettierFormat(text, document, transaction);

case "prettier":
return prettierFormat(text, document);
default:
return { status: "invalid_argument", result: null };
}
} catch (error) {
serverState.logger.trace(
`Error formatting document ${uri} with ${formatter}: ${error}`
);

default:
return null;
return { status: "internal_error", result: null };
}
}
} catch (error) {
serverState.logger.info(
`Error formatting document ${uri} with ${formatter}: ${error}`
);

return null;
}
);
};
}

async function runForgeFormat(
text: string,
document: TextDocument,
logger: Logger,
transaction: Transaction
): Promise<TrackingResult<OnDocumentFormattingResult>> {
transaction.setTag("formatter", "forge");
const span = transaction.startChild({ op: "forge-format" });

const result = await forgeFormat(text, document, logger);

span.finish();

return { status: "ok", result };
}

function runPrettierFormat(
text: string,
document: TextDocument,
transaction: Transaction
): TrackingResult<OnDocumentFormattingResult> {
transaction.setTag("formatter", "prettier");
const span = transaction.startChild({ op: "prettier-format" });

const result = prettierFormat(text, document);

span.finish();

return { status: "ok", result };
}
Loading