Skip to content

Commit 6ca9c9a

Browse files
amarzialiamarziali
committed
move sslsocket to java-net
1 parent d27fb81 commit 6ca9c9a

File tree

9 files changed

+20
-154
lines changed

9 files changed

+20
-154
lines changed

‎dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,11 @@ addTestSuiteForDir('latestDepTest', 'test')
1212
dependencies {
1313
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
1414
}
15+
16+
// IBM8 is having troubles with TLS set up by jetty 9.4.
17+
// As a temporary workaround we used a lower jetty version for ssl socket tests
18+
configurations.configureEach {
19+
resolutionStrategy {
20+
force group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.30.v20200428'
21+
}
22+
}

‎dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,17 @@ org.codehaus.groovy:groovy-ant:3.0.23=codenarc
6969
org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc
7070
org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc
7171
org.codehaus.groovy:groovy-json:3.0.23=codenarc
72-
org.codehaus.groovy:groovy-json:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
72+
org.codehaus.groovy:groovy-json:3.0.25=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
7373
org.codehaus.groovy:groovy-templates:3.0.23=codenarc
7474
org.codehaus.groovy:groovy-xml:3.0.23=codenarc
7575
org.codehaus.groovy:groovy:3.0.23=codenarc
7676
org.codehaus.groovy:groovy:3.0.25=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
7777
org.codenarc:CodeNarc:3.7.0=codenarc
7878
org.dom4j:dom4j:2.2.0=spotbugs
79-
org.eclipse.jetty:jetty-http:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
80-
org.eclipse.jetty:jetty-io:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
81-
org.eclipse.jetty:jetty-server:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
82-
org.eclipse.jetty:jetty-util:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
79+
org.eclipse.jetty:jetty-http:9.2.30.v20200428=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
80+
org.eclipse.jetty:jetty-io:9.2.30.v20200428=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
81+
org.eclipse.jetty:jetty-server:9.2.30.v20200428=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
82+
org.eclipse.jetty:jetty-util:9.2.30.v20200428=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8383
org.gmetrics:GMetrics:2.1.0=codenarc
8484
org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspath
8585
org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

dd-java-agent/instrumentation/sslsocket/src/main/java/datadog/trace/instrumentation/sslsocket/SocketConnectInstrumentation.java renamed to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/SocketConnectInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.instrumentation.sslsocket;
1+
package datadog.trace.instrumentation.java.net;
22

33
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
44
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED;

dd-java-agent/instrumentation/sslsocket/src/main/java/datadog/trace/instrumentation/sslsocket/SslSocketInstrumentation.java renamed to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/SslSocketInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.instrumentation.sslsocket;
1+
package datadog.trace.instrumentation.java.net;
22

33
import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.concreteClass;
44
import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.extendsClass;

dd-java-agent/instrumentation/sslsocket/src/test/groovy/SocketForkedTest.groovy renamed to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/SocketForkedTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import datadog.trace.agent.test.InstrumentationSpecification
2-
31
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
42

3+
import datadog.trace.agent.test.InstrumentationSpecification
4+
55
class SocketForkedTest extends InstrumentationSpecification {
66

77
@Override

dd-java-agent/instrumentation/sslsocket/src/test/groovy/SslSocketTest.groovy renamed to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/SslSocketTest.groovy

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
package test
1+
import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
22

33
import datadog.trace.agent.test.InstrumentationSpecification
44
import datadog.trace.bootstrap.instrumentation.usm.UsmExtractor
55
import datadog.trace.bootstrap.instrumentation.usm.UsmMessageFactory
6+
import java.lang.reflect.Field
7+
import javax.net.ssl.HttpsURLConnection
68
import spock.lang.AutoCleanup
79
import spock.lang.Shared
810

9-
import javax.net.ssl.HttpsURLConnection
10-
import java.lang.reflect.Field
11-
12-
import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
13-
1411
class SslSocketTest extends InstrumentationSpecification {
1512
@AutoCleanup
1613
@Shared

‎dd-java-agent/instrumentation/sslsocket/build.gradle‎

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

‎dd-java-agent/instrumentation/sslsocket/gradle.lockfile‎

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

‎settings.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,6 @@ include(
572572
":dd-java-agent:instrumentation:spring:spring-webmvc:spring-webmvc-6.0",
573573
":dd-java-agent:instrumentation:spring:spring-ws-2.0",
574574
":dd-java-agent:instrumentation:spymemcached-2.10",
575-
":dd-java-agent:instrumentation:sslsocket",
576575
":dd-java-agent:instrumentation:synapse-3.0",
577576
":dd-java-agent:instrumentation:testng:testng-6",
578577
":dd-java-agent:instrumentation:testng:testng-7",

0 commit comments

Comments
 (0)