Merge pull request #576 from ascrutae/fix/postgresql-issue (1bf47645) · Commits · SUMMER2020 / students / proj-2005254

apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc3ConnectionInstrumentation.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,8 +41,8 @@ import static org.skywalking.apm.plugin.jdbc.define.Constants.ROLLBACK_METHOD_NA
		import static org.skywalking.apm.plugin.jdbc.define.Constants.SERVICE_METHOD_INTERCEPT_CLASS;

		/**
		* {@link ConnectionInstrumentation} intercept the following methods that the class which extend {@link
		* org.postgresql.jdbc.PgConnection}. <br/>
		* {@link Jdbc3ConnectionInstrumentation} intercept the following methods that the class which extend {@link
		* org.postgresql.jdbc3.Jdbc3Connection}. <br/>
		*
		* 1. Enhance <code>prepareStatement</code> by <code>org.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor</code>
		* 2. Enhance <code>prepareCall</code> by

apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc4ConnectionInstrumentation.java

0 → 100644

+124 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017, OpenSkywalking Organization All rights reserved.
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*
		* Project repository: https://github.com/OpenSkywalking/skywalking
		*/

		package org.skywalking.apm.plugin.jdbc.postgresql.define;

		import net.bytebuddy.description.method.MethodDescription;
		import net.bytebuddy.matcher.ElementMatcher;
		import org.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
		import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
		import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
		import org.skywalking.apm.agent.core.plugin.match.ClassMatch;

		import static net.bytebuddy.matcher.ElementMatchers.named;
		import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
		import static org.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
		import static org.skywalking.apm.plugin.jdbc.define.Constants.CLOSE_METHOD_NAME;
		import static org.skywalking.apm.plugin.jdbc.define.Constants.COMMIT_METHOD_NAME;
		import static org.skywalking.apm.plugin.jdbc.define.Constants.CREATE_STATEMENT_INTERCEPT_CLASS;
		import static org.skywalking.apm.plugin.jdbc.define.Constants.CREATE_STATEMENT_METHOD_NAME;
		import static org.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_CALL_INTERCEPT_CLASS;
		import static org.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_CALL_METHOD_NAME;
		import static org.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_STATEMENT_INTERCEPT_CLASS;
		import static org.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_STATEMENT_METHOD_NAME;
		import static org.skywalking.apm.plugin.jdbc.define.Constants.RELEASE_SAVE_POINT_METHOD_NAME;
		import static org.skywalking.apm.plugin.jdbc.define.Constants.ROLLBACK_METHOD_NAME;
		import static org.skywalking.apm.plugin.jdbc.define.Constants.SERVICE_METHOD_INTERCEPT_CLASS;

		/**
		* {@link Jdbc4ConnectionInstrumentation} intercept the following methods that the class which extend {@link
		* org.postgresql.jdbc4.Jdbc4Connection}. <br/>
		*
		* 1. Enhance <code>prepareStatement</code> by <code>org.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor</code>
		* 2. Enhance <code>prepareCall</code> by
		* <code>org.skywalking.apm.plugin.jdbc.define.JDBCPrepareCallInterceptor</code>
		* 3. Enhance <code>createStatement</code>
		* by <code>org.skywalking.apm.plugin.jdbc.define.JDBCStatementInterceptor</code>
		* 4. Enhance <code>commit, rollback, close, releaseSavepoint</code> by <code>org.skywalking.apm.plugin.jdbc.define.ConnectionServiceMethodInterceptor</code>
		*
		* @author zhangxin
		*/
		public class Jdbc4ConnectionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {

		public static final String ENHANCE_CLASS = "org.postgresql.jdbc4.Jdbc4Connection";

		@Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
		return new ConstructorInterceptPoint[0];
		}

		@Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
		return new InstanceMethodsInterceptPoint[] {
		new InstanceMethodsInterceptPoint() {
		@Override public ElementMatcher<MethodDescription> getMethodsMatcher() {
		return named(PREPARE_STATEMENT_METHOD_NAME).and(takesArguments(4));
		}

		@Override public String getMethodsInterceptor() {
		return PREPARE_STATEMENT_INTERCEPT_CLASS;
		}

		@Override public boolean isOverrideArgs() {
		return false;
		}
		},
		new InstanceMethodsInterceptPoint() {
		@Override public ElementMatcher<MethodDescription> getMethodsMatcher() {
		return named(PREPARE_CALL_METHOD_NAME).and(takesArguments(4));
		}

		@Override public String getMethodsInterceptor() {
		return PREPARE_CALL_INTERCEPT_CLASS;
		}

		@Override public boolean isOverrideArgs() {
		return false;
		}
		},
		new InstanceMethodsInterceptPoint() {
		@Override public ElementMatcher<MethodDescription> getMethodsMatcher() {
		return named(CREATE_STATEMENT_METHOD_NAME).and(takesArguments(3));
		}

		@Override public String getMethodsInterceptor() {
		return CREATE_STATEMENT_INTERCEPT_CLASS;
		}

		@Override public boolean isOverrideArgs() {
		return false;
		}
		},
		new InstanceMethodsInterceptPoint() {
		@Override public ElementMatcher<MethodDescription> getMethodsMatcher() {
		return named(COMMIT_METHOD_NAME).or(named(ROLLBACK_METHOD_NAME)).or(named(CLOSE_METHOD_NAME)).or(named(RELEASE_SAVE_POINT_METHOD_NAME));
		}

		@Override public String getMethodsInterceptor() {
		return SERVICE_METHOD_INTERCEPT_CLASS;
		}

		@Override public boolean isOverrideArgs() {
		return false;
		}
		}
		};
		}

		@Override protected ClassMatch enhanceClass() {
		return byName(ENHANCE_CLASS);
		}
		}

apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/resources/skywalking-plugin.def

+1 −0

Original line number	Diff line number	Diff line
		postgresql-8.x=org.skywalking.apm.plugin.jdbc.postgresql.define.DriverInstrumentation
		postgresql-8.x=org.skywalking.apm.plugin.jdbc.postgresql.define.Jdbc3ConnectionInstrumentation
		postgresql-8.x=org.skywalking.apm.plugin.jdbc.postgresql.define.Jdbc4ConnectionInstrumentation
		postgresql-8.x=org.skywalking.apm.plugin.jdbc.postgresql.define.ConnectionInstrumentation