Skip to content
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

Jump to bottom

Added an option to wrap current spring rabbit components #636

Merged
merged 4 commits into from
Mar 6, 2018
Merged

Added an option to wrap current spring rabbit components #636

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
638e8b1
Added an option to wrap current spring rabbit compontents
marcingrzejszczak Mar 5, 2018
3f8348b
Changes following review
marcingrzejszczak Mar 6, 2018
61a1bc4
Polish
marcingrzejszczak Mar 6, 2018
6c013d7
polish and rename
Mar 6, 2018
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
Next Next commit
Polish
  • Loading branch information
@marcingrzejszczak
marcingrzejszczak committed Mar 6, 2018
commit 61a1bc4395ed910526771fa4cca2001634a5e55b
10 changes: 4 additions & 6 deletions instrumentation/spring-rabbit/src/main/java/brave/spring/rabbit/SpringRabbitTracing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ private MessagePostProcessor[] currentProcessorsWithTracing(
if (processors != null) {
newProcessors.addAll(processors);
}
return newProcessors.toArray(new MessagePostProcessor[] {});
return newProcessors.toArray(new MessagePostProcessor[0]);
}

private boolean hasTracedProcessor(Collection<MessagePostProcessor> processors) {
Expand Down Expand Up @@ -132,17 +132,15 @@ public SimpleRabbitListenerContainerFactory decorateSimpleMessageListenerContain

private Advice[] chainListWithTracing(Advice[] chain) {
if (chain == null) {
return chain;
return new Advice[] { tracingRabbitListenerAdvice };
}
List<Advice> currentChain = Arrays.asList(chain);
List<Advice> chainList = new ArrayList<>();
if (!hasTracedListenerAdvice(currentChain)) {
chainList.add(tracingRabbitListenerAdvice);
}
if (chain != null) {
chainList.addAll(currentChain);
}
return chainList.toArray(new Advice[] {});
chainList.addAll(currentChain);
return chainList.toArray(new Advice[0]);
}

private boolean hasTracedListenerAdvice(List<Advice> currentChain) {
Expand Down