8000 Provide access to VM arguments via shared CLIHelper by mtoffl01 · Pull Request #8538 · DataDog/dd-trace-java · GitHub
[go: up one dir, main page]
Skip to content

Provide access to VM arguments via shared CLIHelper #8538

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 17 commits into from
Mar 25, 2025
Merged

Provide access to VM arguments via shared CLIHelper #8538

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a9d4400
Abstract away getVMArgumentsThroughReflection into a VMArgsCache class
mtoffl01 Mar 10, 2025
d688313
Change underlying data structure of VMArgsCache to HashSet
mtoffl01 Mar 11, 2025
d6344a8
Update internal-api/src/main/java/datadog/trace/bootstrap/config/prov…
mtoffl01 Mar 11, 2025
6aba3f8
Update internal-api/src/main/java/datadog/trace/bootstrap/config/prov…
mtoffl01 Mar 11, 2025
8afbec1
Update internal-api/src/main/java/datadog/trace/bootstrap/config/prov…
mtoffl01 Mar 11, 2025
d807b02
Clean up for initial review
mtoffl01 Mar 12, 2025
0603490
fix merge conflicts
mtoffl01 Mar 12, 2025
7ce4953
move VMArgsCache to components/cli
mtoffl01 Mar 14, 2025
7a9f694
fix datadog.cli import
mtoffl01 Mar 14, 2025
dd17ca2
nits: remove outdated comments
mtoffl01 Mar 14, 2025
2798bed
annotate initJvmArgs with @SuppressForbidden to allow Class.forName()…
mtoffl01 Mar 17, 2025
1d30309
Merge branch 'master' into mtoff/jvm-args
mtoffl01 Mar 24, 2025
2ca8d98
Merge remote-tracking branch 'origin/master' into mtoff/jvm-args
mcculls Mar 25, 2025
253e5e4
Fix package directory
mcculls Mar 25, 2025
e67ae7a
Cleanup code:
mcculls Mar 25, 2025
b844607
Remove warning when reflection fails
mcculls Mar 25, 2025
8837a21
Expose components:cli from internal-api
mcculls Mar 25, 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
Next Next commit
fix datadog.cli import
  • Loading branch information
@mtoffl01
mtoffl01 committed Mar 14, 2025
commit 7a9f694eea8e0126bee1f7731f68298b4ee95107
4 changes: 2 additions & 2 deletions dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import static java.nio.charset.StandardCharsets.UTF_8;

import datadog.cli;
import datadog.cli.CLIHelper;
import de.thetaphi.forbiddenapis.SuppressForbidden;
import java.io.BufferedReader;
import java.io.File;
Expand Down Expand Up @@ -381,7 +381,7 @@ private static List<File> getAgentFilesFromVMArguments() {
// - On IBM-based JDKs since at least 1.7
// This prevents custom log managers from working correctly
// Use reflection to bypass the loading of the class~
for (final String argument : cli.ARGS.getJvmArgs()) {
for (final String argument : CLIHelper.ARGS.getJvmArgs()) {
if (argument.startsWith(JAVA_AGENT_ARGUMENT)) {
int index = argument.indexOf('=', JAVA_AGENT_ARGUMENT.length());
String agentPathname =
Expand Down
Loading
0