aboutsummaryrefslogtreecommitdiff
path: root/kamon-spray/src/main/resources
diff options
context:
space:
mode:
Diffstat (limited to 'kamon-spray/src/main/resources')
-rw-r--r--kamon-spray/src/main/resources/META-INF/aop.xml6
-rw-r--r--kamon-spray/src/main/resources/reference.conf7
2 files changed, 8 insertions, 5 deletions
diff --git a/kamon-spray/src/main/resources/META-INF/aop.xml b/kamon-spray/src/main/resources/META-INF/aop.xml
index 0e5726c6..00e8763a 100644
--- a/kamon-spray/src/main/resources/META-INF/aop.xml
+++ b/kamon-spray/src/main/resources/META-INF/aop.xml
@@ -2,14 +2,16 @@
<aspectj>
<aspects>
+
<!-- Spray Server -->
- <aspect name="spray.can.server.ServerRequestInstrumentation"/>
+ <aspect name="spray.can.server.instrumentation.ServerRequestInstrumentation"/>
<!-- Spray Client -->
<aspect name="spray.can.client.ClientRequestInstrumentation"/>
+
</aspects>
<weaver>
- <include within="spray.can..*"/>
+ <include within="spray..*"/>
</weaver>
</aspectj>
diff --git a/kamon-spray/src/main/resources/reference.conf b/kamon-spray/src/main/resources/reference.conf
index 5c5e9317..bdba21cb 100644
--- a/kamon-spray/src/main/resources/reference.conf
+++ b/kamon-spray/src/main/resources/reference.conf
@@ -4,6 +4,7 @@
kamon {
spray {
+
# Header name used when propagating the `TraceContext.token` value across applications.
trace-token-header-name = "X-Trace-Token"
@@ -23,16 +24,16 @@ kamon {
client {
# Strategy used for automatic trace segment generation when issue requests with spray-client. The possible values
# are:
- # - pipelining: measures the time during which the user application code is waiting for a spray-client request to
+ # - request-level: measures the time during which the user application code is waiting for a spray-client request to
# complete, by attaching a callback to the Future[HttpResponse] returned by `spray.client.pipelining.sendReceive`.
# If `spray.client.pipelining.sendReceive` is not used, the segment measurement wont be performed.
- # - internal: measures the internal time taken by spray-client to finish a request. Sometimes the user application
+ # - host-level: measures the internal time taken by spray-client to finish a request. Sometimes the user application
# code has a finite future timeout (like when using `spray.client.pipelining.sendReceive`) that doesn't match
# the actual amount of time spray might take internally to resolve a request, counting retries, redirects,
# connection timeouts and so on. If using the internal strategy, the measured time will include the entire time
# since the request has been received by the corresponding `HttpHostConnector` until a response is sent back
# to the requester.
- segment-collection-strategy = pipelining
+ instrumentation-level = request-level
}
}
} \ No newline at end of file