Commit Graph

639 Commits

Author SHA1 Message Date
Marcin Grzejszczak
78dc17fc45 Added verification for lack of response status code
With this change when there is no http response status code an exception is not thrown and the tags are not set for http.status_code

fixes #304
2016-06-15 13:07:42 +02:00
Dave Syer
6ddf8c7576 Use "safe: :unsafe" to ensure included snippets work
Also copy the document attributes over and re-use them so
any variables that need to be resolved are there. Code copied
from https://github.com/asciidoctor/asciidoctor-extensions-lab/blob/master/scripts/asciidoc-coalescer.rb
2016-06-11 07:45:26 +01:00
Dave Syer
fea2397501 Update to 1.0.2 snapshots 2016-06-10 17:10:35 +01:00
Marcin Grzejszczak
8f726cb514 Update SNAPSHOT to 1.0.1.RELEASE 2016-06-10 15:38:37 +02:00
Marcin Grzejszczak
0a188cd8df Extracted a method for readability purposes 2016-06-10 15:09:40 +02:00
Marcin Grzejszczak
ca89b58661 Removed build status from running examples 2016-06-10 12:56:06 +02:00
Marcin Grzejszczak
7cd49319dc Bumped up logging level to DEBUG 2016-06-10 09:31:21 +02:00
Marcin Grzejszczak
65796e9aa2 Added client side tags for zuul (#302)
Now when a request is sent via Zuul, the HTTP client side tags will be added to the request
2016-06-10 08:53:01 +02:00
Marcin Grzejszczak
fbfed722c7 Altered tests 2016-06-09 21:42:57 +02:00
Marcin Grzejszczak
0f60e5bf67 Fixed the issues with Zuul exception handling (#300)
TraceFilter no longer is a OncePerRequestFilter
TraceFilter processes the request that is executed upon ERROR dispatch (the logs will be present there)
Altered the logic in TraceFilter that an already processed request will not be detached (which resulted in an exception)
Added some debugging to instrumentation
Added assertion over a list of spans
Bumped up SC-Netflix to 1.1.2.BUILD-SNAPSHOT
Added Zuul integration tests
Added Http keys injection to Zuul client call
2016-06-09 18:26:46 +02:00
Marcin Grzejszczak
e9cfe6d2ab Lowered logging level for RxJava hook - in debug mode it's present every second 2016-06-07 15:20:12 +02:00
Marcin Grzejszczak
5f716611ae Fixed the missing spanid in incoming http request
until now if traceid was set and span id wasn't we were generating a new span id. That approach was wrong since
1) there shouldn't be such a situation in the first place (you have to have neither or both headers set)
2) if there is one we should assume that the span is the root one

