Skip to content

Commit 88bfa7d

Browse files
refs #236: split brave extension into core and spring boot (#237)
This was to remove warnings for building the Maven distributions in regards to the optional spring dependencies. I feel it is easier to understand and less likely to make mistakes if I just create separate modules for them.
1 parent 57b125b commit 88bfa7d

File tree

17 files changed

+37
-39
lines changed

17 files changed

+37
-39
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ look at [Core - How to create a message processing decorator](doc/how-to-guides/
390390
### Adding Brave Tracing
391391
392392
If you are using Brave Tracing in your application, for example using Spring Sleuth, you can hook into this system by including the
393-
[brave-message-processing-decorator](extensions/brave-message-processing-decorator) extension.
393+
[brave-extension](extensions/brave-extension) modules.
394394
395395
See
396396
[Core - How to add Brave Tracing](doc/how-to-guides/core/core-how-to-add-brave-tracing.md) and

doc/how-to-guides/core/core-how-to-add-brave-tracing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
## Steps
44

55
1. Make sure you have the Brave tracing dependency configured, e.g. via Spring Sleuth. See their documentation on how to do this.
6-
1. Add the [brave-message-processing-decorator](../../../extensions/brave-message-processing-decorator) module
6+
1. Add the [brave-extension-core](../../../extensions/brave-extension/core) module
77

88
```xml
99
<dependency>
1010
<groupId>com.jashmore</groupId>
11-
<artifactId>brave-message-processing-decorator</artifactId>
11+
<artifactId>brave-extension-core</artifactId>
1212
<version>${java.dynamic.sqs.listener.version}</version>
1313
</dependency>
1414
```

doc/how-to-guides/spring/spring-how-to-add-brave-tracing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
## Steps
44

55
1. Make sure you have the brave tracing dependency configured, e.g. via Spring Sleuth. See their documentation on how to do this.
6-
1. Add the [brave-message-processing-decorator](../../../extensions/brave-message-processing-decorator) module
6+
1. Add the [brave-extension-spring-boot](../../../extensions/brave-extension/spring-boot) module
77

88
```xml
99
<dependency>
1010
<groupId>com.jashmore</groupId>
11-
<artifactId>brave-message-processing-decorator</artifactId>
11+
<artifactId>brave-extension-spring-boot</artifactId>
1212
<version>${library.version}</version>
1313
</dependency>
1414
```

examples/core-example/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies {
1111
implementation(project(":elasticmq-sqs-client"))
1212
implementation("io.zipkin.brave:brave")
1313
implementation("io.zipkin.brave:brave-context-slf4j")
14-
implementation(project(":brave-message-processing-decorator"))
14+
implementation(project(":brave-extension-core"))
1515
compileOnly(project(":documentation-annotations"))
1616
implementation("ch.qos.logback:logback-core")
1717
implementation("ch.qos.logback:logback-classic")

examples/core-kotlin-example/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
implementation(project(":core-kotlin-dsl"))
1616
implementation("io.zipkin.brave:brave")
1717
implementation("io.zipkin.brave:brave-context-slf4j")
18-
implementation(project(":brave-message-processing-decorator"))
18+
implementation(project(":brave-extension-core"))
1919
implementation("ch.qos.logback:logback-core")
2020
implementation("ch.qos.logback:logback-classic")
2121
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")

examples/spring-sleuth-example/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ dependencies {
1010
implementation("org.springframework.cloud:spring-cloud-starter-zipkin:2.2.3.RELEASE")
1111
implementation(project(":java-dynamic-sqs-listener-spring-starter"))
1212
implementation(project(":elasticmq-sqs-client"))
13-
implementation(project(":brave-message-processing-decorator"))
13+
implementation(project(":brave-extension-spring-boot"))
1414
implementation(project(":sqs-brave-tracing"))
1515
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
description = "Message Processing Decorator that adds Brave Tracing to the message listeners"
3+
4+
dependencies {
5+
api(project(":java-dynamic-sqs-listener-api"))
6+
api("io.zipkin.brave:brave")
7+
implementation(project(":sqs-brave-tracing"))
8+
compileOnly(project(":documentation-annotations"))
9+
10+
testImplementation("io.zipkin.brave:brave-tests")
11+
testImplementation(project(":elasticmq-sqs-client"))
12+
testImplementation(project(":expected-test-exception"))
13+
}

extensions/brave-message-processing-decorator/src/main/java/com/jashmore/sqs/extensions/brave/decorator/BraveMessageProcessingDecorator.java renamed to extensions/brave-extension/core/src/main/java/com/jashmore/sqs/extensions/brave/decorator/BraveMessageProcessingDecorator.java

File renamed without changes.

extensions/brave-message-processing-decorator/src/test/java/com/jashmore/sqs/extensions/brave/decorator/BraveMessageProcessingDecoratorTest.java renamed to extensions/brave-extension/core/src/test/java/com/jashmore/sqs/extensions/brave/decorator/BraveMessageProcessingDecoratorTest.java

File renamed without changes.

extensions/brave-message-processing-decorator/build.gradle.kts renamed to extensions/brave-extension/spring-boot/build.gradle.kts

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11

2-
description = "Message Processing Decorator that adds Brave Tracing to the message listeners"
3-
4-
java {
5-
registerFeature("spring") {
6-
usingSourceSet(sourceSets.main.get())
7-
}
8-
}
2+
description = "Message Processing Decorator that adds Brave Tracing to the message listeners in a Spring Boot Application"
93

104
dependencies {
11-
api(project(":java-dynamic-sqs-listener-api"))
12-
api("io.zipkin.brave:brave")
13-
implementation(project(":sqs-brave-tracing"))
5+
api(project(":brave-extension-core"))
146
compileOnly(project(":documentation-annotations"))
157

16-
"springImplementation"("org.springframework:spring-context")
17-
"springImplementation"("org.springframework.boot:spring-boot-autoconfigure")
8+
implementation("org.springframework:spring-context")
9+
implementation("org.springframework.boot:spring-boot-autoconfigure")
1810

11+
testImplementation(project(":sqs-brave-tracing"))
1912
testImplementation("io.zipkin.brave:brave-tests")
2013
testImplementation("org.springframework:spring-test")
2114
testImplementation("org.springframework.boot:spring-boot-test")

0 commit comments

Comments
 (0)