Skip to content

Support rx java #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Apr 4, 2016
Merged

Support rx java #243

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6905cdc
Added test for tags
marcingrzejszczak Mar 29, 2016
6cd98dd
Fixed missing logs for untraced first request
marcingrzejszczak Mar 29, 2016
82a7b34
Updated readme
marcingrzejszczak Mar 29, 2016
6326264
Adding RxJava Support
Mar 31, 2016
f30b7b8
Messages don't log events even though they should
marcingrzejszczak Mar 30, 2016
7b11f4c
Add Feign sample that fails to close a span
Mar 31, 2016
c8a4732
Remove @Bean RestTemplate
Mar 31, 2016
31e8cb9
Updates to zipkin 0.10.4
Mar 31, 2016
3bc1283
Ensure span is cleaned up if Feign client throws a non retryable
Mar 31, 2016
f0ff074
Add zipkin-ui to dependencies
Apr 1, 2016
c0f05a0
Merge branch 'master' into support-rx-java
Apr 1, 2016
f093454
Adding documentation for rx-java support
Apr 2, 2016
e64ea26
Minor change to the tests
marcingrzejszczak Apr 4, 2016
c07887f
Merge branch 'rx_java' of https://github.com/marcingrzejszczak/spring…
Apr 4, 2016
bfbcb04
Merge branch 'marcingrzejszczak-rx_java' into support-rx-java
Apr 4, 2016
47107db
Removing minor oversights of merge conflicts in javadocs
Apr 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Removing minor oversights of merge conflicts in javadocs
  • Loading branch information
Shivang Shah committed Apr 4, 2016
commit 47107db35e9f958b251cc2ddb757b873a7cca7cd
5 changes: 0 additions & 5 deletions ...main/java/org/springframework/cloud/sleuth/instrument/rxjava/RxJavaAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,11 @@
import rx.plugins.RxJavaSchedulersHook;

/**
<<<<<<< HEAD
*
* @author Shivang Shah
=======
* {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration Auto-configuration} that
* enables support for RxJava via {@link RxJavaSchedulersHook}.
*
* @author Shivang Shah
* @since 1.0.0
>>>>>>> e64ea26da45e5f9383d86a9689fe916c53eb7ad2
*/
@Configuration
@AutoConfigureAfter(TraceAutoConfiguration.class)
Expand Down
5 changes: 0 additions & 5 deletions spring-cloud-sleuth-core/src/main/java/rx/plugins/SleuthRxJavaPlugins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
package rx.plugins;

/**
<<<<<<< HEAD
*
* @author Shivang Shah
=======
* {@link RxJavaPlugins} helper class to access the package scope method
* of {@link RxJavaPlugins#reset()}. Will disappear once this gets closed
* https://github.com/ReactiveX/RxJava/issues/2297
*
* @author Shivang Shah
* @since 1.0.0
>>>>>>> e64ea26da45e5f9383d86a9689fe916c53eb7ad2
*/
public class SleuthRxJavaPlugins extends RxJavaPlugins {

Expand Down