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

upgrades kanela agent to 1.0.18 which includes support for jdk21 #1300

Merged
merged 2 commits into from
Oct 23, 2023
Merged

upgrades kanela agent to 1.0.18 which includes support for jdk21 #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5ce20d
upgrades kanela agent from 1.0.17 to 1.0.18
danischroeter Oct 16, 2023
fa247e5
make shaky test less shaky
danischroeter Oct 16, 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
2 changes: 1 addition & 1 deletion ...ala/kamon/instrumentation/instrumentation/CassandraClientTracingInstrumentationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class CassandraClientTracingInstrumentationSpec

session.execute(query).iterator().asScala.foreach(_ => ())

eventually(timeout(10 seconds)) {
eventually(timeout(20 seconds)) {
val spans = testSpanReporter().spans()
val clientSpan = spans.find(span => span.operationName == QueryOperations.QueryOperationName)
val executionSpans = spans.filter(span => span.operationName == QueryOperations.ExecutionOperationName)
Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ object BaseProject extends AutoPlugin {
/** Marker configuration for dependencies that will be shaded into their module's jar. */
lazy val Shaded = config("shaded").hide

val kanelaAgent = "io.kamon" % "kanela-agent" % "1.0.17"
val kanelaAgent = "io.kamon" % "kanela-agent" % "1.0.18"
val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.36"
val slf4jnop = "org.slf4j" % "slf4j-nop" % "1.7.36"
val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.2.12"
Expand Down