Skip to content

Commit e3c33ed

Browse files
committed
fix some warnings
1 parent e600da8 commit e3c33ed

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

instrumentation/kamon-armeria/src/main/scala/kamon/instrumentation/armeria/client/ArmeriaHttpClientInstrumentation.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
package kamon.instrumentation.armeria.client
1717

1818
import com.linecorp.armeria.client.{ClientBuilder, HttpClient}
19+
import com.typesafe.config.Config
1920
import kamon.Kamon
20-
import kamon.instrumentation.armeria.converters.JavaConverters
21+
import kamon.instrumentation.armeria.converters.JavaConverter
2122
import kamon.instrumentation.http.HttpClientInstrumentation
2223
import kanela.agent.api.instrumentation.InstrumentationBuilder
2324
import kanela.agent.libs.net.bytebuddy.asm.Advice
@@ -29,12 +30,12 @@ class ArmeriaHttpClientInstrumentation extends InstrumentationBuilder {
2930

3031
class ArmeriaHttpClientBuilderAdvisor
3132

32-
object ArmeriaHttpClientBuilderAdvisor extends JavaConverters {
33-
lazy val httpClientConfig = Kamon.config().getConfig("kamon.instrumentation.armeria.client")
33+
object ArmeriaHttpClientBuilderAdvisor extends JavaConverter {
34+
lazy val httpClientConfig: Config = Kamon.config().getConfig("kamon.instrumentation.armeria.client")
3435

3536
@Advice.OnMethodExit(suppress = classOf[Throwable])
3637
def addKamonDecorator(@Advice.This builder: ClientBuilder): Unit = {
37-
val clientInstrumentation = HttpClientInstrumentation.from(httpClientConfig, "armeria.http.client");
38+
val clientInstrumentation = HttpClientInstrumentation.from(httpClientConfig, "armeria.http.client")
3839
builder.decorator(toJavaFunction((delegate: HttpClient) => new ArmeriaHttpClientDecorator(delegate, clientInstrumentation)))
3940
}
4041
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.util.function.{Function => JFunction}
55
/**
66
* Only because scala-2.11 compatibility issues
77
*/
8-
trait JavaConverters {
8+
trait JavaConverter {
99
implicit def toJavaFunction[A, B](f: Function1[A, B]): JFunction[A, B] = new JFunction[A, B] {
1010
override def apply(a: A): B = f(a)
1111
}

instrumentation/kamon-armeria/src/main/scala/kamon/instrumentation/armeria/converters/KamonArmeriaMessageConverter.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import kamon.context.HttpPropagation.HeaderWriter
2121
import kamon.instrumentation.http.HttpMessage
2222

2323
import scala.collection.JavaConverters.iterableAsScalaIterableConverter
24-
import scala.collection.immutable.Map
2524
import scala.collection.{JavaConverters, mutable}
2625

2726
object KamonArmeriaMessageConverter {
@@ -60,7 +59,7 @@ object KamonArmeriaMessageConverter {
6059

6160
override def read(header: String): Option[String] = Option(request.headers().get(header))
6261

63-
override def readAll: Map[String, String] = {
62+
override def readAll(): Map[String, String] = {
6463
JavaConverters
6564
.asScalaIteratorConverter(request.headers().iterator())
6665
.asScala
@@ -83,7 +82,7 @@ object KamonArmeriaMessageConverter {
8382
_headers += (header -> value)
8483
}
8584

86-
override def build: HttpRequest = {
85+
override def build(): HttpRequest = {
8786
val newHeadersMap = request.headers.toBuilder
8887
_headers.foreach { case (key, value) => newHeadersMap.add(key, value) }
8988
request.withHeaders(newHeadersMap)

instrumentation/kamon-armeria/src/main/scala/kamon/instrumentation/armeria/server/ArmeriaHttpServerInstrumentation.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ import java.util
1919

2020
import com.linecorp.armeria.common.HttpStatus
2121
import com.linecorp.armeria.server._
22+
import com.typesafe.config.Config
2223
import kamon.Kamon
23-
import kamon.instrumentation.armeria.converters.JavaConverters
24+
import kamon.instrumentation.armeria.converters.JavaConverter
2425
import kamon.instrumentation.armeria.server.ArmeriaHttpServerDecorator.REQUEST_HANDLER_TRACE_KEY
2526
import kamon.instrumentation.armeria.server.InternalState.ServerBuilderInternalState
2627
import kamon.instrumentation.http.HttpServerInstrumentation
@@ -45,8 +46,8 @@ class ArmeriaServerBuilderAdvisor
4546
* After enter to <a href="https://github.com/line/armeria/blob/master/core/src/main/java/com/linecorp/armeria/server/ServerBuilder.java">build()</a>
4647
* some things are done with the ports field, so we aren't entirely sure that this ports are gonna to be final
4748
*/
48-
object ArmeriaServerBuilderAdvisor extends JavaConverters {
49-
lazy val httpServerConfig = Kamon.config().getConfig("kamon.instrumentation.armeria.server")
49+
object ArmeriaServerBuilderAdvisor extends JavaConverter {
50+
lazy val httpServerConfig: Config = Kamon.config().getConfig("kamon.instrumentation.armeria.server")
5051

5152
@Advice.OnMethodEnter
5253
def addKamonDecorator(@Advice.This builder: ServerBuilder): Unit = {
@@ -66,7 +67,7 @@ object ArmeriaServerBuilderAdvisor extends JavaConverters {
6667
class HandleNotFoundMethodAdvisor
6768

6869
object HandleNotFoundMethodAdvisor {
69-
lazy val unhandledOperationName = Kamon.config().getConfig("kamon.instrumentation.armeria.server").getString("tracing.operations.unhandled")
70+
lazy val unhandledOperationName: String = Kamon.config().getConfig("kamon.instrumentation.armeria.server").getString("tracing.operations.unhandled")
7071

7172
/**
7273
* When an HttpStatusException is thrown in {@link com.linecorp.armeria.server.FallbackService.handleNotFound( )} is because the route doesn't exist

0 commit comments

Comments
 (0)