From d107fe50169a6417f7520386b683905582995f42 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 28 Jul 2020 16:49:46 -0700 Subject: [PATCH] Fix build (#824) --- .../auto/typedspan/DelegatingSpan.java | 5 +++++ .../spring-boot-autoconfigure.gradle | 17 ++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/agent-bootstrap/src/main/java/io/opentelemetry/auto/typedspan/DelegatingSpan.java b/agent-bootstrap/src/main/java/io/opentelemetry/auto/typedspan/DelegatingSpan.java index 0274b4ec8d..0015e15374 100644 --- a/agent-bootstrap/src/main/java/io/opentelemetry/auto/typedspan/DelegatingSpan.java +++ b/agent-bootstrap/src/main/java/io/opentelemetry/auto/typedspan/DelegatingSpan.java @@ -91,6 +91,11 @@ public class DelegatingSpan implements Span { delegate.setStatus(status); } + @Override + public void recordException(Throwable throwable) { + delegate.recordException(throwable); + } + @Override public void updateName(final String name) { delegate.updateName(name); diff --git a/instrumentation-core/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle b/instrumentation-core/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle index f975da9f6a..d078bebf79 100644 --- a/instrumentation-core/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle +++ b/instrumentation-core/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle @@ -13,28 +13,31 @@ dependencies { implementation group: 'org.springframework.boot', name: 'spring-boot-autoconfigure', version: versions.springboot annotationProcessor group: 'org.springframework.boot', name: 'spring-boot-autoconfigure-processor', version: versions.springboot implementation group: 'javax.validation', name: 'validation-api', version: '2.0.1.Final' - + testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.springboot) { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' } - - implementation(project(':instrumentation-core:spring:spring-webmvc-3.1')){ + + implementation(project(':instrumentation-core:spring:spring-webmvc-3.1')) { exclude group: 'org.slf4j', module: 'slf4j-simple' } - implementation(project(':instrumentation-core:spring:spring-web-3.1')){ + implementation(project(':instrumentation-core:spring:spring-web-3.1')) { exclude group: 'org.slf4j', module: 'slf4j-simple' } - implementation(project(':instrumentation-core:spring:spring-webflux-5.0')){ + implementation(project(':instrumentation-core:spring:spring-webflux-5.0')) { exclude group: 'org.slf4j', module: 'slf4j-simple' } - + compileOnly group: 'io.grpc', name: 'grpc-api', version: '1.24.0' compileOnly deps.opentelemetryLogging compileOnly deps.opentelemetryJaeger compileOnly deps.opentelemetryOtlp compileOnly deps.opentelemetryZipkin + + testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: versions.springboot + testImplementation deps.opentelemetrySdk } test { useJUnitPlatform() -} \ No newline at end of file +}