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

move spring resources to javaagent directory (#10813)

This commit is contained in:
Gregor Zeitlinger 2024-03-14 16:27:19 +01:00 committed by GitHub
parent c1dd65ffc9
commit 3839342e3b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/supported-libraries.md
View File

@ -119,7 +119,7 @@ These are the supported libraries and frameworks:
| [Servlet](https://javaee.github.io/javaee-spec/javadocs/javax/servlet/package-summary.html) | 2.2+ | N/A | [HTTP Server Spans], [HTTP Server Metrics] |
| [Spark Web Framework](https://github.com/perwendel/spark) | 2.3+ | N/A | Provides `http.route` [2] |
| [Spring Batch](https://spring.io/projects/spring-batch) | 3.0+ (not including 5.0+ yet) | N/A | none |
| [Spring Boot](https://spring.io/projects/spring-boot) | | [opentelemetry-spring-boot-resources](../instrumentation/spring/spring-boot-resources/library) | none |
| [Spring Boot](https://spring.io/projects/spring-boot) | | [opentelemetry-spring-boot-resources](https://opentelemetry.io/docs/languages/java/automatic/spring-boot/) | none |
| [Spring Cloud Gateway](https://github.com/spring-cloud/spring-cloud-gateway) | 2.0+ | N/A | Provides `http.route` [2] |
| [Spring Core](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/package-summary.html) | 2.0+ | N/A | Context propagation |
| [Spring Data](https://spring.io/projects/spring-data) | 1.8+ | N/A | none |

1
instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts
View File

@ -60,7 +60,6 @@ dependencies {
testImplementation("io.opentelemetry:opentelemetry-sdk")
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
testImplementation(project(":instrumentation:resources:library"))
testImplementation(project(":instrumentation:spring:spring-boot-resources:library"))
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
testImplementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
testImplementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")

2
instrumentation/spring/spring-boot-resources/testing/build.gradle.kts → instrumentation/spring/spring-boot-resources/javaagent-unit-tests/build.gradle.kts
View File

@ -6,7 +6,7 @@ dependencies {
testCompileOnly("com.google.auto.service:auto-service-annotations")
testImplementation("org.mockito:mockito-junit-jupiter")
testImplementation(project(":instrumentation:spring:spring-boot-resources:library"))
testImplementation(project(":instrumentation:spring:spring-boot-resources:javaagent"))
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
testImplementation(project(path = ":smoke-tests:images:spring-boot", configuration = "springBootJar"))
}

0
instrumentation/spring/spring-boot-resources/testing/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java → instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java
View File

0
instrumentation/spring/spring-boot-resources/library/build.gradle.kts → instrumentation/spring/spring-boot-resources/javaagent/build.gradle.kts
View File

0
instrumentation/spring/spring-boot-resources/library/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java → instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java
View File

0
instrumentation/spring/spring-boot-resources/library/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java → instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java
View File

0
instrumentation/spring/spring-boot-resources/library/src/main/java/io/opentelemetry/instrumentation/spring/resources/SystemHelper.java → instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SystemHelper.java
View File

0
instrumentation/spring/spring-boot-resources/library/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java → instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java
View File

0
instrumentation/spring/spring-boot-resources/library/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java → instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java
View File

0
instrumentation/spring/spring-boot-resources/library/src/test/resources/META-INF/build-info.properties → instrumentation/spring/spring-boot-resources/javaagent/src/test/resources/META-INF/build-info.properties
View File

0
instrumentation/spring/spring-boot-resources/library/src/test/resources/application-multi.yml → instrumentation/spring/spring-boot-resources/javaagent/src/test/resources/application-multi.yml
View File

0
instrumentation/spring/spring-boot-resources/library/src/test/resources/application.properties → instrumentation/spring/spring-boot-resources/javaagent/src/test/resources/application.properties
View File

0
instrumentation/spring/spring-boot-resources/library/src/test/resources/application.yml → instrumentation/spring/spring-boot-resources/javaagent/src/test/resources/application.yml
View File

0
instrumentation/spring/spring-boot-resources/library/src/test/resources/bootstrap-multi.yml → instrumentation/spring/spring-boot-resources/javaagent/src/test/resources/bootstrap-multi.yml
View File

0
instrumentation/spring/spring-boot-resources/library/src/test/resources/bootstrap.properties → instrumentation/spring/spring-boot-resources/javaagent/src/test/resources/bootstrap.properties
View File

0
instrumentation/spring/spring-boot-resources/library/src/test/resources/bootstrap.yaml → instrumentation/spring/spring-boot-resources/javaagent/src/test/resources/bootstrap.yaml
View File

0
instrumentation/spring/spring-boot-resources/library/src/test/resources/bootstrap.yml → instrumentation/spring/spring-boot-resources/javaagent/src/test/resources/bootstrap.yml
View File

0
instrumentation/spring/spring-boot-resources/library/src/test/resources/build-info.properties → instrumentation/spring/spring-boot-resources/javaagent/src/test/resources/build-info.properties
View File

4
settings.gradle.kts
View File

@ -508,8 +508,8 @@ include(":instrumentation:servlet:servlet-5.0:testing")
include(":instrumentation:spark-2.3:javaagent")
include(":instrumentation:spring:spring-batch-3.0:javaagent")
include(":instrumentation:spring:spring-boot-actuator-autoconfigure-2.0:javaagent")
include(":instrumentation:spring:spring-boot-resources:library")
include(":instrumentation:spring:spring-boot-resources:testing")
include(":instrumentation:spring:spring-boot-resources:javaagent")
include(":instrumentation:spring:spring-boot-resources:javaagent-unit-tests")
include(":instrumentation:spring:spring-cloud-gateway:spring-cloud-gateway-2.0:javaagent")
include(":instrumentation:spring:spring-cloud-gateway:spring-cloud-gateway-2.2:testing")
include(":instrumentation:spring:spring-cloud-gateway:spring-cloud-gateway-common:testing")