-
Couldn't load subscription status.
- Fork 1k
feat: support instrumentation for jsonrpc4j #13008
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
Open
chenlujjj
wants to merge
17
commits into
open-telemetry:main
Choose a base branch
from
chenlujjj:feat/jsonrpc-instrumentation
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
0190c13
feat: support instrumentation for jsonrpc4j
chenlujjj 7781c8c
inject trace data to headers
chenlujjj b859165
fix style
chenlujjj 466971e
fix style
chenlujjj a5e1a43
resolve some comments
chenlujjj 6f50140
server span name follow convention
chenlujjj 51534a4
fix style
chenlujjj c8cd109
update supported-libraryies.md
chenlujjj c20644b
try to support proxy client
chenlujjj 527b244
update supported-libraries.md
chenlujjj 12e289d
add README.md for library
chenlujjj 974c315
support instrument proxy client
chenlujjj 06f0869
add test for proxy client
chenlujjj c5f1862
resolve some comments
chenlujjj 7972e68
move client instrumentation from library to javaagent
chenlujjj 8536218
fix failed testss
chenlujjj bfb152e
use one threadlocal in OpenTelemetryJsonRpcInvocationListener
chenlujjj File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| plugins { | ||
| id("otel.javaagent-instrumentation") | ||
| } | ||
|
|
||
| muzzle { | ||
| pass { | ||
| group.set("com.github.briandilley.jsonrpc4j") | ||
| module.set("jsonrpc4j") | ||
| versions.set("[1.3.3,)") | ||
| assertInverse.set(true) | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation(project(":instrumentation:jsonrpc4j-1.3:library")) | ||
|
|
||
| library("com.github.briandilley.jsonrpc4j:jsonrpc4j:1.3.3") | ||
|
|
||
| testImplementation(project(":instrumentation:jsonrpc4j-1.3:testing")) | ||
|
|
||
| testImplementation("com.fasterxml.jackson.core:jackson-databind:2.13.3") | ||
|
|
||
| testImplementation("org.eclipse.jetty:jetty-server:9.4.49.v20220914") | ||
|
|
||
| testImplementation("org.eclipse.jetty:jetty-servlet:9.4.49.v20220914") | ||
|
|
||
| testImplementation("javax.portlet:portlet-api:2.0") | ||
chenlujjj marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| tasks { | ||
| test { | ||
| jvmArgs("-Dotel.javaagent.experimental.thread-propagation-debugger.enabled=false") | ||
| } | ||
| } | ||
chenlujjj marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
96 changes: 96 additions & 0 deletions
96
.../opentelemetry/javaagent/instrumentation/jsonrpc4j/v1_3/JsonRpcClientInstrumentation.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3; | ||
|
|
||
| import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; | ||
| import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface; | ||
| import static io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3.JsonRpcSingletons.CLIENT_INSTRUMENTER; | ||
| import static net.bytebuddy.matcher.ElementMatchers.isMethod; | ||
| import static net.bytebuddy.matcher.ElementMatchers.named; | ||
| import static net.bytebuddy.matcher.ElementMatchers.returns; | ||
| import static net.bytebuddy.matcher.ElementMatchers.takesArgument; | ||
| import static net.bytebuddy.matcher.ElementMatchers.takesArguments; | ||
|
|
||
| import io.opentelemetry.context.Context; | ||
| import io.opentelemetry.context.Scope; | ||
| import io.opentelemetry.instrumentation.jsonrpc4j.v1_3.JsonRpcClientRequest; | ||
| import io.opentelemetry.instrumentation.jsonrpc4j.v1_3.JsonRpcClientResponse; | ||
| import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; | ||
| import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; | ||
| import java.util.Map; | ||
| import net.bytebuddy.asm.Advice; | ||
| import net.bytebuddy.description.type.TypeDescription; | ||
| import net.bytebuddy.matcher.ElementMatcher; | ||
|
|
||
| public class JsonRpcClientInstrumentation implements TypeInstrumentation { | ||
|
|
||
| @Override | ||
| public ElementMatcher<ClassLoader> classLoaderOptimization() { | ||
| return hasClassesNamed("com.googlecode.jsonrpc4j.IJsonRpcClient"); | ||
| } | ||
|
|
||
| @Override | ||
| public ElementMatcher<TypeDescription> typeMatcher() { | ||
| // match JsonRpcHttpClient and JsonRpcRestClient | ||
| return implementsInterface(named("com.googlecode.jsonrpc4j.IJsonRpcClient")); | ||
| } | ||
|
|
||
| @Override | ||
| public void transform(TypeTransformer transformer) { | ||
| transformer.applyAdviceToMethod( | ||
| isMethod() | ||
| .and(named("invoke")) | ||
| .and(takesArguments(4)) | ||
| .and(takesArgument(0, String.class)) | ||
| .and(takesArgument(1, Object.class)) | ||
| .and(takesArgument(2, named("java.lang.reflect.Type"))) | ||
| .and(takesArgument(3, named("java.util.Map"))) | ||
chenlujjj marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| .and(returns(Object.class)), | ||
| this.getClass().getName() + "$InvokeAdvice"); | ||
| } | ||
|
|
||
| @SuppressWarnings("unused") | ||
| public static class InvokeAdvice { | ||
|
|
||
| @Advice.OnMethodEnter(suppress = Throwable.class) | ||
| public static void onEnter( | ||
| @Advice.Argument(0) String methodName, | ||
| @Advice.Argument(1) Object argument, | ||
| @Advice.Argument(3) Map<String, String> extraHeaders, | ||
| @Advice.Local("otelContext") Context context, | ||
| @Advice.Local("otelScope") Scope scope) { | ||
| Context parentContext = Context.current(); | ||
| JsonRpcClientRequest request = new JsonRpcClientRequest(methodName, argument); | ||
| if (!CLIENT_INSTRUMENTER.shouldStart(parentContext, request)) { | ||
| return; | ||
| } | ||
|
|
||
| context = CLIENT_INSTRUMENTER.start(parentContext, request); | ||
| scope = context.makeCurrent(); | ||
| } | ||
|
|
||
| @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) | ||
| public static void onExit( | ||
| @Advice.Argument(0) String methodName, | ||
| @Advice.Argument(1) Object argument, | ||
| @Advice.Argument(3) Map<String, String> extraHeaders, | ||
| @Advice.Return Object result, | ||
| @Advice.Thrown Throwable throwable, | ||
| @Advice.Local("otelContext") Context context, | ||
| @Advice.Local("otelScope") Scope scope) { | ||
| if (scope == null) { | ||
| return; | ||
| } | ||
|
|
||
| scope.close(); | ||
| CLIENT_INSTRUMENTER.end( | ||
| context, | ||
| new JsonRpcClientRequest(methodName, argument), | ||
chenlujjj marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| new JsonRpcClientResponse(result), | ||
| throwable); | ||
| } | ||
| } | ||
| } | ||
28 changes: 28 additions & 0 deletions
28
.../opentelemetry/javaagent/instrumentation/jsonrpc4j/v1_3/JsonRpcInstrumentationModule.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3; | ||
|
|
||
| import static java.util.Arrays.asList; | ||
|
|
||
| import com.google.auto.service.AutoService; | ||
| import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; | ||
| import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; | ||
| import java.util.List; | ||
|
|
||
| @AutoService(InstrumentationModule.class) | ||
| public class JsonRpcInstrumentationModule extends InstrumentationModule { | ||
| public JsonRpcInstrumentationModule() { | ||
| super("jsonrpc4j", "jsonrpc4j-1.3"); | ||
| } | ||
|
|
||
| @Override | ||
| public List<TypeInstrumentation> typeInstrumentations() { | ||
| return asList( | ||
| new JsonRpcServerInstrumentation(), | ||
| new JsonRpcClientInstrumentation(), | ||
| new JsonRpcProxyInstrumentation()); | ||
| } | ||
| } |
123 changes: 123 additions & 0 deletions
123
...o/opentelemetry/javaagent/instrumentation/jsonrpc4j/v1_3/JsonRpcProxyInstrumentation.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3; | ||
|
|
||
| import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; | ||
| import static io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3.JsonRpcSingletons.CLIENT_INSTRUMENTER; | ||
| import static net.bytebuddy.matcher.ElementMatchers.isMethod; | ||
| import static net.bytebuddy.matcher.ElementMatchers.isPrivate; | ||
| import static net.bytebuddy.matcher.ElementMatchers.isStatic; | ||
| import static net.bytebuddy.matcher.ElementMatchers.named; | ||
|
|
||
| import com.googlecode.jsonrpc4j.IJsonRpcClient; | ||
| import io.opentelemetry.context.Context; | ||
| import io.opentelemetry.context.Scope; | ||
| import io.opentelemetry.instrumentation.jsonrpc4j.v1_3.JsonRpcClientRequest; | ||
| import io.opentelemetry.instrumentation.jsonrpc4j.v1_3.JsonRpcClientResponse; | ||
| import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; | ||
| import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; | ||
| import java.lang.reflect.InvocationHandler; | ||
| import java.lang.reflect.Method; | ||
| import java.lang.reflect.Proxy; | ||
| import java.util.Map; | ||
| import net.bytebuddy.asm.Advice; | ||
| import net.bytebuddy.description.type.TypeDescription; | ||
| import net.bytebuddy.matcher.ElementMatcher; | ||
|
|
||
| public class JsonRpcProxyInstrumentation implements TypeInstrumentation { | ||
|
|
||
| @Override | ||
| public ElementMatcher<ClassLoader> classLoaderOptimization() { | ||
| return hasClassesNamed("com.googlecode.jsonrpc4j.ProxyUtil"); | ||
| } | ||
|
|
||
| @Override | ||
| public ElementMatcher<TypeDescription> typeMatcher() { | ||
| return named("com.googlecode.jsonrpc4j.ProxyUtil"); | ||
| } | ||
|
|
||
| @Override | ||
| public void transform(TypeTransformer transformer) { | ||
| transformer.applyAdviceToMethod( | ||
| isMethod().and(isStatic()).and(isPrivate()).and(named("createClientProxy")), | ||
| this.getClass().getName() + "$CreateClientProxyAdvice"); | ||
| } | ||
|
|
||
| @SuppressWarnings({"unused"}) | ||
| public static class CreateClientProxyAdvice { | ||
|
|
||
| @Advice.OnMethodExit(suppress = Throwable.class) | ||
| public static <T> void onExit( | ||
| @Advice.Argument(0) ClassLoader classLoader, | ||
| @Advice.Argument(1) Class<T> proxyInterface, | ||
| @Advice.Argument(2) IJsonRpcClient client, | ||
| @Advice.Argument(3) Map<String, String> extraHeaders, | ||
| @Advice.Return(readOnly = false) Object proxy) { | ||
|
|
||
| proxy = instrumentCreateClientProxy(classLoader, proxyInterface, client, extraHeaders, proxy); | ||
| } | ||
|
|
||
| private static Object proxyObjectMethods(Method method, Object proxyObject, Object[] args) { | ||
chenlujjj marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| String name = method.getName(); | ||
| switch (name) { | ||
| case "toString": | ||
| return proxyObject.getClass().getName() + "@" + System.identityHashCode(proxyObject); | ||
| case "hashCode": | ||
| return System.identityHashCode(proxyObject); | ||
| case "equals": | ||
| return proxyObject == args[0]; | ||
| default: | ||
| throw new IllegalArgumentException( | ||
| method.getName() + " is not a member of java.lang.Object"); | ||
| } | ||
| } | ||
|
|
||
| @SuppressWarnings({"unchecked"}) | ||
| public static <T> T instrumentCreateClientProxy( | ||
chenlujjj marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ClassLoader classLoader, | ||
| Class<T> proxyInterface, | ||
| IJsonRpcClient client, | ||
| Map<String, String> extraHeaders, | ||
| Object proxy) { | ||
|
|
||
| return (T) | ||
| Proxy.newProxyInstance( | ||
| classLoader, | ||
| new Class<?>[] {proxyInterface}, | ||
| new InvocationHandler() { | ||
| @Override | ||
| public Object invoke(Object proxy1, Method method, Object[] args) throws Throwable { | ||
| // before invoke | ||
| Context parentContext = Context.current(); | ||
| JsonRpcClientRequest request = new JsonRpcClientRequest(method, args); | ||
| if (!CLIENT_INSTRUMENTER.shouldStart(parentContext, request)) { | ||
| return method.invoke(proxy, args); | ||
chenlujjj marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| Context context = CLIENT_INSTRUMENTER.start(parentContext, request); | ||
| Scope scope = context.makeCurrent(); | ||
| try { | ||
chenlujjj marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| Object result = method.invoke(proxy, args); | ||
| // after invoke | ||
| scope.close(); | ||
| CLIENT_INSTRUMENTER.end( | ||
| context, | ||
| new JsonRpcClientRequest(method, args), | ||
chenlujjj marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| new JsonRpcClientResponse(result), | ||
| null); | ||
| return result; | ||
|
|
||
chenlujjj marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } catch (Throwable t) { | ||
| // after invoke | ||
| scope.close(); | ||
| CLIENT_INSTRUMENTER.end(context, request, null, t); | ||
| throw t; | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| } | ||
84 changes: 84 additions & 0 deletions
84
.../opentelemetry/javaagent/instrumentation/jsonrpc4j/v1_3/JsonRpcServerInstrumentation.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3; | ||
|
|
||
| import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; | ||
| import static io.opentelemetry.javaagent.instrumentation.jsonrpc4j.v1_3.JsonRpcSingletons.SERVER_INVOCATION_LISTENER; | ||
| import static net.bytebuddy.matcher.ElementMatchers.isConstructor; | ||
| import static net.bytebuddy.matcher.ElementMatchers.isMethod; | ||
| import static net.bytebuddy.matcher.ElementMatchers.named; | ||
|
|
||
| import com.googlecode.jsonrpc4j.InvocationListener; | ||
| import com.googlecode.jsonrpc4j.JsonRpcBasicServer; | ||
| import com.googlecode.jsonrpc4j.MultipleInvocationListener; | ||
| import io.opentelemetry.instrumentation.api.util.VirtualField; | ||
| import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; | ||
| import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; | ||
| import net.bytebuddy.asm.Advice; | ||
| import net.bytebuddy.description.type.TypeDescription; | ||
| import net.bytebuddy.implementation.bytecode.assign.Assigner; | ||
| import net.bytebuddy.matcher.ElementMatcher; | ||
|
|
||
| public class JsonRpcServerInstrumentation implements TypeInstrumentation { | ||
|
|
||
| @Override | ||
| public ElementMatcher<ClassLoader> classLoaderOptimization() { | ||
| return hasClassesNamed("com.googlecode.jsonrpc4j.JsonRpcBasicServer"); | ||
| } | ||
chenlujjj marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| @Override | ||
| public ElementMatcher<TypeDescription> typeMatcher() { | ||
| return named("com.googlecode.jsonrpc4j.JsonRpcBasicServer"); | ||
| } | ||
|
|
||
| @Override | ||
| public void transform(TypeTransformer transformer) { | ||
| transformer.applyAdviceToMethod( | ||
| isConstructor(), this.getClass().getName() + "$ConstructorAdvice"); | ||
|
|
||
| transformer.applyAdviceToMethod( | ||
| isMethod().and(named("setInvocationListener")), | ||
| this.getClass().getName() + "$SetInvocationListenerAdvice"); | ||
| } | ||
|
|
||
| @SuppressWarnings("unused") | ||
| public static class ConstructorAdvice { | ||
|
|
||
| @Advice.OnMethodExit(suppress = Throwable.class) | ||
| public static void setInvocationListener( | ||
| @Advice.This JsonRpcBasicServer jsonRpcServer, | ||
| @Advice.FieldValue(value = "invocationListener", readOnly = false) | ||
| InvocationListener invocationListener) { | ||
| invocationListener = SERVER_INVOCATION_LISTENER; | ||
| } | ||
| } | ||
|
|
||
| @SuppressWarnings("unused") | ||
| public static class SetInvocationListenerAdvice { | ||
|
|
||
| @Advice.OnMethodEnter(suppress = Throwable.class) | ||
| public static void setInvocationListener( | ||
| @Advice.This JsonRpcBasicServer jsonRpcServer, | ||
| @Advice.Argument(value = 0, readOnly = false, typing = Assigner.Typing.DYNAMIC) | ||
chenlujjj marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| InvocationListener invocationListener) { | ||
| VirtualField<JsonRpcBasicServer, Boolean> instrumented = | ||
| VirtualField.find(JsonRpcBasicServer.class, Boolean.class); | ||
| if (!Boolean.TRUE.equals(instrumented.get(jsonRpcServer))) { | ||
chenlujjj marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| if (invocationListener == null) { | ||
| invocationListener = SERVER_INVOCATION_LISTENER; | ||
| } else if (invocationListener instanceof MultipleInvocationListener) { | ||
| ((MultipleInvocationListener) invocationListener) | ||
| .addInvocationListener(SERVER_INVOCATION_LISTENER); | ||
| } else { | ||
| invocationListener = | ||
| new MultipleInvocationListener(invocationListener, SERVER_INVOCATION_LISTENER); | ||
| } | ||
|
|
||
| instrumented.set(jsonRpcServer, true); | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.