From d30ff29cdb5f94be34163d851d71716a316bdf10 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Thu, 30 Aug 2018 13:25:10 +0200 Subject: mockup definition on the HTTP Server instrumentation configuration --- .../src/main/scala/kamon/ContextPropagation.scala | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'kamon-core/src/main/scala') diff --git a/kamon-core/src/main/scala/kamon/ContextPropagation.scala b/kamon-core/src/main/scala/kamon/ContextPropagation.scala index 518aa021..bfcfbf7e 100644 --- a/kamon-core/src/main/scala/kamon/ContextPropagation.scala +++ b/kamon-core/src/main/scala/kamon/ContextPropagation.scala @@ -40,8 +40,8 @@ trait ContextPropagation { self: Configuration with ClassLoading => } object ContextPropagation { - val DefaultHttpChannel = "http" - val DefaultBinaryChannel = "binary" + val DefaultHttpChannel = "default" + val DefaultBinaryChannel = "default" case class Components( httpChannels: Map[String, HttpPropagation] @@ -51,17 +51,12 @@ object ContextPropagation { def from(config: Config, classLoading: ClassLoading): Components = { val propagationConfig = config.getConfig("kamon.propagation") - val channels = propagationConfig.getConfig("channels").configurations - - val httpChannels = Map.newBuilder[String, HttpPropagation] - - channels.foreach { - case (channelName, channelConfig) => channelConfig.getString("type") match { - case "http" => httpChannels += (channelName -> HttpPropagation.from(channelConfig, classLoading)) - } + val httpChannelsConfig = propagationConfig.getConfig("http").configurations + val httpChannels = httpChannelsConfig.map { + case (channelName, channelConfig) => (channelName -> HttpPropagation.from(channelConfig, classLoading)) } - Components(httpChannels.result()) + Components(httpChannels) } } } -- cgit v1.2.3