[#10940] Move the class location to avoid loading the class in web to…

… fix the NoClassDefFoundError error on web startup.
pinpoint-apm · Apr 24, 2024 · 5537511 · 5537511
1 parent 0ee497a
commit 5537511
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/...ap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/MongoDatabaseInfo.java b/...ap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/MongoDatabaseInfo.java
@@ -19,6 +19,7 @@
 import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo;
 import com.navercorp.pinpoint.common.trace.ServiceType;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -27,6 +28,7 @@
  */
 public class MongoDatabaseInfo implements DatabaseInfo {
 
+    public static final MongoDatabaseInfo UNKNOWN_MONGO_DATABASE_INFO = new MongoDatabaseInfo(ServiceType.UNKNOWN_DB, ServiceType.UNKNOWN_DB_EXECUTE_QUERY, "unknown", "unknown", Arrays.asList("unknown"), "unknown", "unknown", false, "unknown", "unknown");
     private final ServiceType type;
     private final ServiceType executeQueryType;
     private final String databaseId;

diff --git a/...ule/plugins/mongodb/src/main/java/com/navercorp/pinpoint/plugin/mongo/MongoConstants.java b/...ule/plugins/mongodb/src/main/java/com/navercorp/pinpoint/plugin/mongo/MongoConstants.java
@@ -14,18 +14,13 @@
  */
 package com.navercorp.pinpoint.plugin.mongo;
 
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.MongoDatabaseInfo;
 import com.navercorp.pinpoint.common.trace.AnnotationKey;
 import com.navercorp.pinpoint.common.trace.AnnotationKeyFactory;
 import com.navercorp.pinpoint.common.trace.ServiceType;
 import com.navercorp.pinpoint.common.trace.ServiceTypeFactory;
 
-import java.util.Arrays;
-
 import static com.navercorp.pinpoint.common.trace.AnnotationKeyProperty.VIEW_IN_RECORD_SET;
-import static com.navercorp.pinpoint.common.trace.ServiceTypeProperty.INCLUDE_DESTINATION_ID;
-import static com.navercorp.pinpoint.common.trace.ServiceTypeProperty.RECORD_STATISTICS;
-import static com.navercorp.pinpoint.common.trace.ServiceTypeProperty.TERMINAL;
+import static com.navercorp.pinpoint.common.trace.ServiceTypeProperty.*;
 
 /**
  * @author Roy Kim
@@ -85,6 +80,4 @@ private MongoConstants() {
     public static final ServiceType MONGODB = ServiceTypeFactory.of(2650, "MONGO", TERMINAL, INCLUDE_DESTINATION_ID);
     public static final ServiceType MONGO_EXECUTE_QUERY = ServiceTypeFactory.of(2651, "MONGO_EXECUTE_QUERY", "MONGO", TERMINAL, RECORD_STATISTICS, INCLUDE_DESTINATION_ID);
     public static final ServiceType MONGO_REACTIVE = ServiceTypeFactory.of(2652, "MONGO_REACTIVE", "MONGO");
-
-    public static final MongoDatabaseInfo UNKNOWN_MONGO_DATABASE_INFO = new MongoDatabaseInfo(ServiceType.UNKNOWN_DB, ServiceType.UNKNOWN_DB_EXECUTE_QUERY, "unknown", "unknown", Arrays.asList("unknown"), "unknown", "unknown", false, "unknown", "unknown");
 }
diff --git a/...ercorp/pinpoint/plugin/mongo/interceptor/MongoCollectionImplReadOperationInterceptor.java b/...ercorp/pinpoint/plugin/mongo/interceptor/MongoCollectionImplReadOperationInterceptor.java
@@ -45,7 +45,7 @@ public MongoCollectionImplReadOperationInterceptor(TraceContext traceContext, Me
     @Override
     public void doInBeforeTrace(SpanEventRecorder recorder, Object target, Object[] args) {
         recorder.recordApi(methodDescriptor);
-        MongoDatabaseInfo databaseInfo = DatabaseInfoUtils.getDatabaseInfo(target, MongoConstants.UNKNOWN_MONGO_DATABASE_INFO);
+        MongoDatabaseInfo databaseInfo = DatabaseInfoUtils.getDatabaseInfo(target, MongoDatabaseInfo.UNKNOWN_MONGO_DATABASE_INFO);
         if (target instanceof HostListAccessor) {
             final List<String> hostList = ((HostListAccessor) target)._$PINPOINT$_getHostList();
             if (hostList != null) {

diff --git a/...rcorp/pinpoint/plugin/mongo/interceptor/MongoCollectionImplWriteOperationInterceptor.java b/...rcorp/pinpoint/plugin/mongo/interceptor/MongoCollectionImplWriteOperationInterceptor.java
@@ -44,7 +44,7 @@ public MongoCollectionImplWriteOperationInterceptor(TraceContext traceContext, M
     @Override
     public void doInBeforeTrace(SpanEventRecorder recorder, Object target, Object[] args) {
         recorder.recordApi(methodDescriptor);
-        MongoDatabaseInfo databaseInfo = DatabaseInfoUtils.getDatabaseInfo(target, MongoConstants.UNKNOWN_MONGO_DATABASE_INFO);
+        MongoDatabaseInfo databaseInfo = DatabaseInfoUtils.getDatabaseInfo(target, MongoDatabaseInfo.UNKNOWN_MONGO_DATABASE_INFO);
         if (target instanceof HostListAccessor) {
             final List<String> hostList = ((HostListAccessor) target)._$PINPOINT$_getHostList();
             if (hostList != null) {

diff --git a/.../src/test/java/com/navercorp/pinpoint/plugin/mongo/interceptor/DatabaseInfoUtilsTest.java b/.../src/test/java/com/navercorp/pinpoint/plugin/mongo/interceptor/DatabaseInfoUtilsTest.java
@@ -37,7 +37,7 @@ public void getDatabaseInfo() {
         DatabaseInfo defaultDatabaseInfo = mock(MongoDatabaseInfo.class);
         when(databaseInfoAccessor._$PINPOINT$_getDatabaseInfo()).thenReturn(defaultDatabaseInfo);
 
-        DatabaseInfo databaseInfo = DatabaseInfoUtils.getDatabaseInfo(databaseInfoAccessor, MongoConstants.UNKNOWN_MONGO_DATABASE_INFO);
+        DatabaseInfo databaseInfo = DatabaseInfoUtils.getDatabaseInfo(databaseInfoAccessor, MongoDatabaseInfo.UNKNOWN_MONGO_DATABASE_INFO);
 
         Assertions.assertEquals(databaseInfo, defaultDatabaseInfo);
     }
@@ -47,15 +47,15 @@ public void getDatabaseInfo_return_null() {
         DatabaseInfoAccessor databaseInfoAccessor = mock(DatabaseInfoAccessor.class);
         when(databaseInfoAccessor._$PINPOINT$_getDatabaseInfo()).thenReturn(null);
 
-        DatabaseInfo databaseInfo = DatabaseInfoUtils.getDatabaseInfo(databaseInfoAccessor, MongoConstants.UNKNOWN_MONGO_DATABASE_INFO);
-        Assertions.assertEquals(databaseInfo, MongoConstants.UNKNOWN_MONGO_DATABASE_INFO);
+        DatabaseInfo databaseInfo = DatabaseInfoUtils.getDatabaseInfo(databaseInfoAccessor, MongoDatabaseInfo.UNKNOWN_MONGO_DATABASE_INFO);
+        Assertions.assertEquals(databaseInfo, MongoDatabaseInfo.UNKNOWN_MONGO_DATABASE_INFO);
     }
 
     @Test
     public void getDatabaseInfo_unknown() {
-        DatabaseInfo databaseInfo = DatabaseInfoUtils.getDatabaseInfo(new Object(), MongoConstants.UNKNOWN_MONGO_DATABASE_INFO);
+        DatabaseInfo databaseInfo = DatabaseInfoUtils.getDatabaseInfo(new Object(), MongoDatabaseInfo.UNKNOWN_MONGO_DATABASE_INFO);
 
-        Assertions.assertEquals(databaseInfo, MongoConstants.UNKNOWN_MONGO_DATABASE_INFO);
+        Assertions.assertEquals(databaseInfo, MongoDatabaseInfo.UNKNOWN_MONGO_DATABASE_INFO);
     }
 
 }