Merge pull request #560 from ivantopo/trace-identifiers-in-response

include trace identifiers in HTTP responses, fixes #558

1 files changed, 15 insertions, 0 deletions

diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf
index 0fb3ce0a..c6d7a6e8 100644
--- a/kamon-core/src/main/resources/reference.conf
+++ b/kamon-core/src/main/resources/reference.conf
@@ -203,6 +203,7 @@ kamon {
           # Specify mappings between Context keys and the Propagation.EntryReader[HeaderReader] implementation in charge
           # of reading them from the incoming HTTP request into the Context.
           incoming {
+
             # kamon.trace.SpanPropagation$B3 for default header format or kamon.trace.SpanPropagation$B3Simple for 'b3 single' header format.
             span = "kamon.trace.SpanPropagation$B3"
           }
@@ -210,6 +211,7 @@ kamon {
           # Specify mappings betwen Context keys and the Propagation.EntryWriter[HeaderWriter] implementation in charge
           # of writing them to outgoing HTTP requests.
           outgoing {
+
             # kamon.trace.SpanPropagation$B3 for default header format or kamon.trace.SpanPropagation$B3Simple for 'b3 single' header format.
             span = "kamon.trace.SpanPropagation$B3"
           }
@@ -218,6 +220,7 @@ kamon {
     }
 
     binary {
+
       # Default HTTP propagation. Unless specified otherwise, all instrumentation will use the configuration on
       # this section for HTTP context propagation.
       #
@@ -338,6 +341,18 @@ kamon {
             }
           }
 
+          # Controls writing trace and span identifiers to HTTP response headers sent by the instrumented servers. The
+          # configuration can be set to either "none" to disable writing the identifiers on the response headers or to
+          # the header name to be used when writing the identifiers.
+          response-headers {
+
+            # HTTP response header name for the trace identifier, or "none" to disable it.
+            trace-id = "trace-id"
+
+            # HTTP response header name for the server span identifier, or "none" to disable it.
+            span-id = none
+          }
+
           # Custom mappings between routes and operation names.
           operations {