Merge pull request #108 from mkopylec/sb_23

Sb 23

Author: mkopylec

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'pl.allegro.tech.build.axion-release' version '1.11.0'
+    id 'pl.allegro.tech.build.axion-release' version '1.12.0'
     id 'io.codearte.nexus-staging' version '0.21.2'
 }
 
@@ -16,9 +16,9 @@ subprojects {
     }
 
     ext {
-        springBootVersion = '2.2.5.RELEASE'
-        resilience4jVersion = '1.3.1'
-        okHttpVersion = '3.14.4'
+        springBootVersion = '2.3.2.RELEASE'
+        resilience4jVersion = '1.5.0'
+        okHttpVersion = '3.14.9'
 
         group = 'com.github.mkopylec'
         pomContent = {
@@ -57,15 +57,15 @@ subprojects {
     version = scmVersion.version
 
     dependencies {
-        compile group: 'org.springframework', name: 'spring-web', version: '5.2.4.RELEASE'
+        compile group: 'org.springframework', name: 'spring-web', version: '5.2.8.RELEASE'
         compile group: 'io.github.resilience4j', name: 'resilience4j-circuitbreaker', version: resilience4jVersion
         compile group: 'io.github.resilience4j', name: 'resilience4j-ratelimiter', version: resilience4jVersion
         compile group: 'io.github.resilience4j', name: 'resilience4j-retry', version: resilience4jVersion
         compile group: 'io.github.resilience4j', name: 'resilience4j-micrometer', version: resilience4jVersion
-        compile group: 'io.micrometer', name: 'micrometer-core', version: '1.3.5'
-        compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
+        compile group: 'io.micrometer', name: 'micrometer-core', version: '1.5.3'
+        compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.11'
         compile group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'
-        compile group: 'commons-io', name: 'commons-io', version: '2.6'
+        compile group: 'commons-io', name: 'commons-io', version: '2.7'
     }
 
     publishing {
@@ -90,5 +90,5 @@ nexusStaging {
 }
 
 wrapper {
-    gradleVersion = '6.2.2'
+    gradleVersion = '6.5.1'
 }

charon-common/src/main/java/com/github/mkopylec/charon/forwarding/interceptors/resilience/CommonCircuitBreaker.java

@@ -4,6 +4,7 @@
 import com.github.mkopylec.charon.forwarding.interceptors.RequestForwardingInterceptorType;
 import io.github.resilience4j.circuitbreaker.CallNotPermittedException;
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
+import io.github.resilience4j.micrometer.tagged.CircuitBreakerMetricNames;
 import io.github.resilience4j.micrometer.tagged.TaggedCircuitBreakerMetrics;
 import org.slf4j.Logger;
 
@@ -43,7 +44,7 @@ TaggedCircuitBreakerMetrics createMetrics(CircuitBreakerRegistry registry, Strin
         String failureRateMetricName = metricName(mappingName, CIRCUIT_BREAKER_METRICS_NAME, "failure-rate");
         String slowCallRateMetricName = metricName(mappingName, CIRCUIT_BREAKER_METRICS_NAME, "slow-calls-rate");
         String slowCallsMetricName = metricName(mappingName, CIRCUIT_BREAKER_METRICS_NAME, "slow-calls");
-        TaggedCircuitBreakerMetrics.MetricNames metricNames = TaggedCircuitBreakerMetrics.MetricNames.custom()
+        CircuitBreakerMetricNames metricNames = CircuitBreakerMetricNames.custom()
                 .bufferedCallsMetricName(bufferedCallsMetricName)
                 .callsMetricName(callsMetricName)
                 .stateMetricName(stateMetricName)

charon-common/src/main/java/com/github/mkopylec/charon/forwarding/interceptors/resilience/CommonRateLimiter.java

@@ -2,6 +2,7 @@
 
 import com.github.mkopylec.charon.configuration.Valid;
 import com.github.mkopylec.charon.forwarding.interceptors.RequestForwardingInterceptorType;
+import io.github.resilience4j.micrometer.tagged.RateLimiterMetricNames;
 import io.github.resilience4j.micrometer.tagged.TaggedRateLimiterMetrics;
 import io.github.resilience4j.ratelimiter.RateLimiterRegistry;
 import org.slf4j.Logger;
@@ -33,7 +34,7 @@ public RequestForwardingInterceptorType getType() {
     TaggedRateLimiterMetrics createMetrics(RateLimiterRegistry registry, String mappingName) {
         String availablePermissionsMetricName = metricName(mappingName, RATE_LIMITING_METRICS_NAME, "available-permissions");
         String waitingThreadsMetricName = metricName(mappingName, RATE_LIMITING_METRICS_NAME, "waiting-threads");
-        TaggedRateLimiterMetrics.MetricNames metricNames = TaggedRateLimiterMetrics.MetricNames.custom()
+        RateLimiterMetricNames metricNames = RateLimiterMetricNames.custom()
                 .availablePermissionsMetricName(availablePermissionsMetricName)
                 .waitingThreadsMetricName(waitingThreadsMetricName)
                 .build();

charon-common/src/main/java/com/github/mkopylec/charon/forwarding/interceptors/resilience/CommonRetryer.java

@@ -2,6 +2,7 @@
 
 import com.github.mkopylec.charon.configuration.Valid;
 import com.github.mkopylec.charon.forwarding.interceptors.RequestForwardingInterceptorType;
+import io.github.resilience4j.micrometer.tagged.RetryMetricNames;
 import io.github.resilience4j.micrometer.tagged.TaggedRetryMetrics;
 import io.github.resilience4j.retry.RetryConfig;
 import io.github.resilience4j.retry.RetryRegistry;
@@ -33,7 +34,7 @@ public RequestForwardingInterceptorType getType() {
 
     TaggedRetryMetrics createMetrics(RetryRegistry registry, String mappingName) {
         String callsMetricName = metricName(mappingName, RETRYING_METRICS_NAME, "calls");
-        TaggedRetryMetrics.MetricNames metricNames = TaggedRetryMetrics.MetricNames.custom()
+        RetryMetricNames metricNames = RetryMetricNames.custom()
                 .callsMetricName(callsMetricName)
                 .build();
         return ofRetryRegistry(metricNames, registry);

charon-spring-webflux/src/test/resources/application.yml

@@ -1,3 +1,7 @@
 logging:
   level:
-    com.github.mkopylec.charon: trace
+    com.github.mkopylec.charon: trace
+
+server:
+  error:
+    include-message: always

charon-spring-webmvc/src/test/resources/application.yml

@@ -4,4 +4,6 @@ logging:
 
 server:
   tomcat:
-    connection-timeout: 0
+    connection-timeout: 0
+  error:
+    include-message: always

charon-test/build.gradle

@@ -2,6 +2,6 @@ dependencies {
     compile project(':charon-common')
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion
     compile group: 'org.spockframework', name: 'spock-spring', version: '1.3-groovy-2.5'
-    compile group: 'org.mock-server', name: 'mockserver-netty', version: '5.10.0'
+    compile group: 'org.mock-server', name: 'mockserver-netty', version: '5.11.1'
     compile group: 'com.squareup.okhttp3', name: 'okhttp', version: okHttpVersion
 }

charon-test/src/main/groovy/com/github/mkopylec/charon/test/specification/ResponseForwardingBasicSpec.groovy

@@ -60,6 +60,6 @@ abstract class ResponseForwardingBasicSpec extends BasicSpec {
                 .hasBody(body)
 
         where:
-        body << [null, '  ', 'response body']
+        body << [null, 'response body']
     }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists