From 99ff807755a07e0ccfadadee8b414132edc6ad6c Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Fri, 12 Oct 2018 13:11:44 +0200
Subject: rename the preferred trace id configuration

---
 kamon-core/src/main/scala/kamon/instrumentation/HttpServer.scala | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'kamon-core/src/main/scala/kamon/instrumentation/HttpServer.scala')

diff --git a/kamon-core/src/main/scala/kamon/instrumentation/HttpServer.scala b/kamon-core/src/main/scala/kamon/instrumentation/HttpServer.scala
index 02e92f25..99b330f7 100644
--- a/kamon-core/src/main/scala/kamon/instrumentation/HttpServer.scala
+++ b/kamon-core/src/main/scala/kamon/instrumentation/HttpServer.scala
@@ -383,7 +383,6 @@ object HttpServer {
     enableContextPropagation: Boolean,
     propagationChannel: String,
     enableServerMetrics: Boolean,
-    serverMetricsTags: Seq[String],
     enableTracing: Boolean,
     traceIDTag: Option[String],
     enableSpanMetrics: Boolean,
@@ -418,11 +417,10 @@ object HttpServer {
 
       // HTTP Server metrics settings
       val enableServerMetrics = config.getBoolean("metrics.enabled")
-      val serverMetricsTags = config.getStringList("metrics.tags").asScala
 
       // Tracing settings
       val enableTracing = config.getBoolean("tracing.enabled")
-      val traceIdTag = Option(config.getString("tracing.trace-id-tag")).filterNot(_ == "none")
+      val traceIdTag = Option(config.getString("tracing.preferred-trace-id-tag")).filterNot(_ == "none")
       val enableSpanMetrics = config.getBoolean("tracing.span-metrics")
       val urlTagMode = TagMode.from(config.getString("tracing.tags.url"))
       val methodTagMode = TagMode.from(config.getString("tracing.tags.method"))
@@ -440,7 +438,6 @@ object HttpServer {
         enablePropagation,
         propagationChannel,
         enableServerMetrics,
-        serverMetricsTags,
         enableTracing,
         traceIdTag,
         enableSpanMetrics,
-- 
cgit v1.2.3