diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 480b9913ce..ac1d35d497 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -25,7 +25,7 @@ jobs: run: .github/scripts/deadlock-detector.sh - name: Build - run: ./gradlew check --stacktrace -x :smoke-tests:test + run: ./gradlew build --stacktrace -x :smoke-tests:test - name: Upload deadlock detector artifacts if: always() diff --git a/gradle/java.gradle b/gradle/java.gradle index 5108e24fdb..0b5c82e6a7 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -52,6 +52,7 @@ java { tasks.withType(JavaCompile) { options.release.set(project.ext.release.majorVersion.toInteger()) + options.compilerArgs.add("-Werror") } //Groovy and Scala compilers don't actually understand --release option tasks.withType(GroovyCompile) { @@ -136,6 +137,8 @@ normalization { javadoc { options.addStringOption('Xdoclint:none', '-quiet') + // non-standard option to fail on warnings, see https://bugs.openjdk.java.net/browse/JDK-8200363 + options.addStringOption('Xwerror', '-quiet') doFirst { if (project.ext.has("apiLinks")) { diff --git a/instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle b/instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle index 14139d9d50..88bb41cec7 100644 --- a/instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle +++ b/instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle @@ -51,3 +51,14 @@ tasks.withType(Test) { jvmArgs "-Dotel.instrumentation.apache-camel.experimental-span-attributes=true" jvmArgs "-Dotel.instrumentation.aws-sdk.experimental-span-attributes=true" } + +javadoc { + dependencies { + // without adding this dependency, javadoc fails: + // warning: unknown enum constant XmlAccessType.PROPERTY + // reason: class file for javax.xml.bind.annotation.XmlAccessType not found + // due to usage of org.apache.camel.model.RouteDefinition in CamelTracingService + // which has jaxb class-level annotations + compileOnly 'javax.xml.bind:jaxb-api:2.3.1' + } +} diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/zipkin/ZipkinSpanExporterProperties.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/zipkin/ZipkinSpanExporterProperties.java index bcf98173fc..e8b63b1124 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/zipkin/ZipkinSpanExporterProperties.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/zipkin/ZipkinSpanExporterProperties.java @@ -11,8 +11,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * Configuration for {@link io.opentelemetry.exporter.zipkin.ZipkinSpanExporter}. * - *

Get Exporter Service Name {@link #getServiceName()} - * *

Get Exporter Endpoint */ @ConfigurationProperties(prefix = "opentelemetry.trace.exporter.zipkin") diff --git a/javaagent-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/Java8BytecodeBridge.java b/javaagent-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/Java8BytecodeBridge.java index b65a58d68b..e425b62bbd 100644 --- a/javaagent-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/Java8BytecodeBridge.java +++ b/javaagent-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/Java8BytecodeBridge.java @@ -5,12 +5,8 @@ package io.opentelemetry.javaagent.instrumentation.api; -import io.opentelemetry.api.GlobalOpenTelemetry; -import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.trace.Span; -import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Context; -import io.opentelemetry.context.propagation.ContextPropagators; /** * A helper for accessing methods that rely on new Java 8 bytecode features such as calling a static @@ -35,13 +31,4 @@ public final class Java8BytecodeBridge { public static Span spanFromContext(Context context) { return Span.fromContext(context); } - - public static ContextPropagators getGlobalPropagators() { - return GlobalOpenTelemetry.getPropagators(); - } - - /** Calls {@link OpenTelemetry#getGlobalTracer(String)}. */ - public static Tracer getGlobalTracer(String name) { - return GlobalOpenTelemetry.getTracer(name); - } }