Skip to content

Commit df4602c

Browse files
Fixed :dd-smoke-tests:gradle module tests.
1 parent f3152e3 commit df4602c

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ build_tests:
289289
CACHE_TYPE: "latestdep"
290290
- GRADLE_TARGET: ":smokeTest"
291291
CACHE_TYPE: "smoke"
292-
MAVEN_OPTS: "-Xms64M -Xmx512M"
292+
MAVEN_OPTS: "-Xms256M -Xmx1024M"
293293

294294
script:
295295
- *gitlab_base_ref_params

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/server/http/TestHttpServer.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext
66
import datadog.trace.bootstrap.instrumentation.api.Tags
77
import datadog.trace.core.DDSpan
88
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
9+
import groovy.transform.CompileStatic
910
import org.eclipse.jetty.http.HttpMethod
1011
import org.eclipse.jetty.http.HttpVersion
1112
import org.eclipse.jetty.server.Handler
@@ -316,6 +317,7 @@ class TestHttpServer implements AutoCloseable {
316317
this.prefix = prefix.startsWith("/") ? prefix : "/" + prefix
317318
}
318319

320+
@CompileStatic // Workaround to avoid `groovy.lang.MissingMethodException`.
319321
@Override
320322
void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
321323
if (target.startsWith(prefix)) {

dd-smoke-tests/gradle/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply from: "$rootDir/gradle/java.gradle"
66
description = 'Gradle Daemon Instrumentation Smoke Tests.'
77

88
dependencies {
9-
testImplementation 'org.codehaus.groovy:groovy-all:3.0.24'
9+
testImplementation 'org.codehaus.groovy:groovy:3.0.24'
1010
testImplementation 'org.spockframework:spock-core:2.4-M6-groovy-3.0'
1111
testImplementation 'org.objenesis:objenesis:3.3'
1212

@@ -34,4 +34,3 @@ tasks.named("test", Test) {
3434
environment "MAVEN_REPOSITORY_PROXY", project.property("mavenRepositoryProxy")
3535
}
3636
}
37-

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ include(
167167
":dd-smoke-tests:custom-systemloader",
168168
":dd-smoke-tests:dynamic-config",
169169
":dd-smoke-tests:field-injection",
170-
// ":dd-smoke-tests:gradle", This module needs Groovy 3.
170+
":dd-smoke-tests:gradle",
171171
":dd-smoke-tests:grpc-1.5",
172172
":dd-smoke-tests:java9-modules",
173173
":dd-smoke-tests:jersey-2",

0 commit comments

Comments
 (0)