1 files changed, 14 insertions, 26 deletions
diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf
index 5b885fd0..e0002194 100644
--- a/kamon-core/src/main/resources/reference.conf
+++ b/kamon-core/src/main/resources/reference.conf
@@ -123,39 +123,27 @@ kamon {
       # with the name of the operation on the parent Span, if any.
       scope-spans-to-parent = yes
     }
-
-    # The SpanContextCodecs are used to encode/decode the SpanContext data into simple TextMaps, HTTP Headers or Binary
-    # carriers. The decision about which one to use is based on the kamon.trace.SpanContextCodec.Format instance passed
-    # to inject/extract calls.
-    #
-    # Any external implementation can be configured here, as long as it can be instantiated with a single parameter
-    # constructor that accepts a IdentityProvider.
-    span-context-codec {
-
-      # Encodes/Decodes the SpanContext data using a simple key/value pair. Since this is very rarely going to be used
-      # we default to using the same codec for HTTP Headers, as it is built on top of a TextMap.
-      text-map = "kamon.trace.SpanContextCodec$ExtendedB3"
-
-      # Encodes/Decodes the SpanContext into a TextMap with HTTP Header friendly, URLEncoded values. The default
-      # implementation follows the guidelines of B3 propagation. See more at https://github.com/openzipkin/b3-propagation.
-      http-headers = "kamon.trace.SpanContextCodec$ExtendedB3"
-
-      # Encodes/Decodes the SpanContext using a binary representation.
-      binary = "TODO"
-    }
-
-
   }
 
   context {
-    encoding {
 
-      http-headers {
+    # Codecs are used to encode/decode Context keys when a Context must be propagated either through HTTP headers or
+    # Binary transports. Only broadcast keys configured bellow will be processed by the context Codec. The FQCN of
+    # the appropriate Codecs for each key must be provided, otherwise keys will be ignored.
+    #
+    codecs {
+
+      # Size of the encoding buffer for the Binary Codec.
+      binary-buffer-size = 256
+
+      # Codecs to be used when propagating a Context through a HTTP Headers transport.
+      http-headers-keys {
         span = "kamon.trace.SpanCodec$B3"
       }
 
-      binary {
-        # span = "kamon.trace.propagation.Binary"
+      # Codecs to be used when propagating a Context through a Binary transport.
+      binary-keys {
+        span = "kamon.trace.SpanCodec$Colfer"
       }
     }
   }