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.

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

indy instrumentation - leftovers migration #13074

Merged
merged 26 commits into from
Jan 31, 2025
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c911faa
lambda
SylvainJuge Jan 20, 2025
26e79f9
inject proxies for indy
SylvainJuge Jan 20, 2025
7f3ae3b
kotlinx + integration tests
SylvainJuge Jan 21, 2025
9183992
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-i…
SylvainJuge Jan 21, 2025
29c99dd
inject missing classes for indy
SylvainJuge Jan 21, 2025
45ead47
do not inject proxies for lambda
SylvainJuge Jan 21, 2025
ba30ba8
move back comment in the expected location
SylvainJuge Jan 21, 2025
eb945b8
remove duplication
SylvainJuge Jan 22, 2025
eba7e20
add jpms compatible class file transformer
SylvainJuge Jan 22, 2025
7a1cbc7
remove lambda java9 module
SylvainJuge Jan 22, 2025
590f86e
fix pebkc
SylvainJuge Jan 22, 2025
a8cbb24
fix lambda instrumentation, must not redefine them
SylvainJuge Jan 22, 2025
403caaa
fix javadoc
SylvainJuge Jan 22, 2025
506cc62
fix things again
SylvainJuge Jan 22, 2025
da1c13d
fix it again
SylvainJuge Jan 22, 2025
c4350d0
make the comments a bit better
SylvainJuge Jan 23, 2025
1d54a14
fix typo
SylvainJuge Jan 23, 2025
03aa810
avoid injecting classes for kotlinxcoroutines
SylvainJuge Jan 24, 2025
2ed4e96
remove commented code
SylvainJuge Jan 24, 2025
77a4f00
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-i…
SylvainJuge Jan 27, 2025
d9cd13f
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-i…
SylvainJuge Jan 29, 2025
5e2ef89
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-i…
SylvainJuge Jan 30, 2025
20856e3
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-i…
SylvainJuge Jan 31, 2025
a38763f
revert commented code that was there for a reason
SylvainJuge Jan 31, 2025
b77428c
add LambdaTransformer interface + rename things
SylvainJuge Jan 31, 2025
bc785b9
fix typos and comments
SylvainJuge Jan 31, 2025
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
Prev Previous commit
Next Next commit
inject proxies for indy
SylvainJuge committed Jan 20, 2025
commit 26e79f9b27cccc643a46a91386bb4fbaaf8c27e5
Original file line number Diff line number Diff line change
@@ -10,13 +10,17 @@
import com.google.auto.service.AutoService;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.internal.injection.ClassInjector;
import io.opentelemetry.javaagent.extension.instrumentation.internal.injection.InjectionMode;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import java.util.ArrayList;
import java.util.List;
import net.bytebuddy.utility.JavaModule;

@AutoService(InstrumentationModule.class)
public class LambdaInstrumentationModule extends InstrumentationModule {
public class LambdaInstrumentationModule extends InstrumentationModule
implements ExperimentalInstrumentationModule {
public LambdaInstrumentationModule() {
super("internal-lambda");
}
@@ -27,6 +31,20 @@ public boolean defaultEnabled(ConfigProperties config) {
return true;
}

@Override
public void injectClasses(ClassInjector injector) {
injector
.proxyBuilder(
"io.opentelemetry.javaagent.instrumentation.internal.lambda.LambdaTransformer")
.inject(InjectionMode.CLASS_ONLY);
if (JavaModule.isSupported()) {
injector
.proxyBuilder(
"io.opentelemetry.javaagent.instrumentation.internal.lambda.Java9LambdaTransformer")
.inject(InjectionMode.CLASS_ONLY);
}
}

@Override
public List<String> getAdditionalHelperClassNames() {
// this instrumentation uses ASM not ByteBuddy so muzzle doesn't automatically add helper