Skip to content

Commit 6ab19f9

Browse files
committed
make V0 a noop
1 parent fbafc0d commit 6ab19f9

File tree

1 file changed

+26
-0
lines changed

1 file changed

+26
-0
lines changed

dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/test/groovy/CouchbaseClient31Test.groovy

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,19 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
4040
Bucket bucket
4141
@Shared
4242
double durationSeconds
43+
@Shared
44+
boolean shouldRunTests = true
4345

4446
def setupSpec() {
47+
LOGGER.info("${this.getClass().getSimpleName()} starting at ${new Date()}")
48+
49+
// Skip setup for V0Test to isolate timing issues
50+
if (this.getClass().getSimpleName() == "CouchbaseClient31V0Test") {
51+
LOGGER.info("Skipping setup for ${this.getClass().getSimpleName()} - NOOP test")
52+
shouldRunTests = false
53+
return
54+
}
55+
4556
def arch = System.getProperty("os.arch") == "aarch64" ? "-aarch64" : ""
4657

4758
long startTime = System.nanoTime()
@@ -96,6 +107,8 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
96107
}
97108

98109
def "check basic spans"() {
110+
if (!shouldRunTests) {return}
111+
99112
setup:
100113
def collection = bucket.defaultCollection()
101114

@@ -122,6 +135,8 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
122135
}
123136

124137
def "check basic error spans with internal spans enabled #internalEnabled"() {
138+
if (!shouldRunTests) {return}
139+
125140
setup:
126141
injectSysConfig("trace.couchbase.internal-spans.enabled", "$internalEnabled")
127142
def collection = bucket.defaultCollection()
@@ -158,6 +173,8 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
158173
}
159174

160175
def "check query spans"() {
176+
if (!shouldRunTests) {return}
177+
161178
when:
162179
// These queries always use the underlying async queries
163180
cluster.query('select * from `test-bucket` limit 1')
@@ -176,6 +193,8 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
176193
}
177194

178195
def "check query spans with parent"() {
196+
if (!shouldRunTests) {return}
197+
179198
setup:
180199
def query = 'select * from `test-bucket` limit 1'
181200
def normalizedQuery = 'select * from `test-bucket` limit ?'
@@ -201,6 +220,9 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
201220
}
202221

203222
def "check query spans with parent and adhoc #adhoc"() {
223+
if (!shouldRunTests) {return}
224+
225+
setup:
204226
def query = 'select count(1) from `test-bucket` where (`something` = "else") limit 1'
205227
def normalizedQuery = 'select count(?) from `test-bucket` where (`something` = "else") limit ?'
206228
int count = 0
@@ -240,6 +262,8 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
240262
}
241263

242264
def "check multiple query spans with parent and adhoc false and internal spans enabled = #internalEnabled"() {
265+
if (!shouldRunTests) {return}
266+
243267
setup:
244268
injectSysConfig("trace.couchbase.internal-spans.enabled", "$internalEnabled")
245269
def query = "select count(1) from `test-bucket` where (`something` = \"$queryArg\") limit 1"
@@ -300,6 +324,8 @@ abstract class CouchbaseClient31Test extends VersionedNamingTestBase {
300324
}
301325

302326
def "check error query spans with parent"() {
327+
if (!shouldRunTests) {return}
328+
303329
setup:
304330
def query = 'select * from `test-bucket` limeit 1'
305331
def normalizedQuery = 'select * from `test-bucket` limeit ?'

0 commit comments

Comments
 (0)