From 05f470093b3dcf5cff98de989780d2385e848ac8 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Wed, 6 Dec 2023 13:46:04 -0600 Subject: [PATCH 1/9] spectator 1.7.4 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5db776aa1..93ede3c12 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,7 +11,7 @@ object Dependencies { val log4j = "2.21.1" val scala = "2.13.12" val slf4j = "1.7.36" - val spectator = "1.7.2" + val spectator = "1.7.4" val spring = "6.0.13" val crossScala = Seq(scala) From 1d444ec280c9b42a71487b8d77f3dc1571fcd367 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Wed, 6 Dec 2023 13:46:57 -0600 Subject: [PATCH 2/9] iep 5.0.15 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 93ede3c12..39a07bc43 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ object Dependencies { object Versions { val pekko = "1.0.1" val pekkoHttpV = "1.0.0" - val iep = "5.0.14" + val iep = "5.0.15" val jackson = "2.15.3" val log4j = "2.21.1" val scala = "2.13.12" From fc9b369319d4401bddf046a4540f527e82dd25ed Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Wed, 6 Dec 2023 13:47:31 -0600 Subject: [PATCH 3/9] jackson 2.16.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 39a07bc43..6685e1d61 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,7 +7,7 @@ object Dependencies { val pekko = "1.0.1" val pekkoHttpV = "1.0.0" val iep = "5.0.15" - val jackson = "2.15.3" + val jackson = "2.16.0" val log4j = "2.21.1" val scala = "2.13.12" val slf4j = "1.7.36" From aa0c22f4e926afee4f5de0426eca50629a4dda0a Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Wed, 6 Dec 2023 13:48:21 -0600 Subject: [PATCH 4/9] embedded-postgres 2.0.6 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6685e1d61..c8a285054 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -52,7 +52,7 @@ object Dependencies { val log4jSlf4j = "org.apache.logging.log4j" % "log4j-slf4j-impl" % log4j val munit = "org.scalameta" %% "munit" % "0.7.29" val postgres = "org.postgresql" % "postgresql" % "42.6.0" - val postgresEmbedded = "io.zonky.test" % "embedded-postgres" % "2.0.4" + val postgresEmbedded = "io.zonky.test" % "embedded-postgres" % "2.0.6" val roaringBitmap = "org.roaringbitmap" % "RoaringBitmap" % "1.0.0" val scalaCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0" val scalaCompatJdk8 = "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2" From 613af3705c4e09644d707471d7186522c0991251 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Wed, 6 Dec 2023 13:48:54 -0600 Subject: [PATCH 5/9] postgresql 42.7.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c8a285054..6c9437ff0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -51,7 +51,7 @@ object Dependencies { val log4jJul = "org.apache.logging.log4j" % "log4j-jul" % log4j val log4jSlf4j = "org.apache.logging.log4j" % "log4j-slf4j-impl" % log4j val munit = "org.scalameta" %% "munit" % "0.7.29" - val postgres = "org.postgresql" % "postgresql" % "42.6.0" + val postgres = "org.postgresql" % "postgresql" % "42.7.1" val postgresEmbedded = "io.zonky.test" % "embedded-postgres" % "2.0.6" val roaringBitmap = "org.roaringbitmap" % "RoaringBitmap" % "1.0.0" val scalaCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0" From 139345cae653c16e1c44e7e7a09251cc66b7ee57 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Wed, 6 Dec 2023 13:49:49 -0600 Subject: [PATCH 6/9] spring 6.1.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6c9437ff0..33153cfb7 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,7 @@ object Dependencies { val scala = "2.13.12" val slf4j = "1.7.36" val spectator = "1.7.4" - val spring = "6.0.13" + val spring = "6.1.1" val crossScala = Seq(scala) } From bd033efec02391771981a21c8c77f4616153ea2b Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Wed, 6 Dec 2023 13:50:28 -0600 Subject: [PATCH 7/9] log4j 2.22.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 33153cfb7..e63458115 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,7 +8,7 @@ object Dependencies { val pekkoHttpV = "1.0.0" val iep = "5.0.15" val jackson = "2.16.0" - val log4j = "2.21.1" + val log4j = "2.22.0" val scala = "2.13.12" val slf4j = "1.7.36" val spectator = "1.7.4" From 6e60aeb9e9dc1bdd01536532fe7889e11cfdbcd8 Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Wed, 6 Dec 2023 13:51:10 -0600 Subject: [PATCH 8/9] equalsverifier 3.15.4 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e63458115..b40719d26 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -29,7 +29,7 @@ object Dependencies { val pekkoTestkit = "org.apache.pekko" %% "pekko-testkit" % pekko val caffeine = "com.github.ben-manes.caffeine" % "caffeine" % "3.1.8" val datasketches = "org.apache.datasketches" % "datasketches-java" % "4.2.0" - val equalsVerifier = "nl.jqno.equalsverifier" % "equalsverifier" % "3.15.3" + val equalsVerifier = "nl.jqno.equalsverifier" % "equalsverifier" % "3.15.4" val iepLeaderApi = "com.netflix.iep" % "iep-leader-api" % iep val iepLeaderDynamoDb = "com.netflix.iep" % "iep-leader-dynamodb" % iep val iepDynConfig = "com.netflix.iep" % "iep-dynconfig" % iep From 4bd98dc056573e5dc0c41dda9c2ec6f85079455f Mon Sep 17 00:00:00 2001 From: Brian Harrington Date: Wed, 6 Dec 2023 13:51:49 -0600 Subject: [PATCH 9/9] pekko 1.0.2 Fix deprecation warning with statefulMapConcat. --- .../com/netflix/atlas/lwcapi/SubscribeApi.scala | 13 +++++-------- project/Dependencies.scala | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/SubscribeApi.scala b/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/SubscribeApi.scala index 56ddd63eb..d18691d8a 100644 --- a/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/SubscribeApi.scala +++ b/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/SubscribeApi.scala @@ -110,14 +110,11 @@ class SubscribeApi( .via(new WebSocketSessionManager(streamMeta, register, subscribe)) .flatMapMerge(Int.MaxValue, msg => msg) .groupedWithin(batchSize, 1.second) - .statefulMapConcat { () => - // Re-use the stream to reduce allocations - val baos = new ByteArrayOutputStream() - - { seq => - List(BinaryMessage(LwcMessages.encodeBatch(seq, baos))) - } - } + .statefulMap(() => new ByteArrayOutputStream())( + (baos, seq) => baos -> List(BinaryMessage(LwcMessages.encodeBatch(seq, baos))), + _ => None + ) + .mapConcat(identity) .watchTermination() { (_, f) => f.onComplete { case Success(_) => diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b40719d26..b1ed93652 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ import sbt._ object Dependencies { object Versions { - val pekko = "1.0.1" + val pekko = "1.0.2" val pekkoHttpV = "1.0.0" val iep = "5.0.15" val jackson = "2.16.0"