Skip to content

Commit bbcd2f6

Browse files
tylerbensontylerbenson
committed
Move other Utils to utils package
1 parent 878bab3 commit bbcd2f6

59 files changed

Lines changed: 219 additions & 263 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dd-java-agent/instrumentation/akka-http-10.0/src/test/scala/AkkaHttpTestWebServer.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import akka.http.scaladsl.Http.ServerBinding
44
import akka.http.scaladsl.model.HttpMethods.GET
55
import akka.http.scaladsl.model._
66
import akka.stream.ActorMaterializer
7-
import datadog.trace.agent.test.TestUtils
7+
import datadog.trace.agent.test.utils.PortUtils
88
import datadog.trace.api.Trace
99

1010
import scala.concurrent.{Await, Future}
1111

1212
object AkkaHttpTestAsyncWebServer {
13-
val port = TestUtils.randomOpenPort()
13+
val port = PortUtils.randomOpenPort()
1414
implicit val system = ActorSystem("my-system")
1515
implicit val materializer = ActorMaterializer()
1616
// needed for the future flatMap/onComplete in the end
@@ -60,7 +60,7 @@ object AkkaHttpTestAsyncWebServer {
6060
}
6161

6262
object AkkaHttpTestSyncWebServer {
63-
val port = TestUtils.randomOpenPort()
63+
val port = PortUtils.randomOpenPort()
6464
implicit val system = ActorSystem("my-system")
6565
implicit val materializer = ActorMaterializer()
6666
// needed for the future flatMap/onComplete in the end

‎dd-java-agent/instrumentation/couchbase-2.0/src/test/groovy/util/AbstractCouchbaseTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import com.couchbase.mock.BucketConfiguration
1515
import com.couchbase.mock.CouchbaseMock
1616
import com.couchbase.mock.http.query.QueryServer
1717
import datadog.trace.agent.test.AgentTestRunner
18-
import datadog.trace.agent.test.TestUtils
18+
import datadog.trace.agent.test.utils.PortUtils
1919
import spock.lang.Shared
2020

2121
import java.util.concurrent.RejectedExecutionException
@@ -27,7 +27,7 @@ abstract class AbstractCouchbaseTest extends AgentTestRunner {
2727
private static final PASSWORD = "password"
2828

2929
@Shared
30-
private int port = TestUtils.randomOpenPort()
30+
private int port = PortUtils.randomOpenPort()
3131

3232
@Shared
3333
private String testBucketName = this.getClass().simpleName

‎dd-java-agent/instrumentation/elasticsearch-rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
22
import datadog.trace.agent.test.AgentTestRunner
3-
import datadog.trace.agent.test.TestUtils
3+
import datadog.trace.agent.test.utils.PortUtils
44
import datadog.trace.api.DDSpanTypes
55
import datadog.trace.api.DDTags
66
import groovy.json.JsonSlurper
@@ -33,8 +33,8 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
3333
RestClient client
3434

3535
def setupSpec() {
36-
httpPort = TestUtils.randomOpenPort()
37-
tcpPort = TestUtils.randomOpenPort()
36+
httpPort = PortUtils.randomOpenPort()
37+
tcpPort = PortUtils.randomOpenPort()
3838

3939
esWorkingDir = File.createTempDir("test-es-working-dir-", "")
4040
esWorkingDir.deleteOnExit()

‎dd-java-agent/instrumentation/elasticsearch-rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
22
import datadog.trace.agent.test.AgentTestRunner
3-
import datadog.trace.agent.test.TestUtils
3+
import datadog.trace.agent.test.utils.PortUtils
44
import datadog.trace.api.DDSpanTypes
55
import datadog.trace.api.DDTags
66
import groovy.json.JsonSlurper
@@ -36,8 +36,8 @@ class Elasticsearch5RestClientTest extends AgentTestRunner {
3636
static RestClient client
3737

3838
def setupSpec() {
39-
httpPort = TestUtils.randomOpenPort()
40-
tcpPort = TestUtils.randomOpenPort()
39+
httpPort = PortUtils.randomOpenPort()
40+
tcpPort = PortUtils.randomOpenPort()
4141

4242
esWorkingDir = File.createTempDir("test-es-working-dir-", "")
4343
esWorkingDir.deleteOnExit()

‎dd-java-agent/instrumentation/elasticsearch-rest-6.4/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
22
import datadog.trace.agent.test.AgentTestRunner
3-
import datadog.trace.agent.test.TestUtils
3+
import datadog.trace.agent.test.utils.PortUtils
44
import datadog.trace.api.DDSpanTypes
55
import datadog.trace.api.DDTags
66
import groovy.json.JsonSlurper
@@ -36,8 +36,8 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
3636
RestClient client
3737

3838
def setupSpec() {
39-
httpPort = TestUtils.randomOpenPort()
40-
tcpPort = TestUtils.randomOpenPort()
39+
httpPort = PortUtils.randomOpenPort()
40+
tcpPort = PortUtils.randomOpenPort()
4141

4242
esWorkingDir = File.createTempDir("test-es-working-dir-", "")
4343
esWorkingDir.deleteOnExit()

‎dd-java-agent/instrumentation/elasticsearch-rest-6.4/src/test/groovy/Elasticsearch6RestClientTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
22
import datadog.trace.agent.test.AgentTestRunner
3-
import datadog.trace.agent.test.TestUtils
3+
import datadog.trace.agent.test.utils.PortUtils
44
import datadog.trace.api.DDSpanTypes
55
import datadog.trace.api.DDTags
66
import groovy.json.JsonSlurper
@@ -33,8 +33,8 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
3333
RestClient client
3434

3535
def setupSpec() {
36-
httpPort = TestUtils.randomOpenPort()
37-
tcpPort = TestUtils.randomOpenPort()
36+
httpPort = PortUtils.randomOpenPort()
37+
tcpPort = PortUtils.randomOpenPort()
3838

3939
esWorkingDir = File.createTempDir("test-es-working-dir-", "")
4040
esWorkingDir.deleteOnExit()

‎dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
22
import datadog.trace.agent.test.AgentTestRunner
3-
import datadog.trace.agent.test.TestUtils
3+
import datadog.trace.agent.test.utils.PortUtils
44
import datadog.trace.api.DDSpanTypes
55
import datadog.trace.api.DDTags
66
import io.opentracing.tag.Tags
@@ -12,7 +12,7 @@ import org.elasticsearch.node.Node
1212
import org.elasticsearch.node.NodeBuilder
1313
import spock.lang.Shared
1414

15-
import static datadog.trace.agent.test.TestUtils.runUnderTrace
15+
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
1616

1717
@RetryOnFailure(times = 3, delaySeconds = 1)
1818
class Elasticsearch2NodeClientTest extends AgentTestRunner {
@@ -30,8 +30,8 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
3030
def client = testNode.client()
3131

3232
def setupSpec() {
33-
httpPort = TestUtils.randomOpenPort()
34-
tcpPort = TestUtils.randomOpenPort()
33+
httpPort = PortUtils.randomOpenPort()
34+
tcpPort = PortUtils.randomOpenPort()
3535

3636
esWorkingDir = File.createTempDir("test-es-working-dir-", "")
3737
esWorkingDir.deleteOnExit()

‎dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
22
import datadog.trace.agent.test.AgentTestRunner
3-
import datadog.trace.agent.test.TestUtils
3+
import datadog.trace.agent.test.utils.PortUtils
44
import datadog.trace.api.DDSpanTypes
55
import datadog.trace.api.DDTags
66
import io.opentracing.tag.Tags
@@ -15,7 +15,7 @@ import org.elasticsearch.node.NodeBuilder
1515
import org.elasticsearch.transport.RemoteTransportException
1616
import spock.lang.Shared
1717

18-
import static datadog.trace.agent.test.TestUtils.runUnderTrace
18+
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
1919

2020
@RetryOnFailure(times = 3, delaySeconds = 1)
2121
class Elasticsearch2TransportClientTest extends AgentTestRunner {
@@ -34,8 +34,8 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
3434
TransportClient client
3535

3636
def setupSpec() {
37-
httpPort = TestUtils.randomOpenPort()
38-
tcpPort = TestUtils.randomOpenPort()
37+
httpPort = PortUtils.randomOpenPort()
38+
tcpPort = PortUtils.randomOpenPort()
3939

4040
esWorkingDir = File.createTempDir("test-es-working-dir-", "")
4141
esWorkingDir.deleteOnExit()

‎dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.springframework.context.ApplicationContext
99
import org.springframework.context.annotation.AnnotationConfigApplicationContext
1010
import spock.lang.Shared
1111

12-
import static datadog.trace.agent.test.TestUtils.runUnderTrace
12+
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
1313

1414
@RetryOnFailure(times = 3, delaySeconds = 1)
1515
class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {

‎dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package springdata
22

33
import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
44
import datadog.trace.agent.test.AgentTestRunner
5-
import datadog.trace.agent.test.TestUtils
5+
import datadog.trace.agent.test.utils.PortUtils
66
import datadog.trace.api.DDSpanTypes
77
import datadog.trace.api.DDTags
88
import io.opentracing.tag.Tags
@@ -40,8 +40,8 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
4040
ElasticsearchTemplate template
4141

4242
def setupSpec() {
43-
httpPort = TestUtils.randomOpenPort()
44-
tcpPort = TestUtils.randomOpenPort()
43+
httpPort = PortUtils.randomOpenPort()
44+
tcpPort = PortUtils.randomOpenPort()
4545

4646
esWorkingDir = File.createTempDir("test-es-working-dir-", "")
4747
esWorkingDir.deleteOnExit()

0 commit comments

Comments
 (0)