Skip to content

Commit 63d3ad6

Browse files
committed
Rename asset "spring-sleuth-modern" to "spring-sleuth"
* this would completely replace the old "spring-sleuth" asset with the new app
1 parent a0f3a85 commit 63d3ad6

9 files changed

Lines changed: 11 additions & 11 deletions

File tree

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# spring-sleuth-modern
1+
# spring-sleuth
22

33
A small Spring Boot app that replaces legacy `Spring Cloud Sleuth` `SpanAccessor` usage with modern `Micrometer Tracing` + `OpenTelemetry`.
44

@@ -12,14 +12,14 @@ A small Spring Boot app that replaces legacy `Spring Cloud Sleuth` `SpanAccessor
1212
## Build and test
1313

1414
```bash
15-
cd /Users/d050987/cf/cf-acceptance-tests/assets/spring-sleuth-modern
15+
cd /Users/d050987/cf/cf-acceptance-tests/assets/spring-sleuth
1616
mvn test
1717
```
1818

1919
## Run locally
2020

2121
```bash
22-
cd /Users/d050987/cf/cf-acceptance-tests/assets/spring-sleuth-modern
22+
cd /Users/d050987/cf/cf-acceptance-tests/assets/spring-sleuth
2323
mvn spring-boot:run
2424
```
2525

@@ -34,8 +34,8 @@ curl -s \
3434
## Cloud Foundry push example
3535

3636
```bash
37-
cd /Users/d050987/cf/cf-acceptance-tests/assets/spring-sleuth-modern
37+
cd /Users/d050987/cf/cf-acceptance-tests/assets/spring-sleuth
3838
mvn -DskipTests package
39-
cf push spring-sleuth-modern -p target/spring-sleuth-modern-0.0.1-SNAPSHOT.jar -m 512M
39+
cf push spring-sleuth -p target/spring-sleuth-0.0.1.jar -m 512M
4040
```
4141

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
</parent>
1212

1313
<groupId>org.cloudfoundry.cats</groupId>
14-
<artifactId>spring-sleuth-modern</artifactId>
14+
<artifactId>spring-sleuth</artifactId>
1515
<version>0.0.1</version>
16-
<name>spring-sleuth-modern</name>
16+
<name>spring-sleuth</name>
1717
<description>Modern tracing sample replacing legacy Spring Cloud Sleuth SpanAccessor usage</description>
1818

1919
<properties>
-34.1 MB
Binary file not shown.

assets/spring-sleuth-modern/src/main/java/hello/Application.java renamed to assets/spring-sleuth/src/main/java/hello/Application.java

File renamed without changes.

assets/spring-sleuth-modern/src/main/java/hello/HelloController.java renamed to assets/spring-sleuth/src/main/java/hello/HelloController.java

File renamed without changes.

assets/spring-sleuth-modern/src/main/resources/application.yml renamed to assets/spring-sleuth/src/main/resources/application.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
spring:
22
application:
3-
name: spring-sleuth-modern
3+
name: spring-sleuth
44

55
management:
66
tracing:
77
enabled: true
88
propagation:
9-
consume: [w3c, b3]
10-
produce: [w3c, b3]
9+
consume: [W3C, B3, B3_MULTI]
10+
produce: [W3C, B3_MULTI]
1111
sampling:
1212
probability: 1.0
1313

assets/spring-sleuth-modern/src/test/java/hello/HelloControllerTest.java renamed to assets/spring-sleuth/src/test/java/hello/HelloControllerTest.java

File renamed without changes.

assets/spring-sleuth-modern/target/spring-sleuth-modern-0.0.1.jar renamed to assets/spring-sleuth/target/spring-sleuth-0.0.1.jar

27.2 MB
Binary file not shown.

helpers/assets/assets.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,6 @@ func NewAssets() Assets {
9696
WindowsWebapp: "assets/webapp",
9797
Worker: "assets/worker",
9898
MultiPortApp: "assets/multi-port-app",
99-
SpringSleuthZip: "assets/spring-sleuth-modern/target/spring-sleuth-modern-0.0.1.jar",
99+
SpringSleuthZip: "assets/spring-sleuth/target/spring-sleuth-0.0.1.jar",
100100
}
101101
}

0 commit comments

Comments
 (0)