chore(store): remove dead clock param + fix broken main (transactionRunner in two purger tests)

CHANGELOG.md

@@ -10,6 +10,12 @@ Until `1.0.0`, breaking changes may appear in any release and are flagged with *
 
 ### Changed (BREAKING)
 
+- **`PostgresOutboxStore` / `MysqlOutboxStore` no longer take a `clock` constructor
+  parameter.** It became unused after the lag-gauge fix ([#58](https://github.com/softwaremill/okapi/pull/58)) —
+  the stores derive no timestamps from a clock. Code that passed an explicit clock
+  (`PostgresOutboxStore(connectionProvider, clock)`) must drop the second argument;
+  the usual `PostgresOutboxStore(connectionProvider)` form is unchanged. Spring Boot
+  users are unaffected.
 - **Outbox domain table renamed `outbox` → `okapi_outbox`.** Indexes follow the rename
   (`idx_outbox_*` → `idx_okapi_outbox_*`). Host applications with a pre-existing `outbox`
   table are no longer affected — okapi creates its own table under the `okapi_` prefix.

okapi-benchmarks/src/jmh/kotlin/com/softwaremill/okapi/benchmarks/HttpThroughputBenchmark.kt

@@ -79,7 +79,7 @@ open class HttpThroughputBenchmark {
         )
 
         val clock = Clock.systemUTC()
-        val store = PostgresOutboxStore(postgres.jdbc, clock)
+        val store = PostgresOutboxStore(postgres.jdbc)
         publisher = OutboxPublisher(store, clock)
         val urlResolver = ServiceUrlResolver { "http://localhost:${wiremock.port()}" }
         val deliverer = HttpMessageDeliverer(urlResolver)

okapi-benchmarks/src/jmh/kotlin/com/softwaremill/okapi/benchmarks/KafkaThroughputBenchmark.kt

@@ -58,7 +58,7 @@ open class KafkaThroughputBenchmark {
         topic = "bench-${UUID.randomUUID()}"
 
         val clock = Clock.systemUTC()
-        val store = PostgresOutboxStore(postgres.jdbc, clock)
+        val store = PostgresOutboxStore(postgres.jdbc)
         publisher = OutboxPublisher(store, clock)
         val deliverer = KafkaMessageDeliverer(producer)
         val entryProcessor = OutboxEntryProcessor(deliverer, RetryPolicy(maxRetries = 0), clock)

okapi-core/src/test/kotlin/com/softwaremill/okapi/core/OutboxPurgerTest.kt

@@ -153,6 +153,7 @@ class OutboxPurgerTest : FunSpec({
         try {
             val purger = OutboxPurger(
                 outboxStore = store,
+                transactionRunner = noOpTransactionRunner(),
                 config = OutboxPurgerConfig(interval = ofMillis(50), batchSize = 100),
                 clock = fixedClock,
             )
@@ -192,6 +193,7 @@ class OutboxPurgerTest : FunSpec({
         try {
             val purger = OutboxPurger(
                 outboxStore = store,
+                transactionRunner = noOpTransactionRunner(),
                 config = OutboxPurgerConfig(interval = ofMillis(50), batchSize = 100),
                 clock = fixedClock,
             )

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/concurrency/MysqlConcurrentClaimTest.kt

@@ -3,17 +3,14 @@ package com.softwaremill.okapi.test.concurrency
 import com.softwaremill.okapi.mysql.MysqlOutboxStore
 import com.softwaremill.okapi.test.support.MysqlTestSupport
 import io.kotest.core.spec.style.FunSpec
-import java.time.Clock
-import java.time.Instant
-import java.time.ZoneOffset
 
 class MysqlConcurrentClaimTest : FunSpec({
     val db = MysqlTestSupport()
 
     concurrentClaimTests(
         dbName = "mysql",
         jdbcProvider = { db.jdbc },
-        storeFactory = { MysqlOutboxStore(db.jdbc, Clock.fixed(Instant.parse("2024-01-01T00:00:00Z"), ZoneOffset.UTC)) },
+        storeFactory = { MysqlOutboxStore(db.jdbc) },
         startDb = { db.start() },
         stopDb = { db.stop() },
         truncate = { db.truncate() },

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/concurrency/PostgresConcurrentClaimTest.kt

@@ -3,17 +3,14 @@ package com.softwaremill.okapi.test.concurrency
 import com.softwaremill.okapi.postgres.PostgresOutboxStore
 import com.softwaremill.okapi.test.support.PostgresTestSupport
 import io.kotest.core.spec.style.FunSpec
-import java.time.Clock
-import java.time.Instant
-import java.time.ZoneOffset
 
 class PostgresConcurrentClaimTest : FunSpec({
     val db = PostgresTestSupport()
 
     concurrentClaimTests(
         dbName = "postgres",
         jdbcProvider = { db.jdbc },
-        storeFactory = { PostgresOutboxStore(db.jdbc, Clock.fixed(Instant.parse("2024-01-01T00:00:00Z"), ZoneOffset.UTC)) },
+        storeFactory = { PostgresOutboxStore(db.jdbc) },
         startDb = { db.start() },
         stopDb = { db.stop() },
         truncate = { db.truncate() },

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/e2e/HttpEndToEndTest.kt

@@ -44,7 +44,7 @@ class HttpEndToEndTest : FunSpec({
 
     fun buildPipeline(maxRetries: Int = 3): Triple<OutboxPublisher, OutboxProcessor, PostgresOutboxStore> {
         val clock = Clock.systemUTC()
-        val store = PostgresOutboxStore(db.jdbc, clock)
+        val store = PostgresOutboxStore(db.jdbc)
         val publisher = OutboxPublisher(store, clock)
         val urlResolver = ServiceUrlResolver { "http://localhost:${wiremock.port()}" }
         val entryProcessor = OutboxEntryProcessor(

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/e2e/KafkaEndToEndTest.kt

@@ -42,7 +42,7 @@ class KafkaEndToEndTest : FunSpec({
 
     test("full pipeline: publish to outbox -> processNext -> message on Kafka topic") {
         val clock = Clock.systemUTC()
-        val store = PostgresOutboxStore(db.jdbc, clock)
+        val store = PostgresOutboxStore(db.jdbc)
         val publisher = OutboxPublisher(store, clock)
         val deliverer = KafkaMessageDeliverer(producer!!)
         val entryProcessor = OutboxEntryProcessor(deliverer, RetryPolicy(maxRetries = 3), clock)

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/e2e/MysqlHttpEndToEndTest.kt

@@ -44,7 +44,7 @@ class MysqlHttpEndToEndTest : FunSpec({
 
     fun buildPipeline(): Triple<OutboxPublisher, OutboxProcessor, MysqlOutboxStore> {
         val clock = Clock.systemUTC()
-        val store = MysqlOutboxStore(db.jdbc, clock)
+        val store = MysqlOutboxStore(db.jdbc)
         val publisher = OutboxPublisher(store, clock)
         val urlResolver = ServiceUrlResolver { "http://localhost:${wiremock.port()}" }
         val entryProcessor = OutboxEntryProcessor(

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/e2e/ObservabilityEndToEndTest.kt

@@ -56,7 +56,7 @@ class ObservabilityEndToEndTest : FunSpec({
 
     test("full pipeline: publish, deliver, verify Micrometer counters and gauges") {
         val registry = SimpleMeterRegistry()
-        val store = PostgresOutboxStore(db.jdbc, clock)
+        val store = PostgresOutboxStore(db.jdbc)
         val publisher = OutboxPublisher(store, clock)
         val listener = MicrometerOutboxListener(registry)
         val metrics = MicrometerOutboxMetrics(store, registry, transactionRunner = jdbcTransactionRunner, clock = clock)
@@ -109,7 +109,7 @@ class ObservabilityEndToEndTest : FunSpec({
 
     test("permanent failure: HTTP 400 → Failed counter incremented, gauge reflects FAILED") {
         val registry = SimpleMeterRegistry()
-        val store = PostgresOutboxStore(db.jdbc, clock)
+        val store = PostgresOutboxStore(db.jdbc)
         val publisher = OutboxPublisher(store, clock)
         val listener = MicrometerOutboxListener(registry)
         val metrics = MicrometerOutboxMetrics(store, registry, transactionRunner = jdbcTransactionRunner, clock = clock)
@@ -135,7 +135,7 @@ class ObservabilityEndToEndTest : FunSpec({
 
     test("batch duration timer records realistic delivery time") {
         val registry = SimpleMeterRegistry()
-        val store = PostgresOutboxStore(db.jdbc, clock)
+        val store = PostgresOutboxStore(db.jdbc)
         val publisher = OutboxPublisher(store, clock)
         val listener = MicrometerOutboxListener(registry)
 
@@ -158,7 +158,7 @@ class ObservabilityEndToEndTest : FunSpec({
 
     test("lag gauge reflects real time difference for pending entries") {
         val registry = SimpleMeterRegistry()
-        val store = PostgresOutboxStore(db.jdbc, clock)
+        val store = PostgresOutboxStore(db.jdbc)
         val publisher = OutboxPublisher(store, clock)
         val metrics = MicrometerOutboxMetrics(store, registry, transactionRunner = jdbcTransactionRunner, clock = clock)
 

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/store/MysqlOutboxStoreTest.kt

@@ -3,9 +3,6 @@ package com.softwaremill.okapi.test.store
 import com.softwaremill.okapi.mysql.MysqlOutboxStore
 import com.softwaremill.okapi.test.support.MysqlTestSupport
 import io.kotest.core.spec.style.FunSpec
-import java.time.Clock
-import java.time.Instant
-import java.time.ZoneOffset
 
 class MysqlOutboxStoreTest : FunSpec({
     val db = MysqlTestSupport()
@@ -15,7 +12,6 @@ class MysqlOutboxStoreTest : FunSpec({
         storeFactory = {
             MysqlOutboxStore(
                 connectionProvider = db.jdbc,
-                clock = Clock.fixed(Instant.parse("2024-01-01T00:00:00Z"), ZoneOffset.UTC),
             )
         },
         jdbcProvider = { db.jdbc },

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/store/PostgresOutboxStoreTest.kt

@@ -3,9 +3,6 @@ package com.softwaremill.okapi.test.store
 import com.softwaremill.okapi.postgres.PostgresOutboxStore
 import com.softwaremill.okapi.test.support.PostgresTestSupport
 import io.kotest.core.spec.style.FunSpec
-import java.time.Clock
-import java.time.Instant
-import java.time.ZoneOffset
 
 class PostgresOutboxStoreTest : FunSpec({
     val db = PostgresTestSupport()
@@ -15,7 +12,6 @@ class PostgresOutboxStoreTest : FunSpec({
         storeFactory = {
             PostgresOutboxStore(
                 connectionProvider = db.jdbc,
-                clock = Clock.fixed(Instant.parse("2024-01-01T00:00:00Z"), ZoneOffset.UTC),
             )
         },
         jdbcProvider = { db.jdbc },

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/transaction/ConnectionLeakProofTest.kt

@@ -42,7 +42,7 @@ class ConnectionLeakProofTest : FunSpec({
         }
         runLiquibase(container)
         counter = CountingDataSource(raw)
-        store = PostgresOutboxStore(SpringConnectionProvider(counter), clock)
+        store = PostgresOutboxStore(SpringConnectionProvider(counter))
     }
 
     afterSpec {

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/transaction/ExposedSpringBridgeEndToEndTest.kt

@@ -23,7 +23,6 @@ import org.springframework.boot.test.context.runner.ApplicationContextRunner
 import org.springframework.transaction.PlatformTransactionManager
 import org.springframework.transaction.support.TransactionTemplate
 import org.testcontainers.containers.PostgreSQLContainer
-import java.time.Clock
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CyclicBarrier
 import java.util.concurrent.Executors
@@ -69,7 +68,7 @@ class ExposedSpringBridgeEndToEndTest : FunSpec({
         .withBean(MessageDeliverer::class.java, { recorder })
         .withBean(PlatformTransactionManager::class.java, { SpringTransactionManager(counter) })
         .withBean(PostgresOutboxStore::class.java, {
-            PostgresOutboxStore(SpringConnectionProvider(counter), Clock.systemUTC())
+            PostgresOutboxStore(SpringConnectionProvider(counter))
         })
 
     test("publish inside Spring TX driven by Exposed-bridge PTM uses a single physical connection") {

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/transaction/JpaTransactionManagerFailFastTest.kt

@@ -65,7 +65,7 @@ class JpaTransactionManagerFailFastTest : FunSpec({
             .withBean("jpaTmA", PlatformTransactionManager::class.java, { JpaTransactionManager(emf) })
             .withBean(MessageDeliverer::class.java, { JpaTestStubDeliverer })
             .withBean(PostgresOutboxStore::class.java, {
-                PostgresOutboxStore(SpringConnectionProvider(dsB), java.time.Clock.systemUTC())
+                PostgresOutboxStore(SpringConnectionProvider(dsB))
             })
             .withPropertyValues("okapi.liquibase.enabled=false")
             .run { ctx ->

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/transaction/JpaTransactionManagerMatchedDataSourceTest.kt

@@ -63,7 +63,7 @@ class JpaTransactionManagerMatchedDataSourceTest : FunSpec({
             .withBean("jpaTm", PlatformTransactionManager::class.java, { jpaPtm })
             .withBean(MessageDeliverer::class.java, { JpaMatchStubDeliverer })
             .withBean(PostgresOutboxStore::class.java, {
-                PostgresOutboxStore(SpringConnectionProvider(ds), java.time.Clock.systemUTC())
+                PostgresOutboxStore(SpringConnectionProvider(ds))
             })
             .withPropertyValues("okapi.liquibase.enabled=false")
             .run { ctx ->

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/transaction/MultiDataSourceTransactionTest.kt

@@ -67,7 +67,7 @@ class MultiDataSourceTransactionTest : FunSpec({
         val otherTxManager = DataSourceTransactionManager(otherDataSource)
         otherTxTemplate = TransactionTemplate(otherTxManager)
 
-        store = PostgresOutboxStore(SpringConnectionProvider(outboxDataSource), clock)
+        store = PostgresOutboxStore(SpringConnectionProvider(outboxDataSource))
         val corePublisher = OutboxPublisher(store, clock)
         publisher = SpringOutboxPublisher(delegate = corePublisher, dataSource = outboxDataSource)
     }

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/transaction/MysqlConnectionLeakProofTest.kt

@@ -39,7 +39,7 @@ class MysqlConnectionLeakProofTest : FunSpec({
         }
         runLiquibase(container)
         counter = CountingDataSource(raw)
-        store = MysqlOutboxStore(SpringConnectionProvider(counter), clock)
+        store = MysqlOutboxStore(SpringConnectionProvider(counter))
     }
 
     afterSpec {

okapi-integration-tests/src/test/kotlin/com/softwaremill/okapi/test/transaction/WrongPtmMultiDataSourceFailFastTest.kt

@@ -38,7 +38,7 @@ class WrongPtmMultiDataSourceFailFastTest : FunSpec({
             .withBean("exposedTmA", PlatformTransactionManager::class.java, { SpringTransactionManager(dsA) })
             .withBean(MessageDeliverer::class.java, { RecordingMessageDeliverer() })
             .withBean(PostgresOutboxStore::class.java, {
-                PostgresOutboxStore(SpringConnectionProvider(dsB), java.time.Clock.systemUTC())
+                PostgresOutboxStore(SpringConnectionProvider(dsB))
             })
             .withPropertyValues("okapi.processor.enabled=false", "okapi.liquibase.enabled=false")
             .run { ctx ->
@@ -61,7 +61,7 @@ class WrongPtmMultiDataSourceFailFastTest : FunSpec({
             .withBean("exposedTmA", PlatformTransactionManager::class.java, { SpringTransactionManager(dsA) })
             .withBean(MessageDeliverer::class.java, { RecordingMessageDeliverer() })
             .withBean(PostgresOutboxStore::class.java, {
-                PostgresOutboxStore(SpringConnectionProvider(dsB), java.time.Clock.systemUTC())
+                PostgresOutboxStore(SpringConnectionProvider(dsB))
             })
             .withPropertyValues(
                 "okapi.processor.enabled=false",
@@ -90,7 +90,7 @@ class WrongPtmMultiDataSourceFailFastTest : FunSpec({
             .withBean("exposedTmA", PlatformTransactionManager::class.java, { SpringTransactionManager(dsA) })
             .withBean(MessageDeliverer::class.java, { RecordingMessageDeliverer() })
             .withBean(PostgresOutboxStore::class.java, {
-                PostgresOutboxStore(SpringConnectionProvider(dsB), java.time.Clock.systemUTC())
+                PostgresOutboxStore(SpringConnectionProvider(dsB))
             })
             .withPropertyValues(
                 "okapi.processor.enabled=false",

okapi-mysql/src/main/kotlin/com/softwaremill/okapi/mysql/MysqlOutboxStore.kt

@@ -7,14 +7,12 @@ import com.softwaremill.okapi.core.OutboxStatus
 import com.softwaremill.okapi.core.OutboxStore
 import java.sql.ResultSet
 import java.sql.Timestamp
-import java.time.Clock
 import java.time.Instant
 import java.util.UUID
 
 /** MySQL [OutboxStore] implementation using plain JDBC. */
 class MysqlOutboxStore(
     private val connectionProvider: ConnectionProvider,
-    private val clock: Clock = Clock.systemUTC(),
 ) : OutboxStore {
 
     override fun persist(entry: OutboxEntry): OutboxEntry {

okapi-postgres/src/main/kotlin/com/softwaremill/okapi/postgres/PostgresOutboxStore.kt

@@ -7,14 +7,12 @@ import com.softwaremill.okapi.core.OutboxStatus
 import com.softwaremill.okapi.core.OutboxStore
 import java.sql.ResultSet
 import java.sql.Timestamp
-import java.time.Clock
 import java.time.Instant
 import java.util.UUID
 
 /** PostgreSQL [OutboxStore] implementation using plain JDBC. */
 class PostgresOutboxStore(
     private val connectionProvider: ConnectionProvider,
-    private val clock: Clock = Clock.systemUTC(),
 ) : OutboxStore {
 
     override fun persist(entry: OutboxEntry): OutboxEntry {

okapi-spring-boot/src/main/kotlin/com/softwaremill/okapi/springboot/OutboxAutoConfiguration.kt

@@ -239,9 +239,8 @@ class OutboxAutoConfiguration(
     ) {
         @Bean
         @ConditionalOnMissingBean(OutboxStore::class)
-        fun outboxStore(clock: ObjectProvider<Clock>): PostgresOutboxStore = PostgresOutboxStore(
+        fun outboxStore(): PostgresOutboxStore = PostgresOutboxStore(
             connectionProvider = SpringConnectionProvider(resolveDataSource(dataSources, primaryDataSource, okapiProperties)),
-            clock = clock.getIfAvailable { Clock.systemUTC() },
         )
     }
 
@@ -255,9 +254,8 @@ class OutboxAutoConfiguration(
     ) {
         @Bean
         @ConditionalOnMissingBean(OutboxStore::class)
-        fun outboxStore(clock: ObjectProvider<Clock>): MysqlOutboxStore = MysqlOutboxStore(
+        fun outboxStore(): MysqlOutboxStore = MysqlOutboxStore(
             connectionProvider = SpringConnectionProvider(resolveDataSource(dataSources, primaryDataSource, okapiProperties)),
-            clock = clock.getIfAvailable { Clock.systemUTC() },
         )
     }
 

okapi-spring-boot/src/test/kotlin/com/softwaremill/okapi/springboot/OutboxMysqlEndToEndTest.kt

@@ -56,7 +56,7 @@ class OutboxMysqlEndToEndTest :
             connection.close()
 
             val clock = Clock.systemUTC()
-            store = MysqlOutboxStore(jdbc, clock)
+            store = MysqlOutboxStore(jdbc)
             publisher = OutboxPublisher(store, clock)
 
             val urlResolver = ServiceUrlResolver { "http://localhost:${wiremock.port()}" }