open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More renames due to shadow clashes

This commit is contained in:
Nikolay Martynov 2019-11-06 15:12:07 -05:00
parent 42cece67c2
commit fdfe4b1dc3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dd-java-agent/dd-java-agent.gradle
View File

@ -62,9 +62,9 @@ jar {
manifest { manifest {
attributes( attributes(
"Main-Class": "datadog.trace.agent.AgentBootstrap", "Main-Class": "datadog.trace.bootstrap.AgentBootstrap",
"Agent-Class": "datadog.trace.agent.AgentBootstrap", "Agent-Class": "datadog.trace.bootstrap.AgentBootstrap",
"Premain-Class": "datadog.trace.agent.AgentBootstrap", "Premain-Class": "datadog.trace.bootstrap.AgentBootstrap",
"Can-Redefine-Classes": true, "Can-Redefine-Classes": true,
"Can-Retransform-Classes": true, "Can-Retransform-Classes": true,
) )
@ -102,6 +102,7 @@ modifyPom {
} }
dependencies { dependencies {
testCompile project(':dd-java-agent:agent-bootstrap')
testCompile project(':dd-trace-api') testCompile project(':dd-trace-api')
testCompile project(':dd-trace-ot') testCompile project(':dd-trace-ot')
testCompile project(':utils:gc-utils') testCompile project(':utils:gc-utils')

2
dd-java-agent/src/main/java/datadog/trace/agent/AgentBootstrap.java → dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java
View File

@ -1,4 +1,4 @@
package datadog.trace.agent; package datadog.trace.bootstrap;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;