Rename spring instrumentation modules (#1125)

This commit is contained in:
dengliming 2020-09-10 07:41:25 +08:00 committed by GitHub
parent 79b2ce3a90
commit 4959aa735f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
55 changed files with 9 additions and 10 deletions

View File

@ -17,9 +17,9 @@ dependencies {
compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-aop', version: versions.springboot compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-aop', version: versions.springboot
compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: versions.springboot compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: versions.springboot
compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: versions.springboot compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: versions.springboot
implementation project(':instrumentation:spring:spring-web-3.1:spring-web-3.1-library') implementation project(':instrumentation:spring:spring-web-3.1:library')
implementation project(':instrumentation:spring:spring-webmvc-3.1:spring-webmvc-3.1-library') implementation project(':instrumentation:spring:spring-webmvc-3.1:library')
implementation project(':instrumentation:spring:spring-webflux-5.0:spring-webflux-5.0-library') implementation project(':instrumentation:spring:spring-webflux-5.0:library')
compileOnly deps.opentelemetryAutoAnnotations compileOnly deps.opentelemetryAutoAnnotations
compileOnly group: 'io.grpc', name: 'grpc-api', version: '1.30.2' compileOnly group: 'io.grpc', name: 'grpc-api', version: '1.30.2'

View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation-library.gradle" apply from: "$rootDir/gradle/instrumentation-library.gradle"
archivesBaseName = "spring-web-3.1"
dependencies { dependencies {
compileOnly "org.springframework:spring-web:3.1.0.RELEASE" compileOnly "org.springframework:spring-web:3.1.0.RELEASE"

View File

@ -42,7 +42,7 @@ muzzle {
} }
dependencies { dependencies {
implementation project(':instrumentation:spring:spring-webflux-5.0:spring-webflux-5.0-library') implementation project(':instrumentation:spring:spring-webflux-5.0:library')
compileOnly group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE' compileOnly group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE'
compileOnly group: 'io.projectreactor.ipc', name: 'reactor-netty', version: '0.7.0.RELEASE' compileOnly group: 'io.projectreactor.ipc', name: 'reactor-netty', version: '0.7.0.RELEASE'

View File

@ -159,11 +159,11 @@ include ':instrumentation:servlet:servlet-3.0'
include ':instrumentation:spark-web-framework-2.3' include ':instrumentation:spark-web-framework-2.3'
include ':instrumentation:spring:spring-data-1.8' include ':instrumentation:spring:spring-data-1.8'
include ':instrumentation:spring:spring-scheduling-3.1' include ':instrumentation:spring:spring-scheduling-3.1'
include ':instrumentation:spring:spring-web-3.1:spring-web-3.1-library' include ':instrumentation:spring:spring-web-3.1:library'
include ':instrumentation:spring:spring-webmvc-3.1:spring-webmvc-3.1-auto' include ':instrumentation:spring:spring-webmvc-3.1:auto'
include ':instrumentation:spring:spring-webmvc-3.1:spring-webmvc-3.1-library' include ':instrumentation:spring:spring-webmvc-3.1:library'
include ':instrumentation:spring:spring-webflux-5.0:spring-webflux-5.0-auto' include ':instrumentation:spring:spring-webflux-5.0:auto'
include ':instrumentation:spring:spring-webflux-5.0:spring-webflux-5.0-library' include ':instrumentation:spring:spring-webflux-5.0:library'
include ':instrumentation:spring:spring-boot-autoconfigure' include ':instrumentation:spring:spring-boot-autoconfigure'
include ':instrumentation:spring:starters:spring-starter' include ':instrumentation:spring:starters:spring-starter'
include ':instrumentation:spring:starters:jaeger-exporter-starter' include ':instrumentation:spring:starters:jaeger-exporter-starter'