Skip to content

Commit 9757902

Browse files
luhenryluhenry
authored
Revert "Some gradle cleanup in preparation for 7.x" (DataDog#3347)
1 parent bfe2c19 commit 9757902

26 files changed

Lines changed: 165 additions & 214 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ jobs:
322322
command: >-
323323
MAVEN_OPTS="-Xms64M -Xmx512M"
324324
GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1750M -Xms512M -XX:ErrorFile=/tmp/hs_err_pid%p.log' -Ddatadog.forkedMaxHeapSize=512M -Ddatadog.forkedMinHeapSize=128M"
325-
./gradlew stageMainDist :dd-smoke-test:<<# parameters.prefixTestTask>>testJava<</ parameters.prefixTestTask>><< parameters.testTask >>
325+
./gradlew stagePlayBinaryDist :dd-smoke-test:<<# parameters.prefixTestTask>>testJava<</ parameters.prefixTestTask>><< parameters.testTask >>
326326
<< pipeline.parameters.gradle_flags >>
327327
--max-workers=2
328328
--continue

‎dd-cws-tls/dd-cws-tls.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ sourceCompatibility = JavaVersion.VERSION_1_8
1010
targetCompatibility = JavaVersion.VERSION_1_8
1111

1212
dependencies {
13-
implementation group: 'net.java.dev.jna', name: 'jna', version: '5.8.0'
14-
implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.8.0'
13+
compile group: 'net.java.dev.jna', name: 'jna', version: '5.8.0'
14+
compile group: 'net.java.dev.jna', name: 'jna-platform', version: '5.8.0'
1515

1616
implementation project(':internal-api')
1717
implementation project(':dd-trace-api')

‎dd-java-agent/agent-profiling/profiling-auxiliary/profiling-auxiliary.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616

1717
testImplementation deps.junit5
1818
testImplementation deps.mockito
19-
testImplementation deps.autoserviceAnnotation
19+
testCompile deps.autoserviceAnnotation
2020
testAnnotationProcessor deps.autoserviceProcessor
2121
}
2222

‎dd-java-agent/agent-tooling/agent-tooling.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ compileMain_java11Java.doFirst {
4343
dependencies {
4444
main_java11CompileOnly deps.bytebuddy
4545
main_java11CompileOnly sourceSets.main.output
46-
runtimeOnly sourceSets.main_java11.output
46+
runtime sourceSets.main_java11.output
4747
}
4848
jar {
4949
from sourceSets.main_java11.output

‎dd-java-agent/appsec/weblog/weblog-spring-app/weblog-spring-app.gradle‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath 'org.springframework.boot:spring-boot-gradle-plugin:1.5.22.RELEASE'
6+
classpath 'org.springframework.boot:spring-boot-gradle-plugin:1.5.9.RELEASE'
77
}
88
}
99

@@ -38,10 +38,12 @@ if (project.hasProperty('testExecutable') && project.testExecutable) {
3838
}
3939
}
4040

41-
ext['jetty.version'] = '9.4.44.v20210927'
41+
/* Last versions supporting Java 6
42+
* (this can be updated now though, because we support only 8+) */
43+
ext['jetty.version'] = '8.1.22.v20160922'
4244
ext['jackson.version'] = '2.7.9'
4345

44-
def groovyVersion = '2.5.13'
46+
def groovyVersion = '2.5.8'
4547
ext['groovy.version'] = groovyVersion
4648

