Commit Graph

91 Commits

Author SHA1 Message Date
Adrian Cole
37a079c174 Updates to Zipkin 0.12
Prevents crashes by making storage calls lazy
2016-04-12 09:26:47 -04:00
Adrian Cole
eaa008f933 Updates to zipkin 0.11
The only notable change for Sleuth is an artifact id change from
spanstore to storage.
2016-04-03 21:04:55 +08:00
Adrian Cole
8382a823e5 Updates to zipkin 0.10.4
This updates to the latest release. Beyond bug fixes, there are some
notable changes:

* storage: writes are now via AsyncSpanConsumer
* storage: added elasticsearch
* zipkin-ui: constrains start time to look for traces
* zipkin-ui: assets set cache headers, increasing responsiveness
* core: debug logging available for zipkin.internal.DependencyLinker
2016-03-31 19:31:45 +08:00
Marcin Grzejszczak
e31edbd254 Revert to snapshots 2016-03-23 13:00:05 +01:00
Marcin Grzejszczak
51fd6f784f Bump for 1.0.0.RC1 2016-03-23 12:54:35 +01:00
Adrian Cole
bd5d3ded0e Merge pull request #222 from spring-cloud/zipkin-web-be-gone
Scrubs docs about zipkin-web as it is now embedded
2016-03-22 17:25:40 +08:00
Adrian Cole
d1972a67f1 Scrubs docs about zipkin-web as it is now embedded 2016-03-21 22:30:56 +08:00
Marcin Grzejszczak
a0048a806e Polish 2016-03-21 14:58:30 +01:00
Adrian Cole
d662a4bf90 Updates to zipkin 0.9
Notably, this removes the "zipkin-web" dependency, as the UI is now
collocated on zipkin-server.

Other notable changes are Cassandra and Kafka support, as well removing
the Brave dependency.
2016-03-18 17:46:45 +08:00
Dave Syer
ef1c91b24d Use JSON for span transport with Stream by default
User can still override it and Stream should adjust itself, but
now we have JSON flowing between instrumented apps and the Zipkin
server.

