[inlong] branch master updated: [INLONG-7365][Agent] The username for the MongoDB connector is missing (#7366)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 816de8f7d [INLONG-7365][Agent] The username for the MongoDB connector 
is missing (#7366)
816de8f7d is described below

commit 816de8f7df351b5fc186373151107402c2f36e5f
Author: Lizhen <88174078+bluew...@users.noreply.github.com>
AuthorDate: Wed Feb 15 11:38:02 2023 +0800

    [INLONG-7365][Agent] The username for the MongoDB connector is missing 
(#7366)
---
 .../main/java/org/apache/inlong/agent/pojo/JobProfileDto.java    | 2 +-
 .../src/main/java/org/apache/inlong/agent/pojo/MongoJob.java     | 2 +-
 .../org/apache/inlong/agent/plugin/sources/MongoDBSource.java    | 4 +++-
 .../apache/inlong/agent/plugin/sources/reader/MongoDBReader.java | 9 +++++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
index f3ab58f03..3f14dd09a 100644
--- 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
+++ 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
@@ -222,7 +222,7 @@ public class JobProfileDto {
         MongoJob mongoJob = new MongoJob();
 
         mongoJob.setHosts(config.getHosts());
-        mongoJob.setUser(config.getUser());
+        mongoJob.setUser(config.getUsername());
         mongoJob.setPassword(config.getPassword());
         mongoJob.setDatabaseIncludeList(config.getDatabaseIncludeList());
         mongoJob.setDatabaseExcludeList(config.getDatabaseExcludeList());
diff --git 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/MongoJob.java
 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/MongoJob.java
index d37512b5d..1ecc4b646 100644
--- 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/MongoJob.java
+++ 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/MongoJob.java
@@ -84,7 +84,7 @@ public class MongoJob {
     public static class MongoJobTaskConfig {
 
         private String hosts;
-        private String user;
+        private String username;
         private String password;
 
         private String databaseIncludeList;
diff --git 
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/MongoDBSource.java
 
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/MongoDBSource.java
index 21dd01f84..d5670db61 100644
--- 
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/MongoDBSource.java
+++ 
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/MongoDBSource.java
@@ -36,7 +36,9 @@ public class MongoDBSource extends AbstractSource {
     @Override
     public List<Reader> split(JobProfile conf) {
         super.init(conf);
-        List<Reader> readerList = Collections.singletonList(new 
MongoDBReader());
+        MongoDBReader mongoDBReader = new MongoDBReader();
+        mongoDBReader.setReadSource(conf.getInstanceId());
+        List<Reader> readerList = Collections.singletonList(mongoDBReader);
         sourceMetric.sourceSuccessCount.incrementAndGet();
         return readerList;
     }
diff --git 
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/MongoDBReader.java
 
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/MongoDBReader.java
index 77e18d79c..9709fc101 100644
--- 
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/MongoDBReader.java
+++ 
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/MongoDBReader.java
@@ -149,6 +149,10 @@ public class MongoDBReader extends AbstractReader {
         return instanceId;
     }
 
+    public void setReadSource(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
     @Override
     public void setReadTimeout(long mills) {
     }
@@ -258,7 +262,7 @@ public class MongoDBReader extends AbstractReader {
     private void handle(boolean success, String message, Throwable error) {
         // jobConf.getInstanceId()
         if (!success) {
-            LOGGER.error("{}, {}", message, error);
+            LOGGER.error("MongoDB job with jobConf {} has error {}", message, 
error);
         }
     }
 
@@ -298,7 +302,8 @@ public class MongoDBReader extends AbstractReader {
         Properties props = builder.build().asProperties();
         props.setProperty("offset.storage.file.filename", offsetStoreFileName);
         props.setProperty("connector.class", 
MongoDbConnector.class.getCanonicalName());
-        props.setProperty("name", instanceId);
+        props.setProperty("name", "engine-" + instanceId);
+        props.setProperty("mongodb.name", "inlong-mongodb-" + instanceId);
 
         String snapshotMode = props.getOrDefault(JOB_MONGO_SNAPSHOT_MODE, 
"").toString();
         if (Objects.equals(SnapshotModeConstants.INITIAL, snapshotMode)) {