Skip to content

Commit 205b403

Browse files
Fixed aerospike tests to run under arm64.
1 parent 620358a commit 205b403

3 files changed

Lines changed: 12 additions & 20 deletions

File tree

dd-java-agent/instrumentation/aerospike-4.0/src/test/groovy/datadog/trace/instrumentation/aerospike4/AerospikeAsyncClientTest.groovy

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package datadog.trace.instrumentation.aerospike4
22

3+
import static org.junit.jupiter.api.Assertions.fail
4+
35
import com.aerospike.client.AerospikeClient
46
import com.aerospike.client.AerospikeException
57
import com.aerospike.client.Bin
@@ -9,27 +11,23 @@ import com.aerospike.client.async.NioEventLoops
911
import com.aerospike.client.listener.WriteListener
1012
import com.aerospike.client.policy.ClientPolicy
1113
import datadog.trace.api.Config
12-
import spock.lang.Shared
13-
14-
import static org.junit.jupiter.api.Assertions.fail
1514

1615
abstract class AerospikeAsyncClientTest extends AerospikeBaseTest {
17-
18-
@Shared
19-
AerospikeClient client
20-
21-
@Shared
22-
EventLoops eventLoops = new NioEventLoops(1)
16+
private AerospikeClient client
17+
private EventLoops eventLoops
2318

2419
def setup() throws Exception {
20+
eventLoops = new NioEventLoops(1)
21+
2522
ClientPolicy clientPolicy = new ClientPolicy()
2623
clientPolicy.eventLoops = eventLoops
24+
2725
client = new AerospikeClient(clientPolicy, aerospikeHost, aerospikePort)
2826
}
2927

3028
def cleanup() throws Exception {
31-
client.close()
32-
eventLoops.close()
29+
client?.close()
30+
eventLoops?.close()
3331
}
3432

3533
def "test put then get"() {
@@ -95,4 +93,3 @@ class AerospikeAsyncClientV1ForkedTest extends AerospikeAsyncClientTest {
9593
return "aerospike.query"
9694
}
9795
}
98-

dd-java-agent/instrumentation/aerospike-4.0/src/test/groovy/datadog/trace/instrumentation/aerospike4/AerospikeBaseTest.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ abstract class AerospikeBaseTest extends VersionedNamingTestBase {
4242
}
4343

4444
def cleanup() throws Exception {
45-
if (aerospike) {
46-
aerospike.stop()
47-
}
45+
aerospike?.stop()
4846
}
4947

5048
def aerospikeSpan(TraceAssert trace, int index, String methodName, Object parentSpan = null) {

dd-java-agent/instrumentation/aerospike-4.0/src/test/groovy/datadog/trace/instrumentation/aerospike4/AerospikeClientTest.groovy

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@ import com.aerospike.client.AerospikeClient
44
import com.aerospike.client.Bin
55
import com.aerospike.client.Key
66
import datadog.trace.api.Config
7-
import spock.lang.Shared
87

98
abstract class AerospikeClientTest extends AerospikeBaseTest {
10-
11-
@Shared
12-
AerospikeClient client
9+
private AerospikeClient client
1310

1411
def setup() throws Exception {
1512
client = new AerospikeClient(aerospikeHost, aerospikePort)
1613
}
1714

1815
def cleanup() throws Exception {
19-
client.close()
16+
client?.close()
2017
}
2118

2219
def "test put then get"() {

0 commit comments

Comments
 (0)