Fixes gh-217
2016-03-17 20:04:31 +00:00
Marcin Grzejszczak
4b61439ab9 [#79] Updated documentation
* first iteration

fixes #79
2016-03-03 11:25:43 +01:00
Marcin Grzejszczak
17bc239536 [#191] Changes following the review 2016-03-02 15:05:18 +01:00
Marcin Grzejszczak
754c8ce96d [#191] Added ServerAddress annotation
* if a span contains a CS or CR (or any other client related annotation) then SA is passed from the Endpoint service name

fixes #191
2016-03-01 16:35:57 +01:00
Marcin Grzejszczak
6c2c87ab3c [#191] Added local component if a span doesn't have any Zipkin constants
fixes #191
2016-03-01 13:45:58 +01:00
Marcin Grzejszczak
3000a4f37d [#69] Added javadocs
fixes #69
2016-02-25 11:23:23 +01:00
Marcin Grzejszczak
dc22434e27 More refactoring 2016-02-22 19:04:37 +01:00
Marcin Grzejszczak
8333c31c99 [#158] Removing span name
fixes #158
2016-02-16 08:28:22 +01:00
Marcin Grzejszczak
ee8d7a54c7 Delomboking 2016-02-10 19:09:20 +01:00
Marcin Grzejszczak
1b0c8dfee5 [#146] Introduced SpanName
- Added aspect to provide better naming for @Async

fixes #146
2016-02-09 15:25:36 +01:00
Dave Syer
bc48a0094e Revert to snapshots 2016-02-05 10:02:47 +00:00
Dave Syer
203d9cc4f2 Update to 1.1.0.M5 2016-02-05 09:56:38 +00:00
Dave Syer
0c5c984e4a Use accumulated millisecs instead of computing span duration 2016-01-26 13:53:44 +00:00
Adrian Cole
ef7e70dde3 Prefers the word event when adding to a Span's timeline
Span.logs are really timestamped events. This clarifies the naming and
documentation around that.
2016-01-25 11:24:07 +01:00
Adrian Cole
9417110e90 Changes http key delimiter to dot and adds size keys 2016-01-23 17:28:12 +01:00
Marcin Grzejszczak
7b6a533498 Fixed checkstyle issues 2016-01-20 12:36:38 +01:00
Marcin Grzejszczak
d5b523d021 Converted MilliSpan to Span. Removed the interface 2016-01-20 10:52:02 +01:00
Adrian Cole
9bcab5b0c6 Updates to zipkin-java 0.4.3 2016-01-20 12:22:18 +08:00
Marcin Grzejszczak
82ed9f78a1 [#106] Converted UUID to Long
- Changed Random instantiation to a shared Random
- Changed the name of the converter
- Changed generator into random
- Span id is now non-nullable.
    - it gets generated in the http filter if it's not there
    - it's generated in the spring-integration channels if it wasn't set
2016-01-18 14:38:09 +01:00
Adrian Cole
425123df86 Updates to zipkin-java 0.4.1, particularly docker images
Zipkin 0.4.1 obviates some duplication of configuration. It is also the
first version that's published as a docker image.

By switching to the published image of zipkin-java, we can be more
consistent, as `spring-cloud-sleuth-zipkin-stream` is derived from that,
not the scala query service.
2016-01-14 11:06:19 +08:00
Adrian Cole
582cd157dc Adds test missing from last PR 2016-01-13 11:44:57 +08:00
Dave Syer
368d1ccae7 Rename some of the core API concepts
E.g. annotation -> tag, timelineAnnotation -> log

See gh-98
2016-01-12 17:39:58 +00:00
Adrian Cole
84d2706a57 Updates to latest zipkin and brave, removing Scribe dependency
Recent versions of zipkin and brave operate with http instead of scribe.
This changes the implementation accordingly, as well adds a sampler to
the POST endpoint.

A notable impact is that we no longer require a collector process, as
the zipkin server's POST endpoint is a collector.
2016-01-12 21:58:48 +08:00
Marcin Grzejszczak
9a8dc17d8c [#89] Initial approach to the integration tests
- Fixed the tests
- Updated surefire
- Added integration tests (for the moment ignored)
- Fixed wrong surefire setup
2016-01-08 19:09:37 +01:00
Adrian Cole
e3669417dd Fixes missing zipkin service name and polishes span converters.
Missing service name:

Zipkin service names were logged as null, which is invalid and led to
them showing up as "unknown" in the zipkin ui. This was due to a wiring
bug, and a special-case, which this change fixes.

The special-case was when a sleuth span had no annotations. Since zipkin
service names are attached to annotations, they are only queryable when
annotations exist. When there are no annotations, we add the "lc"
binary annotation, which makes that span attached to the correct service
in zipkin.

Polishing:

Zipkin timestamps were not always set as microseconds. This fixes that.

The de-facto label in zipkin for unknown service is "unknown". This
fixes the code, which formerly fell back to "application".

This also removes complexity in assigning timestamp and duration as we
no longer need to make pseudo-annotations "acquire" and "release".

Finally, this adds tests about above consistently to both scs-zipkin and
scs-zipkin-stream.
2015-12-29 17:10:16 +08:00
Dave Syer
ff3c39e497 Revert to snapshots 2015-12-23 09:22:21 +00:00
Dave Syer
3b0ff4b4c5 Update to 1.0.0.M4 2015-12-23 09:12:22 +00:00
Dave Syer
c49ee09b68 Zipkin java bumped to 0.1.1 2015-12-16 10:57:19 +00:00
Dave Syer
28dbb0cd14 Refactor docker compose so default launches everything 2015-12-15 11:44:28 +00:00
Dave Syer
327bb46e90 Remove reference to unused class 2015-12-15 09:44:17 +00:00
Dave Syer
b1068e2050 Re-organize docker files for Zipkin server
Still not quite working:

$ docker-compose -f docker-compose.yml -f docker-compose.zipkin.yml up

everything starts up fine (once the database is initialized), but
the zipkin server is not listening to rabbit (and there are errors
in the logs).
2015-12-11 16:33:25 +00:00
Dave Syer
ce4a7409fa Add Zipkin stream support
@EnableZipkinStreamServer and bind to a Spring Cloud Stream message
broker. That's it. The default span store is in memory, but Zipkin
also supports MySQL (and Cassandra coming soon).
2015-12-11 10:24:03 +00:00