so ATM in case of missing span id we are placing the trace id value there.
2016-06-07 15:07:10 +02:00
Marcin Grzejszczak
23d9b23cec Fixed a typo 2016-06-07 14:11:56 +02:00
Marcin Grzejszczak
8856854002 Fixed duplicated logs in tracefilter 2016-06-07 10:17:32 +02:00
Marcin Grzejszczak
a613e8a0e4 Changed aspect into filter with custom dispatch (#297) 2016-06-06 12:25:37 +02:00
Dave Syer
2a38aa1241 Fix property names for stream binder headers
Spring Cloud Stream changed the names of the headers config
that we need to propagate headers in kafka (and other binders
that do not support headers natively).

Fixes gh-284
2016-06-06 09:53:54 +01:00
Marcin Grzejszczak
7e215aac82 Added aspect that closes spans for wrong http responses (#296)
with this change trace filter is not closing all spans. It's closing only spans when the response is successful. If the response status is 4xx,5xx then an exception controller should start processing the response. At the end of the day an aspect will close the span once the controller has finished processing.

fixes #278
2016-06-06 10:20:18 +02:00
Dave Syer
2b058be77e Update tp mvn 3.3.9 2016-06-04 09:14:48 +01:00
Adrian Cole
24ff30bffc Merge pull request #293 from spring-cloud/zipkin-1.1
Updates to zipkin 1.1.1
2016-06-03 08:49:01 +08:00
Marcin Grzejszczak
a194c4a17a Added list of threads to ignore for rx (#294)
fixes #274

* Updates following code review
2016-06-02 19:20:12 +02:00
Adrian Cole
117a31b31f Updates to zipkin 1.1.1
Zipkin 1.1.1 includes a few changes relevant to sleuth:
* Adds JSON button to trace detail screen
* Presents server errors in UI
* Fixes misclassification of http span metrics (1.1.1)

https://github.com/openzipkin/zipkin-java/releases/tag/1.1.0
2016-06-02 10:07:47 +08:00
Marcin Grzejszczak
a3dc021ec4 Added a test for deferred result returning controller 2016-05-31 13:41:49 +02:00
Marcin Grzejszczak
d30efca703 Updated HTTP client side span with HTTP tags
After this change when sending an HTTP request, the client side span will have all the necessary HTTP related tags.

Fixes #290
2016-05-31 09:31:55 +02:00
Marcin Grzejszczak
723b19ee78 Added Logback with Logstash JSON logging pattern 2016-05-30 17:09:41 +02:00
Marcin Grzejszczak
a7480880ea Fixed sonar suggestion 2016-05-28 23:43:57 +02:00
Marcin Grzejszczak
4f9a953285 Decreased visibility of TraceFeignContext 2016-05-27 09:01:39 +02:00
Marcin Grzejszczak
0a0d36053d Cloning the Retryer
@dpalita's suggested that since Default Retryer implemenation is not thread-safe we have to clone the delegate. And obviously he's right!
2016-05-27 08:52:47 +02:00
Marcin Grzejszczak
00d06a17c0 Fixed wrong cloning of TraceFeignRetryer
ATM we're cloning the retryer with the default retryer as a delegate. We should be honouring the retryer that the user has provided.

Fixes #291
2016-05-27 08:19:18 +02:00
Marcin Grzejszczak
358d0b16b5 Issues #286 custom feign config (#289)
After this change a custom FeignContext is created that before returning instance  or instances of beans will wrap, if necessary, that bean into a tracing representation. That way all the custom Feign configurations will have wrapped beans and tracing will get propagated.

Fixes #286
2016-05-25 18:12:06 +02:00
Adrian Cole
51960876de Moves to zipkin 1.0.0 2016-05-25 10:52:46 -04:00
Adrian Cole
c360e00a5a Scopes collector metrics 2016-05-24 22:34:47 -04:00
Adrian Cole
3921568572 Merge pull request #287 from spring-cloud/zipkin-0.21.5
Moves to zipkin 0.21
2016-05-24 09:27:47 -04:00
Marcin Grzejszczak
76b8716dc6 Added Kafka script 2016-05-24 12:36:37 +02:00
Pei-Tang Huang
f729781734 Fixed typo. (#277) 2016-05-24 10:14:56 +02:00
Adrian Cole
b8b1ff05ac Moves to zipkin 0.21
This moves to changes made in preparation of zipkin 1.0.

Here are the notables:

* Zipkin has autoconfiguration modules, where maven artifacts have the prefix 'zipkin-autoconfigure-X'
* Zipkin's ui now shares a version with everything else

* Zipkin now namespaces packages and configuration. ex zipkin.storage.X as opposed to zipkin.X
* All autoconfiguration classes are prefixed `Zipkin` to be easier to find

* Zipkin binds components like StorageComponent, as opposed to individual classes like SpanStore.
* Health checks are under the scope "zipkin" and broken down by component

* UI responsiveness is better by conditionally caching names queries for 5 minutes
* New `Collector` class, which makes logging and metrics patterns the same regardless of transport
2016-05-23 11:21:53 -04:00
Marcin Grzejszczak
bed01f2779 Revert "Updated docs for Kafka binder configuration"
This reverts commit 47bb27db12.
2016-05-23 11:03:39 +02:00
Marcin Grzejszczak
47bb27db12 Updated docs for Kafka binder configuration
Currently we need to explicitly define the headers for Kafka binder integration. Updated docs to refect that.

fixes #282
2016-05-23 10:53:53 +02:00
Marcin Grzejszczak
ef369d9ee2 Updated docs with missing starter dep
In the docs we needed to add the dependency to starter-sleuth, that way all the necessary dependencies are downloaded to the project

fixes #281
2016-05-23 10:08:54 +02:00
Dave Syer
9ad0933768 Update to latest builds snapshots 2016-05-20 12:35:44 +02:00
Dave Syer
6ae8dfa21c Check for null in endpoint port
Fixes gh-280
2016-05-20 12:27:45 +02:00
Marcin Grzejszczak
650bf6d1f8 Removing the cloud profiled beans for ZipkinMessageListener
fixes #268
2016-05-19 17:23:39 +02:00
Marcin Grzejszczak
af70f0dde1 Fixing CGLIB issue with Spring Boot 1.4.0 2016-05-19 17:01:57 +02:00
Marcin Grzejszczak
29d2eec030 Updated the version in the docs 2016-05-12 17:00:09 +02:00
Dave Syer
3a12186aa7 Re-instate .settings.xml for Travis 2016-05-12 11:34:40 +01:00
Dave Syer
d8a9933725 Update README and remove .settings.xml where appropriate 2016-05-12 10:47:36 +01:00
Marcin Grzejszczak
f8ed14bd5b Revert "Fixed tests with a workaround"
This reverts commit 94ed8cfe4b.
2016-05-12 10:10:49 +02:00
Marcin Grzejszczak
3fc2994d31 Update runAcceptanceTestsStream.sh 2016-05-11 14:31:13 +02:00
Marcin Grzejszczak
d69e138ffd Update runAcceptanceTests.sh 2016-05-11 14:31:00 +02:00
Dave Syer
25d89f6e98 Update dependencies to their latest snapshot 2016-05-11 09:32:20 +01:00
Dave Syer
fc29838b86 Update to 1.0.1 snapshots 2016-05-11 09:21:54 +01:00