Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update dependencies #1590

Merged
merged 9 commits into from
Dec 6, 2023
Merged

update dependencies #1590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
05f4700
spectator 1.7.4
brharrington Dec 6, 2023
1d444ec
iep 5.0.15
brharrington Dec 6, 2023
fc9b369
jackson 2.16.0
brharrington Dec 6, 2023
aa0c22f
embedded-postgres 2.0.6
brharrington Dec 6, 2023
613af37
postgresql 42.7.1
brharrington Dec 6, 2023
139345c
spring 6.1.1
brharrington Dec 6, 2023
bd033ef
log4j 2.22.0
brharrington Dec 6, 2023
6e60aeb
equalsverifier 3.15.4
brharrington Dec 6, 2023
4bd98dc
pekko 1.0.2
brharrington Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/SubscribeApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(_) =>
Expand Down
18 changes: 9 additions & 9 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ 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.14"
val jackson = "2.15.3"
val log4j = "2.21.1"
val iep = "5.0.15"
val jackson = "2.16.0"
val log4j = "2.22.0"
val scala = "2.13.12"
val slf4j = "1.7.36"
val spectator = "1.7.2"
val spring = "6.0.13"
val spectator = "1.7.4"
val spring = "6.1.1"

val crossScala = Seq(scala)
}
Expand All @@ -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
Expand All @@ -51,8 +51,8 @@ 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 postgresEmbedded = "io.zonky.test" % "embedded-postgres" % "2.0.4"
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"
val scalaCompatJdk8 = "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2"
Expand Down