[#4849] Mongo Plugin update for Front-End

Author: RoySRose

agent-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBBase.java

@@ -97,7 +97,7 @@ public void insertData(PluginTestVerifier verifier, MongoCollection<Document> co
         verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, insertOne, null, MONGODB_ADDRESS, null
                 , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_INFO.getName(), collectionInfo)
                 , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_OPTION.getName(), collectionOption)
-                , new ExpectedAnnotation(MongoConstants.MONGO_JSON.getName(), parsedBson)));
+                , new ExpectedAnnotation(MongoConstants.MONGO_JSON_DATA.getName(), parsedBson)));
     }
 
     public void updateData(PluginTestVerifier verifier, MongoCollection<Document> collection, Class<?> mongoDatabaseImpl) {
@@ -123,7 +123,7 @@ public void updateData(PluginTestVerifier verifier, MongoCollection<Document> co
         verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, updateOne, null, MONGODB_ADDRESS, null
                 , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_INFO.getName(), "customers")
                 , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_OPTION.getName(), "MAJORITY")
-                , new ExpectedAnnotation(MongoConstants.MONGO_JSON.getName(), parsedBson)));
+                , new ExpectedAnnotation(MongoConstants.MONGO_JSON_DATA.getName(), parsedBson)));
     }
 
 
@@ -174,7 +174,7 @@ public void deleteData(PluginTestVerifier verifier, MongoCollection<Document> co
         verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, deleteMany, null, MONGODB_ADDRESS, null
                 , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_INFO.getName(), "customers")
                 , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_OPTION.getName(), "MAJORITY")
-                , new ExpectedAnnotation(MongoConstants.MONGO_JSON.getName(), parsedBson)));
+                , new ExpectedAnnotation(MongoConstants.MONGO_JSON_DATA.getName(), parsedBson)));
 
         Assert.assertEquals(1, deleteResult.getDeletedCount());
     }

plugins/mongodb/src/main/java/com/navercorp/pinpoint/plugin/mongo/MongoConstants.java

@@ -31,10 +31,11 @@ private MongoConstants() {
 
     public static final String MONGO_SCOPE = "MONGO_JAVA_DRIVER";
 
-    public static final AnnotationKey MONGO_JSON = AnnotationKeyFactory.of(51, "MONGO-JSON");
+    public static final AnnotationKey MONGO_JSON_DATA = AnnotationKeyFactory.of(51, "MONGO-JSON-Data");
     public static final AnnotationKey MONGO_COLLECTION_INFO = AnnotationKeyFactory.of(52, "Collection-Info", VIEW_IN_RECORD_SET);
     public static final AnnotationKey MONGO_COLLECTION_OPTION = AnnotationKeyFactory.of(53, "Collection-Option");
-    public static final AnnotationKey MONGO_JSON_BINDVALUE = AnnotationKeyFactory.of(54, "MONGO-JSON-BindValue", VIEW_IN_RECORD_SET);
+    public static final AnnotationKey MONGO_JSON = AnnotationKeyFactory.of(54, "MONGO-JSON", VIEW_IN_RECORD_SET);
+    public static final AnnotationKey MONGO_JSON_BINDVALUE = AnnotationKeyFactory.of(55, "MONGO-JSON-BindValue", VIEW_IN_RECORD_SET);
 
     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);

plugins/mongodb/src/main/java/com/navercorp/pinpoint/plugin/mongo/MongoTypeProvider.java

@@ -29,6 +29,7 @@ public void setup(TraceMetadataSetupContext context) {
         context.addServiceType(MongoConstants.MONGODB, AnnotationKeyMatchers.exact(AnnotationKey.ARGS0));
         context.addServiceType(MongoConstants.MONGO_EXECUTE_QUERY, AnnotationKeyMatchers.exact(AnnotationKey.ARGS0));
 
+        context.addAnnotationKey(MongoConstants.MONGO_JSON_DATA);
         context.addAnnotationKey(MongoConstants.MONGO_COLLECTION_INFO);
         context.addAnnotationKey(MongoConstants.MONGO_COLLECTION_OPTION);
         context.addAnnotationKey(MongoConstants.MONGO_JSON);

plugins/mongodb/src/main/java/com/navercorp/pinpoint/plugin/mongo/MongoUtil.java

@@ -48,7 +48,7 @@ public static String getWriteConcern0(WriteConcern writeConcern) {
 
     public static void recordParsedBson(SpanEventRecorder recorder, StringStringValue stringStringValue) {
         if (stringStringValue != null) {
-            recorder.recordAttribute(MongoConstants.MONGO_JSON, stringStringValue);
+            recorder.recordAttribute(MongoConstants.MONGO_JSON_DATA, stringStringValue);
         }
     }
 

web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java

@@ -226,7 +226,7 @@ public void replacement(SpanAlign spanAlign, List<AnnotationBo> annotationBoList
                     collectionInfo.setValue(stringBuilder);
                 }
 
-                AnnotationBo jsonAnnotation = findAnnotation(annotationBoList, MongoConstants.MONGO_JSON.getCode());
+                AnnotationBo jsonAnnotation = findAnnotation(annotationBoList, MongoConstants.MONGO_JSON_DATA.getCode());
                 if (jsonAnnotation == null) {
                     return;
                 }