diff --git a/common-service/src/main/kotlin/ru/romanow/inst/services/common/config/CircuitBreakerConfiguration.kt b/common-service/src/main/kotlin/ru/romanow/inst/services/common/config/CircuitBreakerConfiguration.kt index a9027fe..50a352d 100644 --- a/common-service/src/main/kotlin/ru/romanow/inst/services/common/config/CircuitBreakerConfiguration.kt +++ b/common-service/src/main/kotlin/ru/romanow/inst/services/common/config/CircuitBreakerConfiguration.kt @@ -56,18 +56,10 @@ class CircuitBreakerConfiguration { @Bean fun fallback(circuitBreakerConfigurationSupport: CircuitBreakerConfigurationSupport): Fallback { return object : Fallback { - override fun apply( - method: HttpMethod, - url: String, - throwable: Throwable, - vararg params: Any - ): Mono { + override fun apply(method: HttpMethod, url: String, throwable: Throwable, vararg params: Any): Mono { logger.warn( "Request to {} '{}' failed with exception: {}. (params: '{}')", - method.name(), - url, - throwable.message, - params + method.name(), url, throwable.message, params ) if (throwable.javaClass in circuitBreakerConfigurationSupport.ignoredExceptions()) { throw (throwable as RuntimeException) diff --git a/common-service/src/main/kotlin/ru/romanow/inst/services/common/config/TracingConfiguration.kt b/common-service/src/main/kotlin/ru/romanow/inst/services/common/config/TracingConfiguration.kt new file mode 100644 index 0000000..3920e4b --- /dev/null +++ b/common-service/src/main/kotlin/ru/romanow/inst/services/common/config/TracingConfiguration.kt @@ -0,0 +1,14 @@ +package ru.romanow.inst.services.common.config + +import io.micrometer.tracing.exporter.SpanExportingPredicate +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration + +@Configuration +@ConditionalOnProperty("management.tracing.enabled", havingValue = "true") +class TracingConfiguration { + + @Bean + fun noActuator() = SpanExportingPredicate { it.tags["uri"] == null || !it.tags["uri"]!!.startsWith("/manage") } +}