Skip to content
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

Instrument Gradle Launcher instead of directly instrumenting Gradle Daemon (to preserve org.gradle.jvmargs if it is specified) #11

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Instrument Gradle Launcher instead of directly instrumenting Gradle Daemon (to preserve org.gradle.jvmargs if it is specified) #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ variables:
AWS_MAX_ATTEMPTS: 5 # retry AWS operations 5 times if they fail on network errors
DATADOG_AGENT_BUILDERS: v9930706-ef9d493
S3_CP_CMD: aws s3 cp --only-show-errors --region us-east-1 --sse AES256
SCRIPT_VERSION: 3
SCRIPT_VERSION: 4

deploy:
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-builders/gitlab_agent_deploy:$DATADOG_AGENT_BUILDERS
Expand Down
4 changes: 2 additions & 2 deletions install_test_visibility.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ install_java_tracer() {

case $DD_INSTRUMENTATION_BUILD_SYSTEM_JAVA in
gradle)
echo "GRADLE_OPTS=-Dorg.gradle.jvmargs=-javaagent:$filepath_tracer $GRADLE_OPTS"
echo "GRADLE_OPTS=-javaagent:$filepath_tracer $GRADLE_OPTS"
;;
maven)
echo "MAVEN_OPTS=-javaagent:$filepath_tracer $MAVEN_OPTS"
Expand All @@ -56,7 +56,7 @@ install_java_tracer() {
fi
;;
*)
echo "GRADLE_OPTS=-Dorg.gradle.jvmargs=-javaagent:$filepath_tracer $GRADLE_OPTS"
echo "GRADLE_OPTS=-javaagent:$filepath_tracer $GRADLE_OPTS"
echo "MAVEN_OPTS=-javaagent:$filepath_tracer $MAVEN_OPTS"
echo "SBT_OPTS=-javaagent:$filepath_tracer $SBT_OPTS"
echo "ANT_OPTS=-javaagent:$filepath_tracer $ANT_OPTS"
Expand Down