Change messagebus topic method to sync

Signed-off-by: ArthurSens <[email protected]>

Author: ArthurSens

components/gitpod-messagebus/src/messagebus.ts

@@ -442,11 +442,11 @@ export abstract class AbstractTopicListener<T> implements MessagebusListener {
     constructor(protected readonly exchangeName: string, protected readonly listener: TopicListener<T>) { }
 
     async establish(channel: Channel): Promise<void> {
-        const topic = await this.topic();
+        const topic = this.topic();
         return this.doEstablish(channel, topic);
     }
 
-    abstract topic(): Promise<string>;
+    abstract topic(): string;
 
     protected async doEstablish(channel: Channel, topic: string): Promise<void> {
         if (channel === undefined) {

components/server/src/consensus/rabbitmq-consensus-leader-messenger.ts

@@ -98,7 +98,7 @@ export class RabbitMQConsensusLeaderMessenger extends AbstractMessageBusIntegrat
 
 class EventListener extends AbstractTopicListener<RaftMessage> {
 
-    async topic(): Promise<string> {
+    topic(): string {
         return '';
     }
 

components/server/src/workspace/messagebus-integration.ts

@@ -21,7 +21,7 @@ export class WorkspaceInstanceUpdateListener extends AbstractTopicListener<Works
         super(messageBusHelper.workspaceExchange, listener);
     }
 
-    async topic() {
+    topic() {
         return this.messageBusHelper.getWsTopicForListening(this.userId, undefined, "updates");
     }
 }
@@ -32,7 +32,7 @@ export class HeadlessWorkspaceLogListener extends AbstractTopicListener<Headless
         super(messageBusHelper.workspaceExchange, listener);
     }
 
-    async topic() {
+    topic() {
         return this.messageBusHelper.getWsTopicForListening(undefined, this.workspaceID, "headless-log");
     }
 
@@ -114,11 +114,11 @@ export class MessageBusIntegration extends AbstractMessageBusIntegration {
         }
     }
 
-    async listenForHeadlessWorkspaceLogs(workspaceID: string, callback: (ctx: TraceContext, evt: HeadlessLogEvent) => void): Disposable {
+    listenForHeadlessWorkspaceLogs(workspaceID: string, callback: (ctx: TraceContext, evt: HeadlessLogEvent) => void): Disposable {
         const listener = new HeadlessWorkspaceLogListener(this.messageBusHelper, callback, workspaceID);
         const cancellationTokenSource = new CancellationTokenSource()
         this.listen(listener, cancellationTokenSource.token);
-        increaseMessagebusTopicReads(await listener.topic())
+        increaseMessagebusTopicReads(listener.topic())
         return Disposable.create(() => cancellationTokenSource.cancel())
     }
 
@@ -129,11 +129,11 @@ export class MessageBusIntegration extends AbstractMessageBusIntegration {
         return Disposable.create(() => cancellationTokenSource.cancel())
     }
 
-    async listenForWorkspaceInstanceUpdates(userId: string | undefined, callback: (ctx: TraceContext, workspaceInstance: WorkspaceInstance) => void): Disposable {
+    listenForWorkspaceInstanceUpdates(userId: string | undefined, callback: (ctx: TraceContext, workspaceInstance: WorkspaceInstance) => void): Disposable {
         const listener = new WorkspaceInstanceUpdateListener(this.messageBusHelper, callback, userId);
         const cancellationTokenSource = new CancellationTokenSource()
         this.listen(listener, cancellationTokenSource.token);
-        increaseMessagebusTopicReads(await listener.topic())
+        increaseMessagebusTopicReads(listener.topic())
         return Disposable.create(() => cancellationTokenSource.cancel())
     }
 

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

@@ -104,7 +104,7 @@ class WorkspaceStatusUpdateListener extends AbstractTopicListener<WorkspaceStatu
         super(MessageBusIntegration.WORKSPACE_EXCHANGE, listener);
     }
 
-    async topic() {
+    topic() {
         return this._topic;
     }
 }
@@ -115,7 +115,7 @@ class WorkspaceLogListener extends AbstractTopicListener<WorkspaceLogMessage.AsO
         super(MessageBusIntegration.WORKSPACE_EXCHANGE, listener);
     }
 
-    async topic() {
+    topic() {
         return this._topic;
     }
 }