diff --git a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBITBase.java b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBITBase.java index 81d97bed783a..4afa9c7d89bc 100644 --- a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBITBase.java +++ b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBITBase.java @@ -151,7 +151,7 @@ public void insertComlexBsonValueData30(PluginTestVerifier verifier, MongoCollec Method insertOneMethod = getMethod(mongoDatabaseImpl, "insertOne", Object.class); NormalizedBson parsedBson = parseBson(document); - verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, insertOneMethod, null, MongoDBITConstants.MONGODB_ADDRESS, null + verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, insertOneMethod, null, mongod.getAddress(), null , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_INFO.getName(), collectionInfo) , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_OPTION.getName(), collectionOption) , new ExpectedAnnotation(MongoConstants.MONGO_JSON_DATA.getName(), new StringStringValue(parsedBson.getNormalizedBson(), parsedBson.getParameter())))); @@ -209,7 +209,7 @@ public void insertComlexBsonValueData34(PluginTestVerifier verifier, MongoCollec Method insertOneMethod = getMethod(mongoDatabaseImpl, "insertOne", Object.class); NormalizedBson parsedBson = parseBson(document); - verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, insertOneMethod, null, MongoDBITConstants.MONGODB_ADDRESS, null + verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, insertOneMethod, null, mongod.getAddress(), null , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_INFO.getName(), collectionInfo) , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_OPTION.getName(), collectionOption) , new ExpectedAnnotation(MongoConstants.MONGO_JSON_DATA.getName(), new StringStringValue(parsedBson.getNormalizedBson(), parsedBson.getParameter())))); @@ -223,7 +223,7 @@ public void insertData(PluginTestVerifier verifier, MongoCollection co Method insertOneMethod = getMethod(mongoDatabaseImpl, "insertOne", Object.class); NormalizedBson parsedBson = parseBson(doc); - verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, insertOneMethod, null, MongoDBITConstants.MONGODB_ADDRESS, null + verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, insertOneMethod, null, mongod.getAddress(), null , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_INFO.getName(), collectionInfo) , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_OPTION.getName(), collectionOption) , new ExpectedAnnotation(MongoConstants.MONGO_JSON_DATA.getName(), new StringStringValue(parsedBson.getNormalizedBson(), parsedBson.getParameter())))); @@ -238,7 +238,7 @@ public void updateData(PluginTestVerifier verifier, MongoCollection co Method updateOne = getMethod(mongoDatabaseImpl, "updateOne", Bson.class, Bson.class); NormalizedBson parsedBson = parseBson(doc, doc2); - verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, updateOne, null, MongoDBITConstants.MONGODB_ADDRESS, null + verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, updateOne, null, mongod.getAddress(), null , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_INFO.getName(), "customers") , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_OPTION.getName(), "MAJORITY") , new ExpectedAnnotation(MongoConstants.MONGO_JSON_DATA.getName(), new StringStringValue(parsedBson.getNormalizedBson(), parsedBson.getParameter())))); @@ -251,7 +251,7 @@ public void readData(PluginTestVerifier verifier, MongoCollection coll Method find = getMethod(mongoDatabaseImpl, "find"); - verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, find, null, MongoDBITConstants.MONGODB_ADDRESS, null + verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, find, null, mongod.getAddress(), null , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_INFO.getName(), "customers") , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_OPTION.getName(), "secondaryPreferred"))); @@ -279,7 +279,7 @@ public void deleteData(PluginTestVerifier verifier, MongoCollection co Method deleteMany = getMethod(mongoDatabaseImpl, "deleteMany", Bson.class); NormalizedBson parsedBson = parseBson(doc); - verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, deleteMany, null, MongoDBITConstants.MONGODB_ADDRESS, null + verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, deleteMany, null, mongod.getAddress(), null , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_INFO.getName(), "customers") , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_OPTION.getName(), "MAJORITY") , new ExpectedAnnotation(MongoConstants.MONGO_JSON_DATA.getName(), new StringStringValue(parsedBson.getNormalizedBson(), parsedBson.getParameter())))); @@ -294,7 +294,7 @@ public void filterData(PluginTestVerifier verifier, MongoCollection co MongoCursor cursor = collection.find(bson).iterator(); - verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, find, null, MongoDBITConstants.MONGODB_ADDRESS, null + verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, find, null, mongod.getAddress(), null , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_INFO.getName(), "customers") , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_OPTION.getName(), "secondaryPreferred") , new ExpectedAnnotation(MongoConstants.MONGO_JSON_DATA.getName(), new StringStringValue(parsedBson.getNormalizedBson(), parsedBson.getParameter())))); @@ -309,7 +309,7 @@ public void filterData2(PluginTestVerifier verifier, MongoCollection c MongoCursor cursor = collection.find(bson).iterator(); - verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, find, null, MongoDBITConstants.MONGODB_ADDRESS, null + verifier.verifyTrace(event(MONGO_EXECUTE_QUERY, find, null, mongod.getAddress(), null , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_INFO.getName(), "customers") , new ExpectedAnnotation(MongoConstants.MONGO_COLLECTION_OPTION.getName(), "secondaryPreferred") , new ExpectedAnnotation(MongoConstants.MONGO_JSON_DATA.getName(), new StringStringValue(parsedBson.getNormalizedBson(), parsedBson.getParameter())))); diff --git a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBITConstants.java b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBITConstants.java index 3f70ff22dfda..3627ce7deea4 100644 --- a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBITConstants.java +++ b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBITConstants.java @@ -20,9 +20,7 @@ public final class MongoDBITConstants { public static final String BIND_ADDRESS = "localhost"; - public static final int PORT = 27018; - - public static final String MONGODB_ADDRESS = BIND_ADDRESS + ":" + PORT; + public static final int DEFAULT_PORT = 27018; public static final String EMBED_MONGODB_VERSION = "de.flapdoodle.embed:de.flapdoodle.embed.mongo:3.4.6"; diff --git a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_0_x_IT.java b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_0_x_IT.java index 49ab2a6f2124..abd2b220e6b6 100644 --- a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_0_x_IT.java +++ b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_0_x_IT.java @@ -29,7 +29,6 @@ import com.mongodb.client.MongoCollection; import org.bson.Document; -import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; @@ -65,7 +64,7 @@ void insertComplex(PluginTestVerifier verifier, MongoCollection collec @Override public void setClient() { - mongoClient = new com.mongodb.MongoClient(MongoDBITConstants.BIND_ADDRESS, MongoDBITConstants.PORT); + mongoClient = new com.mongodb.MongoClient(MongoDBITConstants.BIND_ADDRESS, mongod.getPort()); database = mongoClient.getDatabase("myMongoDbFake").withReadPreference(ReadPreference.secondaryPreferred()).withWriteConcern(WriteConcern.MAJORITY); } diff --git a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_2_x_IT.java b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_2_x_IT.java index 475d7e13b043..98a7a4a2fb29 100644 --- a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_2_x_IT.java +++ b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_2_x_IT.java @@ -29,8 +29,6 @@ import com.mongodb.client.MongoCollection; import org.bson.Document; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.runner.RunWith; /** @@ -60,7 +58,7 @@ void insertComplex(PluginTestVerifier verifier, MongoCollection collec @Override public void setClient() { - mongoClient = new com.mongodb.MongoClient(MongoDBITConstants.BIND_ADDRESS, MongoDBITConstants.PORT); + mongoClient = new com.mongodb.MongoClient(MongoDBITConstants.BIND_ADDRESS, mongod.getPort()); database = mongoClient.getDatabase("myMongoDbFake").withReadPreference(ReadPreference.secondaryPreferred()).withWriteConcern(WriteConcern.MAJORITY); } diff --git a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_4_x_IT.java b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_4_x_IT.java index 27f003534459..042691e3deca 100644 --- a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_4_x_IT.java +++ b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_4_x_IT.java @@ -29,8 +29,6 @@ import com.mongodb.client.MongoCollection; import org.bson.Document; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.runner.RunWith; /** @@ -60,7 +58,7 @@ void insertComplex(PluginTestVerifier verifier, MongoCollection collec @Override public void setClient() { - mongoClient = new com.mongodb.MongoClient(MongoDBITConstants.BIND_ADDRESS, MongoDBITConstants.PORT); + mongoClient = new com.mongodb.MongoClient(MongoDBITConstants.BIND_ADDRESS, mongod.getPort()); database = mongoClient.getDatabase("myMongoDbFake").withReadPreference(ReadPreference.secondaryPreferred()).withWriteConcern(WriteConcern.MAJORITY); } diff --git a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_7_x_IT.java b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_7_x_IT.java index 5b721d59ae07..41cb32e644bd 100644 --- a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_7_x_IT.java +++ b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongoDBIT_3_7_x_IT.java @@ -31,8 +31,6 @@ import com.mongodb.client.MongoCollection; import org.bson.Document; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.runner.RunWith; /** @@ -62,7 +60,7 @@ void insertComplex(PluginTestVerifier verifier, MongoCollection collec @Override public void setClient() { - mongoClient = MongoClients.create("mongodb://" + MongoDBITConstants.MONGODB_ADDRESS); + mongoClient = MongoClients.create("mongodb://" + mongod.getAddress()); database = mongoClient.getDatabase("myMongoDbFake").withReadPreference(ReadPreference.secondaryPreferred()).withWriteConcern(WriteConcern.MAJORITY); } diff --git a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongodServer.java b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongodServer.java index 3f02dfe904d3..db8d22ae7890 100644 --- a/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongodServer.java +++ b/plugins-it/mongodb-it/src/test/java/com/navercorp/pinpoint/plugin/mongodb/MongodServer.java @@ -1,5 +1,6 @@ package com.navercorp.pinpoint.plugin.mongodb; +import com.navercorp.pinpoint.testcase.util.SocketUtils; import de.flapdoodle.embed.mongo.MongodExecutable; import de.flapdoodle.embed.mongo.MongodProcess; import de.flapdoodle.embed.mongo.MongodStarter; @@ -27,12 +28,14 @@ public class MongodServer { private final MongodExecutable mongodExecutable; private MongodProcess mongod; + private final int port = SocketUtils.findAvailableTcpPort(MongoDBITConstants.DEFAULT_PORT); + public MongodServer() throws IOException { MongodStarter starter = newStarter(); MongodConfig mongodConfig = MongodConfig.builder() .version(Version.Main.V4_4) - .net(new Net(MongoDBITConstants.BIND_ADDRESS, MongoDBITConstants.PORT, Network.localhostIsIPv6())) + .net(new Net(MongoDBITConstants.BIND_ADDRESS, port, Network.localhostIsIPv6())) .build(); this.mongodExecutable = starter.prepare(mongodConfig); } @@ -41,6 +44,14 @@ public void start() throws IOException { mongod = mongodExecutable.start(); } + public int getPort() { + return port; + } + + public String getAddress() { + return MongoDBITConstants.BIND_ADDRESS + ":" + port; + } + private String getTempPath() throws IOException { URL resource = MongoDBITBase.class.getProtectionDomain().getCodeSource().getLocation(); if (resource == null) {