Skip to content

make geode indy-ready #15031

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Oct 20, 2025
Merged

make geode indy-ready #15031

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50cfcf6
make geode indy-ready
SylvainJuge Oct 17, 2025
3b08477
make fields private
SylvainJuge Oct 17, 2025
8a3e395
remove useless stuff
SylvainJuge Oct 17, 2025
2e1a688
post-review changes
SylvainJuge Oct 20, 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
95 changes: 48 additions & 47 deletions ...ain/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeRegionInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

package io.opentelemetry.javaagent.instrumentation.geode;

import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
import static io.opentelemetry.javaagent.instrumentation.geode.GeodeSingletons.instrumenter;
Expand All @@ -19,6 +18,7 @@
import io.opentelemetry.context.Scope;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import javax.annotation.Nullable;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
Expand Down Expand Up @@ -61,76 +61,77 @@ public void transform(TypeTransformer transformer) {
this.getClass().getName() + "$QueryAdvice");
}

@SuppressWarnings("unused")
public static class SimpleAdvice {
public static class AdviceScope {
private final GeodeRequest request;
private final Context context;
private final Scope scope;

@Advice.OnMethodEnter(suppress = Throwable.class)
public static void onEnter(
@Advice.This Region<?, ?> region,
@Advice.Origin("#m") String methodName,
@Advice.Local("otelRequest") GeodeRequest request,
@Advice.Local("otelContext") Context context,
@Advice.Local("otelScope") Scope scope) {
public AdviceScope(GeodeRequest request, Context context, Scope scope) {
this.request = request;
this.context = context;
this.scope = scope;
}

Context parentContext = currentContext();
request = GeodeRequest.create(region, methodName, null);
@Nullable
public static AdviceScope start(
Region<?, ?> region, String methodName, @Nullable String query) {
Context parentContext = Context.current();
GeodeRequest request = GeodeRequest.create(region, methodName, query);
if (!instrumenter().shouldStart(parentContext, request)) {
return;
return null;
}

context = instrumenter().start(parentContext, request);
scope = context.makeCurrent();
Context context = instrumenter().start(parentContext, request);
return new AdviceScope(request, context, context.makeCurrent());
}

public void end(@Nullable Throwable throwable) {
if (scope != null) {
scope.close();
}
instrumenter().end(context, request, null, throwable);
}
}

@SuppressWarnings("unused")
public static class SimpleAdvice {

@Nullable
@Advice.OnMethodEnter(suppress = Throwable.class)
public static AdviceScope onEnter(
@Advice.This Region<?, ?> region, @Advice.Origin("#m") String methodName) {
return AdviceScope.start(region, methodName, null);
}

@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
public static void stopSpan(
@Advice.Thrown Throwable throwable,
@Advice.Local("otelRequest") GeodeRequest request,
@Advice.Local("otelContext") Context context,
@Advice.Local("otelScope") Scope scope) {
if (scope == null) {
return;
@Advice.Thrown @Nullable Throwable throwable,
@Advice.Enter @Nullable AdviceScope adviceScope) {
if (adviceScope != null) {
adviceScope.end(throwable);
}

scope.close();
instrumenter().end(context, request, null, throwable);
}
}

@SuppressWarnings("unused")
public static class QueryAdvice {

@Nullable
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void onEnter(
public static AdviceScope onEnter(
@Advice.This Region<?, ?> region,
@Advice.Origin("#m") String methodName,
@Advice.Argument(0) String query,
@Advice.Local("otelRequest") GeodeRequest request,
@Advice.Local("otelContext") Context context,
@Advice.Local("otelScope") Scope scope) {

Context parentContext = currentContext();
request = GeodeRequest.create(region, methodName, query);
if (!instrumenter().shouldStart(parentContext, request)) {
return;
}

context = instrumenter().start(parentContext, request);
scope = context.makeCurrent();
@Advice.Argument(0) String query) {
return AdviceScope.start(region, methodName, query);
}

@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
public static void stopSpan(
@Advice.Thrown Throwable throwable,
@Advice.Local("otelRequest") GeodeRequest request,
@Advice.Local("otelContext") Context context,
@Advice.Local("otelScope") Scope scope) {
if (scope == null) {
return;
@Advice.Thrown @Nullable Throwable throwable,
@Advice.Enter @Nullable AdviceScope adviceScope) {
if (adviceScope != null) {
adviceScope.end(throwable);
}

scope.close();
instrumenter().end(context, request, null, throwable);
}
}
}
Loading