apache camel 2.20.x instrumentation #1397
Merged
Conversation
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
ghost
requested review from
anuraaga,
iNikem,
jkwatson,
mateuszrzeszutek,
trask and
tylerbenson
as code owners
There was a problem hiding this comment.
Two more questions:
- Have you tested it on a 3.X camel project? Can we be sure that this instrumentation won't interfere with Camel's OTel instrumentation?
- Can you add some multithreaded tests (e.g. multicast & aggregate)? To make sure that context is propagated correctly
...main/java/io/opentelemetry/instrumentation/auto/apachecamel/CamelContextInstrumentation.java
Outdated
Show resolved
Hide resolved
...main/java/io/opentelemetry/instrumentation/auto/apachecamel/CamelContextInstrumentation.java
Outdated
Show resolved
Hide resolved
...main/java/io/opentelemetry/instrumentation/auto/apachecamel/CamelContextInstrumentation.java
Outdated
Show resolved
Hide resolved
....20/src/main/java/io/opentelemetry/instrumentation/auto/apachecamel/CamelTracingService.java
Outdated
Show resolved
Hide resolved
...-2.20/src/main/java/io/opentelemetry/instrumentation/auto/apachecamel/ActiveSpanManager.java
Outdated
Show resolved
Hide resolved
...ain/java/io/opentelemetry/instrumentation/auto/apachecamel/decorators/HttpSpanDecorator.java
Outdated
Show resolved
Hide resolved
...umentation/apache-camel-2.20/src/test/groovy/test/TwoServicesCamelSpringBootBasedTest.groovy
Outdated
Show resolved
Hide resolved
...umentation/apache-camel-2.20/src/test/groovy/test/TwoServicesCamelSpringBootBasedTest.groovy
Outdated
Show resolved
Hide resolved
...umentation/apache-camel-2.20/src/test/groovy/test/TwoServicesCamelSpringBootBasedTest.groovy
Outdated
Show resolved
Hide resolved
anuraaga
reviewed
Oct 17, 2020
.../src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveSpanManager.java
Outdated
Show resolved
Hide resolved
|
@mateuszrzeszutek added new tests (multithreaded and simple internal direct). Also - added logic to prevent wrong CLIENT spas with all internal components. Please have another look :) |
jkwatson
reviewed
Oct 20, 2020
.../src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveSpanManager.java
Show resolved
Hide resolved
jkwatson
reviewed
Oct 20, 2020
...src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelEventNotifier.java
Show resolved
Hide resolved
|
I'm not a primary reviewer for this, but I wonder how it is possible to effectively review a 2222 line PR. Can this be broken up into a series of smaller PRs to make it easier for maintainers to review? |
|
@iNikem @anuraaga @trask @tylerbenson please have a look, looking into closing this PR this week. Thanks in advance! |
|
Honestly, I am waiting for @mateuszrzeszutek approval :) He has done such thorough first review. |
|
@iNikem yep, I'm nagging him on a daily basis ;) |
.../src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveSpanManager.java
Outdated
Show resolved
Hide resolved
.../src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveSpanManager.java
Show resolved
Hide resolved
...src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelEventNotifier.java
Outdated
Show resolved
Hide resolved
...ava/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java
Outdated
Show resolved
Hide resolved
...ava/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java
Outdated
Show resolved
Hide resolved
...va/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java
Outdated
Show resolved
Hide resolved
...ava/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/RestSpanDecorator.java
Outdated
Show resolved
Hide resolved
...ava/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java
Outdated
Show resolved
Hide resolved
...ava/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java
Outdated
Show resolved
Hide resolved
instrumentation/apache-camel-2.20/src/test/groovy/test/MulticastDirectCamelTest.groovy
Show resolved
Hide resolved
instrumentation/apache-camel-2.20/src/test/groovy/test/RestCamelTest.groovy
Outdated
Show resolved
Hide resolved
|
@mateuszrzeszutek pls have another look ;) |
mateuszrzeszutek
approved these changes
Oct 28, 2020
iNikem
approved these changes
Oct 29, 2020
.../java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #1356
Instrumentation for Apache Camel 2.20.x
Apache Camel provides OTEL instrumentation (https://camel.apache.org/components/latest/others/opentelemetry.html) but for Camel >= 3.5. For customers using older versions that don't want / can't move to 3.5 or newer, a separate instrumentation library is provided.
NOTE
Large portions of the code has been adapted from existing Apache Camel OpenTracing library. In order to honour the license and work of the original Authors, I've added following header:
to all files consisting at least some code from the library.
The header was put under "package" in order to pass spotless:license plugin check.
I'm not entirely sure that the header is 100% compatible with Apache License 2.0 of the original code (see https://github.com/apache/camel/tree/camel-2.20.0/components/camel-opentracing). Therefore during review please have a look at this as well.