Skip to content

Commit 3beaf38

Browse files
xiepuhuanxiepuhuan
committed
1. Removing Annotations for Simple Names @DisplayName.
2. Change the return type of the involved method from int to long. 3. Using isIn instead of containsAnyOf for correct assertions. 4. Directly throw InterruptedException without capturing it. 5. Latch calls await method with timeout. 6. Merge comment lines. 7. Use the get method to wait for the future to complete, just like the original Groovy code. 8. In the mongoSpan method parameters, use SpanDataAsset instead of trace and index. 9. In the mongoSpan method, optimizing assertion error prompts. Signed-off-by: xiepuhuan <[email protected]>
1 parent dda22cb commit 3beaf38

File tree

7 files changed

+88
-105
lines changed

7 files changed

+88
-105
lines changed

‎instrumentation/mongo/mongo-3.1/library/src/test/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetterTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void shouldTruncateSimpleCommand() {
7272
.append("f2", new BsonString("c2")));
7373

7474
// This can vary because of different whitespace for different MongoDB versions
75-
assertThat(normalized).containsAnyOf("{\"cmd\": \"c\", \"f1\": \"", "{\"cmd\": \"c\", \"f1\" ");
75+
assertThat(normalized).isIn("{\"cmd\": \"c\", \"f1\": \"", "{\"cmd\": \"c\", \"f1\" ");
7676
}
7777

7878
@Test
@@ -89,7 +89,7 @@ void shouldTruncateArray() {
8989

9090
// This can vary because of different whitespace for different MongoDB versions
9191
assertThat(normalized)
92-
.containsAnyOf("{\"cmd\": \"c\", \"f1\": [\"?\", \"?", "{\"cmd\": \"c\", \"f1\": [\"?\",");
92+
.isIn("{\"cmd\": \"c\", \"f1\": [\"?\", \"?", "{\"cmd\": \"c\", \"f1\": [\"?\",");
9393
}
9494

