8000 Added special lightweight pre-main class that skips installation on incompatible JVMs. by AlexeyKuznetsov-DD · Pull Request #8855 · DataDog/dd-trace-java · GitHub
[go: up one dir, main page]
Skip to content

Added special lightweight pre-main class that skips installation on incompatible JVMs. #8855

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 21 commits into from
May 28, 2025
Merged

Added special lightweight pre-main class that skips installation on incompatible JVMs. #8855

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5e9b6ba
Added special lightweight pre-main class to enable SSI inject for Jav…
AlexeyKuznetsov-DD May 20, 2025
c40db79
Fixed SuppressForbidden test.
AlexeyKuznetsov-DD May 20, 2025
125a148
Refactored pre-check logic.
AlexeyKuznetsov-DD May 23, 2025
1e7ecd1
Merge branch 'master' into ssi-inject-java-6
AlexeyKuznetsov-DD May 23, 2025
99abf99
Refactored build.gradle to reuse existing functions.
AlexeyKuznetsov-DD May 23, 2025
2eb2753
Minor cleanup.
AlexeyKuznetsov-DD May 23, 2025
0c2e817
Added missing `@SuppressForbidden`.
AlexeyKuznetsov-DD May 23, 2025
45fb91f
Merge branch 'master' into ssi-inject-java-6
AlexeyKuznetsov-DD May 23, 2025
78dc42b
Merge branch 'master' into ssi-inject-java-6
AlexeyKuznetsov-DD May 23, 2025
ea5bea7
Added 'java.home' to warning. That would help to identify problematic…
AlexeyKuznetsov-DD May 23, 2025
5695279
Merge branch 'master' into ssi-inject-java-6
AlexeyKuznetsov-DD May 23, 2025
9238f7d
Added test to ensure Java 6 & 8 compilation.
AlexeyKuznetsov-DD May 24, 2025
10d60a0
Merge branch 'master' into ssi-inject-java-6
AlexeyKuznetsov-DD May 24, 2025
5f61b62
Fixed test.
AlexeyKuznetsov-DD May 24, 2025
5fa1bb6
Drop support for 0.x version.
AlexeyKuznetsov-DD May 27, 2025
985412f
Merge branch 'master' into ssi-inject-java-6
AlexeyKuznetsov-DD May 27, 2025 8000
be58d6b
Fixed small typo.
AlexeyKuznetsov-DD May 27, 2025
7c2a597
Fixed test.
AlexeyKuznetsov-DD May 27, 2025
8192ac4
Update dd-java-agent/src/main/java6/datadog/trace/bootstrap/AgentPreC…
AlexeyKuznetsov-DD May 28, 2025
1037295
Merge branch 'master' into ssi-inject-java-6
AlexeyKuznetsov-DD May 28, 2025
e1df6fe
Fixed test.
AlexeyKuznetsov-DD May 28, 2025
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
Fixed test.
  • Loading branch information
@AlexeyKuznetsov-DD
AlexeyKuznetsov-DD committed May 28, 2025
commit e1df6fe273fbbcc9c7d772280d03ce89789dbde4
2 changes: 1 addition & 1 deletion dd-java-agent/src/test/groovy/datadog/trace/bootstrap/AgentPreCheckTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class AgentPreCheckTest extends Specification {
} else {
logLines.size() == 2
def expectedLogLines = [
"Warning: Version ${AgentJar.getAgentVersion()} of dd-java-agent is not compatible with Java $javaVersion found at '/Library/$javaVersion' and will not be installed.",
"Warning: Version ${AgentJar.getAgentVersion()} of dd-java-agent is not compatible with Java $javaVersion found at '/Library/$javaVersion' and is effectively disabled.",
"Please upgrade your Java version to 8+"
]
assert logLines == expectedLogLines
Expand Down
2 changes: 1 addition & 1 deletion test-published-dependencies/agent-logs-on-java-7/src/test/java/StartWithAgentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

public class StartWithAgentTest {

private static final Pattern WARNING_PATTERN = Pattern.compile("^Warning: Version [^ ]+ of dd-java-agent is not compatible with Java [^ ]+ found at [^ ]+ and will not be installed\\.$");
private static final Pattern WARNING_PATTERN = Pattern.compile("^Warning: Version [^ ]+ of dd-java-agent is not compatible with Java [^ ]+ found at [^ ]+ and is effectively disabled\\.$");
private static final String UPGRADE_MESSAGE = "Please upgrade your Java version to 8+";

@Test
Expand Down
0