Skip to content

Commit

Permalink
code clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@emeroad
emeroad committed Nov 13, 2015
1 parent db140ff commit f402f09
Show file tree
Hide file tree
Showing 29 changed files with 181 additions and 181 deletions.
2 changes: 1 addition & 1 deletion ...p-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/InstrumentClassPool.java
View file
Expand Up @@ -20,7 +20,7 @@
*
*/
public interface InstrumentClassPool {
InstrumentClass getClass(InstrumentContext pluginContext, ClassLoader classLoader, String classInternalName, byte[] classFileBuffer) throws NotFoundInstrumentException;
InstrumentClass getClass(InstrumentContext instrumentContext, ClassLoader classLoader, String classInternalName, byte[] classFileBuffer) throws NotFoundInstrumentException;
boolean hasClass(ClassLoader classLoader, String classBinaryName);
void appendToBootstrapClassPath(String jar);
}
10 changes: 5 additions & 5 deletions ...former/PinpointClassFileTransformers.java → ...nstrument/transformer/TransformUtils.java
View file
Expand Up @@ -24,14 +24,14 @@
* @author Jongho Moon
*
*/
public class PinpointClassFileTransformers {
public class TransformUtils {

public static TransformCallback addInterceptor(final String interceptorClassName, final Object[] constructorArgs) {
return new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor instrumentContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentor.getInstrumentClass(loader, className, classfileBuffer);
target.addInterceptor(interceptorClassName, constructorArgs);
return target.toBytecode();
}
Expand All @@ -42,8 +42,8 @@ public static TransformCallback addField(final String fieldAccessorClassName) {
return new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor instrumentContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentor.getInstrumentClass(loader, className, classfileBuffer);
target.addField(fieldAccessorClassName);
return target.toBytecode();
}
Expand Down
16 changes: 8 additions & 8 deletions ...ins/cubrid-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridPlugin.java
View file
Expand Up @@ -51,8 +51,8 @@ private void addCUBRIDConnectionTransformer(final CubridConfig config) {
transformTemplate.transform("cubrid.jdbc.driver.CUBRIDConnection", new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor instrumentContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor Instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = Instrumentor.getInstrumentClass(loader, className, classfileBuffer);
target.addField("com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor");

target.addScopedInterceptor("com.navercorp.pinpoint.bootstrap.plugin.jdbc.interceptor.ConnectionCloseInterceptor", CubridConstants.CUBRID_SCOPE);
Expand Down Expand Up @@ -80,8 +80,8 @@ private void addCUBRIDDriverTransformer() {
transformTemplate.transform("cubrid.jdbc.driver.CUBRIDDriver", new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor instrumentContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor Instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = Instrumentor.getInstrumentClass(loader, className, classfileBuffer);

target.addScopedInterceptor("com.navercorp.pinpoint.bootstrap.plugin.jdbc.interceptor.DriverConnectInterceptor", va(new CubridJdbcUrlParser()), CubridConstants.CUBRID_SCOPE, ExecutionPolicy.ALWAYS);

Expand All @@ -94,8 +94,8 @@ private void addCUBRIDPreparedStatementTransformer(final CubridConfig config) {
transformTemplate.transform("cubrid.jdbc.driver.CUBRIDPreparedStatement", new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor instrumentContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor Instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = Instrumentor.getInstrumentClass(loader, className, classfileBuffer);

target.addField("com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor");
target.addField("com.navercorp.pinpoint.bootstrap.plugin.jdbc.ParsingResultAccessor");
Expand All @@ -115,8 +115,8 @@ private void addCUBRIDStatementTransformer() {
transformTemplate.transform("cubrid.jdbc.driver.CUBRIDStatement", new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor instrumentContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor Instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = Instrumentor.getInstrumentClass(loader, className, classfileBuffer);

target.addField("com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor");

Expand Down
8 changes: 4 additions & 4 deletions plugins/dbcp/src/main/java/com/navercorp/pinpoint/plugin/commons/dbcp/CommonsDbcpPlugin.java
View file
Expand Up @@ -52,8 +52,8 @@ private void addPoolGuardConnectionWrapperTransformer() {
transformTemplate.transform("org.apache.commons.dbcp.PoolingDataSource$PoolGuardConnectionWrapper", new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor pluginContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = pluginContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor Instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = Instrumentor.getInstrumentClass(loader, className, classfileBuffer);
target.addInterceptor("com.navercorp.pinpoint.plugin.commons.dbcp.interceptor.DataSourceCloseInterceptor");
return target.toBytecode();
}
Expand All @@ -64,8 +64,8 @@ private void addBasicDataSourceTransformer() {
transformTemplate.transform("org.apache.commons.dbcp.BasicDataSource", new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor pluginContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = pluginContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor Instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = Instrumentor.getInstrumentClass(loader, className, classfileBuffer);
target.addInterceptor("com.navercorp.pinpoint.plugin.commons.dbcp.interceptor.DataSourceGetConnectionInterceptor");
return target.toBytecode();
}
Expand Down
10 changes: 5 additions & 5 deletions ...lient/src/main/java/com/navercorp/pinpoint/plugin/google/httpclient/HttpClientPlugin.java
View file
Expand Up @@ -52,8 +52,8 @@ private void addHttpRequestClass(final HttpClientPluginConfig config) {
transformTemplate.transform("com.google.api.client.http.HttpRequest", new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor instrumentContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor Instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = Instrumentor.getInstrumentClass(loader, className, classfileBuffer);

InstrumentMethod execute = target.getDeclaredMethod("execute");
if (execute != null) {
Expand All @@ -68,10 +68,10 @@ public byte[] doInTransform(Instrumentor instrumentContext, ClassLoader loader,

for(InstrumentClass nestedClass : target.getNestedClasses(ClassFilters.chain(ClassFilters.enclosingMethod("executeAsync", "java.util.concurrent.Executor"), ClassFilters.interfaze("java.util.concurrent.Callable")))) {
logger.debug("Find nested class {}", target.getName());
instrumentContext.addClassFileTransformer(loader, nestedClass.getName(), new TransformCallback() {
Instrumentor.addClassFileTransformer(loader, nestedClass.getName(), new TransformCallback() {
@Override
public byte[] doInTransform(Instrumentor instrumentContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor Instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = Instrumentor.getInstrumentClass(loader, className, classfileBuffer);
target.addField(AsyncTraceIdAccessor.class.getName());

InstrumentMethod constructor = target.getConstructor("com.google.api.client.http.HttpRequest");
Expand Down
4 changes: 2 additions & 2 deletions plugins/gson/src/main/java/com/navercorp/pinpoint/plugin/gson/GsonPlugin.java
View file
Expand Up @@ -48,8 +48,8 @@ public void setup(ProfilerPluginSetupContext context) {
transformTemplate.transform("com.google.gson.Gson", new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor pluginContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = pluginContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor Instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = Instrumentor.getInstrumentClass(loader, className, classfileBuffer);

for (InstrumentMethod m : target.getDeclaredMethods(MethodFilters.name("fromJson"))) {
m.addScopedInterceptor("com.navercorp.pinpoint.plugin.gson.interceptor.FromJsonInterceptor", GSON_SCOPE);
Expand Down
16 changes: 8 additions & 8 deletions ...ttpclient3/src/main/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClient3Plugin.java
View file
Expand Up @@ -56,8 +56,8 @@ private void addHttpClient3Class() {
transformTemplate.transform("org.apache.commons.httpclient.HttpClient", new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor instrumentContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor Instrument, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = Instrument.getInstrumentClass(loader, className, classfileBuffer);

injectHttpClientExecuteMethod(target, "org.apache.commons.httpclient.HttpMethod");
injectHttpClientExecuteMethod(target, "org.apache.commons.httpclient.HostConfiguration", "org.apache.commons.httpclient.HttpMethod");
Expand All @@ -82,8 +82,8 @@ private void addDefaultHttpMethodRetryHandlerClass() {
transformTemplate.transform("org.apache.commons.httpclient.DefaultHttpMethodRetryHandler", new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor instrumentContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor Instrument, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = Instrument.getInstrumentClass(loader, className, classfileBuffer);

InstrumentMethod retryMethod = target.getDeclaredMethod("retryMethod", "org.apache.commons.httpclient.HttpMethod", "java.io.IOException", "int");

Expand All @@ -100,8 +100,8 @@ private void addHttpConnectionClass() {
transformTemplate.transform("org.apache.commons.httpclient.HttpConnection", new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor instrumentContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor Instrument, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = Instrument.getInstrumentClass(loader, className, classfileBuffer);

target.addGetter(HostNameGetter.class.getName(), HttpClient3Constants.FIELD_HOST_NAME);
target.addGetter(PortNumberGetter.class.getName(), HttpClient3Constants.FIELD_PORT_NUMBER);
Expand All @@ -123,8 +123,8 @@ private void addHttpMethodBaseClass(final HttpClient3PluginConfig config) {
transformTemplate.transform("org.apache.commons.httpclient.HttpMethodBase", new TransformCallback() {

@Override
public byte[] doInTransform(Instrumentor instrumentContext, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = instrumentContext.getInstrumentClass(loader, className, classfileBuffer);
public byte[] doInTransform(Instrumentor Instrument, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
InstrumentClass target = Instrument.getInstrumentClass(loader, className, classfileBuffer);

InstrumentMethod execute = target.getDeclaredMethod("execute", "org.apache.commons.httpclient.HttpState", "org.apache.commons.httpclient.HttpConnection");
if (execute != null) {
Expand Down

0 comments on commit f402f09

Please sign in to comment.