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.

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

[#9348] Add lambda expression matcher #9349

Merged
merged 1 commit into from
Nov 7, 2022
Merged

[#9348] Add lambda expression matcher #9349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 48 additions & 0 deletions ...ain/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/LambdaExpressionMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package com.navercorp.pinpoint.bootstrap.instrument.matcher;

import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.InterfaceInternalNameMatcherOperand;
import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.MatcherOperand;
import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.PackageInternalNameMatcherOperand;
import com.navercorp.pinpoint.common.util.StringUtils;

import java.util.Objects;

public class LambdaExpressionMatcher implements PackageBasedMatcher {
static final String LAMBDA_INSTANCE_NAME_PREFIX = "$$Lambda$";
private final String basePackageName;
private final MatcherOperand matcherOperand;

public LambdaExpressionMatcher(String baseClassName, String functionalInterfaceName) {
Objects.requireNonNull(baseClassName, "baseClassName");
if (!StringUtils.hasText(baseClassName)) {
throw new IllegalArgumentException("baseClassName must not be empty");
}
Objects.requireNonNull(functionalInterfaceName, "functionalInterfaceName");
if (!StringUtils.hasText(functionalInterfaceName)) {
throw new IllegalArgumentException("functionalInterfaceName must not be empty");
}
this.basePackageName = baseClassName + LAMBDA_INSTANCE_NAME_PREFIX;

final MatcherOperand operand = new PackageInternalNameMatcherOperand(basePackageName);
final MatcherOperand functionalInterfaceMatcherOperand = new InterfaceInternalNameMatcherOperand(functionalInterfaceName, false);
this.matcherOperand = operand.and(functionalInterfaceMatcherOperand);
}

@Override
public String getBasePackageName() {
return this.basePackageName;
}

@Override
public MatcherOperand getMatcherOperand() {
return this.matcherOperand;
}

@Override
public String toString() {
return "LambdaExpressionMatcher{" +
"basePackageName='" + basePackageName + '\'' +
", matcherOperand=" + matcherOperand +
'}';
}
}
5 changes: 5 additions & 0 deletions ...trap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/Matchers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.MatcherOperand;
import com.navercorp.pinpoint.common.annotations.InterfaceStability;

import java.util.List;

/**
Expand Down Expand Up @@ -70,4 +71,8 @@ public static Matcher newMultiClassBasedMatcher(List<String> baseClassNames) {
public static Matcher newMultiClassBasedMatcher(List<String> baseClassNames, MatcherOperand additional) {
return new DefaultMultiClassBasedMatcher(baseClassNames, additional);
}

public static Matcher newLambdaExpressionMatcher(String baseClassName, String functionalInterfaceName) {
return new LambdaExpressionMatcher(baseClassName, functionalInterfaceName);
}
}
54 changes: 54 additions & 0 deletions ...java/com/navercorp/pinpoint/bootstrap/instrument/matcher/LambdaExpressionMatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package com.navercorp.pinpoint.bootstrap.instrument.matcher;

import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.InterfaceInternalNameMatcherOperand;
import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.MatcherOperand;
import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.PackageInternalNameMatcherOperand;
import com.navercorp.pinpoint.bootstrap.instrument.matcher.operator.AndMatcherOperator;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;

import static org.junit.jupiter.api.Assertions.*;

public class LambdaExpressionMatcherTest {

@Test
public void getMatcherOperand() {
LambdaExpressionMatcher matcher = new LambdaExpressionMatcher("java.lang.Runnable", "java.util.function.Function");
assertEquals("java.lang.Runnable" + LambdaExpressionMatcher.LAMBDA_INSTANCE_NAME_PREFIX, matcher.getBasePackageName());

MatcherOperand operand = matcher.getMatcherOperand();
assertTrue(operand instanceof AndMatcherOperator);

AndMatcherOperator operator = (AndMatcherOperator) operand;
assertTrue(operator.getLeftOperand() instanceof PackageInternalNameMatcherOperand);
assertTrue(operator.getRightOperand() instanceof InterfaceInternalNameMatcherOperand);
}

@Test
public void getMatcherOperandWithBaseClassNameIsNull() {
Assertions.assertThrows(NullPointerException.class, () -> {
LambdaExpressionMatcher lambdaExpressionMatcher = new LambdaExpressionMatcher(null, "java.util.function.Function");
});
}

@Test
public void getMatcherOperandWithBaseClassNameIsEmpty() {
Assertions.assertThrows(IllegalArgumentException.class, () -> {
LambdaExpressionMatcher lambdaExpressionMatcher = new LambdaExpressionMatcher("", "java.util.function.Function");
});
}

@Test
public void getMatcherOperandWithFuncationalInterfaceNameIsNull() {
Assertions.assertThrows(NullPointerException.class, () -> {
LambdaExpressionMatcher lambdaExpressionMatcher = new LambdaExpressionMatcher("java.lang.Runnable", null);
});
}

@Test
public void getMatcherOperandWithFunctionalInterfaceNameIsEmpty() {
Assertions.assertThrows(IllegalArgumentException.class, () -> {
LambdaExpressionMatcher lambdaExpressionMatcher = new LambdaExpressionMatcher("java.lang.Runnable", "");
});
}
}
8 changes: 2 additions & 6 deletions ...r2dbc/src/main/java/com/navercorp/pinpoint/plugin/spring/r2dbc/SpringDataR2dbcPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
import com.navercorp.pinpoint.plugin.spring.r2dbc.interceptor.StatementExecuteInterceptor;
import com.navercorp.pinpoint.plugin.spring.r2dbc.interceptor.jasync.ConfigurationConstructorInterceptor;
import com.navercorp.pinpoint.plugin.spring.r2dbc.interceptor.postgresql.PostgresqlConnectionFactoryConstructorInterceptor;
import io.r2dbc.spi.Parameter;

import java.security.ProtectionDomain;

Expand Down Expand Up @@ -146,7 +145,7 @@ public void setup(ProfilerPluginSetupContext context) {
// Oracle
transformTemplate.transform("oracle.r2dbc.impl.OracleConnectionFactoryImpl", OracleConnectionFactoryImplTransform.class);
transformTemplate.transform("oracle.r2dbc.impl.OracleReactiveJdbcAdapter", OracleReactiveJdbcAdapterTransform.class);
final Matcher oracleConnectionFactoryImplLambdaMatcher = Matchers.newPackageBasedMatcher("oracle.r2dbc.impl.OracleConnectionFactoryImpl$$Lambda$");
final Matcher oracleConnectionFactoryImplLambdaMatcher = Matchers.newLambdaExpressionMatcher("oracle.r2dbc.impl.OracleConnectionFactoryImpl", "java.util.function.Function");
transformTemplate.transform(oracleConnectionFactoryImplLambdaMatcher, OracleConnectionFactoryImplLambdaTransform.class);
transformTemplate.transform("oracle.r2dbc.impl.OracleConnectionImpl", OracleConnectionImplTransform.class);
transformTemplate.transform("oracle.r2dbc.impl.OracleStatementImpl", OracleStatementImplTransform.class);
Expand All @@ -166,7 +165,7 @@ public void setup(ProfilerPluginSetupContext context) {
transformTemplate.transform("org.springframework.r2dbc.core.DefaultFetchSpec", DefaultFetchSpecTransform.class);

// statementFunction, resultFunction Lambda
final Matcher defaultGenericExecuteSpecLambdaMatcher = Matchers.newPackageBasedMatcher("org.springframework.r2dbc.core.DefaultDatabaseClient$DefaultGenericExecuteSpec$$Lambda$");
final Matcher defaultGenericExecuteSpecLambdaMatcher = Matchers.newLambdaExpressionMatcher("org.springframework.r2dbc.core.DefaultDatabaseClient$DefaultGenericExecuteSpec", "java.util.function.Function");
transformTemplate.transform(defaultGenericExecuteSpecLambdaMatcher, DefaultGenericExecuteSpecStatementFunctionTransform.class);
}

Expand Down Expand Up @@ -721,7 +720,6 @@ public static class OracleConnectionFactoryImplLambdaTransform implements Transf
@Override
public byte[] doInTransform(Instrumentor instrumentor, ClassLoader classLoader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
final InstrumentClass target = instrumentor.getInstrumentClass(classLoader, className, classfileBuffer);

final InstrumentMethod lambdaMethod = target.getLambdaMethod("oracle.r2dbc.impl.OracleConnectionFactoryImpl", "oracle.r2dbc.impl.ReactiveJdbcAdapter");
if (lambdaMethod != null) {
lambdaMethod.addInterceptor(OracleConnectionFactoryImplLambdaCreateInterceptor.class);
Expand Down Expand Up @@ -934,15 +932,13 @@ public static class DefaultGenericExecuteSpecStatementFunctionTransform implemen
@Override
public byte[] doInTransform(Instrumentor instrumentor, ClassLoader classLoader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
final InstrumentClass target = instrumentor.getInstrumentClass(classLoader, className, classfileBuffer);

final InstrumentMethod resultFunctionGetLambdaMethod = target.getLambdaMethod("org.springframework.r2dbc.core.DefaultDatabaseClient$DefaultGenericExecuteSpec", "java.util.function.Function", "java.lang.String");
if (resultFunctionGetLambdaMethod != null) {
// resultFunction
target.addField(DatabaseInfoAccessor.class);
target.addField(AsyncContextAccessor.class);

resultFunctionGetLambdaMethod.addInterceptor(DefaultGenericExecuteSpecStatementFunctionGetLambdaInterceptor.class);

final InstrumentMethod applyMethod = target.getDeclaredMethod("apply", "java.lang.Object");
if (applyMethod != null) {
applyMethod.addInterceptor(DefaultGenericExecuteSpecResultFunctionApplyInterceptor.class);
Expand Down