Merge pull request #141 from commercetools/gcp-pub-sub-max-ack-deadline

Fix maxAckDeadline in GCP pub/sub puller
commercetools · Jan 10, 2025 · e10e1d7 · e10e1d7
2 parents 1905cb2 + 443344f
commit e10e1d7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/gcp/pubsub/src/main/scala/com/commercetools/queue/gcp/pubsub/PubSubPuller.scala b/gcp/pubsub/src/main/scala/com/commercetools/queue/gcp/pubsub/PubSubPuller.scala
@@ -42,6 +42,8 @@ private class PubSubPuller[F[_], T](
   deserializer: Deserializer[T])
   extends UnsealedQueuePuller[F, T] {
 
+  private val maxAckDeadlineSeconds = 600
+
   private def callContext(waitingTime: FiniteDuration): ApiCallContext =
     GrpcCallContext
       .createDefault()
@@ -87,7 +89,8 @@ private class PubSubPuller[F[_], T](
                           .newBuilder()
                           .addAckIds(msg.getAckId())
                           .setSubscription(subscriptionName.toString())
-                          .setAckDeadlineSeconds(time.Duration.between(now, until).getSeconds().toInt)
+                          .setAckDeadlineSeconds(
+                            Math.min(time.Duration.between(now, until).getSeconds().toInt, maxAckDeadlineSeconds))
                           .build()))).as(None)
               case _ => F.pure(Some(msg))
             }