Skip to content

Commit 803b52a

Browse files
geroplroboquat
authored andcommitted
[server] Remove outdated feature flag deprecateOldImageLogsMechanism
1 parent b31278f commit 803b52a

File tree

1 file changed

+4
-24
lines changed

1 file changed

+4
-24
lines changed

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

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1583,31 +1583,11 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
15831583

15841584
const logInfo = instance.imageBuildInfo?.log;
15851585
if (!logInfo) {
1586-
const teams = await this.teamDB.findTeamsByUser(user.id);
1587-
const isOldImageBuildLogsMechanismDeprecated = await getExperimentsClientForBackend().getValueAsync(
1588-
"deprecateOldImageLogsMechanism",
1589-
false,
1590-
{
1591-
user,
1592-
projectId: workspace.projectId,
1593-
teams,
1594-
},
1586+
log.error(logCtx, "cannot watch imagebuild logs for workspaceId: no image build info available");
1587+
throw new ResponseError(
1588+
ErrorCodes.HEADLESS_LOG_NOT_YET_AVAILABLE,
1589+
"cannot watch imagebuild logs for workspaceId",
15951590
);
1596-
if (isOldImageBuildLogsMechanismDeprecated) {
1597-
log.error(logCtx, "cannot watch imagebuild logs for workspaceId: no image build info available");
1598-
throw new ResponseError(
1599-
ErrorCodes.HEADLESS_LOG_NOT_YET_AVAILABLE,
1600-
"cannot watch imagebuild logs for workspaceId",
1601-
);
1602-
}
1603-
1604-
// during roll-out this is our fall-back case.
1605-
// Afterwards we might want to do some spinning-lock and re-check for a certain period (30s?) to give db-sync
1606-
// a change to move the imageBuildLogInfo across the globe.
1607-
log.warn(logCtx, "imageBuild logs: fallback!");
1608-
ctx.span?.setTag("workspace.imageBuild.logs.fallback", true);
1609-
await this.deprecatedDoWatchWorkspaceImageBuildLogs(ctx, logCtx, user, workspace);
1610-
return;
16111591
}
16121592

16131593
const aborted = new Deferred<boolean>();

0 commit comments

Comments
 (0)