From commits-return-55219-archive-asf-public=cust-asf.ponee.io@cxf.apache.org Sun Nov 1 15:44:18 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id DF6E718066B for ; Sun, 1 Nov 2020 16:44:17 +0100 (CET) Received: from mail.apache.org (localhost [127.0.0.1]) by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id 0F5C9122184 for ; Sun, 1 Nov 2020 15:44:17 +0000 (UTC) Received: (qmail 16485 invoked by uid 500); 1 Nov 2020 15:44:16 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 16474 invoked by uid 99); 1 Nov 2020 15:44:16 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Nov 2020 15:44:16 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 28003820CE; Sun, 1 Nov 2020 15:44:15 +0000 (UTC) Date: Sun, 01 Nov 2020 15:44:14 +0000 To: "commits@cxf.apache.org" Subject: [cxf] branch 3.3.x-fixes updated (53afe98 -> 43d812a) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <160424545440.27878.8029153715477689084@gitbox.apache.org> From: reta@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: cxf X-Git-Refname: refs/heads/3.3.x-fixes X-Git-Reftype: branch X-Git-Oldrev: 53afe98ba138bd76b57aaba89b3c2164c292f639 X-Git-Newrev: 43d812a6117d8d58eefa8cb28c001e6c95089396 X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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