Skip to content

Commit 43efec0

Browse files
authored
Javadoc, scalatest and checkstyle fixes
Suppress OutputBuffer deprecation warning Fix javadoc Move tracing tests to the appropriate package Add SpanTree to scala test exclusions list
1 parent 459836c commit 43efec0

File tree

8 files changed

+17
-9
lines changed

8 files changed

+17
-9
lines changed

bson/src/main/org/bson/io/BasicOutputBuffer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public void writeInt32(final int value) {
8888
}
8989

9090
@Override
91+
@SuppressWarnings("deprecation")
9192
public void writeInt32(final int position, final int value) {
9293
ensureOpen();
9394
checkPosition(position, 4);

driver-core/src/main/com/mongodb/internal/connection/ByteBufferBsonOutput.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ public void writeInt32(final int value) {
100100

101101

102102
@Override
103+
@SuppressWarnings("deprecation")
103104
public void writeInt32(final int absolutePosition, final int value) {
104105
ensureOpen();
105106

driver-core/src/main/com/mongodb/observability/MicrometerObservabilitySettings.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,20 @@
4444
@Immutable
4545
public final class MicrometerObservabilitySettings extends ObservabilitySettings {
4646

47+
/**
48+
* If set, this will enable/disable tracing even when an observationRegistry has been passed
49+
* <p>
50+
* For internal use only
51+
*/
4752
@Internal
48-
// If set, this will enable/disable tracing even when an observationRegistry has been passed.
4953
public static final String ENV_OBSERVABILITY_ENABLED = "OBSERVABILITY_MONGODB_ENABLED";
54+
55+
/**
56+
* If set, this will truncate the command payload captured in the tracing span to the specified length.
57+
* <p>
58+
* For internal use only
59+
*/
5060
@Internal
51-
// If set, this will truncate the command payload captured in the tracing span to the specified length.
5261
public static final String ENV_OBSERVABILITY_QUERY_TEXT_MAX_LENGTH = "OBSERVABILITY_MONGODB_QUERY_TEXT_MAX_LENGTH";
5362
@Nullable
5463
private final ObservationRegistry observationRegistry;

driver-scala/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ class ApiAliasAndCompanionSpec extends BaseSpec {
7474
"SessionContext",
7575
"SingleResultCallback",
7676
"Slow",
77+
"SpanTree",
7778
"SubjectProvider",
7879
"TransactionExample",
7980
"UnixServerAddress",

driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.mongodb.client.gridfs.GridFSBucket;
2929
import com.mongodb.client.model.Filters;
3030
import com.mongodb.client.test.CollectionHelper;
31-
import com.mongodb.client.tracing.SpanTree;
31+
import com.mongodb.observability.SpanTree;
3232
import com.mongodb.client.unified.UnifiedTestModifications.TestDef;
3333
import com.mongodb.client.vault.ClientEncryption;
3434
import com.mongodb.connection.ClusterDescription;

driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727

2828
import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
2929
import static com.mongodb.ClusterFixture.isSharded;
30-
import static com.mongodb.ClusterFixture.isStandalone;
31-
import static com.mongodb.ClusterFixture.isUnixSocket;
3230
import static com.mongodb.ClusterFixture.serverVersionLessThan;
3331
import static com.mongodb.assertions.Assertions.assertNotNull;
3432
import static com.mongodb.assertions.Assertions.assertTrue;

driver-sync/src/test/functional/com/mongodb/client/tracing/MicrometerProseTest.java renamed to driver-sync/src/test/functional/com/mongodb/observability/MicrometerProseTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.mongodb.client.tracing;
17+
package com.mongodb.observability;
1818

1919
import com.mongodb.MongoClientSettings;
2020
import com.mongodb.client.Fixture;
2121
import com.mongodb.client.MongoClient;
2222
import com.mongodb.client.MongoClients;
2323
import com.mongodb.client.MongoCollection;
2424
import com.mongodb.client.MongoDatabase;
25-
import com.mongodb.observability.MicrometerObservabilitySettings;
26-
import com.mongodb.observability.ObservabilitySettings;
2725
import io.micrometer.observation.ObservationRegistry;
2826
import io.micrometer.tracing.test.reporter.inmemory.InMemoryOtelSetup;
2927
import org.bson.Document;

driver-sync/src/test/functional/com/mongodb/client/tracing/SpanTree.java renamed to driver-sync/src/test/functional/com/mongodb/observability/SpanTree.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.mongodb.client.tracing;
17+
package com.mongodb.observability;
1818

1919
import com.mongodb.lang.Nullable;
2020
import io.micrometer.tracing.exporter.FinishedSpan;

0 commit comments

Comments
 (0)