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

Upgrade Byte Buddy to 1.10.10 (DataDog/dd-trace-java#1409)

This commit is contained in:
Tyler Benson 2020-04-29 16:25:43 -04:00 committed by Trask Stalnaker
parent 5ecd8cb81e
commit ca27485a5c
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
agent-tooling/src/main/java/io/opentelemetry/auto/tooling/context/FieldBackedProvider.java
View File

@ -340,7 +340,7 @@ public class FieldBackedProvider implements InstrumentationContextProvider {
// TODO: Better to pass through the context of the Instrumenter // TODO: Better to pass through the context of the Instrumenter
return new AgentBuilder.Transformer() { return new AgentBuilder.Transformer() {
final HelperInjector injector = final HelperInjector injector =
HelperInjector.forDynamicTypes(this.getClass().getSimpleName(), helpers); HelperInjector.forDynamicTypes(getClass().getSimpleName(), helpers);
@Override @Override
public DynamicType.Builder<?> transform( public DynamicType.Builder<?> transform(
@ -407,7 +407,7 @@ public class FieldBackedProvider implements InstrumentationContextProvider {
.type(safeHasSuperType(named(entry.getKey())), instrumenter.classLoaderMatcher()) .type(safeHasSuperType(named(entry.getKey())), instrumenter.classLoaderMatcher())
.and(safeToInjectFieldsMatcher()) .and(safeToInjectFieldsMatcher())
.and(Default.NOT_DECORATOR_MATCHER) .and(Default.NOT_DECORATOR_MATCHER)
.transform(AgentBuilder.Transformer.NoOp.INSTANCE); .transform(NoOpTransformer.INSTANCE);
/* /*
* We inject helpers here as well as when instrumentation is applied to ensure that * We inject helpers here as well as when instrumentation is applied to ensure that
@ -1059,4 +1059,18 @@ public class FieldBackedProvider implements InstrumentationContextProvider {
private static String getContextSetterName(final String key) { private static String getContextSetterName(final String key) {
return "set" + getContextFieldName(key); return "set" + getContextFieldName(key);
} }
// Originally found in AgentBuilder.Transformer.NoOp, but removed in 1.10.7
enum NoOpTransformer implements AgentBuilder.Transformer {
INSTANCE;
@Override
public DynamicType.Builder<?> transform(
final DynamicType.Builder<?> builder,
final TypeDescription typeDescription,
final ClassLoader classLoader,
final JavaModule module) {
return builder;
}
}
} }

2
gradle/dependencies.gradle
View File

@ -18,7 +18,7 @@ ext {
groovy : groovyVer, groovy : groovyVer,
logback : "1.2.3", logback : "1.2.3",
lombok : "1.18.10", lombok : "1.18.10",
bytebuddy : "1.10.6", bytebuddy : "1.10.10",
scala : "2.11.12", // Last version to support Java 7 (2.12+ require Java 8+) scala : "2.11.12", // Last version to support Java 7 (2.12+ require Java 8+)
kotlin : "1.3.72", kotlin : "1.3.72",
coroutines : "1.3.0" coroutines : "1.3.0"