-
Notifications
You must be signed in to change notification settings - Fork 580
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
[3.x] - Make Jaeger Tracer OpenTelemetry Agent aware. #6537
Merged
dalexandrov
merged 9 commits into
helidon-io:helidon-3.x
from
dalexandrov:6174_3.x_OTEL_Agent
Jun 2, 2023
Merged
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
4645c3b
Refactor Java Agent detector.
dalexandrov a988f16
Remove redundant AgentDetection class
dalexandrov 5e851b8
Detector aligned with 4.x. Package name in tests fixed.
dalexandrov 9d9dc1c
Utility class
dalexandrov 3e0bbe3
Formatting
dalexandrov 565f346
Formatting
dalexandrov 34b5ac9
Formatting
dalexandrov e05967a
fix style
dalexandrov 36452d5
fix style
dalexandrov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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
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
60 changes: 60 additions & 0 deletions
60
tracing/opentelemetry/src/test/java/io/helidon/tracing/opentelemetry/AgentDetectorTest.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,60 @@ | ||
/* | ||
* Copyright (c) 2023 Oracle and/or its affiliates. | ||
* | ||
* 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.helidon.tracing.opentelemetry; | ||
|
||
import io.helidon.config.Config; | ||
import io.helidon.microprofile.server.ServerCdiExtension; | ||
import io.helidon.microprofile.tests.junit5.AddConfig; | ||
import io.helidon.microprofile.tests.junit5.AddExtension; | ||
import io.helidon.microprofile.tests.junit5.HelidonTest; | ||
import jakarta.enterprise.inject.spi.CDI; | ||
import org.junit.jupiter.api.Test; | ||
|
||
import static org.hamcrest.MatcherAssert.assertThat; | ||
import static org.hamcrest.Matchers.is; | ||
|
||
|
||
/** | ||
* Check Agent Detector working correctly. | ||
*/ | ||
@HelidonTest(resetPerTest = true) | ||
@AddExtension(ServerCdiExtension.class) | ||
class AgentDetectorTest { | ||
|
||
@Test | ||
@AddConfig(key = HelidonOpenTelemetry.OTEL_AGENT_PRESENT_PROPERTY, value = "true") | ||
void shouldBeNoOpTelemetry(){ | ||
Verdent marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Config config = CDI.current().select(Config.class).get(); | ||
boolean present = HelidonOpenTelemetry.AgentDetector.isAgentPresent(config); | ||
assertThat(present, is(true)); | ||
} | ||
|
||
@Test | ||
@AddConfig(key = HelidonOpenTelemetry.OTEL_AGENT_PRESENT_PROPERTY, value = "false") | ||
void shouldNotBeNoOpTelemetry(){ | ||
Config config = CDI.current().select(Config.class).get(); | ||
boolean present = HelidonOpenTelemetry.AgentDetector.isAgentPresent(config); | ||
assertThat(present, is(false)); | ||
} | ||
|
||
@Test | ||
void checkEnvVariable(){ | ||
System.setProperty(HelidonOpenTelemetry.IO_OPENTELEMETRY_JAVAAGENT, "true"); | ||
Config config = CDI.current().select(Config.class).get(); | ||
boolean present = HelidonOpenTelemetry.AgentDetector.isAgentPresent(config); | ||
assertThat(present, is(true)); | ||
} | ||
} |
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.
I think this formatting is not correct.
It should look like this:
Every method paramter should be on the new line. It improves readablity.
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.
ok...
(#6537 (comment))
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.
it was wrong at that point as well. since it was at the level of
return
instead ofcreate
method and that was what I was talking about.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.
fixed :)