open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build (#824)

This commit is contained in:
Trask Stalnaker 2020-07-28 16:49:46 -07:00 committed by GitHub
parent fbfa062694
commit d107fe5016
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent-bootstrap/src/main/java/io/opentelemetry/auto/typedspan/DelegatingSpan.java
View File

@ -91,6 +91,11 @@ public class DelegatingSpan implements Span {
delegate.setStatus(status); delegate.setStatus(status);
} }
@Override
public void recordException(Throwable throwable) {
delegate.recordException(throwable);
}
@Override @Override
public void updateName(final String name) { public void updateName(final String name) {
delegate.updateName(name); delegate.updateName(name);

17
instrumentation-core/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle
View File

@ -13,28 +13,31 @@ dependencies {
implementation group: 'org.springframework.boot', name: 'spring-boot-autoconfigure', version: versions.springboot 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 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' 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) { testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.springboot) {
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' 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' 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' 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' exclude group: 'org.slf4j', module: 'slf4j-simple'
} }
compileOnly group: 'io.grpc', name: 'grpc-api', version: '1.24.0' compileOnly group: 'io.grpc', name: 'grpc-api', version: '1.24.0'
compileOnly deps.opentelemetryLogging compileOnly deps.opentelemetryLogging
compileOnly deps.opentelemetryJaeger compileOnly deps.opentelemetryJaeger
compileOnly deps.opentelemetryOtlp compileOnly deps.opentelemetryOtlp
compileOnly deps.opentelemetryZipkin compileOnly deps.opentelemetryZipkin
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: versions.springboot
testImplementation deps.opentelemetrySdk
} }
test { test {
useJUnitPlatform() useJUnitPlatform()
} }