-
Notifications
You must be signed in to change notification settings - Fork 64
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.
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
Porting Spring Sleuth implementation of @KafkaListener
support
#83
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
...g/src/main/java/io/opentracing/contrib/kafka/spring/MessageListenerMethodInterceptor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
/* | ||
* Copyright 2017-2020 The OpenTracing Authors | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except | ||
* in compliance with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software distributed under the License | ||
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express | ||
* or implied. See the License for the specific language governing permissions and limitations under | ||
* the License. | ||
*/ | ||
package io.opentracing.contrib.kafka.spring; | ||
|
||
import io.opentracing.References; | ||
import io.opentracing.Scope; | ||
import io.opentracing.Span; | ||
import io.opentracing.SpanContext; | ||
import io.opentracing.Tracer; | ||
import io.opentracing.contrib.kafka.TracingKafkaUtils; | ||
import io.opentracing.tag.Tags; | ||
import org.aopalliance.intercept.MethodInterceptor; | ||
import org.aopalliance.intercept.MethodInvocation; | ||
import org.apache.kafka.clients.consumer.ConsumerRecord; | ||
|
||
class MessageListenerMethodInterceptor implements MethodInterceptor { | ||
|
||
private static final String SPAN_PREFIX = "KafkaListener_"; | ||
|
||
private final Tracer tracer; | ||
|
||
MessageListenerMethodInterceptor(Tracer tracer) { | ||
this.tracer = tracer; | ||
} | ||
|
||
@Override | ||
public Object invoke(MethodInvocation invocation) throws Throwable { | ||
if (!"onMessage".equals(invocation.getMethod().getName())) { | ||
return invocation.proceed(); | ||
} | ||
Object[] arguments = invocation.getArguments(); | ||
ConsumerRecord<?, ?> record = getConsumerRecord(arguments); | ||
if (record == null) { | ||
return invocation.proceed(); | ||
} | ||
|
||
Tracer.SpanBuilder spanBuilder = tracer.buildSpan(SPAN_PREFIX + record.topic()) | ||
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CONSUMER); | ||
|
||
SpanContext parentContext = TracingKafkaUtils.extractSpanContext(record.headers(), tracer); | ||
if (parentContext != null) { | ||
spanBuilder.addReference(References.FOLLOWS_FROM, parentContext); | ||
} | ||
Span span = spanBuilder.start(); | ||
try (Scope ignored = tracer.activateSpan(span)) { | ||
return invocation.proceed(); | ||
} catch (Exception e) { | ||
Tags.ERROR.set(span, Boolean.TRUE); | ||
throw e; | ||
} finally { | ||
span.finish(); | ||
} | ||
} | ||
|
||
private ConsumerRecord<?, ?> getConsumerRecord(Object[] arguments) { | ||
for (Object object : arguments) { | ||
if (object instanceof ConsumerRecord) { | ||
return (ConsumerRecord<?, ?>) object; | ||
} | ||
} | ||
return null; | ||
} | ||
|
||
} |
69 changes: 69 additions & 0 deletions
69
...ng-kafka-spring/src/main/java/io/opentracing/contrib/kafka/spring/TracingKafkaAspect.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/* | ||
* Copyright 2017-2020 The OpenTracing Authors | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except | ||
* in compliance with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software distributed under the License | ||
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express | ||
* or implied. See the License for the specific language governing permissions and limitations under | ||
* the License. | ||
*/ | ||
package io.opentracing.contrib.kafka.spring; | ||
|
||
import io.opentracing.Tracer; | ||
import org.aspectj.lang.ProceedingJoinPoint; | ||
import org.aspectj.lang.annotation.Around; | ||
import org.aspectj.lang.annotation.Aspect; | ||
import org.aspectj.lang.annotation.Pointcut; | ||
import org.springframework.aop.framework.ProxyFactoryBean; | ||
import org.springframework.kafka.listener.AbstractMessageListenerContainer; | ||
import org.springframework.kafka.listener.MessageListener; | ||
import org.springframework.kafka.listener.MessageListenerContainer; | ||
|
||
/** | ||
* Wraps a {@link MessageListener} into a tracing proxy, | ||
* to support {@link org.springframework.kafka.annotation.KafkaListener} beans. | ||
* <p> | ||
* A port of Spring Sleuth implementation. | ||
*/ | ||
@Aspect | ||
public class TracingKafkaAspect { | ||
private final Tracer tracer; | ||
|
||
public TracingKafkaAspect(Tracer tracer) { | ||
this.tracer = tracer; | ||
} | ||
|
||
@Pointcut("execution(public * org.springframework.kafka.config.KafkaListenerContainerFactory.createListenerContainer(..))") | ||
private void anyCreateListenerContainer() { | ||
} | ||
|
||
@Pointcut("execution(public * org.springframework.kafka.config.KafkaListenerContainerFactory.createContainer(..))") | ||
private void anyCreateContainer() { | ||
} | ||
|
||
@Around("anyCreateListenerContainer() || anyCreateContainer()") | ||
public Object wrapListenerContainerCreation(ProceedingJoinPoint pjp) throws Throwable { | ||
MessageListenerContainer listener = (MessageListenerContainer) pjp.proceed(); | ||
if (listener instanceof AbstractMessageListenerContainer) { | ||
AbstractMessageListenerContainer<?, ?> container = (AbstractMessageListenerContainer<?, ?>) listener; | ||
Object someMessageListener = container.getContainerProperties().getMessageListener(); | ||
if (someMessageListener instanceof MessageListener) { | ||
container.setupMessageListener(createProxy(someMessageListener)); | ||
} | ||
} | ||
return listener; | ||
} | ||
|
||
Object createProxy(Object bean) { | ||
ProxyFactoryBean factory = new ProxyFactoryBean(); | ||
factory.setProxyTargetClass(true); | ||
factory.addAdvice(new MessageListenerMethodInterceptor(this.tracer)); | ||
factory.setTarget(bean); | ||
return factory.getObject(); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why we need it if it doesn't do anything?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure what you mean, it is used by
@Around
aspect. Defining a pointcut is a canonical Spring AOP way to introduce aspects.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
got it