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

Merge pull request #1027 from DataDog/mar-kolya/update-bytebuddy 

Update bytebuddy to 1.10.1
This commit is contained in:
Nikolay Martynov 2019-10-07 09:42:00 -04:00 committed by GitHub
parent 0d6fe9d267 8e75eeb506
commit 91db34766e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java
View File

@ -157,7 +157,13 @@ public class HelperInjector implements Transformer {
if (!target.canRead(helperModule)) {
log.debug("Adding module read from {} to {}", target, helperModule);
target.addReads(AgentInstaller.getInstrumentation(), helperModule);
target.modify(
AgentInstaller.getInstrumentation(),
Collections.singleton(helperModule),
Collections.<String, Set<JavaModule>>emptyMap(),
Collections.<String, Set<JavaModule>>emptyMap(),
Collections.<Class<?>>emptySet(),
Collections.<Class<?>, List<Class<?>>>emptyMap());
}
}
}

4
gradle/dependencies.gradle
View File

@ -16,7 +16,7 @@ ext {
junit : "4.12",
logback : "1.2.3",
lombok : "1.18.8",
bytebuddy : "1.10.0",
bytebuddy : "1.10.1",
scala : "2.11.12", // Last version to support Java 7 (2.12+ require Java 8+)
kotlin : "1.3.50",
coroutines : "1.3.0"
@ -40,6 +40,7 @@ ext {
dependencies.create(group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.8.17'),
],
bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: "${versions.bytebuddy}"),
bytebuddyagent : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy-agent', version: "${versions.bytebuddy}"),
autoservice : [
dependencies.create(group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'),
dependencies.create(group: 'com.google.auto', name: 'auto-common', version: '0.8'),
@ -51,7 +52,6 @@ ext {
spock : dependencies.create("org.spockframework:spock-core:${versions.spock}", {
exclude group: 'org.codehaus.groovy', module: 'groovy-all'
}),
bytebuddyagent : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy-agent', version: "${versions.bytebuddy}"),
groovy : "org.codehaus.groovy:groovy-all:${versions.groovy}",
junit : "junit:junit:${versions.junit}",
testcontainers : "org.testcontainers:testcontainers:1.7.3",