Skip to content

Commit 19c0b21

Browse files
committed
Remove useless tests from Glassfish 4 instrumentation
1 parent 37b734d commit 19c0b21

5 files changed

Lines changed: 5 additions & 71 deletions

File tree

dd-java-agent/instrumentation/glassfish-4.1/src/test/groovy/datadog/trace/instrumentation/glassfish4/GlassfishInstrumentationTest.groovy

Lines changed: 0 additions & 33 deletions
This file was deleted.

dd-java-agent/instrumentation/glassfish-4.1/src/test/java/com/sun/enterprise/v3/server/APIClassLoaderServiceImpl.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

dd-java-agent/instrumentation/glassfish-4.1/glassfish-4.1.gradle renamed to dd-java-agent/instrumentation/glassfish-4/glassfish-4.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ muzzle {
66
pass {
77
group = 'org.glassfish.main.extras'
88
module = 'glassfish-embedded-all'
9-
versions = "[4.1,4.1.2)"
9+
versions = "[4.0,4.1.2)"
10+
assertInverse = true
1011
}
1112
}
1213

@@ -28,7 +29,7 @@ dependencies {
2829
implementation deps.autoservice
2930

3031
testCompile project(':dd-java-agent:testing')
31-
// testCompile group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '4.1.2'
32+
testCompile group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '4.1.2'
3233

3334
latestDepTestCompile sourceSets.test.output
3435
}

dd-java-agent/instrumentation/glassfish-4.1/src/main/java/datadog/trace/instrumentation/glassfish4/GlassfishInstrumentation.java renamed to dd-java-agent/instrumentation/glassfish-4/src/main/java/datadog/trace/instrumentation/glassfish4/GlassfishInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public final class GlassfishInstrumentation extends Instrumenter.Default {
3030

3131
public GlassfishInstrumentation() {
32-
super("cassandra");
32+
super("glassfish");
3333
}
3434

3535
@Override

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ include ':dd-java-agent:instrumentation:elasticsearch:transport-2'
4040
include ':dd-java-agent:instrumentation:elasticsearch:transport-5'
4141
include ':dd-java-agent:instrumentation:elasticsearch:transport-5.3'
4242
include ':dd-java-agent:instrumentation:elasticsearch:transport-6'
43-
include ':dd-java-agent:instrumentation:glassfish-4.1'
43+
include ':dd-java-agent:instrumentation:glassfish-4'
4444
include ':dd-java-agent:instrumentation:grpc-1.5'
4545
include ':dd-java-agent:instrumentation:hibernate'
4646
include ':dd-java-agent:instrumentation:hibernate:core-3.3'

0 commit comments

Comments
 (0)