remove ws-man-bridge messagebus

Author: easyCZ

components/ws-manager-bridge/src/bridge.ts

@@ -5,7 +5,6 @@
  */
 
 import { inject, injectable } from "inversify";
-import { MessageBusIntegration } from "./messagebus-integration";
 import {
     Disposable,
     Queue,
@@ -52,7 +51,6 @@ export type WorkspaceClusterInfo = Pick<WorkspaceCluster, "name" | "url">;
 export class WorkspaceManagerBridge implements Disposable {
     constructor(
         @inject(TracedWorkspaceDB) private readonly workspaceDB: DBWithTracing<WorkspaceDB>,
-        @inject(MessageBusIntegration) private readonly messagebus: MessageBusIntegration,
         @inject(Metrics) private readonly metrics: Metrics,
         @inject(Configuration) private readonly config: Configuration,
         @inject(IAnalyticsWriter) private readonly analytics: IAnalyticsWriter,
@@ -363,7 +361,6 @@ export class WorkspaceManagerBridge implements Disposable {
             if (!!lifecycleHandler) {
                 await lifecycleHandler();
             }
-            await this.messagebus.notifyOnInstanceUpdate(ctx, userId, instance);
             await this.publisher.publishInstanceUpdate({
                 ownerID: userId,
                 instanceID: instance.id,

components/ws-manager-bridge/src/container-module.ts

@@ -7,9 +7,6 @@
 require("reflect-metadata");
 
 import { ContainerModule } from "inversify";
-import { MessageBusHelper, MessageBusHelperImpl } from "@gitpod/gitpod-messagebus/lib";
-import { MessagebusConfiguration } from "@gitpod/gitpod-messagebus/lib/config";
-import { MessageBusIntegration } from "./messagebus-integration";
 import { Configuration } from "./config";
 import * as fs from "fs";
 import { WorkspaceManagerBridgeFactory, WorkspaceManagerBridge } from "./bridge";
@@ -41,10 +38,6 @@ import { RedisClient } from "./redis/client";
 import { RedisPublisher } from "./redis/publisher";
 
 export const containerModule = new ContainerModule((bind) => {
-    bind(MessagebusConfiguration).toSelf().inSingletonScope();
-    bind(MessageBusHelper).to(MessageBusHelperImpl).inSingletonScope();
-    bind(MessageBusIntegration).toSelf().inSingletonScope();
-
     bind(BridgeController).toSelf().inSingletonScope();
 
     bind(PrometheusClientCallMetrics).toSelf().inSingletonScope();

components/ws-manager-bridge/src/main.ts

@@ -9,7 +9,6 @@ import * as express from "express";
 import * as prometheusClient from "prom-client";
 import { log, LogrusLogLevel } from "@gitpod/gitpod-protocol/lib/util/logging";
 import { DebugApp } from "@gitpod/gitpod-protocol/lib/util/debug-app";
-import { MessageBusIntegration } from "./messagebus-integration";
 import { TypeORM } from "@gitpod/gitpod-db/lib/typeorm/typeorm";
 import { TracingManager } from "@gitpod/gitpod-protocol/lib/util/tracing";
 import { ClusterServiceServer } from "./cluster-service-server";
@@ -23,9 +22,6 @@ export const start = async (container: Container) => {
         const db = container.get(TypeORM);
         await db.connect();
 
-        const msgbus = container.get(MessageBusIntegration);
-        await msgbus.connect();
-
         const tracingManager = container.get(TracingManager);
         tracingManager.setup("ws-manager-bridge");
 

components/ws-manager-bridge/src/messagebus-integration.ts

@@ -12,7 +12,6 @@ import { log, LogContext } from "@gitpod/gitpod-protocol/lib/util/logging";
 import { PrebuildStateMapper } from "./prebuild-state-mapper";
 import { DBWithTracing, TracedWorkspaceDB } from "@gitpod/gitpod-db/lib/traced-db";
 import { WorkspaceDB } from "@gitpod/gitpod-db/lib/workspace-db";
-import { MessageBusIntegration } from "./messagebus-integration";
 import { Metrics } from "./metrics";
 import { filterStatus } from "./bridge";
 import { RedisPublisher } from "./redis/publisher";
@@ -22,7 +21,6 @@ export class PrebuildUpdater {
     constructor(
         @inject(PrebuildStateMapper) private readonly prebuildStateMapper: PrebuildStateMapper,
         @inject(TracedWorkspaceDB) private readonly workspaceDB: DBWithTracing<WorkspaceDB>,
-        @inject(MessageBusIntegration) private readonly messagebus: MessageBusIntegration,
         @inject(Metrics) private readonly prometheusExporter: Metrics,
         @inject(RedisPublisher) private readonly publisher: RedisPublisher,
     ) {}
@@ -85,10 +83,6 @@ export class PrebuildUpdater {
 
                 // notify updates
                 // headless update
-                await this.messagebus.notifyHeadlessUpdate({ span }, userId, workspaceId, {
-                    type: update.type,
-                    workspaceID: workspaceId,
-                });
                 if (!HeadlessWorkspaceEventType.isRunning(update.type)) {
                     await this.publisher.publishHeadlessUpdate({
                         type: update.type,
@@ -99,7 +93,6 @@ export class PrebuildUpdater {
                 // prebuild info
                 const info = (await this.workspaceDB.trace({ span }).findPrebuildInfos([updatedPrebuild.id]))[0];
                 if (info) {
-                    await this.messagebus.notifyOnPrebuildUpdate({ info, status: updatedPrebuild.state });
                     await this.publisher.publishPrebuildUpdate({
                         projectID: prebuild.projectId || "",
                         prebuildID: updatedPrebuild.id,
@@ -129,7 +122,6 @@ export class PrebuildUpdater {
                 // notify about prebuild updated
                 const info = (await this.workspaceDB.trace({ span }).findPrebuildInfos([prebuild.id]))[0];
                 if (info) {
-                    await this.messagebus.notifyOnPrebuildUpdate({ info, status: prebuild.state });
                     await this.publisher.publishPrebuildUpdate({
                         projectID: prebuild.projectId || "",
                         prebuildID: prebuild.id,

components/ws-manager-bridge/src/prebuild-updater.ts

@@ -14,7 +14,6 @@ import { Metrics } from "./metrics";
 import { WorkspaceDB } from "@gitpod/gitpod-db/lib/workspace-db";
 import { DBWithTracing, TracedUserDB, TracedWorkspaceDB } from "@gitpod/gitpod-db/lib/traced-db";
 import { UserDB } from "@gitpod/gitpod-db/lib/user-db";
-import { MessageBusIntegration } from "./messagebus-integration";
 import { IAnalyticsWriter } from "@gitpod/gitpod-protocol/lib/analytics";
 import { ClientProvider } from "./wsman-subscriber";
 import { repeat } from "@gitpod/gitpod-protocol/lib/util/repeat";
@@ -53,7 +52,6 @@ export class WorkspaceInstanceControllerImpl implements WorkspaceInstanceControl
         @inject(Metrics) private readonly prometheusExporter: Metrics,
         @inject(TracedWorkspaceDB) private readonly workspaceDB: DBWithTracing<WorkspaceDB>,
         @inject(TracedUserDB) private readonly userDB: DBWithTracing<UserDB>,
-        @inject(MessageBusIntegration) private readonly messagebus: MessageBusIntegration,
         @inject(PrebuildUpdater) private readonly prebuildUpdater: PrebuildUpdater,
         @inject(IAnalyticsWriter) private readonly analytics: IAnalyticsWriter,
         @inject(RedisPublisher) private readonly publisher: RedisPublisher,
@@ -273,7 +271,6 @@ export class WorkspaceInstanceControllerImpl implements WorkspaceInstanceControl
         // important: call this after the DB update
         await this.onStopped(ctx, info.workspace.ownerId, info.latestInstance);
 
-        await this.messagebus.notifyOnInstanceUpdate(ctx, info.workspace.ownerId, info.latestInstance);
         await this.publisher.publishInstanceUpdate({
             ownerID: info.workspace.ownerId,
             instanceID: info.latestInstance.id,