Merge pull request #1028 from SimunKaracic/1027-jedis-fix

Remove element matcher, replace with pattern match

Author: SimunKaracic

instrumentation/kamon-redis/src/main/resources/reference.conf

@@ -1,15 +1,14 @@
 kanela.modules {
   redis {
     name = "Redis Instrumentation"
-    # Does it provide metrics? No.
-    description = "Provides tracing and metrics for the Jedis library"
+    description = "Provides tracing for the Jedis library"
 
     instrumentations = [
       "kamon.instrumentation.jedis.JedisInstrumentation",
     ]
 
     within = [
-      "redis.clients.jedis..*",
+      "redis.clients.jedis.Protocol",
     ]
   }
 }

instrumentation/kamon-redis/src/main/scala/kamon/instrumentation/jedis/JedisInstrumentation.scala

@@ -8,19 +8,20 @@ import redis.clients.jedis.commands.ProtocolCommand
 
 class JedisInstrumentation extends InstrumentationBuilder {
   onType("redis.clients.jedis.Protocol")
-    .advise(method("sendCommand").and(withArgument(1, classOf[ProtocolCommand])), classOf[SendCommandAdvice])
+    .advise(method("sendCommand"), classOf[SendCommandAdvice])
 }
 
 class SendCommandAdvice
-
 object SendCommandAdvice {
   @Advice.OnMethodEnter()
-  def enter(@Advice.Argument(1) command: ProtocolCommand) = {
-    val spanName = s"redis.command.${command}"
-    val span = Kamon.clientSpanBuilder(spanName, "redis.client.jedis")
-      .start()
-
-    span
+  def enter(@Advice.Argument(1) command: Any) = {
+    command match {
+      case command: ProtocolCommand =>
+        val spanName = s"redis.command.${command}"
+        Kamon.clientSpanBuilder(spanName, "redis.client.jedis")
+          .start()
+      case _ => Span.Empty
+    }
   }
 
   @Advice.OnMethodExit(onThrowable = classOf[Throwable])