Spring/spring-pulsar
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Brave from Java Platform (#589)

Browse Source 
* Remove Brave from java platform

This commit removes Brave from being managed directly in the Java
Platform. Because the Brave version is already handled by Micrometer
Tracing BOM (which we import) there is no need to manage this
directly.

* Add observations back in sample failover app

This commit adds back in the observation related dependencies into the
sample-failover-custom-router sample app. They were removed temporarily
as Spring Boot 3.3.0-SNAPSHOT had a bug when they bumped to Brave 6.0.1.

Additionally:
-------------
* Add in template and listener observation-enabled properties as
Spring Boot is currently setting these to false byu default.

* Remove observation related dependencies from the sample functions app
as they were not intended to be there in the first place.
This commit is contained in:
Chris Bono
2024-02-24 10:37:44 -06:00
committed by GitHub
parent 0fba3433a4
commit 48407e96ae
6 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/libs.versions.toml
View File

@@ -1,6 +1,5 @@
[versions]
# product
brave = "6.0.1"
caffeine = "3.1.8"
jackson = "2.16.1"
jsr305 = "3.0.2"
@@ -40,7 +39,6 @@ version-catalog-update = "0.8.4"
[libraries]
# Product libs
brave-bom = { module = "io.zipkin.brave:brave-bom", version.ref = "brave" }
caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffeine" }
jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "jackson" }
jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }

1
spring-pulsar-dependencies/spring-pulsar-dependencies.gradle
View File

@@ -12,7 +12,6 @@ dependencies {
api platform(libs.micrometer.bom)
api platform(libs.micrometer.tracing.bom)
api platform(libs.reactor.bom)
api platform(libs.brave.bom)
api platform(libs.assertj.bom)
api platform(libs.awaitility)
api platform(libs.junit.bom)

7
spring-pulsar-sample-apps/sample-failover-custom-router/build.gradle
View File

@@ -21,10 +21,9 @@ ext['pulsar.version'] = "${pulsarVersion}"
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-pulsar'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
// TODO add back in once samples are not run during part of the 'test' target
// implementation 'io.micrometer:micrometer-tracing-bridge-brave'
// implementation 'io.zipkin.reporter2:zipkin-reporter-brave'
// implementation 'io.zipkin.reporter2:zipkin-sender-urlconnection'
implementation 'io.micrometer:micrometer-tracing-bridge-brave'
implementation 'io.zipkin.reporter2:zipkin-reporter-brave'
implementation 'io.zipkin.reporter2:zipkin-sender-urlconnection'
developmentOnly 'org.springframework.boot:spring-boot-docker-compose'
testImplementation project(':spring-pulsar-test')

4
spring-pulsar-sample-apps/sample-failover-custom-router/src/main/resources/application.yml
View File

@@ -2,6 +2,10 @@ spring:
pulsar:
producer:
message-routing-mode: custompartition
template:
observations-enabled: true
listener:
observation-enabled: true
docker:
compose:
# when run from Intellij via "Run" button, path must be set from project root

4
spring-pulsar-sample-apps/sample-pulsar-functions/sample-signup-app/build.gradle
View File

@@ -25,10 +25,6 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-pulsar"
implementation 'org.springframework.boot:spring-boot-starter-amqp'
implementation 'org.springframework.boot:spring-boot-starter-data-cassandra'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'io.micrometer:micrometer-tracing-bridge-brave'
implementation 'io.zipkin.reporter2:zipkin-reporter-brave'
implementation 'io.zipkin.reporter2:zipkin-sender-urlconnection'
implementation 'com.devskiller:jfairy:0.6.5'
}

1
spring-pulsar/src/main/java/org/springframework/pulsar/core/PulsarTemplate.java
View File

@@ -37,7 +37,6 @@ import org.springframework.context.ApplicationContextAware;
import org.springframework.core.log.LogAccessor;
import org.springframework.lang.Nullable;
import org.springframework.pulsar.PulsarException;
import org.springframework.pulsar.core.PulsarOperations.SendMessageBuilder;
import org.springframework.pulsar.observation.DefaultPulsarTemplateObservationConvention;
import org.springframework.pulsar.observation.PulsarMessageSenderContext;
import org.springframework.pulsar.observation.PulsarTemplateObservation;