diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | api/src/main/java/io/opencensus/stats/Stats.java | 8 | ||||
| -rw-r--r-- | api/src/main/java/io/opencensus/tags/Tags.java | 8 | ||||
| -rw-r--r-- | api/src/main/java/io/opencensus/trace/Tracing.java | 8 | ||||
| -rw-r--r-- | build.gradle | 5 | ||||
| -rw-r--r-- | impl_core/src/main/java/io/opencensus/implcore/trace/SpanImpl.java | 2 | ||||
| -rwxr-xr-x | scripts/travis_script | 3 |
7 files changed, 29 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index f70cbcc8..50b6e66f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,10 @@ matrix: # contrib/agent, but are not installed by default. - openjdk-6-jdk + - jdk: oraclejdk9 + env: TASK=BUILD + os: linux + - jdk: oraclejdk8 env: TASK=CHECKER_FRAMEWORK os: linux diff --git a/api/src/main/java/io/opencensus/stats/Stats.java b/api/src/main/java/io/opencensus/stats/Stats.java index 4b7852ce..d7f77e34 100644 --- a/api/src/main/java/io/opencensus/stats/Stats.java +++ b/api/src/main/java/io/opencensus/stats/Stats.java @@ -94,7 +94,8 @@ public final class Stats { try { // Call Class.forName with literal string name of the class to help shading tools. return Provider.createInstance( - Class.forName("io.opencensus.impl.stats.StatsComponentImpl", true, classLoader), + Class.forName( + "io.opencensus.impl.stats.StatsComponentImpl", /*initialize=*/ true, classLoader), StatsComponent.class); } catch (ClassNotFoundException e) { logger.log( @@ -106,7 +107,10 @@ public final class Stats { try { // Call Class.forName with literal string name of the class to help shading tools. return Provider.createInstance( - Class.forName("io.opencensus.impllite.stats.StatsComponentImplLite", true, classLoader), + Class.forName( + "io.opencensus.impllite.stats.StatsComponentImplLite", + /*initialize=*/ true, + classLoader), StatsComponent.class); } catch (ClassNotFoundException e) { logger.log( diff --git a/api/src/main/java/io/opencensus/tags/Tags.java b/api/src/main/java/io/opencensus/tags/Tags.java index b784b5f5..e4c6a579 100644 --- a/api/src/main/java/io/opencensus/tags/Tags.java +++ b/api/src/main/java/io/opencensus/tags/Tags.java @@ -96,7 +96,8 @@ public final class Tags { try { // Call Class.forName with literal string name of the class to help shading tools. return Provider.createInstance( - Class.forName("io.opencensus.impl.tags.TagsComponentImpl", true, classLoader), + Class.forName( + "io.opencensus.impl.tags.TagsComponentImpl", /*initialize=*/ true, classLoader), TagsComponent.class); } catch (ClassNotFoundException e) { logger.log( @@ -108,7 +109,10 @@ public final class Tags { try { // Call Class.forName with literal string name of the class to help shading tools. return Provider.createInstance( - Class.forName("io.opencensus.impllite.tags.TagsComponentImplLite", true, classLoader), + Class.forName( + "io.opencensus.impllite.tags.TagsComponentImplLite", + /*initialize=*/ true, + classLoader), TagsComponent.class); } catch (ClassNotFoundException e) { logger.log( diff --git a/api/src/main/java/io/opencensus/trace/Tracing.java b/api/src/main/java/io/opencensus/trace/Tracing.java index f3673020..e67eb008 100644 --- a/api/src/main/java/io/opencensus/trace/Tracing.java +++ b/api/src/main/java/io/opencensus/trace/Tracing.java @@ -92,7 +92,8 @@ public final class Tracing { try { // Call Class.forName with literal string name of the class to help shading tools. return Provider.createInstance( - Class.forName("io.opencensus.impl.trace.TraceComponentImpl", true, classLoader), + Class.forName( + "io.opencensus.impl.trace.TraceComponentImpl", /*initialize=*/ true, classLoader), TraceComponent.class); } catch (ClassNotFoundException e) { logger.log( @@ -104,7 +105,10 @@ public final class Tracing { try { // Call Class.forName with literal string name of the class to help shading tools. return Provider.createInstance( - Class.forName("io.opencensus.impllite.trace.TraceComponentImplLite", true, classLoader), + Class.forName( + "io.opencensus.impllite.trace.TraceComponentImplLite", + /*initialize=*/ true, + classLoader), TraceComponent.class); } catch (ClassNotFoundException e) { logger.log( diff --git a/build.gradle b/build.gradle index effcb08f..69662153 100644 --- a/build.gradle +++ b/build.gradle @@ -103,9 +103,10 @@ subprojects { ] } it.options.encoding = "UTF-8" - // TODO(bdrutu): Enable when fix the issue with configuring bootstrap class. + // TODO(bdrutu): Enable for Java 7 when fix the issue with configuring bootstrap class. // [options] bootstrap class path not set in conjunction with -source 1.6 - if (JavaVersion.current().isJava8Compatible()) { + // TODO(sebright): Fix warnings about -source 1.6 and -target 1.6 with Java 9. + if (JavaVersion.current().isJava8()) { it.options.compilerArgs += ["-Werror"] } } diff --git a/impl_core/src/main/java/io/opencensus/implcore/trace/SpanImpl.java b/impl_core/src/main/java/io/opencensus/implcore/trace/SpanImpl.java index 20dde75d..f9a7f859 100644 --- a/impl_core/src/main/java/io/opencensus/implcore/trace/SpanImpl.java +++ b/impl_core/src/main/java/io/opencensus/implcore/trace/SpanImpl.java @@ -500,7 +500,7 @@ public final class SpanImpl extends Span implements Element<SpanImpl> { // Capacity of the map is capacity + 1 to avoid resizing because removeEldestEntry is invoked // by put and putAll after inserting a new entry into the map. The loadFactor is set to 1 // to avoid resizing because. The accessOrder is set to true. - super(capacity + 1, 1, true); + super(capacity + 1, 1, /*accessOrder=*/ true); this.capacity = capacity; } diff --git a/scripts/travis_script b/scripts/travis_script index 77bad8c6..bb756a2a 100755 --- a/scripts/travis_script +++ b/scripts/travis_script @@ -16,6 +16,9 @@ case "$TASK" in source /opt/jdk_switcher/jdk_switcher.sh export JAVA8_HOME="$(jdk_switcher home oraclejdk8)" case "$TRAVIS_JDK_VERSION" in + "oraclejdk9") + ./gradlew clean assemble check --stacktrace + ;; "oraclejdk8") export JAVA_HOMES="$(jdk_switcher home openjdk6)/jre:$(jdk_switcher home openjdk7)/jre:$(jdk_switcher home oraclejdk8)/jre:$(jdk_switcher home oraclejdk9)" ./gradlew clean assemble --stacktrace |