Skip to content

Commit 3d445a9

Browse files
otelbot[bot]trask
andauthored
Review fixes for akka-actor-fork-join-2.5:javaagent (open-telemetry#17875)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
1 parent 3803100 commit 3d445a9

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

instrumentation/akka/akka-actor-fork-join-2.5/javaagent/build.gradle.kts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,21 @@ dependencies {
3030

3131
library("com.typesafe.akka:akka-actor_2.11:2.5.0")
3232

33+
// akka's ForkJoinPool was removed in 2.6, replaced with the normal java.util.concurrent version
34+
latestDepTestLibrary("com.typesafe.akka:akka-actor_2.13:2.5.+") // no longer applicable
35+
3336
testImplementation(project(":instrumentation:executors:testing"))
3437
}
3538

39+
if (otelProps.testLatestDeps) {
40+
configurations {
41+
// akka artifact name is different for regular and latest tests
42+
testImplementation {
43+
exclude("com.typesafe.akka", "akka-actor_2.11")
44+
}
45+
}
46+
}
47+
3648
if (otelProps.denyUnsafe) {
3749
tasks.withType<Test>().configureEach {
3850
enabled = false

instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaforkjoin/AkkaForkJoinTaskInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static class ForkJoinTaskAdvice {
5555

5656
/**
5757
* When {@link ForkJoinTask} object is submitted to {@link ForkJoinPool} as {@link Runnable} or
58-
* {@link Callable} it will not get wrapped, instead it will be casted to {@code ForkJoinTask}
58+
* {@link Callable} it will not get wrapped, instead it will be cast to {@code ForkJoinTask}
5959
* directly. This means state is still stored in {@code Runnable} or {@code Callable} and we
6060
* need to use that state.
6161
*/

0 commit comments

Comments
 (0)