4749
dependencies {
@@ -53,7 +55,7 @@ dependencies {
5355
implementation group: 'io.sqreen', name: 'sqreen-sdk', version: '0.3'
5456
implementation group: 'io.sqreen', name: 'sqreen-sdk-standalone', version: '0.3.0'
5557

56-
implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.5.13'
58+
implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.5.8'
5759
implementation 'org.springframework.boot:spring-boot-starter-web'
5860
implementation 'org.springframework.boot:spring-boot-starter-data-jpa', {
5961
exclude module: 'tomcat-jdbc'
@@ -208,7 +210,7 @@ def createBundleTarget = { name, deps ->
208210
if (!(d instanceof List)) {
209211
d = [d]
210212
}
211-
delegate."${name}Implementation"(*d)
213+
delegate."${name}Compile"(*d)
212214
}
213215
}
214216

‎dd-java-agent/benchmark-integration/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ cp /tmp/perf_results.csv ~/somewhere_else/
2626
```
2727
./gradlew :dd-java-agent:benchmark-integration:play-perftest:dist
2828
# Compare a baseline (no agent) to the 0.18.0 and 0.19.0 releases.
29-
/usr/local/bin/bash ./run-perf-test.sh play-zip play-perftest/build/distributions/main-*.zip NoAgent ~/Downloads/dd-java-agent-0.18.0.jar ~/Downloads/dd-java-agent-0.19.0.jar
29+
/usr/local/bin/bash ./run-perf-test.sh play-zip play-perftest/build/distributions/playBinary NoAgent ~/Downloads/dd-java-agent-0.18.0.jar ~/Downloads/dd-java-agent-0.19.0.jar
3030
cp /tmp/perf_results.csv ~/somewhere_else/
3131
```

‎dd-java-agent/benchmark-integration/play-perftest/app/controllers/HomeController.scala‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@ class HomeController @Inject()(cc: ControllerComponents) extends AbstractControl
1616
/**
1717
* Create an Action to perform busy wait
1818
*/
19-
def doGet(workTimeMS: Option[Long], error: Option[String]) = Action {
20-
implicit request: Request[AnyContent] =>
21-
error match {
22-
case Some(x) => throw new RuntimeException("some sync error")
23-
case None => {
24-
var workTime = workTimeMS.getOrElse(0L)
25-
scheduleWork(workTime)
26-
Ok("Did " + workTime + "ms of work.")
27-
}
19+
def doGet(workTimeMS: Option[Long], error: Option[String]) = Action { implicit request: Request[AnyContent] =>
20+
error match {
21+
case Some(x) => throw new RuntimeException("some sync error")
22+
case None => {
23+
var workTime = workTimeMS.getOrElse(0l)
24+
scheduleWork(workTime)
25+
Ok("Did " + workTime + "ms of work.")
2826
}
27+
}
2928

3029
}
3130

‎dd-java-agent/benchmark-integration/play-perftest/app/controllers/Worker.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ object Worker {
1515
span.setTag("additionalInfo", "interesting stuff")
1616
}
1717
val doneTimestamp = System.nanoTime + TimeUnit.MILLISECONDS.toNanos(workTimeMS)
18-
while ({
18+
while ( {
1919
System.nanoTime < doneTimestamp
2020
}) {
2121
// busy-wait to simulate work

‎dd-java-agent/benchmark-integration/play-perftest/play-perftest.gradle‎

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
plugins {
2-
id 'org.gradle.playframework'
2+
id 'play'
3+
// id 'idea'
34
}
45

5-
java {
6-
sourceCompatibility = JavaVersion.VERSION_1_8
7-
targetCompatibility = JavaVersion.VERSION_1_8
8-
}
9-
10-
def playVer = "2.6.20"
11-
def scalaVer = System.getProperty("scala.binary.version", /* default = */ "2.12")
6+
def playVersion = "2.6.20"
7+
def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12")
128

13-
play {
14-
platform {
15-
playVersion = playVer
16-
scalaVersion = scalaVer
17-
javaVersion = JavaVersion.VERSION_1_8
9+
model {
10+
components {
11+
play {
12+
platform play: playVersion, scala: scalaVersion, java: '1.8'
13+
injectedRoutesGenerator = true
14+
}
1815
}
19-
injectedRoutesGenerator = true
2016
}
2117

2218
dependencies {
23-
implementation "com.typesafe.play:play-guice_$scalaVer:$playVer"
24-
implementation "com.typesafe.play:play-logback_$scalaVer:$playVer"
25-
implementation "com.typesafe.play:filters-helpers_$scalaVer:$playVer"
19+
play "com.typesafe.play:play-guice_$scalaVersion:$playVersion"
20+
play "com.typesafe.play:play-logback_$scalaVersion:$playVersion"
21+
play "com.typesafe.play:filters-helpers_$scalaVersion:$playVersion"
2622

27-
implementation project(':dd-trace-api')
28-
implementation project(':dd-java-agent:benchmark-integration')
29-
implementation group: 'io.opentracing', name: 'opentracing-api', version: '0.32.0'
30-
implementation group: 'io.opentracing', name: 'opentracing-util', version: '0.32.0'
23+
play project(':dd-trace-api')
24+
play project(':dd-java-agent:benchmark-integration')
25+
play group: 'io.opentracing', name: 'opentracing-api', version: '0.32.0'
26+
play group: 'io.opentracing', name: 'opentracing-util', version: '0.32.0'
3127
}
3228

3329
repositories {
@@ -43,12 +39,3 @@ repositories {
4339
layout "ivy"
4440
}
4541
}
46-
47-
spotless {
48-
java {
49-
target "**/*.java"
50-
}
51-
scala {
52-
target "**/*.scala"
53-
}
54-
}

‎dd-java-agent/benchmark-integration/run-perf-test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ function start_server {
7676
unzipped_server_path=${unzip_temp}
7777

7878
java_opts_env='JAVA_OPTS="'${javaagent_arg}'"'
79-
# it appears the binary script will always be named main at the time of writing
79+
# it appears the binary script will always be named playBinary at the time of writing
8080
# no matter what the zip file is named.
81-
play_script=${unzipped_server_path}/${unzipped_dirname}/bin/main
81+
play_script=${unzipped_server_path}/${unzipped_dirname}/bin/playBinary
8282

8383
# have to use env to set JAVA_OPTS because of a gradle play plugin bug:
8484
# https://github.com/gradle/gradle/issues/4471

0 commit comments

Comments
 (0)