Upgradle gradle
MODIFY
dd-java-agent/benchmark/benchmark.gradle
dd-java-agent/benchmark/benchmark.gradle
plugins {
- id "me.champeau.gradle.jmh" version "0.4.4"
+ id "me.champeau.gradle.jmh" version "0.4.8"
}
apply from: "${rootDir}/gradle/java.gradle"

MODIFY
dd-java-agent/instrumentation/aws-java-sdk-2.2/aws-java-sdk-2.2.gradle
dd-java-agent/instrumentation/aws-java-sdk-2.2/aws-java-sdk-2.2.gradle
@@ -51,6 +51,7 @@ dependencies {
testCompile project(':dd-java-agent:instrumentation:netty-4.1')
// Needed by netty async instrumentation
testCompile project(':dd-java-agent:instrumentation:java-concurrent')
+ testCompile group: 'software.amazon.awssdk', name: 'apache-client', version: '2.2.0'
testCompile group: 'software.amazon.awssdk', name: 's3', version: '2.2.0'
testCompile group: 'software.amazon.awssdk', name: 'rds', version: '2.2.0'
testCompile group: 'software.amazon.awssdk', name: 'ec2', version: '2.2.0'
@@ -59,6 +60,7 @@ dependencies {
latestDepTestCompile project(':dd-java-agent:instrumentation:apache-httpclient-4')
latestDepTestCompile project(':dd-java-agent:instrumentation:netty-4.1')
latestDepTestCompile project(':dd-java-agent:instrumentation:java-concurrent')
+ latestDepTestCompile group: 'software.amazon.awssdk', name: 'apache-client', version: '+'
latestDepTestCompile group: 'software.amazon.awssdk', name: 's3', version: '+'
latestDepTestCompile group: 'software.amazon.awssdk', name: 'rds', version: '+'
latestDepTestCompile group: 'software.amazon.awssdk', name: 'ec2', version: '+'

MODIFY
dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle
dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle
@@ -31,7 +31,9 @@ dependencies {
testCompile project(':dd-java-agent:testing')
testCompile project(':dd-java-agent:instrumentation:java-concurrent')
testCompile project(':dd-java-agent:instrumentation:trace-annotation')
+ testCompile group: 'io.reactivex', name: 'rxjava', version: '1.0.7'
testCompile group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
+ latestDepTestCompile group: 'io.reactivex', name: 'rxjava', version: '+'
latestDepTestCompile group: 'com.netflix.hystrix', name: 'hystrix-core', version: '+'
}

RENAME
dd-smoke-tests/play/src/main/scala/app/controllers/HomeController.scala
dd-smoke-tests/play/app/controllers/HomeController.scala
RENAME
dd-smoke-tests/play/src/main/conf/application.conf
dd-smoke-tests/play/conf/application.conf
RENAME
dd-smoke-tests/play/src/main/conf/logback.xml
dd-smoke-tests/play/conf/logback.xml
RENAME
dd-smoke-tests/play/src/main/conf/routes
dd-smoke-tests/play/conf/routes
MODIFY
dd-smoke-tests/play/play.gradle
dd-smoke-tests/play/play.gradle
@@ -17,20 +17,12 @@ model {
play {
platform play: playVersion, scala: scalaVersion, java: '1.8'
injectedRoutesGenerator = true
- sources {
- scala {
- source.srcDir "src/main/scala"
- }
- extraRoutes(RoutesSourceSet) {
- source.srcDir "src/main/conf"
- }
- }
}
}
distributions {
playBinary {
contents {
- from("src/main/conf") {
+ from("conf") {
into "conf"
}
}

MODIFY
dd-trace-java.gradle
dd-trace-java.gradle
@@ -2,12 +2,12 @@ plugins {
id 'io.franzbecker.gradle-lombok' version '1.14'
id 'com.jfrog.artifactory' version '4.8.1'
id 'com.jfrog.bintray' version '1.8.4'
- id 'org.unbroken-dome.test-sets' version '1.5.2'
+ id 'org.unbroken-dome.test-sets' version '2.1.1'
- id 'com.gradle.build-scan' version '1.16' // 2.0+ requires gradle 5
+ id 'com.gradle.build-scan' version '2.2.1'
// Not applying google java format by default because it gets confused by stray java build
// files in 'workspace' build directory in CI
- id 'com.github.sherter.google-java-format' version '0.7.1' apply false
+ id 'com.github.sherter.google-java-format' version '0.8' apply false
id 'com.dorongold.task-tree' version '1.3.1'
}
@@ -49,9 +49,9 @@ buildScan {
}
}
-ext.gradleWrapperVersion = '4.10.3'
-tasks.register("wrapper", Wrapper) {
- gradleVersion = gradleWrapperVersion
+wrapper {
+ distributionType = Wrapper.DistributionType.ALL
+ version = '5.3.1'
}
allprojects {

MODIFY
dd-trace-ot/dd-trace-ot.gradle
dd-trace-ot/dd-trace-ot.gradle
plugins {
- id "me.champeau.gradle.jmh" version "0.4.4"
+ id "me.champeau.gradle.jmh" version "0.4.8"
}
description = 'dd-trace-ot'

MODIFY
gradle/java.gradle
gradle/java.gradle
@@ -14,6 +14,11 @@ if (applyCodeCoverage) {
sourceCompatibility = 1.7
targetCompatibility = 1.7
+java {
+ // See https://docs.gradle.org/current/userguide/upgrading_version_5.html, Automatic target JVM version
+ disableAutoTargetJvm()
+}
+
[JavaCompile, ScalaCompile].each { type ->
tasks.withType(type) {
doFirst {
@@ -255,7 +260,7 @@ for (def env : System.getenv().entrySet()) {
}
tasks.check.dependsOn parentTask
- tasks.withType(Test).configureEach {
+ tasks.withType(Test).all {
//if (name.endsWith("Generated")) {
if (!name.equals("test")) {
// The way we're copying the test doesn't currently work with "test-sets" generated tests.

MODIFY
gradle/wrapper/gradle-wrapper.jar
gradle/wrapper/gradle-wrapper.jar
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ

MODIFY
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

MODIFY
gradlew
gradlew
#!/usr/bin/env sh
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
##############################################################################
##
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

MODIFY
gradlew.bat
gradlew.bat
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

Upgradle gradle