Skip to content

Commit

Permalink
Don't report more than one error feedback per code.
Browse files Browse the repository at this point in the history
  • Loading branch information
fabioz committed May 25, 2022
1 parent 6baa985 commit 5fd29b2
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 2 deletions.
7 changes: 7 additions & 0 deletions robocorp-code/src/robocorp_code/rcc.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ def __init__(self, config_provider: IConfigProvider) -> None:

self._last_verified_account_info: Optional[AccountInfo] = None
self.rcc_listeners: List[IRccListener] = []
self._feedback_metrics_reported: Set[str] = set()

@property
def last_verified_account_info(self) -> Optional[AccountInfo]:
Expand Down Expand Up @@ -1010,6 +1011,12 @@ def check_conda_installed(self, timeout=None) -> ActionResult[str]:

@implements(IRcc.feedack_metric)
def feedack_metric(self, name, value="+1") -> ActionResult[str]:
key = f"{name}.{value}"
if key in self._feedback_metrics_reported:
return ActionResult(True)

self._feedback_metrics_reported.add(key)

return self._run_rcc(
["feedback", "metric", "-t", "vscode", "-n", name, "-v", value],
mutex_name=None,
Expand Down
9 changes: 9 additions & 0 deletions robocorp-code/vscode-client/src/rcc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -447,13 +447,22 @@ export async function feedbackRobocorpCodeError(errorCode: string) {
await feedbackAnyError("vscode.code.error", errorCode);
}

const reportedErrorCodes = new Set();

/**
* Submit feedback on some predefined error code.
*
* @param errorSource Something as "vscode.code.error"
* @param errorCode The error code to be shown.
*/
export async function feedbackAnyError(errorSource: string, errorCode: string) {
// Make sure that only one error is reported per error code.
const errorCodeKey = `${errorSource}.${errorCode}`;
if (reportedErrorCodes.has(errorCodeKey)) {
return;
}
reportedErrorCodes.add(errorCodeKey);

const rccLocation = await getRccLocation();
let args: string[] = ["feedback", "metric", "-t", "vscode", "-n", errorSource, "-v", errorCode];

Expand Down
10 changes: 8 additions & 2 deletions robotframework-ls/vscode-client/src/testview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ export async function setupTestExplorerSupport() {
}
}
} catch (err) {
logError("Error handling debug session event", err, "HANDLE_DEBUG_SESSION_EVENT");
logError("Error handling debug session event: " + JSON.stringify(event), err, "HANDLE_DEBUG_SESSION_EVENT");
}
});
}
Expand Down Expand Up @@ -498,7 +498,13 @@ function handleLogMessage(testRun: vscode.TestRun, event: vscode.DebugSessionCus
// }
// }

message = `[${level}]: ${message.replaceAll(/(?:\r\n|\r|\n)/g, "\r\n")}`;
try {
message = message.replaceAll(/(?:\r\n|\r|\n)/g, "\r\n");
} catch (err) {
logError("Error handling log message: " + JSON.stringify(event.body), err, "HANDLE_LOG_MESSAGE");
}

message = `[${level}]: ${message}`;

switch (level) {
case "WARN":
Expand Down

0 comments on commit 5fd29b2

Please sign in to comment.