This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 53afe98 Update to Spring Boot 2.1.18.RELEASE
new e225ae3 CXF-8252: Add Micrometer metric support for JAX-RS (Spring
Boot) (#716)
new 43d812a Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 1 +
.../main/release/samples/jax_rs/spring_boot/README | 8 +-
.../release/samples/jax_rs/spring_boot/pom.xml | 13 ++
.../sample/rs/service/SampleRestApplication.java | 11 +-
.../src/main/resources/application.properties | 3 +
integration/spring-boot/autoconfigure/pom.xml | 6 +
.../spring/boot/autoconfigure/CxfProperties.java | 15 +-
.../MicrometerMetricsAutoConfiguration.java | 85 ++++++----
.../SpringBasedTimedAnnotationProvider.java | 38 ++++-
.../MicrometerMetricsAutoConfigurationTest.java | 91 +++++++++++
.../micrometer/MicrometerMetricsProperties.java | 10 +-
.../micrometer/MicrometerMetricsProvider.java | 19 ++-
.../provider/DefaultTimedAnnotationProvider.java | 32 ++--
.../metrics/micrometer/provider/StandardTags.java | 2 +-
.../JaxrsOperationTagsCustomizer.java} | 13 +-
.../{jaxws/JaxwsTags.java => jaxrs/JaxrsTags.java} | 25 +--
.../micrometer/MicrometerMetricsProviderTest.java | 30 +++-
.../DefaultExceptionClassProviderTest.java | 6 +-
.../DefaultTimedAnnotationProviderTest.java | 9 +-
.../provider/StandardTagsProviderTest.java | 4 +-
.../micrometer/provider/StandardTagsTest.java | 7 +-
.../jaxrs/JaxrsOperationTagsCustomizerTest.java | 73 +++++++++
.../micrometer/provider/jaxrs/JaxrsTagsTest.java | 65 ++++++++
.../cxf/systest/jaxrs/resources/Library.java | 6 +
.../systest/jaxrs/spring/boot/SpringJaxrsTest.java | 181 +++++++++++++++++++++
.../src/test/resources/application-jaxrs.yml | 7 +
.../src/test/resources/application-jaxws.yml | 5 +-
27 files changed, 661 insertions(+), 104 deletions(-)
create mode 100644
integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/MicrometerMetricsAutoConfigurationTest.java
copy
rt/features/metrics/src/main/java/org/apache/cxf/metrics/micrometer/provider/{jaxws/JaxwsOperationTagsCustomizer.java
=> jaxrs/JaxrsOperationTagsCustomizer.java} (80%)
copy
rt/features/metrics/src/main/java/org/apache/cxf/metrics/micrometer/provider/{jaxws/JaxwsTags.java
=> jaxrs/JaxrsTags.java} (65%)
create mode 100644
rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/jaxrs/JaxrsOperationTagsCustomizerTest.java
create mode 100644
rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/jaxrs/JaxrsTagsTest.java
create mode 100644
systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
create mode 100644
systests/spring-boot/src/test/resources/application-jaxrs.yml
