Skip to content

Commit a2daa49

Browse files
committed
[server] Remove deprecated image build log mechanism
1 parent 33a7b02 commit a2daa49

File tree

1 file changed

+6
-47
lines changed

1 file changed

+6
-47
lines changed

components/server/src/workspace/gitpod-server-impl.ts

Lines changed: 6 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ import {
108108
RemotePageMessage,
109109
RemoteTrackMessage,
110110
} from "@gitpod/gitpod-protocol/lib/analytics";
111-
import { ImageBuilderClientProvider, LogsRequest } from "@gitpod/image-builder/lib";
111+
import { ImageBuilderClientProvider } from "@gitpod/image-builder/lib";
112112
import { WorkspaceManagerClientProvider } from "@gitpod/ws-manager/lib/client-provider";
113113
import {
114114
ControlPortRequest,
@@ -1547,11 +1547,11 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
15471547
// during roll-out this is our fall-back case.
15481548
// Afterwards we might want to do some spinning-lock and re-check for a certain period (30s?) to give db-sync
15491549
// a change to move the imageBuildLogInfo across the globe.
1550-
1551-
log.warn(logCtx, "imageBuild logs: fallback!");
1552-
ctx.span?.setTag("workspace.imageBuild.logs.fallback", true);
1553-
await this.deprecatedDoWatchWorkspaceImageBuildLogs(ctx, logCtx, user, workspace);
1554-
return;
1550+
log.error(logCtx, "cannot watch imagebuild logs for workspaceId: no image build info available");
1551+
throw new ResponseError(
1552+
ErrorCodes.HEADLESS_LOG_NOT_YET_AVAILABLE,
1553+
"cannot watch imagebuild logs for workspaceId",
1554+
);
15551555
}
15561556

15571557
const aborted = new Deferred<boolean>();
@@ -1596,47 +1596,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
15961596
}
15971597
}
15981598

1599-
protected async deprecatedDoWatchWorkspaceImageBuildLogs(
1600-
ctx: TraceContext,
1601-
logCtx: LogContext,
1602-
user: User,
1603-
workspace: Workspace,
1604-
) {
1605-
if (!workspace.imageNameResolved) {
1606-
log.debug(logCtx, `No imageNameResolved set for workspaceId, cannot watch logs.`);
1607-
return;
1608-
}
1609-
1610-
try {
1611-
const imgbuilder = await this.imageBuilderClientProvider.getDefault(
1612-
user,
1613-
workspace,
1614-
{} as WorkspaceInstance,
1615-
);
1616-
const req = new LogsRequest();
1617-
req.setCensored(true);
1618-
req.setBuildRef(workspace.imageNameResolved);
1619-
1620-
let lineCount = 0;
1621-
await imgbuilder.logs(ctx, req, (data) => {
1622-
if (!this.client) {
1623-
return "stop";
1624-
}
1625-
data = data.replace("\n", WorkspaceImageBuild.LogLine.DELIMITER);
1626-
lineCount += data.split(WorkspaceImageBuild.LogLine.DELIMITER_REGEX).length;
1627-
1628-
this.client.onWorkspaceImageBuildLogs(undefined as any, {
1629-
text: data,
1630-
isDiff: true,
1631-
upToLine: lineCount,
1632-
});
1633-
return "continue";
1634-
});
1635-
} catch (err) {
1636-
log.error(logCtx, `cannot watch logs for workspaceId`, err);
1637-
}
1638-
}
1639-
16401599
async getHeadlessLog(ctx: TraceContext, instanceId: string): Promise<HeadlessLogUrls> {
16411600
traceAPIParams(ctx, { instanceId });
16421601

0 commit comments

Comments
 (0)