fix: JOIN-38534 fix occasional error during pubsub publishing on star…

…tup (#100)
join-com · Dec 19, 2023 · 9f04441 · 9f04441
1 parent 99bcb97
commit 9f04441
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/packages/pubsub/src/Publisher.ts b/packages/pubsub/src/Publisher.ts
@@ -36,7 +36,8 @@ export class Publisher<T = unknown> {
 
   private readonly avroMessageMetadata?: Record<string, string>
   private readonly fieldsProcessor = new FieldsProcessor()
-  //TODO: remove flags below, when only avro will be used
+  //TODO: remove fields below, when only avro will be used, why we use jsonPublisher described here: https://joinsolutionsag.atlassian.net/browse/JOIN-38534
+  private jsonPublisher: Topic
   private topicHasAssignedSchema = false
   private avroSchemasProvided = false
 
@@ -56,6 +57,7 @@ export class Publisher<T = unknown> {
       this.avroMessageMetadata = this.prepareAvroMessageMetadata(readerAvroSchema)
     }
     this.topic = client.topic(topicName)
+    this.jsonPublisher = client.topic(topicName, { gaxOpts: {retry: null}})
     this.topicSchemaName = `${this.topicName}-generated-avro`
   }
 
@@ -204,8 +206,7 @@ export class Publisher<T = unknown> {
 
 
   private async sendJsonMessage(message: MessageOptions) {
-    // why we use this.topic.publisher described here: https://joinsolutionsag.atlassian.net/browse/JOIN-38534
-    const messageId = await this.topic.publisher.publishMessage(message)
+    const messageId = await this.jsonPublisher.publishMessage(message)
     this.logger?.info(`PubSub: JSON Message sent for topic: ${this.topicName}:`, { data: message.json as unknown, messageId })
   }
 

diff --git a/packages/pubsub/src/__tests__/Publisher.test.ts b/packages/pubsub/src/__tests__/Publisher.test.ts
@@ -78,14 +78,14 @@ describe('Publisher', () => {
     it('publishes json object', async () => {
       await publisher.publishMsg(message)
 
-      expect(topicMock.publisher.publishMessage).toHaveBeenCalledWith({ json: message })
+      expect(topicMock.publishMessage).toHaveBeenCalledWith({ json: message })
     })
 
     it('publishes json array', async () => {
       const array = [message, message]
       await publisher.publishMsg(array)
 
-      expect(topicMock.publisher.publishMessage).toHaveBeenCalledWith({ json: array })
+      expect(topicMock.publishMessage).toHaveBeenCalledWith({ json: array })
     })
   })
 

diff --git a/packages/pubsub/src/__tests__/support/pubsubMock.ts b/packages/pubsub/src/__tests__/support/pubsubMock.ts
@@ -67,10 +67,7 @@ export const getTopicMock = ({ subscriptionMock, iamMock }: ITopicMockOption = {
   publishMessage: jest.fn(),
   subscription: jest.fn(() => subscriptionMock),
   iam: iamMock,
-  getMetadata: jest.fn(),
-  publisher: {
-    publishMessage: jest.fn()
-  }
+  getMetadata: jest.fn()
 })
 
 export const schemaMock = {