[GitHub] [cxf] reta commented on a change in pull request #642: [CXF-8213] Add Micrometer metric support for JAX-WS

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[GitHub] [cxf] reta commented on a change in pull request #642: [CXF-8213] Add Micrometer metric support for JAX-WS

GitBox

reta commented on a change in pull request #642:
URL: https://github.com/apache/cxf/pull/642#discussion_r506958810



##########
File path: rt/features/metrics/src/main/java/org/apache/cxf/metrics/micrometer/MicrometerMetricsContext.java
##########
@@ -0,0 +1,138 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.metrics.micrometer;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Supplier;
+
+import com.google.common.collect.Iterables;
+
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.metrics.MetricsContext;
+import org.apache.cxf.metrics.micrometer.provider.TagsCustomizer;
+import org.apache.cxf.metrics.micrometer.provider.TagsProvider;
+import org.apache.cxf.metrics.micrometer.provider.TimedAnnotationProvider;
+
+import io.micrometer.core.annotation.Timed;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.Timer;
+
+public class MicrometerMetricsContext implements MetricsContext {
+
+    private final MeterRegistry registry;
+    private final TagsProvider tagsProvider;
+    private final TimedAnnotationProvider timedAnnotationProvider;
+    private final List<TagsCustomizer> tagsCustomizers;
+
+    private final String metricName;
+    private final boolean autoTimeRequests;
+
+    public MicrometerMetricsContext(MeterRegistry registry, TagsProvider tagsProvider,
+                                    TimedAnnotationProvider timedAnnotationProvider,
+                                    List<TagsCustomizer> tagsCustomizers, String metricName, boolean autoTimeRequests) {
+        this.registry = registry;
+        this.tagsProvider = tagsProvider;
+        this.timedAnnotationProvider = timedAnnotationProvider;
+        this.tagsCustomizers = tagsCustomizers;
+        this.metricName = metricName;
+        this.autoTimeRequests = autoTimeRequests;
+    }
+
+    @Override
+    public void start(Exchange ex) {
+        Message request = ex.getInMessage();
+        TimingContext timingContext = TimingContext.get(request);
+        if (timingContext == null) {
+            startAndAttachTimingContext(request);
+        }
+    }
+
+    @Override
+    public void stop(long timeInNS, long inSize, long outSize, Exchange ex) {
+        Message request = ex.getInMessage();
+        TimingContext timingContext = TimingContext.get(request);
+        if (timingContext == null) {
+            timingContext = startAndAttachTimingContext(request);
+        }
+        record(timingContext, ex);
+    }
+
+    private TimingContext startAndAttachTimingContext(Message request) {
+        Timer.Sample timerSample = Timer.start(this.registry);
+        TimingContext timingContext = new TimingContext(timerSample);
+        timingContext.attachTo(request);
+        return timingContext;
+    }
+
+    private void record(TimingContext timingContext, Exchange ex) {
+        Set<Timed> annotations = timedAnnotationProvider.getTimedAnnotations(ex);
+        Timer.Sample timerSample = timingContext.getTimerSample();
+        Supplier<Iterable<Tag>> tags = () -> {
+            Iterable<Tag> defaultTags = this.tagsProvider.getTags(ex);
+            List<Tag> additionalTags = new ArrayList<>();
+            tagsCustomizers
+                    .forEach(tagsCustomizer -> tagsCustomizer.getAdditionalTags(ex).forEach(additionalTags::add));
+            return Iterables.concat(defaultTags, additionalTags);

Review comment:
       Bringing whole Guava for using `Iterables` seems too much, could you please rewrite it using standard library? Fe:
   
   ```
               return () -> Stream.concat(
                       StreamSupport.stream(defaultTags.spliterator(), false),
                       StreamSupport.stream(additionalTags.spliterator(), false))
                   .iterator();
   ```




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]