|
1 | 1 | /* |
2 | | - * Copyright 2017 the original author or authors. |
| 2 | + * Copyright 2017-2018 the original author or authors. |
3 | 3 | * |
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | 5 | * you may not use this file except in compliance with the License. |
|
16 | 16 |
|
17 | 17 | package org.springframework.cloud.dataflow.metrics.collector; |
18 | 18 |
|
| 19 | +import java.io.IOException; |
| 20 | +import java.util.List; |
| 21 | +import java.util.stream.Collectors; |
| 22 | + |
| 23 | +import com.fasterxml.jackson.core.type.TypeReference; |
| 24 | +import com.fasterxml.jackson.databind.ObjectMapper; |
19 | 25 | import org.slf4j.Logger; |
20 | 26 | import org.slf4j.LoggerFactory; |
21 | 27 |
|
22 | 28 | import org.springframework.cloud.dataflow.metrics.collector.model.ApplicationMetrics; |
| 29 | +import org.springframework.cloud.dataflow.metrics.collector.model.Metric; |
| 30 | +import org.springframework.cloud.dataflow.metrics.collector.model.MicrometerMetric; |
23 | 31 | import org.springframework.cloud.dataflow.metrics.collector.services.ApplicationMetricsService; |
24 | 32 | import org.springframework.cloud.stream.annotation.StreamListener; |
25 | 33 | import org.springframework.cloud.stream.messaging.Sink; |
26 | 34 | import org.springframework.stereotype.Component; |
| 35 | +import org.springframework.util.StringUtils; |
27 | 36 |
|
28 | 37 | /** |
29 | 38 | * Adds the incoming {@link ApplicationMetrics} payload into the backend store |
30 | 39 | * @author Vinicius Carvalho |
| 40 | + * @author Christian Tzolov |
31 | 41 | */ |
32 | 42 | @Component |
33 | 43 | public class MetricsAggregator { |
| 44 | + private Logger logger = LoggerFactory.getLogger(MetricsAggregator.class); |
34 | 45 |
|
| 46 | + private ObjectMapper mapper; |
35 | 47 | private ApplicationMetricsService service; |
36 | 48 |
|
37 | | - private Logger logger = LoggerFactory.getLogger(MetricsAggregator.class); |
38 | 49 |
|
39 | 50 | public MetricsAggregator(ApplicationMetricsService service) { |
40 | 51 | this.service = service; |
| 52 | + this.mapper = new ObjectMapper(); |
41 | 53 | } |
42 | 54 |
|
| 55 | + private final static class Metric1TypeReference extends TypeReference<ApplicationMetrics<Metric<Number>>> {} |
| 56 | + |
| 57 | + private final static class Metric2TypeReference extends TypeReference<ApplicationMetrics<MicrometerMetric<Number>>> {} |
| 58 | + |
43 | 59 | @StreamListener(Sink.INPUT) |
44 | | - public void receive(ApplicationMetrics metrics) { |
| 60 | + public void receive(String metrics) { |
| 61 | + |
| 62 | + ApplicationMetrics<Metric<Double>> applicationMetrics; |
| 63 | + try { |
| 64 | + // Use the "spring.integration.send" metric name as a version discriminator for old and new metrics |
| 65 | + if (StringUtils.hasText(metrics) && metrics.contains("spring.integration.send")) { |
| 66 | + ApplicationMetrics<MicrometerMetric<Number>> applicationMetrics2 = mapper.readValue(metrics, new Metric2TypeReference()); |
| 67 | + applicationMetrics = convertMetric2ToMetric(applicationMetrics2); |
| 68 | + applicationMetrics.getProperties().put(ApplicationMetrics.STREAM_METRICS_VERSION, ApplicationMetrics.METRICS_VERSION_2); |
| 69 | + } |
| 70 | + else { |
| 71 | + applicationMetrics = mapper.readValue(metrics, new Metric1TypeReference()); |
| 72 | + applicationMetrics.getProperties().put(ApplicationMetrics.STREAM_METRICS_VERSION, ApplicationMetrics.METRICS_VERSION_1); |
| 73 | + } |
| 74 | + |
| 75 | + this.processApplicationMetrics(applicationMetrics); |
| 76 | + } |
| 77 | + catch (IOException e) { |
| 78 | + logger.warn("Invalid metrics Json", e); |
| 79 | + } |
| 80 | + |
| 81 | + } |
| 82 | + |
| 83 | + /** |
| 84 | + * Converts the new Micrometer metrics into the previous {@link Metric} |
| 85 | + * format (e.g. to the Spring Boot 1.x actuator metrics) |
| 86 | + * Only the successful Spring Integration channel metrics are filtered in. All other metrics are discarded! |
| 87 | + * @param applicationMetrics2 {@link ApplicationMetrics} with Micrometer Metrics collection |
| 88 | + * @return Returns {@link ApplicationMetrics} with SpringBoot1.5's Metric collection. |
| 89 | + */ |
| 90 | + private ApplicationMetrics<Metric<Double>> convertMetric2ToMetric(ApplicationMetrics<MicrometerMetric<Number>> applicationMetrics2) { |
| 91 | + List<Metric<Double>> metrics = applicationMetrics2.getMetrics().stream() |
| 92 | + .filter(metric -> metric.getId().getName().matches("spring\\.integration\\.send")) |
| 93 | + .filter(metric -> metric.getId().getTag("type").equals("channel")) |
| 94 | + .filter(metric -> metric.getId().getTag("result").equals("success")) |
| 95 | + .map(m2 -> new Metric<>( |
| 96 | + generateOldMetricName(m2), |
| 97 | + m2.getCount().doubleValue() / (applicationMetrics2.getInterval() / 1000), // normalize rate |
| 98 | + m2.getTimestamp())) |
| 99 | + .collect(Collectors.toList()); |
| 100 | + ApplicationMetrics<Metric<Double>> applicationMetrics = new ApplicationMetrics(applicationMetrics2.getName(), metrics); |
| 101 | + applicationMetrics.setCreatedTime(applicationMetrics2.getCreatedTime()); |
| 102 | + applicationMetrics.setProperties(applicationMetrics2.getProperties()); |
| 103 | + return applicationMetrics; |
| 104 | + } |
| 105 | + |
| 106 | + /** |
| 107 | + * Build an hierarchical Metric Ver.1 name from the the multi-dimension (e.g. multi-tag) micrometer Metric |
| 108 | + * @param metric2 Micrometer based metrics |
| 109 | + * @return Returns an hierarchical name compatible with the Metric ver.1 name convention. |
| 110 | + */ |
| 111 | + private String generateOldMetricName(MicrometerMetric<Number> metric2) { |
| 112 | + String oldMetricName = metric2.getId().getName(); |
| 113 | + if (metric2.getId().getName().startsWith("spring.integration.")) { |
| 114 | + String channelName = metric2.getId().getTag("name"); |
| 115 | + String metricResult = metric2.getId().getTag("result"); |
| 116 | + String successSuffix = "success".equals(metricResult) ? "" : "." + metricResult; |
| 117 | + oldMetricName = "integration.channel." + channelName + ".send.mean" + successSuffix; |
| 118 | + } |
| 119 | + return oldMetricName; |
| 120 | + } |
| 121 | + |
| 122 | + private void processApplicationMetrics(ApplicationMetrics<Metric<Double>> metrics) { |
45 | 123 | if (metrics.getProperties().get(ApplicationMetrics.APPLICATION_GUID) != null |
46 | 124 | && metrics.getProperties().get(ApplicationMetrics.APPLICATION_NAME) != null |
47 | 125 | && metrics.getProperties().get(ApplicationMetrics.STREAM_NAME) != null) { |
48 | 126 | this.service.add(metrics); |
49 | | - }else{ |
50 | | - if(logger.isDebugEnabled()){ |
51 | | - logger.debug("Metric : {} is missing key properties and will not be consumed by the collector",metrics.getName()); |
| 127 | + } |
| 128 | + else { |
| 129 | + if (logger.isDebugEnabled()) { |
| 130 | + logger.debug("Metric : {} is missing key properties and will not be consumed by the collector", metrics.getName()); |
52 | 131 | } |
53 | 132 | } |
54 | 133 | } |
55 | | - |
56 | 134 | } |
0 commit comments