Extend PostgreSQL plugin to support JDBC 42.2-42.7

PostgreSQL 42.x removed AbstractJdbc2Statement which handled execute() 0-arg
interception in old drivers. Without it, only executeWithFlags(int) was
intercepted, producing different span names.

Fix: replace executeWithFlags matcher with execute() (all overloads) in
PgPreparedStatementInstrumentation and PgCallableStatementInstrumentation.
This intercepts the user-facing execute() method, and the internal
executeWithFlags() delegation is no longer intercepted (1-level only,
no extra memory cost from nested interception).

Locally verified: all 9 versions passed (9.2, 9.3, 9.4, 42.2-42.7).

Author: wu-sheng

CHANGES.md

@@ -17,6 +17,7 @@ Release Notes.
 * Extend GraphQL plugin to support graphql-java 18 -> 24 (20+ requires JDK 17).
 * Extend Spring Kafka plugin to support Spring Kafka 2.4 -> 2.9 and 3.0 -> 3.3.
 * Enhance test/plugin/run.sh to support extra Maven properties per version in support-version.list (format: version,key=value).
+* Extend PostgreSQL plugin to support PostgreSQL JDBC 42.2 -> 42.7. Fix execute() interception: replace executeWithFlags with execute() to match user-facing method names in 42.x (AbstractJdbc2Statement removed in 42.x).
 * Extend OkHttp plugin to support OkHttp 4.10 -> 4.12.
 * Extend Dubbo 3.x plugin to support Dubbo 3.1 -> 3.3. Replace dubbo-dependencies-zookeeper (removed in 3.3) with direct dependencies in test scenario.
 

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

@@ -26,7 +26,6 @@
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
-import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType;
 import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
 import static org.apache.skywalking.apm.plugin.jdbc.postgresql.Variables.PG_PREPARED_STATEMENT_EXECUTE_METHOD_INTERCEPTOR;
 
@@ -42,7 +41,7 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
             new InstanceMethodsInterceptPoint() {
                 @Override
                 public ElementMatcher<MethodDescription> getMethodsMatcher() {
-                    return named("executeWithFlags").and(takesArgumentWithType(0, "int")).or(named("executeUpdate"));
+                    return named("execute").or(named("executeUpdate"));
                 }
 
                 @Override

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

@@ -26,7 +26,6 @@
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
-import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType;
 import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
 import static org.apache.skywalking.apm.plugin.jdbc.postgresql.Variables.PG_PREPARED_STATEMENT_EXECUTE_METHOD_INTERCEPTOR;
 
@@ -42,8 +41,7 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
             new InstanceMethodsInterceptPoint() {
                 @Override
                 public ElementMatcher<MethodDescription> getMethodsMatcher() {
-                    return named("execute").and(takesArgumentWithType(0, "java.lang.String"))
-                                           .or(named("executeWithFlags").and(takesArgumentWithType(0, "int")))
+                    return named("execute")
                                            .or(named("executeQuery"))
                                            .or(named("executeUpdate"));
                 }

docs/en/setup/service-agent/java-agent/Supported-list.md

@@ -49,7 +49,7 @@ metrics based on the tracing data.
   * Oracle Driver (Optional¹), See [SkySPM Plugin Repository](https://github.com/SkyAPM/java-plugin-extensions)
   * H2 Driver 1.3.x -> 1.4.x
   * [ShardingSphere](https://github.com/apache/shardingsphere) 3.0.0, 4.0.0, 4.0.1, 4.1.0, 4.1.1, 5.0.0
-  * PostgreSQL Driver 8.x, 9.x, 42.x
+  * PostgreSQL Driver 8.x, 9.x, 42.x (42.2 -> 42.7)
   * Mariadb Driver 1.8, 2.x (2.0 -> 2.7)
   * [InfluxDB](https://github.com/influxdata/influxdb-java) 2.5 -> 2.17
   * [Mssql-Jtds](https://github.com/milesibastos/jTDS) 1.x

test/plugin/scenarios/postgresql-scenario/support-version.list

@@ -14,9 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# PostgreSQL 42.x changes internal method dispatch: execute() delegates to
-# executeWithFlags(), producing different span names. Needs expectedData update
-# or investigation of which method to intercept for 42.x.
 9.2-1004-jdbc41
 9.3-1104-jdbc41
 9.4-1206-jdbc42
+42.2.29
+42.3.10
+42.4.5
+42.5.6
+42.6.2
+42.7.10