Browse Source

Fix akka actors testLatestDeps (#5589)

* Fix akka actors testLatestDeps

* latest dep test scala version differs by module

* Don't bother with compat library since doesn't look good anyways
Anuraag Agrawal 3 years ago
parent
commit
47508330ba

+ 0 - 1
conventions/src/main/kotlin/otel.scala-conventions.gradle.kts

@@ -6,7 +6,6 @@ plugins {
 
 dependencies {
   testImplementation("org.scala-lang:scala-library")
-  testImplementation("org.scala-lang.modules:scala-java8-compat_2.11")
 }
 
 tasks {

+ 0 - 1
dependencyManagement/build.gradle.kts

@@ -116,7 +116,6 @@ val DEPENDENCIES = listOf(
   "org.spockframework:spock-core:2.2-M1-groovy-4.0",
   "org.spockframework:spock-junit4:2.2-M1-groovy-4.0",
   "org.scala-lang:scala-library:2.11.12",
-  "org.scala-lang.modules:scala-java8-compat_2.11:1.0.2",
   // Note that this is only referenced as "org.springframework.boot" in build files, not the artifact name.
   "org.springframework.boot:spring-boot-dependencies:2.3.1.RELEASE"
 )

+ 62 - 54
instrumentation/akka/akka-actor-2.5/javaagent/src/test/scala/io/opentelemetry/instrumentation/akkaactor/AkkaActorTest.scala

@@ -16,6 +16,8 @@ import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.extension.RegisterExtension
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
+
+import java.util.function.Consumer
 import scala.compat.java8.FunctionConverters._
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -34,24 +36,26 @@ class AkkaActorTest {
 
     val assertions = (1 to count)
       .map(_ =>
-        ((trace: TraceAssert) => {
-          trace.hasSpansSatisfyingExactly(
-            ((span: SpanDataAssert) => {
-              span
-                .hasName("parent")
-                .hasAttributes(Attributes.empty())
-              ()
-            }).asJava,
-            ((span: SpanDataAssert) => {
-              span
-                .hasName("Howdy, Akka")
-                .hasParent(trace.getSpan(0))
-                .hasAttributes(Attributes.empty())
-              ()
-            }).asJava
-          )
-          ()
-        }).asJava
+        new Consumer[TraceAssert] {
+          override def accept(trace: TraceAssert): Unit =
+            trace.hasSpansSatisfyingExactly(
+              new Consumer[SpanDataAssert] {
+                override def accept(span: SpanDataAssert): Unit = {
+                  span
+                    .hasName("parent")
+                    .hasAttributes(Attributes.empty())
+                }
+              },
+              new Consumer[SpanDataAssert] {
+                override def accept(span: SpanDataAssert): Unit = {
+                  span
+                    .hasName("Howdy, Akka")
+                    .hasParent(trace.getSpan(0))
+                    .hasAttributes(Attributes.empty())
+                }
+              }
+            )
+        }
       )
       .asJava
 
@@ -68,24 +72,26 @@ class AkkaActorTest {
 
     val assertions = (1 to count)
       .map(_ =>
-        ((trace: TraceAssert) => {
-          trace.hasSpansSatisfyingExactly(
-            ((span: SpanDataAssert) => {
-              span
-                .hasName("parent")
-                .hasAttributes(Attributes.empty())
-              ()
-            }).asJava,
-            ((span: SpanDataAssert) => {
-              span
-                .hasName("Howdy, Akka")
-                .hasParent(trace.getSpan(0))
-                .hasAttributes(Attributes.empty())
-              ()
-            }).asJava
-          )
-          ()
-        }).asJava
+        new Consumer[TraceAssert] {
+          override def accept(trace: TraceAssert): Unit =
+            trace.hasSpansSatisfyingExactly(
+              new Consumer[SpanDataAssert] {
+                override def accept(span: SpanDataAssert): Unit = {
+                  span
+                    .hasName("parent")
+                    .hasAttributes(Attributes.empty())
+                }
+              },
+              new Consumer[SpanDataAssert] {
+                override def accept(span: SpanDataAssert): Unit = {
+                  span
+                    .hasName("Howdy, Akka")
+                    .hasParent(trace.getSpan(0))
+                    .hasAttributes(Attributes.empty())
+                }
+              }
+            )
+        }
       )
       .asJava
 
@@ -102,24 +108,26 @@ class AkkaActorTest {
 
     val assertions = (1 to count)
       .map(_ =>
-        ((trace: TraceAssert) => {
-          trace.hasSpansSatisfyingExactly(
-            ((span: SpanDataAssert) => {
-              span
-                .hasName("parent")
-                .hasAttributes(Attributes.empty())
-              ()
-            }).asJava,
-            ((span: SpanDataAssert) => {
-              span
-                .hasName("Hello, Akka")
-                .hasParent(trace.getSpan(0))
-                .hasAttributes(Attributes.empty())
-              ()
-            }).asJava
-          )
-          ()
-        }).asJava
+        new Consumer[TraceAssert] {
+          override def accept(trace: TraceAssert): Unit =
+            trace.hasSpansSatisfyingExactly(
+              new Consumer[SpanDataAssert] {
+                override def accept(span: SpanDataAssert): Unit = {
+                  span
+                    .hasName("parent")
+                    .hasAttributes(Attributes.empty())
+                }
+              },
+              new Consumer[SpanDataAssert] {
+                override def accept(span: SpanDataAssert): Unit = {
+                  span
+                    .hasName("Hello, Akka")
+                    .hasParent(trace.getSpan(0))
+                    .hasAttributes(Attributes.empty())
+                }
+              }
+            )
+        }
       )
       .asJava
 

+ 1 - 1
instrumentation/akka/akka-actor-2.5/javaagent/src/test/scala/io/opentelemetry/instrumentation/akkaactor/AkkaActors.scala

@@ -113,7 +113,7 @@ class Greeter(message: String, receiverActor: ActorRef) extends Actor {
 }
 
 object Receiver {
-  def props: Props = Props[Receiver]
+  def props: Props = Props[Receiver]()
 
   final case class Greeting(greeting: String)