Skip to content

Update Mongo instance name and remove memcache instance name #880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tylerbenson merged 6 commits into from
Jun 13, 2019
Merged

Update Mongo instance name and remove memcache instance name #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d6719ed
Replace Mongo tests with updated tests.
tylerbenson Jun 11, 2019
d26edd6
Ensure gradle runs base mongo test first
tylerbenson Jun 12, 2019
2530544
Set minimum version and fix var name.
tylerbenson Jun 13, 2019
75b626a
fix tests
tylerbenson Jun 13, 2019
3be6868
Update Mongo instance name and remove memcache instance name
tylerbenson Jun 13, 2019
7e2f85d
Fix latest test
tylerbenson Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions dd-java-agent/dd-java-agent.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,6 @@ dependencies {
testCompile deps.opentracingMock
testCompile deps.testLogging
testCompile deps.guava
testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0'

testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2'
testCompile group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2'
// run embedded mongodb for integration testing
testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'
}

tasks.withType(Test).configureEach {
Expand Down
45 changes: 0 additions & 45 deletions dd-java-agent/instrumentation/mongo-3.1/src/test/groovy/MongoClientDecoratorTest.groovy
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions ...3.1/src/test/java/datadog/trace/instrumentation/mongo/MongoClientInstrumentationTest.java
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions ...nstrumentation/mongo-3.1/mongo-3.1.gradle → ...tation/mongo/driver-3.1/driver-3.1.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ dependencies {
implementation deps.autoservice

testCompile project(':dd-java-agent:testing')

testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
testCompile project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output
testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'

testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
latestDepTestCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '+'
Expand Down
34 changes: 22 additions & 12 deletions ...mentation/mongo/MongoClientDecorator.java → ...mentation/mongo/MongoClientDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package datadog.trace.instrumentation.mongo;

import com.mongodb.connection.ClusterId;
import com.mongodb.connection.ConnectionDescription;
import com.mongodb.connection.ConnectionId;
import com.mongodb.connection.ServerId;
import com.mongodb.event.CommandStartedEvent;
import datadog.trace.agent.decorator.DatabaseClientDecorator;
import datadog.trace.api.DDSpanTypes;
Expand Down Expand Up @@ -48,19 +52,25 @@ protected String dbUser(final CommandStartedEvent event) {

@Override
protected String dbInstance(final CommandStartedEvent event) {
// Use description if set.
final ConnectionDescription connectionDescription = event.getConnectionDescription();
if (connectionDescription != null) {
final ConnectionId connectionId = connectionDescription.getConnectionId();
if (connectionId != null) {
final ServerId serverId = connectionId.getServerId();
if (serverId != null) {
ClusterId clusterId = serverId.getClusterId();
if (clusterId != null) {
String description = clusterId.getDescription();
if (description != null) {
return description;
}
}
}
}
}
// Fallback to db name.
return event.getDatabaseName();
// This would be the "proper" db.instance:
// final ConnectionDescription connectionDescription = event.getConnectionDescription();
// if (connectionDescription != null) {
// final ConnectionId connectionId = connectionDescription.getConnectionId();
// if (connectionId != null) {
// final ServerId serverId = connectionId.getServerId();
// if (serverId != null) {
// return serverId.toString();
// }
// }
// }
// return null;
}

public Span onStatement(final Span span, final BsonDocument statement) {
Expand Down
0 ...ion/mongo/MongoClientInstrumentation.java → ...ion/mongo/MongoClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ntation/mongo/TracingCommandListener.java → ...ntation/mongo/TracingCommandListener.java
View file
Open in desktop
File renamed without changes.
Loading