Skip to content

Remove heartbeat in gitpod-remote #378

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 15, 2022
Merged

Remove heartbeat in gitpod-remote #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 29 additions & 17 deletions extensions/gitpod-remote/src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,20 @@ export async function activate(context: vscode.ExtensionContext) {
}
return;
}
if (openWorkspaceLocation(gitpodContext)) {
return;
}

registerTasks(gitpodContext);
installInitialExtensions(gitpodContext);
registerHearbeat(gitpodContext);

// We are moving the heartbeat to gitpod-desktop extension,
// so we register a command to cancel the heartbeat on the gitpod-remote extension
// and then gitpod-desktop will take care of it.
const toDispose = registerHearbeat(gitpodContext);
context.subscriptions.push(toDispose);
context.subscriptions.push(vscode.commands.registerCommand('__gitpod.cancelGitpodRemoteHeartbeat', () => {
toDispose.dispose();
gitpodContext?.logger.info('__gitpod.cancelGitpodRemoteHeartbeat command executed');
return true;
}));

registerCLI(gitpodContext);
// configure task terminals if Gitpod Code Server is running
Expand Down Expand Up @@ -83,15 +90,6 @@ export function registerCLI(context: GitpodExtensionContext): void {
context.environmentVariableCollection.replace('GITPOD_REMOTE_CLI_IPC', ipcHookCli);
}

export function openWorkspaceLocation(context: GitpodExtensionContext): boolean {
if (vscode.workspace.workspaceFolders) {
return false;
}
const workspaceUri = vscode.Uri.file(context.info.getWorkspaceLocationFile() || context.info.getWorkspaceLocationFolder());
vscode.commands.executeCommand('vscode.openFolder', workspaceUri, { forceReuseWindow: true });
return true;
}

export async function installInitialExtensions(context: GitpodExtensionContext): Promise<void> {
context.logger.info('installing initial extensions...');
const extensions: (vscode.Uri | string)[] = [];
Expand Down Expand Up @@ -151,7 +149,9 @@ export async function installInitialExtensions(context: GitpodExtensionContext):
context.logger.info('initial extensions installed');
}

export function registerHearbeat(context: GitpodExtensionContext): void {
export function registerHearbeat(context: GitpodExtensionContext): vscode.Disposable {
const disposables: vscode.Disposable[] = [];

let lastActivity = 0;
const updateLastActivitiy = () => {
lastActivity = new Date().getTime();
Expand All @@ -173,7 +173,16 @@ export function registerHearbeat(context: GitpodExtensionContext): void {
};
sendHeartBeat();
if (!context.devMode) {
context.pendingWillCloseSocket.push(() => sendHeartBeat(true));
const sendCloseHeartbeat = () => sendHeartBeat(true);
context.pendingWillCloseSocket.push(sendCloseHeartbeat);
disposables.push({
dispose() {
const idx = context.pendingWillCloseSocket.indexOf(sendCloseHeartbeat);
if (idx >= 0) {
context.pendingWillCloseSocket.splice(idx, 1);
}
}
});
}

const activityInterval = 10000;
Expand All @@ -184,9 +193,10 @@ export function registerHearbeat(context: GitpodExtensionContext): void {
}
sendHeartBeat();
}, activityInterval);
context.subscriptions.push(

disposables.push(
{
dispose: () => {
dispose() {
clearInterval(heartBeatHandle);
}
},
Expand Down Expand Up @@ -237,4 +247,6 @@ export function registerHearbeat(context: GitpodExtensionContext): void {
}
})
);

return vscode.Disposable.from(...disposables);
}
2 changes: 2 additions & 0 deletions extensions/gitpod-shared/src/analytics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ export interface BaseGitpodAnalyticsEventPropeties {
devMode: boolean;
version: string;
timestamp: number;
'common.extname': string;
'common.extversion': string;
}

interface GAET<N extends string, P> {
Expand Down
2 changes: 2 additions & 0 deletions extensions/gitpod-shared/src/features.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ export class GitpodExtensionContext implements vscode.ExtensionContext {
devMode: this.devMode,
version: vscode.version,
timestamp: Date.now(),
'common.extname': this.extension.id,
'common.extversion': this.extension.packageJSON.version
};
const msg: RemoteTrackMessage = {
event: eventName,
Expand Down