Skip to content

Commit e0c9cea

Browse files
committed
remove changing class version
1 parent 449a31a commit e0c9cea

File tree

7 files changed

+4
-507
lines changed

7 files changed

+4
-507
lines changed

javaagent-tooling/build.gradle.kts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,6 @@ testing {
103103
}
104104
}
105105

106-
val testPatchBytecodeVersion by registering(JvmTestSuite::class) {
107-
dependencies {
108-
implementation(project(":javaagent-bootstrap"))
109-
implementation(project(":javaagent-tooling"))
110-
implementation("net.bytebuddy:byte-buddy-dep")
111-
112-
// Used by byte-buddy but not brought in as a transitive dependency.
113-
compileOnly("com.google.code.findbugs:annotations")
114-
}
115-
}
116-
117106
val testConfigFile by registering(JvmTestSuite::class) {
118107
dependencies {
119108
implementation(project(":javaagent-tooling"))

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import io.opentelemetry.javaagent.tooling.instrumentation.indy.ForwardIndyAdviceTransformer;
2929
import io.opentelemetry.javaagent.tooling.instrumentation.indy.IndyModuleRegistry;
3030
import io.opentelemetry.javaagent.tooling.instrumentation.indy.IndyTypeTransformerImpl;
31-
import io.opentelemetry.javaagent.tooling.instrumentation.indy.PatchByteCodeVersionTransformer;
3231
import io.opentelemetry.javaagent.tooling.muzzle.HelperResourceBuilderImpl;
3332
import io.opentelemetry.javaagent.tooling.muzzle.InstrumentationModuleMuzzle;
3433
import io.opentelemetry.javaagent.tooling.util.IgnoreFailedTypeMatcher;
@@ -146,23 +145,13 @@ private AgentBuilder installIndyModule(
146145
VirtualFieldImplementationInstaller contextProvider =
147146
virtualFieldInstallerFactory.create(instrumentationModule);
148147

149-
boolean allowClassVersionChange =
150-
config.getBoolean("otel.javaagent.experimental.allow-class-version-change", false);
151148
AgentBuilder agentBuilder = parentAgentBuilder;
152149
for (TypeInstrumentation typeInstrumentation : instrumentationModule.typeInstrumentations()) {
153-
AgentBuilder.Identified.Extendable extendableAgentBuilder;
154-
AgentBuilder.Identified.Narrowable narrowableAgentBuilder =
150+
AgentBuilder.Identified.Extendable extendableAgentBuilder =
155151
setTypeMatcher(agentBuilder, instrumentationModule, typeInstrumentation)
156-
.and(muzzleMatcher);
157-
if (allowClassVersionChange) {
158-
extendableAgentBuilder =
159-
narrowableAgentBuilder.transform(new PatchByteCodeVersionTransformer());
160-
} else {
161-
extendableAgentBuilder =
162-
narrowableAgentBuilder
163-
.transform(ConstantAdjuster.instance())
164-
.transform(new ForwardIndyAdviceTransformer(helperInjector));
165-
}
152+
.and(muzzleMatcher)
153+
.transform(ConstantAdjuster.instance())
154+
.transform(new ForwardIndyAdviceTransformer(helperInjector));
166155

167156
extendableAgentBuilder =
168157
IndyModuleRegistry.initializeModuleLoaderOnMatch(

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/PatchByteCodeVersionTransformer.java

Lines changed: 0 additions & 103 deletions
This file was deleted.

javaagent-tooling/src/testPatchBytecodeVersion/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/ComputeFramesAsmVisitorWrapper.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

javaagent-tooling/src/testPatchBytecodeVersion/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/OldBytecode.java

Lines changed: 0 additions & 150 deletions
This file was deleted.

0 commit comments

Comments
 (0)