9595
static String sanitizeStatementAcrossVersions(

‎instrumentation/mongo/mongo-3.1/testing/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/AbstractMongo31ClientTest.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.bson.Document;
2626
import org.junit.jupiter.api.AfterAll;
2727
import org.junit.jupiter.api.BeforeAll;
28-
import org.junit.jupiter.api.DisplayName;
2928
import org.junit.jupiter.api.Test;
3029

3130
public abstract class AbstractMongo31ClientTest
@@ -87,9 +86,9 @@ protected void createCollectionCallingBuildTwice(String dbName, String collectio
8786
}
8887

8988
@Override
90-
protected int getCollection(String dbName, String collectionName) {
89+
protected long getCollection(String dbName, String collectionName) {
9190
MongoDatabase db = client.getDatabase(dbName);
92-
return Math.toIntExact(db.getCollection(collectionName).count());
91+
return db.getCollection(collectionName).count();
9392
}
9493

9594
@Override
@@ -108,9 +107,9 @@ protected MongoCollection<Document> setupInsert(String dbName, String collection
108107
}
109108

110109
@Override
111-
protected int insert(MongoCollection<Document> collection) {
110+
protected long insert(MongoCollection<Document> collection) {
112111
collection.insertOne(new Document("password", "SECRET"));
113-
return Math.toIntExact(collection.count());
112+
return collection.count();
114113
}
115114

116115
@Override
@@ -131,13 +130,13 @@ protected MongoCollection<Document> setupUpdate(String dbName, String collection
131130
}
132131

133132
@Override
134-
protected int update(MongoCollection<Document> collection) {
133+
protected long update(MongoCollection<Document> collection) {
135134
UpdateResult result =
136135
collection.updateOne(
137136
new BsonDocument("password", new BsonString("OLDPW")),
138137
new BsonDocument("$set", new BsonDocument("password", new BsonString("NEWPW"))));
139138
collection.count();
140-
return Math.toIntExact(result.getModifiedCount());
139+
return result.getModifiedCount();
141140
}
142141

143142
@Override
@@ -158,11 +157,11 @@ protected MongoCollection<Document> setupDelete(String dbName, String collection
158157
}
159158

160159
@Override
161-
protected int delete(MongoCollection<Document> collection) {
160+
protected long delete(MongoCollection<Document> collection) {
162161
DeleteResult result =
163162
collection.deleteOne(new BsonDocument("password", new BsonString("SECRET")));
164163
collection.count();
165-
return Math.toIntExact(result.getDeletedCount());
164+
return result.getDeletedCount();
166165
}
167166

168167
@Override
@@ -208,7 +207,6 @@ protected void error(String dbName, String collectionName) {
208207
}
209208

210209
@Test
211-
@DisplayName("test client failure")
212210
void testClientFailure() {
213211
MongoClientOptions options = MongoClientOptions.builder().serverSelectionTimeout(10).build();
214212
MongoClient client = new MongoClient(new ServerAddress(host, PortUtils.UNUSABLE_PORT), options);
@@ -220,6 +218,6 @@ void testClientFailure() {
220218
db.createCollection(createCollectionName());
221219
});
222220
// Unfortunately not caught by our instrumentation.
223-
assertThat(testing().spans().size()).isEqualTo(0);
221+
assertThat(testing().spans()).isEmpty();
224222
}
225223
}

‎instrumentation/mongo/mongo-3.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_7/MongoClientTest.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.bson.Document;
3030
import org.junit.jupiter.api.AfterAll;
3131
import org.junit.jupiter.api.BeforeAll;
32-
import org.junit.jupiter.api.DisplayName;
3332
import org.junit.jupiter.api.Test;
3433
import org.junit.jupiter.api.extension.RegisterExtension;
3534

@@ -108,9 +107,9 @@ protected void createCollectionCallingBuildTwice(String dbName, String collectio
108107
}
109108

110109
@Override
111-
protected int getCollection(String dbName, String collectionName) {
110+
protected long getCollection(String dbName, String collectionName) {
112111
MongoDatabase db = client.getDatabase(dbName);
113-
return Math.toIntExact(db.getCollection(collectionName).estimatedDocumentCount());
112+
return db.getCollection(collectionName).estimatedDocumentCount();
114113
}
115114

116115
@Override
@@ -129,9 +128,9 @@ protected MongoCollection<Document> setupInsert(String dbName, String collection
129128
}
130129

131130
@Override
132-
protected int insert(MongoCollection<Document> collection) {
131+
protected long insert(MongoCollection<Document> collection) {
133132
collection.insertOne(new Document("password", "SECRET"));
134-
return Math.toIntExact(collection.estimatedDocumentCount());
133+
return collection.estimatedDocumentCount();
135134
}
136135

137136
@Override
@@ -152,13 +151,13 @@ protected MongoCollection<Document> setupUpdate(String dbName, String collection
152151
}
153152

154153
@Override
155-
protected int update(MongoCollection<Document> collection) {
154+
protected long update(MongoCollection<Document> collection) {
156155
UpdateResult result =
157156
collection.updateOne(
158157
new BsonDocument("password", new BsonString("OLDPW")),
159158
new BsonDocument("$set", new BsonDocument("password", new BsonString("NEWPW"))));
160159
collection.estimatedDocumentCount();
161-
return Math.toIntExact(result.getModifiedCount());
160+
return result.getModifiedCount();
162161
}
163162

164163
@Override
@@ -179,11 +178,11 @@ protected MongoCollection<Document> setupDelete(String dbName, String collection
179178
}
180179

181180
@Override
182-
protected int delete(MongoCollection<Document> collection) {
181+
protected long delete(MongoCollection<Document> collection) {
183182
DeleteResult result =
184183
collection.deleteOne(new BsonDocument("password", new BsonString("SECRET")));
185184
collection.estimatedDocumentCount();
186-
return Math.toIntExact(result.getDeletedCount());
185+
return result.getDeletedCount();
187186
}
188187

189188
@Override
@@ -229,7 +228,6 @@ protected void error(String dbName, String collectionName) {
229228
}
230229

231230
@Test
232-
@DisplayName("test client failure")
233231
void testClientFailure() {
234232
MongoClient client =
235233
MongoClients.create("mongodb://" + host + ":" + UNUSABLE_PORT + "/?connectTimeoutMS=10");
@@ -241,6 +239,6 @@ void testClientFailure() {
241239
})
242240
.isInstanceOf(MongoTimeoutException.class);
243241
// Unfortunately not caught by our instrumentation.
244-
assertThat(testing().spans().size()).isEqualTo(0);
242+
assertThat(testing().spans()).isEmpty();
245243
}
246244
}

‎instrumentation/mongo/mongo-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/Mongo4ReactiveClientTest.java‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,11 @@ protected InstrumentationExtension testing() {
6262
}
6363

6464
@Override
65-
public void createCollection(String dbName, String collectionName) {
65+
public void createCollection(String dbName, String collectionName) throws InterruptedException {
6666
MongoDatabase db = client.getDatabase(dbName);
6767
CountDownLatch latch = new CountDownLatch(1);
6868
db.createCollection(collectionName).subscribe(toSubscriber(o -> latch.countDown()));
69-
70-
try {
71-
latch.await(30, TimeUnit.SECONDS);
72-
} catch (InterruptedException e) {
73-
throw new RuntimeException(e);
74-
}
69+
latch.await(30, TimeUnit.SECONDS);
7570
}
7671

7772
@Override
@@ -107,14 +102,14 @@ public void createCollectionCallingBuildTwice(String dbName, String collectionNa
107102
}
108103

109104
@Override
110-
public int getCollection(String dbName, String collectionName)
105+
public long getCollection(String dbName, String collectionName)
111106
throws ExecutionException, InterruptedException, TimeoutException {
112107
MongoDatabase db = client.getDatabase(dbName);
113108
CompletableFuture<Long> count = new CompletableFuture<>();
114109
db.getCollection(collectionName)
115110
.estimatedDocumentCount()
116111
.subscribe(toSubscriber(o -> count.complete(((Long) o))));
117-
return Math.toIntExact(count.get(30, TimeUnit.SECONDS));
112+
return count.get(30, TimeUnit.SECONDS);
118113
}
119114

120115
@Override
@@ -137,7 +132,7 @@ public MongoCollection<Document> setupInsert(String dbName, String collectionNam
137132
}
138133

139134
@Override
140-
public int insert(MongoCollection<Document> collection) throws Exception {
135+
public long insert(MongoCollection<Document> collection) throws Exception {
141136
CompletableFuture<Long> count = new CompletableFuture<>();
142137
collection
143138
.insertOne(new Document("password", "SECRET"))
@@ -147,7 +142,7 @@ public int insert(MongoCollection<Document> collection) throws Exception {
147142
collection
148143
.estimatedDocumentCount()
149144
.subscribe(toSubscriber(c -> count.complete(((Long) c))))));
150-
return Math.toIntExact(count.get(30, TimeUnit.SECONDS));
145+
return count.get(30, TimeUnit.SECONDS);
151146
}
152147

153148
@Override
@@ -175,7 +170,7 @@ public MongoCollection<Document> setupUpdate(String dbName, String collectionNam
175170
}
176171

177172
@Override
178-
public int update(MongoCollection<Document> collection) throws Exception {
173+
public long update(MongoCollection<Document> collection) throws Exception {
179174
CompletableFuture<UpdateResult> result = new CompletableFuture<>();
180175
CompletableFuture<Long> count = new CompletableFuture<>();
181176
collection
@@ -190,7 +185,7 @@ public int update(MongoCollection<Document> collection) throws Exception {
190185
.estimatedDocumentCount()
191186
.subscribe(toSubscriber(o -> count.complete(((Long) o))));
192187
}));
193-
return Math.toIntExact(result.get(30, TimeUnit.SECONDS).getModifiedCount());
188+
return result.get(30, TimeUnit.SECONDS).getModifiedCount();
194189
}
195190

196191
@Override
@@ -218,7 +213,7 @@ public MongoCollection<Document> setupDelete(String dbName, String collectionNam
218213
}
219214

220215
@Override
221-
public int delete(MongoCollection<Document> collection)
216+
public long delete(MongoCollection<Document> collection)
222217
throws ExecutionException, InterruptedException, TimeoutException {
223218
CompletableFuture<DeleteResult> result = new CompletableFuture<>();
224219
CompletableFuture<Long> count = new CompletableFuture<>();
@@ -232,7 +227,7 @@ public int delete(MongoCollection<Document> collection)
232227
.estimatedDocumentCount()
233228
.subscribe(toSubscriber(o -> count.complete(((Long) o))));
234229
}));
235-
return Math.toIntExact(result.get(30, TimeUnit.SECONDS).getDeletedCount());
230+
return result.get(30, TimeUnit.SECONDS).getDeletedCount();
236231
}
237232

238233
@Override

‎instrumentation/mongo/mongo-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/MongoClientTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ public void createCollectionCallingBuildTwice(String dbName, String collectionNa
8181
}
8282

8383
@Override
84-
public int getCollection(String dbName, String collectionName) {
84+
public long getCollection(String dbName, String collectionName) {
8585
MongoDatabase db = client.getDatabase(dbName);
86-
return Math.toIntExact(db.getCollection(collectionName).estimatedDocumentCount());
86+
return db.getCollection(collectionName).estimatedDocumentCount();
8787
}
8888

8989
@Override
@@ -102,9 +102,9 @@ public MongoCollection<Document> setupInsert(String dbName, String collectionNam
102102
}
103103

104104
@Override
105-
public int insert(MongoCollection<Document> collection) {
105+
public long insert(MongoCollection<Document> collection) {
106106
collection.insertOne(new Document("password", "SECRET"));
107-
return Math.toIntExact(collection.estimatedDocumentCount());
107+
return collection.estimatedDocumentCount();
108108
}
109109

110110
@Override
@@ -125,13 +125,13 @@ public MongoCollection<Document> setupUpdate(String dbName, String collectionNam
125125
}
126126

127127
@Override
128-
public int update(MongoCollection<Document> collection) {
128+
public long update(MongoCollection<Document> collection) {
129129
UpdateResult result =
130130
collection.updateOne(
131131
new BsonDocument("password", new BsonString("OLDPW")),
132132
new BsonDocument("$set", new BsonDocument("password", new BsonString("NEWPW"))));
133133
collection.estimatedDocumentCount();
134-
return Math.toIntExact(result.getModifiedCount());
134+
return result.getModifiedCount();
135135
}
136136

137137
@Override
@@ -152,11 +152,11 @@ public MongoCollection<Document> setupDelete(String dbName, String collectionNam
152152
}
153153

154154
@Override
155-
public int delete(MongoCollection<Document> collection) {
155+
public long delete(MongoCollection<Document> collection) {
156156
DeleteResult result =
157157
collection.deleteOne(new BsonDocument("password", new BsonString("SECRET")));
158158
collection.estimatedDocumentCount();
159-
return Math.toIntExact(result.getDeletedCount());
159+
return result.getDeletedCount();
160160
}
161161

162162
@Override

0 commit comments

Comments
 (0)