Skip to content

Commit 428aa28

Browse files
authored
Restructure to have a single spring-boot-autoconfigure artifact (#11826)
1 parent 09ad619 commit 428aa28

File tree

84 files changed

+205
-188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+205
-188
lines changed

docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure-3.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure-2.txt renamed to docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2-2.6.0-SNAPSHOT.jar against
2-
+++ NEW CLASS: PUBLIC(+) io.opentelemetry.instrumentation.spring.autoconfigure.v2.OpenTelemetryAutoConfiguration (not serializable)
1+
Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.6.0-SNAPSHOT.jar against
2+
+++ NEW CLASS: PUBLIC(+) io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration (not serializable)
33
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
44
+++ NEW SUPERCLASS: java.lang.Object
55
+++ NEW CONSTRUCTOR: PUBLIC(+) OpenTelemetryAutoConfiguration()
66
+++ NEW ANNOTATION: org.springframework.context.annotation.Configuration
77
+++ NEW ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties
8-
+++ NEW ELEMENT: value=io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.PropagationProperties (+)
8+
+++ NEW ELEMENT: value=io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.PropagationProperties (+)

docs/contributing/intellij-setup-and-troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ If you are working on a specific instrumentation, you can load only the modules
3535
For example, to load the modules for the Spring Boot autoconfigure instrumentation, run:
3636

3737
```shell
38-
./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure-2/
38+
./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure/
3939
```
4040

4141
Install the [Kotlin executable](https://kotlinlang.org/docs/tutorials/command-line.html)

docs/contributing/selectModules.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ main(args)
1212

1313
fun main(args: Array<String>) {
1414
if (args.isEmpty()) {
15-
println("Usage: ./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure-2/ <module to include2> ...")
15+
println("Usage: ./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure/ <module to include2> ...")
1616
return
1717
}
1818

instrumentation/spring/spring-boot-autoconfigure-2/src/main/resources/META-INF/spring.factories

Lines changed: 0 additions & 15 deletions
This file was deleted.

instrumentation/spring/spring-boot-autoconfigure-2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 0 additions & 10 deletions
This file was deleted.

instrumentation/spring/spring-boot-autoconfigure-3/README.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

instrumentation/spring/spring-boot-autoconfigure-3/build.gradle.kts

Lines changed: 0 additions & 26 deletions
This file was deleted.

instrumentation/spring/spring-boot-autoconfigure-3/gradle.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

instrumentation/spring/spring-boot-autoconfigure-3/src/main/resources/META-INF/spring/aot.factories

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)