Merge branch 'kamon-1.0-develop' of github.com:kamon-io/Kamon into kamon-1.0-develop

4 files changed, 56 insertions, 41 deletions

diff --git a/kamon-core-tests/src/test/scala/kamon/context/ContextCodecSpec.scala b/kamon-core-tests/src/test/scala/kamon/context/ContextCodecSpec.scala
index ceac4e58..ab71814f 100644
--- a/kamon-core-tests/src/test/scala/kamon/context/ContextCodecSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/context/ContextCodecSpec.scala
@@ -1,7 +1,5 @@
 package kamon.context
 
-import java.nio.ByteBuffer
-
 import kamon.Kamon
 import kamon.testkit.ContextTesting
 import org.scalatest.{Matchers, OptionValues, WordSpec}
@@ -69,42 +67,4 @@ class ContextCodecSpec extends WordSpec with Matchers with ContextTesting with O
   }
 
   val ContextCodec = new Codecs(Kamon.config())
-}
-
-object SimpleStringCodec {
-  final class Headers extends Codecs.ForEntry[TextMap] {
-    private val dataKey = "X-String-Value"
-
-    override def encode(context: Context): TextMap = {
-      val textMap = TextMap.Default()
-      context.get(ContextTesting.StringBroadcastKey).foreach { value =>
-        textMap.put(dataKey, value)
-      }
-
-      textMap
-    }
-
-    override def decode(carrier: TextMap, context: Context): Context = {
-      carrier.get(dataKey) match {
-        case value @ Some(_) => context.withKey(ContextTesting.StringBroadcastKey, value)
-        case None            => context
-      }
-    }
-  }
-
-  final class Binary extends Codecs.ForEntry[ByteBuffer] {
-    val emptyBuffer = ByteBuffer.allocate(0)
-
-    override def encode(context: Context): ByteBuffer = {
-      context.get(ContextTesting.StringBroadcastKey) match {
-        case Some(value)  => ByteBuffer.wrap(value.getBytes)
-        case None         => emptyBuffer
-      }
-    }
-
-    override def decode(carrier: ByteBuffer, context: Context): Context = {
-      context.withKey(ContextTesting.StringBroadcastKey, Some(new String(carrier.array())))
-    }
-  }
-
-}
+}
\ No newline at end of file
diff --git a/kamon-testkit/src/main/resources/reference.conf b/kamon-testkit/src/main/resources/reference.conf
index e69de29b..bd16a022 100644
--- a/kamon-testkit/src/main/resources/reference.conf
+++ b/kamon-testkit/src/main/resources/reference.conf
@@ -0,0 +1,11 @@
+kamon {
+  context.codecs {
+    http-headers-keys {
+      string-broadcast-key = "kamon.testkit.SimpleStringCodec$Headers"
+    }
+
+    binary-keys {
+      string-broadcast-key = "kamon.testkit.SimpleStringCodec$Binary"
+    }
+  }
+}
\ No newline at end of file
diff --git a/kamon-testkit/src/main/scala/kamon/testkit/ContextTesting.scala b/kamon-testkit/src/main/scala/kamon/testkit/ContextTesting.scala
index 8fd51024..b9e243d4 100644
--- a/kamon-testkit/src/main/scala/kamon/testkit/ContextTesting.scala
+++ b/kamon-testkit/src/main/scala/kamon/testkit/ContextTesting.scala
@@ -11,3 +11,5 @@ trait ContextTesting {
 }
 
 object ContextTesting extends ContextTesting
+
+
diff --git a/kamon-testkit/src/main/scala/kamon/testkit/SimpleStringCodec.scala b/kamon-testkit/src/main/scala/kamon/testkit/SimpleStringCodec.scala
new file mode 100644
index 00000000..f1d8cb14
--- /dev/null
+++ b/kamon-testkit/src/main/scala/kamon/testkit/SimpleStringCodec.scala
@@ -0,0 +1,42 @@
+package kamon.testkit
+
+import java.nio.ByteBuffer
+
+import kamon.context.{Codecs, Context, TextMap}
+
+object SimpleStringCodec {
+  final class Headers extends Codecs.ForEntry[TextMap] {
+    private val dataKey = "X-String-Value"
+
+    override def encode(context: Context): TextMap = {
+      val textMap = TextMap.Default()
+      context.get(ContextTesting.StringBroadcastKey).foreach { value =>
+        textMap.put(dataKey, value)
+      }
+
+      textMap
+    }
+
+    override def decode(carrier: TextMap, context: Context): Context = {
+      carrier.get(dataKey) match {
+        case value @ Some(_) => context.withKey(ContextTesting.StringBroadcastKey, value)
+        case None            => context
+      }
+    }
+  }
+
+  final class Binary extends Codecs.ForEntry[ByteBuffer] {
+    val emptyBuffer: ByteBuffer = ByteBuffer.allocate(0)
+
+    override def encode(context: Context): ByteBuffer = {
+      context.get(ContextTesting.StringBroadcastKey) match {
+        case Some(value)  => ByteBuffer.wrap(value.getBytes)
+        case None         => emptyBuffer
+      }
+    }
+
+    override def decode(carrier: ByteBuffer, context: Context): Context = {
+      context.withKey(ContextTesting.StringBroadcastKey, Some(new String(carrier.array())))
+    }
+  }
+}