Refactor metrics code.
This commit is contained in:
+52
-82
@@ -2,9 +2,6 @@ package com.alibaba.otter.canal.prometheus;
|
||||
|
||||
import com.alibaba.otter.canal.instance.core.CanalInstance;
|
||||
import com.alibaba.otter.canal.prometheus.impl.*;
|
||||
import com.alibaba.otter.canal.sink.CanalEventSink;
|
||||
import com.alibaba.otter.canal.sink.entry.EntryEventSink;
|
||||
import com.alibaba.otter.canal.store.CanalStoreException;
|
||||
import io.prometheus.client.Collector;
|
||||
import io.prometheus.client.CollectorRegistry;
|
||||
import org.slf4j.Logger;
|
||||
@@ -18,98 +15,71 @@ import java.util.List;
|
||||
*/
|
||||
public class CanalInstanceExports {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(CanalInstanceExports.class);
|
||||
public static final String DEST = "destination";
|
||||
public static final String[] DEST_LABELS = {DEST};
|
||||
public static final List<String> DEST_LABEL_LIST = Collections.singletonList(DEST);
|
||||
// private final String destination;
|
||||
private Collector storeCollector;
|
||||
private Collector delayCollector;
|
||||
private Collector metaCollector;
|
||||
private Collector sinkCollector;
|
||||
private Collector parserCollector;
|
||||
private static final Logger logger = LoggerFactory.getLogger(CanalInstanceExports.class);
|
||||
public static final String DEST = "destination";
|
||||
public static final String[] DEST_LABELS = {DEST};
|
||||
public static final List<String> DEST_LABELS_LIST = Collections.singletonList(DEST);
|
||||
private final Collector storeCollector;
|
||||
private final Collector entryCollector;
|
||||
private final Collector metaCollector;
|
||||
private final Collector sinkCollector;
|
||||
private final Collector parserCollector;
|
||||
|
||||
public CanalInstanceExports() {
|
||||
// this.destination = instance.getDestination();
|
||||
// initEventsMetrics(instance);
|
||||
// initStoreCollector(instance);
|
||||
// initMetaCollector(instance);
|
||||
// initSinkCollector(instance);
|
||||
// initParserCollector(instance);
|
||||
private CanalInstanceExports() {
|
||||
this.storeCollector = StoreCollector.instance();
|
||||
this.entryCollector = EntryCollector.instance();
|
||||
this.metaCollector = MetaCollector.instance();
|
||||
this.sinkCollector = SinkCollector.instance();
|
||||
this.parserCollector = ParserCollector.instance();
|
||||
}
|
||||
|
||||
private static class SingletonHolder {
|
||||
private static final CanalInstanceExports SINGLETON = new CanalInstanceExports();
|
||||
}
|
||||
|
||||
public static CanalInstanceExports instance() {
|
||||
return SingletonHolder.SINGLETON;
|
||||
}
|
||||
|
||||
// static CanalInstanceExports forInstance(CanalInstance instance) {
|
||||
// return new CanalInstanceExports(instance);
|
||||
// }
|
||||
public void initialize() {
|
||||
storeCollector.register();
|
||||
entryCollector.register();
|
||||
metaCollector.register();
|
||||
sinkCollector.register();
|
||||
parserCollector.register();
|
||||
}
|
||||
|
||||
public void terminate() {
|
||||
CollectorRegistry.defaultRegistry.unregister(storeCollector);
|
||||
CollectorRegistry.defaultRegistry.unregister(entryCollector);
|
||||
CollectorRegistry.defaultRegistry.unregister(metaCollector);
|
||||
CollectorRegistry.defaultRegistry.unregister(sinkCollector);
|
||||
CollectorRegistry.defaultRegistry.unregister(parserCollector);
|
||||
}
|
||||
|
||||
void register(CanalInstance instance) {
|
||||
if (delayCollector != null) {
|
||||
delayCollector.register();
|
||||
}
|
||||
if (storeCollector != null) {
|
||||
storeCollector.register();
|
||||
}
|
||||
if (metaCollector != null) {
|
||||
metaCollector.register();
|
||||
}
|
||||
if (sinkCollector != null) {
|
||||
sinkCollector.register();
|
||||
}
|
||||
if (parserCollector != null) {
|
||||
parserCollector.register();
|
||||
}
|
||||
requiredInstanceRegistry(storeCollector).register(instance);
|
||||
requiredInstanceRegistry(entryCollector).register(instance);
|
||||
requiredInstanceRegistry(metaCollector).register(instance);
|
||||
requiredInstanceRegistry(sinkCollector).register(instance);
|
||||
requiredInstanceRegistry(parserCollector).register(instance);
|
||||
logger.info("Successfully register metrics for instance {}.", instance.getDestination());
|
||||
}
|
||||
|
||||
void unregister(CanalInstance instance) {
|
||||
if (delayCollector != null) {
|
||||
CollectorRegistry.defaultRegistry.unregister(delayCollector);
|
||||
}
|
||||
if (storeCollector != null) {
|
||||
CollectorRegistry.defaultRegistry.unregister(storeCollector);
|
||||
}
|
||||
if (metaCollector != null) {
|
||||
CollectorRegistry.defaultRegistry.unregister(metaCollector);
|
||||
}
|
||||
if (sinkCollector != null) {
|
||||
CollectorRegistry.defaultRegistry.unregister(sinkCollector);
|
||||
}
|
||||
if (parserCollector != null) {
|
||||
CollectorRegistry.defaultRegistry.unregister(parserCollector);
|
||||
}
|
||||
requiredInstanceRegistry(storeCollector).unregister(instance);
|
||||
requiredInstanceRegistry(entryCollector).unregister(instance);
|
||||
requiredInstanceRegistry(metaCollector).unregister(instance);
|
||||
requiredInstanceRegistry(sinkCollector).unregister(instance);
|
||||
requiredInstanceRegistry(parserCollector).unregister(instance);
|
||||
logger.info("Successfully unregister metrics for instance {}.", instance.getDestination());
|
||||
}
|
||||
|
||||
private void initEventsMetrics(CanalInstance instance) {
|
||||
CanalEventSink sink = instance.getEventSink();
|
||||
if (sink instanceof EntryEventSink) {
|
||||
EntryEventSink entryEventSink = (EntryEventSink) sink;
|
||||
// TODO ensure not to add handler again
|
||||
// PrometheusCanalEventDownStreamHandler handler = new PrometheusCanalEventDownStreamHandler(destination);
|
||||
// entryEventSink.addHandler(handler);
|
||||
// delayCollector = handler.getCollector();
|
||||
} else {
|
||||
logger.warn("This impl register metrics for only EntryEventSink, skip.");
|
||||
private InstanceRegistry requiredInstanceRegistry(Collector collector) {
|
||||
if (!(collector instanceof InstanceRegistry)) {
|
||||
throw new IllegalArgumentException("Canal collector need to implement InstanceRegistry.");
|
||||
}
|
||||
return (InstanceRegistry) collector;
|
||||
}
|
||||
|
||||
// private void initStoreCollector(CanalInstance instance) {
|
||||
// try {
|
||||
// storeCollector = new StoreCollector(instance.getEventStore(), destination);
|
||||
// } catch (CanalStoreException cse) {
|
||||
// logger.warn("Failed to register metrics for destination {}.", destination, cse);
|
||||
// }
|
||||
// }
|
||||
|
||||
private void initMetaCollector(CanalInstance instance) {
|
||||
metaCollector = new MetaCollector(instance);
|
||||
}
|
||||
|
||||
private void initSinkCollector(CanalInstance instance) {
|
||||
// sinkCollector = new EntryCollector(instance.getEventSink(), instance.getDestination());
|
||||
}
|
||||
|
||||
private void initParserCollector(CanalInstance instance) {
|
||||
parserCollector = new MysqlParserCollector(instance.getEventParser(), instance.getDestination());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
package com.alibaba.otter.canal.prometheus;
|
||||
|
||||
|
||||
/**
|
||||
* @author Chuanyi Li
|
||||
*/
|
||||
public class CanalServerExports {
|
||||
|
||||
private static boolean initialized = false;
|
||||
|
||||
public static synchronized void initialize() {
|
||||
if (!initialized) {
|
||||
initialized = true;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
+16
-17
@@ -20,12 +20,13 @@ import static com.alibaba.otter.canal.server.netty.CanalServerWithNettyProfiler.
|
||||
public class PrometheusService implements CanalMetricsService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(PrometheusService.class);
|
||||
private final CanalInstanceExports instanceExports = new CanalInstanceExports();
|
||||
private final CanalInstanceExports instanceExports;
|
||||
private volatile boolean running = false;
|
||||
private HTTPServer server;
|
||||
private ClientInstanceProfiler clientProfiler = new PrometheusClientInstanceProfiler();
|
||||
|
||||
private PrometheusService() {
|
||||
this.instanceExports = CanalInstanceExports.instance();
|
||||
}
|
||||
|
||||
private static class SingletonHolder {
|
||||
@@ -49,8 +50,7 @@ public class PrometheusService implements CanalMetricsService {
|
||||
try {
|
||||
// JVM exports
|
||||
DefaultExports.initialize();
|
||||
// Canal server level exports
|
||||
CanalServerExports.initialize();
|
||||
instanceExports.initialize();
|
||||
if (!clientProfiler.isStart()) {
|
||||
clientProfiler.start();
|
||||
}
|
||||
@@ -65,13 +65,17 @@ public class PrometheusService implements CanalMetricsService {
|
||||
@Override
|
||||
public void terminate() {
|
||||
running = false;
|
||||
instanceExports.unregister();
|
||||
if (clientProfiler.isStart()) {
|
||||
clientProfiler.stop();
|
||||
}
|
||||
profiler().setInstanceProfiler(NOP);
|
||||
if (server != null) {
|
||||
server.stop();
|
||||
try {
|
||||
instanceExports.terminate();
|
||||
if (clientProfiler.isStart()) {
|
||||
clientProfiler.stop();
|
||||
}
|
||||
profiler().setInstanceProfiler(NOP);
|
||||
if (server != null) {
|
||||
server.stop();
|
||||
}
|
||||
} catch (Throwable t) {
|
||||
logger.warn("Something happened while terminating.", t);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -87,9 +91,7 @@ public class PrometheusService implements CanalMetricsService {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
CanalInstanceExports export = CanalInstanceExports.forInstance(instance);
|
||||
export.register();
|
||||
exports.put(instance.getDestination(), export);
|
||||
instanceExports.register(instance);
|
||||
} catch (Throwable t) {
|
||||
logger.warn("Unable to register instance exports for {}.", instance.getDestination(), t);
|
||||
}
|
||||
@@ -102,10 +104,7 @@ public class PrometheusService implements CanalMetricsService {
|
||||
logger.warn("Try unregister metrics after destination {} is stopped.", instance.getDestination());
|
||||
}
|
||||
try {
|
||||
CanalInstanceExports export = exports.remove(instance.getDestination());
|
||||
if (export != null) {
|
||||
export.unregister();
|
||||
}
|
||||
instanceExports.unregister(instance);
|
||||
} catch (Throwable t) {
|
||||
logger.warn("Unable to unregister instance exports for {}.", instance.getDestination(), t);
|
||||
}
|
||||
|
||||
+66
-12
@@ -2,10 +2,12 @@ package com.alibaba.otter.canal.prometheus.impl;
|
||||
|
||||
import com.alibaba.otter.canal.instance.core.CanalInstance;
|
||||
import com.alibaba.otter.canal.prometheus.InstanceRegistry;
|
||||
import com.alibaba.otter.canal.sink.CanalEventDownStreamHandler;
|
||||
import com.alibaba.otter.canal.sink.CanalEventSink;
|
||||
import com.alibaba.otter.canal.sink.entry.EntryEventSink;
|
||||
import com.google.common.base.Preconditions;
|
||||
import io.prometheus.client.Collector;
|
||||
import io.prometheus.client.CounterMetricFamily;
|
||||
import io.prometheus.client.GaugeMetricFamily;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -17,27 +19,43 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ConcurrentMap;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
|
||||
import static com.alibaba.otter.canal.prometheus.CanalInstanceExports.DEST_LABEL_LIST;
|
||||
import static com.alibaba.otter.canal.prometheus.CanalInstanceExports.DEST_LABELS_LIST;
|
||||
|
||||
/**
|
||||
* @author Chuanyi Li
|
||||
*/
|
||||
public class EntryCollector extends Collector implements InstanceRegistry {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(SinkCollector.class);
|
||||
private static final String DELAY_NAME = "canal_instance_traffic_delay";
|
||||
private static final String delayHelpName = "Traffic delay of canal instance";
|
||||
private final ConcurrentMap<String, EntryMetricsHolder> instances = new ConcurrentHashMap<String, EntryMetricsHolder>();
|
||||
private static final Logger logger = LoggerFactory.getLogger(SinkCollector.class);
|
||||
private static final String DELAY = "canal_instance_traffic_delay";
|
||||
private static final String TRANSACTION = "canal_instance_transactions";
|
||||
private static final String DELAY_HELP = "Traffic delay of canal instance";
|
||||
private static final String TRANSACTION_HELP = "Transactions counter of canal instance";
|
||||
private final ConcurrentMap<String, EntryMetricsHolder> instances = new ConcurrentHashMap<String, EntryMetricsHolder>();
|
||||
|
||||
private EntryCollector() {}
|
||||
|
||||
private static class SingletonHolder {
|
||||
private static final EntryCollector SINGLETON = new EntryCollector();
|
||||
}
|
||||
|
||||
public static EntryCollector instance() {
|
||||
return SingletonHolder.SINGLETON;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MetricFamilySamples> collect() {
|
||||
List<MetricFamilySamples> mfs = new ArrayList<MetricFamilySamples>();
|
||||
GaugeMetricFamily delay = new GaugeMetricFamily(DELAY_NAME,
|
||||
delayHelpName, DEST_LABEL_LIST);
|
||||
GaugeMetricFamily delay = new GaugeMetricFamily(DELAY,
|
||||
DELAY_HELP, DEST_LABELS_LIST);
|
||||
CounterMetricFamily transactions = new CounterMetricFamily(TRANSACTION,
|
||||
TRANSACTION_HELP, DEST_LABELS_LIST);
|
||||
for (EntryMetricsHolder emh : instances.values()) {
|
||||
delay.addMetric(emh.destLabelValues, emh.latestExecTime.doubleValue());
|
||||
transactions.addMetric(emh.destLabelValues, emh.transactionCounter.doubleValue());
|
||||
}
|
||||
mfs.add(delay);
|
||||
mfs.add(transactions);
|
||||
return mfs;
|
||||
}
|
||||
|
||||
@@ -51,25 +69,61 @@ public class EntryCollector extends Collector implements InstanceRegistry {
|
||||
throw new IllegalArgumentException("CanalEventSink must be EntryEventSink");
|
||||
}
|
||||
EntryEventSink entrySink = (EntryEventSink) sink;
|
||||
PrometheusCanalEventDownStreamHandler handler = new PrometheusCanalEventDownStreamHandler();
|
||||
PrometheusCanalEventDownStreamHandler handler = assembleHandler(entrySink);
|
||||
holder.latestExecTime = handler.getLatestExecuteTime();
|
||||
entrySink.addHandler(handler, 0);
|
||||
Preconditions.checkNotNull(holder.destLabelValues);
|
||||
holder.transactionCounter = handler.getTransactionCounter();
|
||||
Preconditions.checkNotNull(holder.latestExecTime);
|
||||
EntryMetricsHolder old = instances.putIfAbsent(destination, holder);
|
||||
Preconditions.checkNotNull(holder.transactionCounter);
|
||||
EntryMetricsHolder old = instances.put(destination, holder);
|
||||
if (old != null) {
|
||||
logger.warn("Ignore repeated EntryCollector register for instance {}.", destination);
|
||||
logger.warn("Remove stale EntryCollector for instance {}.", destination);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void unregister(CanalInstance instance) {
|
||||
final String destination = instance.getDestination();
|
||||
CanalEventSink sink = instance.getEventSink();
|
||||
if (!(sink instanceof EntryEventSink)) {
|
||||
throw new IllegalArgumentException("CanalEventSink must be EntryEventSink");
|
||||
}
|
||||
unloadHandler((EntryEventSink) sink);
|
||||
instances.remove(destination);
|
||||
}
|
||||
|
||||
private PrometheusCanalEventDownStreamHandler assembleHandler(EntryEventSink entrySink) {
|
||||
PrometheusCanalEventDownStreamHandler ph = new PrometheusCanalEventDownStreamHandler();
|
||||
List<CanalEventDownStreamHandler> handlers = entrySink.getHandlers();
|
||||
for (CanalEventDownStreamHandler handler : handlers) {
|
||||
if (handler instanceof PrometheusCanalEventDownStreamHandler) {
|
||||
throw new IllegalStateException("PrometheusCanalEventDownStreamHandler already exists in handlers.");
|
||||
}
|
||||
}
|
||||
entrySink.addHandler(ph, 0);
|
||||
return ph;
|
||||
}
|
||||
|
||||
private void unloadHandler(EntryEventSink entrySink) {
|
||||
List<CanalEventDownStreamHandler> handlers = entrySink.getHandlers();
|
||||
int i = 0;
|
||||
for (; i < handlers.size(); i++) {
|
||||
if (handlers.get(i) instanceof PrometheusCanalEventDownStreamHandler) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
entrySink.removeHandler(i);
|
||||
// Ensure no PrometheusCanalEventDownStreamHandler
|
||||
handlers = entrySink.getHandlers();
|
||||
for (CanalEventDownStreamHandler handler : handlers) {
|
||||
if (handler instanceof PrometheusCanalEventDownStreamHandler) {
|
||||
throw new IllegalStateException("Multiple prometheusCanalEventDownStreamHandler exists in handlers.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class EntryMetricsHolder {
|
||||
private AtomicLong latestExecTime;
|
||||
private AtomicLong transactionCounter;
|
||||
private List<String> destLabelValues;
|
||||
}
|
||||
|
||||
|
||||
+18
-9
@@ -23,18 +23,28 @@ import java.util.concurrent.ConcurrentMap;
|
||||
*/
|
||||
public class MetaCollector extends Collector implements InstanceRegistry {
|
||||
|
||||
private static final List<String> InfoLabel = Arrays.asList("destination", "mode");
|
||||
private static final Logger logger = LoggerFactory.getLogger(MetaCollector.class);
|
||||
private static final String SUBSCRIPTION = "canal_instance";
|
||||
private static final String subscriptionHelp = "Canal instance";
|
||||
private final ConcurrentMap<String, MetaMetricsHolder> instances = new ConcurrentHashMap<String, MetaMetricsHolder>();
|
||||
private static final List<String> InfoLabel = Arrays.asList("destination", "mode");
|
||||
private static final Logger logger = LoggerFactory.getLogger(MetaCollector.class);
|
||||
private static final String SUBSCRIPTION = "canal_instance";
|
||||
private static final String SUBSCRIPTION_HELP = "Canal instance";
|
||||
private final ConcurrentMap<String, MetaMetricsHolder> instances = new ConcurrentHashMap<String, MetaMetricsHolder>();
|
||||
|
||||
private MetaCollector() {}
|
||||
|
||||
private static class SingletonHolder {
|
||||
private static final MetaCollector SINGLETON = new MetaCollector();
|
||||
}
|
||||
|
||||
public static MetaCollector instance() {
|
||||
return SingletonHolder.SINGLETON;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MetricFamilySamples> collect() {
|
||||
List<MetricFamilySamples> mfs = new ArrayList<MetricFamilySamples>();
|
||||
GaugeMetricFamily instanceInfo = new GaugeMetricFamily(
|
||||
SUBSCRIPTION,
|
||||
subscriptionHelp,
|
||||
SUBSCRIPTION_HELP,
|
||||
InfoLabel);
|
||||
for (Map.Entry<String, MetaMetricsHolder> nme : instances.entrySet()) {
|
||||
final String destination = nme.getKey();
|
||||
@@ -54,11 +64,10 @@ public class MetaCollector extends Collector implements InstanceRegistry {
|
||||
String mode = (instance instanceof CanalInstanceWithSpring) ? "spring" : "manager";
|
||||
holder.infoLabelValues = Arrays.asList(destination, mode);
|
||||
holder.metaManager = instance.getMetaManager();
|
||||
Preconditions.checkNotNull(holder.infoLabelValues);
|
||||
Preconditions.checkNotNull(holder.metaManager);
|
||||
MetaMetricsHolder old = instances.putIfAbsent(destination, holder);
|
||||
MetaMetricsHolder old = instances.put(destination, holder);
|
||||
if (old != null) {
|
||||
logger.warn("Ignore repeated MetaCollector register for instance {}.", destination);
|
||||
logger.warn("Remove stale MetaCollector for instance {}.", destination);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
-74
@@ -1,74 +0,0 @@
|
||||
package com.alibaba.otter.canal.prometheus.impl;
|
||||
|
||||
import com.alibaba.otter.canal.common.utils.SerializedLongAdder;
|
||||
import com.alibaba.otter.canal.parse.CanalEventParser;
|
||||
import com.alibaba.otter.canal.parse.inbound.mysql.MysqlEventParser;
|
||||
import io.prometheus.client.Collector;
|
||||
import io.prometheus.client.CounterMetricFamily;
|
||||
import io.prometheus.client.GaugeMetricFamily;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import static com.alibaba.otter.canal.prometheus.CanalInstanceExports.DEST;
|
||||
import static com.alibaba.otter.canal.prometheus.CanalInstanceExports.DEST_LABEL_LIST;
|
||||
|
||||
/**
|
||||
* @author Chuanyi Li
|
||||
*/
|
||||
public class MysqlParserCollector extends Collector {
|
||||
|
||||
private static final String PUBLISH_BLOCKING_TIME = "canal_instance_publish_blocking_time";
|
||||
private static final String RECEIVED_BINLOG_BYTES = "canal_instance_received_binlog_bytes";
|
||||
private static final String PARSER_MODE = "canal_instance_parser_mode";
|
||||
private static final String MODE_LABEL = "parallel";
|
||||
private final List<String> destLabelValues;
|
||||
private final List<String> modeLabelValues;
|
||||
private final SerializedLongAdder receivedBinlogBytes;
|
||||
private final SerializedLongAdder eventsPublishBlockingTime;
|
||||
private final String publishBlockingTimeHelp;
|
||||
private final String receivedBinlogBytesHelp;
|
||||
private final String modeHelp;
|
||||
private final List<String> modeLabels;
|
||||
private final Boolean isParallel;
|
||||
|
||||
public MysqlParserCollector(CanalEventParser parser, String destination) {
|
||||
if (!(parser instanceof MysqlEventParser)) {
|
||||
throw new IllegalArgumentException("CanalEventParser must be MysqlEventParser");
|
||||
}
|
||||
this.destLabelValues = Collections.singletonList(destination);
|
||||
this.eventsPublishBlockingTime = ((MysqlEventParser)parser).getEventsPublishBlockingTime();
|
||||
this.publishBlockingTimeHelp = "Blocking time of publishing of instance " + destination;
|
||||
this.receivedBinlogBytes = ((MysqlEventParser)parser).getReceivedBinlogBytes();
|
||||
this.receivedBinlogBytesHelp = "Received binlog bytes of instance" + destination;
|
||||
this.isParallel = ((MysqlEventParser)parser).isParallel();
|
||||
this.modeHelp = "Parser mode of instance" + destination;
|
||||
this.modeLabels = Arrays.asList(DEST, MODE_LABEL);
|
||||
this.modeLabelValues = Arrays.asList(destination, isParallel.toString());
|
||||
}
|
||||
|
||||
@Override public List<MetricFamilySamples> collect() {
|
||||
List<MetricFamilySamples> mfs = new ArrayList<MetricFamilySamples>();
|
||||
// canal_instance_received_binlog_bytes
|
||||
CounterMetricFamily bytesCounter = new CounterMetricFamily(RECEIVED_BINLOG_BYTES,
|
||||
receivedBinlogBytesHelp, DEST_LABEL_LIST);
|
||||
bytesCounter.addMetric(destLabelValues, receivedBinlogBytes.get());
|
||||
mfs.add(bytesCounter);
|
||||
// canal_instance_parser_mode
|
||||
GaugeMetricFamily modeGauge = new GaugeMetricFamily(PARSER_MODE,
|
||||
modeHelp,
|
||||
modeLabels);
|
||||
modeGauge.addMetric(modeLabelValues, 1);
|
||||
mfs.add(modeGauge);
|
||||
// canal_instance_publish_blocking_time
|
||||
if (isParallel) {
|
||||
CounterMetricFamily blockingCounter = new CounterMetricFamily(PUBLISH_BLOCKING_TIME,
|
||||
publishBlockingTimeHelp, DEST_LABEL_LIST);
|
||||
blockingCounter.addMetric(destLabelValues, eventsPublishBlockingTime.get());
|
||||
mfs.add(blockingCounter);
|
||||
}
|
||||
return mfs;
|
||||
}
|
||||
}
|
||||
+114
@@ -0,0 +1,114 @@
|
||||
package com.alibaba.otter.canal.prometheus.impl;
|
||||
|
||||
import com.alibaba.otter.canal.instance.core.CanalInstance;
|
||||
import com.alibaba.otter.canal.parse.CanalEventParser;
|
||||
import com.alibaba.otter.canal.parse.inbound.mysql.MysqlEventParser;
|
||||
import com.alibaba.otter.canal.prometheus.InstanceRegistry;
|
||||
import com.google.common.base.Preconditions;
|
||||
import io.prometheus.client.Collector;
|
||||
import io.prometheus.client.CounterMetricFamily;
|
||||
import io.prometheus.client.GaugeMetricFamily;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ConcurrentMap;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
|
||||
import static com.alibaba.otter.canal.prometheus.CanalInstanceExports.DEST;
|
||||
import static com.alibaba.otter.canal.prometheus.CanalInstanceExports.DEST_LABELS_LIST;
|
||||
|
||||
/**
|
||||
* @author Chuanyi Li
|
||||
*/
|
||||
public class ParserCollector extends Collector implements InstanceRegistry {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(ParserCollector.class);
|
||||
private static final String PUBLISH_BLOCKING = "canal_instance_publish_blocking_time";
|
||||
private static final String RECEIVED_BINLOG = "canal_instance_received_binlog_bytes";
|
||||
private static final String PARSER_MODE = "canal_instance_parser_mode";
|
||||
private static final String MODE_LABEL = "parallel";
|
||||
private static final String PUBLISH_BLOCKING_HELP = "Publish blocking time of dump thread";
|
||||
private static final String RECEIVED_BINLOG_HELP = "Received binlog bytes";
|
||||
private static final String MODE_HELP = "Parser mode(parallel/serial) of instance";
|
||||
private final List<String> modeLabels = Arrays.asList(DEST, MODE_LABEL);
|
||||
private final ConcurrentMap<String, ParserMetricsHolder> instances = new ConcurrentHashMap<String, ParserMetricsHolder>();
|
||||
|
||||
private ParserCollector() {}
|
||||
|
||||
private static class SingletonHolder {
|
||||
private static final ParserCollector SINGLETON = new ParserCollector();
|
||||
}
|
||||
|
||||
public static ParserCollector instance() {
|
||||
return SingletonHolder.SINGLETON;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MetricFamilySamples> collect() {
|
||||
List<MetricFamilySamples> mfs = new ArrayList<MetricFamilySamples>();
|
||||
boolean hasParallel = false;
|
||||
CounterMetricFamily bytesCounter = new CounterMetricFamily(RECEIVED_BINLOG,
|
||||
RECEIVED_BINLOG_HELP, DEST_LABELS_LIST);
|
||||
GaugeMetricFamily modeGauge = new GaugeMetricFamily(PARSER_MODE,
|
||||
MODE_HELP, modeLabels);
|
||||
CounterMetricFamily blockingCounter = new CounterMetricFamily(PUBLISH_BLOCKING,
|
||||
PUBLISH_BLOCKING_HELP, DEST_LABELS_LIST);
|
||||
for (ParserMetricsHolder emh : instances.values()) {
|
||||
if (emh.isParallel) {
|
||||
blockingCounter.addMetric(emh.destLabelValues, emh.eventsPublishBlockingTime.doubleValue());
|
||||
hasParallel = true;
|
||||
}
|
||||
modeGauge.addMetric(emh.modeLabelValues, 1);
|
||||
bytesCounter.addMetric(emh.destLabelValues, emh.receivedBinlogBytes.doubleValue());
|
||||
|
||||
}
|
||||
mfs.add(bytesCounter);
|
||||
mfs.add(modeGauge);
|
||||
if (hasParallel) {
|
||||
mfs.add(blockingCounter);
|
||||
}
|
||||
return mfs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void register(CanalInstance instance) {
|
||||
final String destination = instance.getDestination();
|
||||
ParserMetricsHolder holder = new ParserMetricsHolder();
|
||||
CanalEventParser parser = instance.getEventParser();
|
||||
if (!(parser instanceof MysqlEventParser)) {
|
||||
throw new IllegalArgumentException("CanalEventParser must be MysqlEventParser");
|
||||
}
|
||||
MysqlEventParser mysqlParser = (MysqlEventParser) parser;
|
||||
holder.destLabelValues = Collections.singletonList(destination);
|
||||
holder.modeLabelValues = Arrays.asList(destination, Boolean.toString(mysqlParser.isParallel()));
|
||||
holder.eventsPublishBlockingTime = mysqlParser.getEventsPublishBlockingTime();
|
||||
holder.receivedBinlogBytes = mysqlParser.getReceivedBinlogBytes();
|
||||
holder.isParallel = mysqlParser.isParallel();
|
||||
Preconditions.checkNotNull(holder.eventsPublishBlockingTime);
|
||||
Preconditions.checkNotNull(holder.receivedBinlogBytes);
|
||||
ParserMetricsHolder old = instances.put(destination, holder);
|
||||
if (old != null) {
|
||||
logger.warn("Remove stale ParserCollector for instance {}.", destination);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void unregister(CanalInstance instance) {
|
||||
final String destination = instance.getDestination();
|
||||
instances.remove(destination);
|
||||
}
|
||||
|
||||
private class ParserMetricsHolder {
|
||||
private List<String> destLabelValues;
|
||||
private List<String> modeLabelValues;
|
||||
private AtomicLong receivedBinlogBytes;
|
||||
private AtomicLong eventsPublishBlockingTime;
|
||||
private boolean isParallel;
|
||||
}
|
||||
|
||||
}
|
||||
+56
-11
@@ -1,7 +1,9 @@
|
||||
package com.alibaba.otter.canal.prometheus.impl;
|
||||
|
||||
import com.alibaba.otter.canal.protocol.CanalEntry.EntryType;
|
||||
import com.alibaba.otter.canal.sink.AbstractCanalEventDownStreamHandler;
|
||||
import com.alibaba.otter.canal.store.model.Event;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
|
||||
@@ -10,28 +12,71 @@ import java.util.concurrent.atomic.AtomicLong;
|
||||
*/
|
||||
public class PrometheusCanalEventDownStreamHandler extends AbstractCanalEventDownStreamHandler<List<Event>> {
|
||||
|
||||
private final AtomicLong latestExecuteTime = new AtomicLong(0L);
|
||||
private final AtomicLong latestExecuteTime = new AtomicLong(0L);
|
||||
private final AtomicLong transactionCounter = new AtomicLong(0L);
|
||||
private final AtomicLong rowEventCounter = new AtomicLong(0L);
|
||||
private final AtomicLong rowsCounter = new AtomicLong(0L);
|
||||
|
||||
@Override
|
||||
public List<Event> before(List<Event> events) {
|
||||
// TODO utilize MySQL master heartbeat packet to refresh delay if always no more events coming
|
||||
// see: https://dev.mysql.com/worklog/task/?id=342
|
||||
// heartbeats are sent by the master only if there is no
|
||||
// more unsent events in the actual binlog file for a period longer that
|
||||
// master_heartbeat_period.
|
||||
long localExecTime = 0L;
|
||||
if (events != null && !events.isEmpty()) {
|
||||
Event last = events.get(events.size() - 1);
|
||||
long ts = last.getExecuteTime();
|
||||
long ls = latestExecuteTime.get();
|
||||
if (ts > ls) {
|
||||
latestExecuteTime.lazySet(ts);
|
||||
for (Event e : events) {
|
||||
EntryType type = e.getEntryType();
|
||||
if (type == null) continue;
|
||||
long exec = e.getExecuteTime();
|
||||
if (exec > 0) localExecTime = exec;
|
||||
switch (type) {
|
||||
case ROWDATA:
|
||||
// TODO 当前proto无法直接获得荣威change的变更行数(需要parse),可考虑放到header里面
|
||||
break;
|
||||
case TRANSACTIONEND:
|
||||
transactionCounter.incrementAndGet();
|
||||
break;
|
||||
case HEARTBEAT:
|
||||
// TODO 确认一下不是canal自己产生的
|
||||
// EventType eventType = e.getEventType();
|
||||
// TODO utilize MySQL master heartbeat packet to refresh delay if always no more events coming
|
||||
// see: https://dev.mysql.com/worklog/task/?id=342
|
||||
// heartbeats are sent by the master only if there is no
|
||||
// more unsent events in the actual binlog file for a period longer that
|
||||
// master_heartbeat_period.
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (localExecTime > 0) {
|
||||
latestExecuteTime.lazySet(localExecTime);
|
||||
}
|
||||
}
|
||||
return events;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void start() {
|
||||
|
||||
super.start();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stop() {
|
||||
super.stop();
|
||||
}
|
||||
|
||||
public AtomicLong getLatestExecuteTime() {
|
||||
return latestExecuteTime;
|
||||
}
|
||||
|
||||
public AtomicLong getTransactionCounter() {
|
||||
return transactionCounter;
|
||||
}
|
||||
|
||||
public AtomicLong getRowsCounter() {
|
||||
return rowsCounter;
|
||||
}
|
||||
|
||||
public AtomicLong getRowEventCounter() {
|
||||
return rowEventCounter;
|
||||
}
|
||||
}
|
||||
|
||||
+18
-9
@@ -17,23 +17,33 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ConcurrentMap;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
|
||||
import static com.alibaba.otter.canal.prometheus.CanalInstanceExports.DEST_LABEL_LIST;
|
||||
import static com.alibaba.otter.canal.prometheus.CanalInstanceExports.DEST_LABELS_LIST;
|
||||
|
||||
/**
|
||||
* @author Chuanyi Li
|
||||
*/
|
||||
public class SinkCollector extends Collector implements InstanceRegistry {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(SinkCollector.class);
|
||||
private static final String SINK_BLOCKING_TIME = "canal_instance_sink_blocking_time";
|
||||
private static final String sinkBlockTimeHelp = "Total sink blocking time";
|
||||
private final ConcurrentMap<String, SinkMetricsHolder> instances = new ConcurrentHashMap<String, SinkMetricsHolder>();
|
||||
private static final Logger logger = LoggerFactory.getLogger(SinkCollector.class);
|
||||
private static final String SINK_BLOCKING_TIME = "canal_instance_sink_blocking_time";
|
||||
private static final String SINK_BLOCK_TIME_HELP = "Total sink blocking time";
|
||||
private final ConcurrentMap<String, SinkMetricsHolder> instances = new ConcurrentHashMap<String, SinkMetricsHolder>();
|
||||
|
||||
private SinkCollector() {}
|
||||
|
||||
private static class SingletonHolder {
|
||||
private static final SinkCollector SINGLETON = new SinkCollector();
|
||||
}
|
||||
|
||||
public static SinkCollector instance() {
|
||||
return SingletonHolder.SINGLETON;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MetricFamilySamples> collect() {
|
||||
List<MetricFamilySamples> mfs = new ArrayList<MetricFamilySamples>();
|
||||
CounterMetricFamily blockingCounter = new CounterMetricFamily(SINK_BLOCKING_TIME,
|
||||
sinkBlockTimeHelp, DEST_LABEL_LIST);
|
||||
SINK_BLOCK_TIME_HELP, DEST_LABELS_LIST);
|
||||
for (SinkMetricsHolder smh : instances.values()) {
|
||||
blockingCounter.addMetric(smh.destLabelValues, smh.eventsSinkBlockingTime.doubleValue());
|
||||
}
|
||||
@@ -52,11 +62,10 @@ public class SinkCollector extends Collector implements InstanceRegistry {
|
||||
}
|
||||
EntryEventSink entrySink = (EntryEventSink) sink;
|
||||
holder.eventsSinkBlockingTime = entrySink.getEventsSinkBlockingTime();
|
||||
Preconditions.checkNotNull(holder.destLabelValues);
|
||||
Preconditions.checkNotNull(holder.eventsSinkBlockingTime);
|
||||
SinkMetricsHolder old = instances.putIfAbsent(destination, holder);
|
||||
SinkMetricsHolder old = instances.put(destination, holder);
|
||||
if (old != null) {
|
||||
logger.warn("Ignore repeated SinkCollector register for instance {}.", destination);
|
||||
logger.warn("Remote stale SinkCollector for instance {}.", destination);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+89
-42
@@ -1,15 +1,17 @@
|
||||
package com.alibaba.otter.canal.prometheus.impl;
|
||||
|
||||
import com.alibaba.otter.canal.instance.core.CanalInstance;
|
||||
import com.alibaba.otter.canal.prometheus.CanalInstanceExports;
|
||||
import com.alibaba.otter.canal.prometheus.InstanceRegistry;
|
||||
import com.alibaba.otter.canal.store.CanalEventStore;
|
||||
import com.alibaba.otter.canal.store.CanalStoreException;
|
||||
import com.alibaba.otter.canal.store.memory.MemoryEventStoreWithBuffer;
|
||||
import com.alibaba.otter.canal.store.model.BatchMode;
|
||||
import com.google.common.base.Preconditions;
|
||||
import io.prometheus.client.Collector;
|
||||
import io.prometheus.client.CounterMetricFamily;
|
||||
import io.prometheus.client.GaugeMetricFamily;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
@@ -18,68 +20,113 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ConcurrentMap;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
|
||||
import static com.alibaba.otter.canal.prometheus.CanalInstanceExports.DEST;
|
||||
import static com.alibaba.otter.canal.prometheus.CanalInstanceExports.DEST_LABELS_LIST;
|
||||
|
||||
/**
|
||||
* @author Chuanyi Li
|
||||
*/
|
||||
public class StoreCollector extends Collector implements InstanceRegistry {
|
||||
|
||||
private static final Class<MemoryEventStoreWithBuffer> clazz = MemoryEventStoreWithBuffer.class;
|
||||
private static final String PRODUCE = "canal_instance_store_produce_seq";
|
||||
private static final String CONSUME = "canal_instance_store_consume_seq";
|
||||
private static final String produceHelp = "Produced sequence of canal instance";
|
||||
private static final String consumeHelp = "Consumed sequence of canal instance";
|
||||
private final ConcurrentMap<String, StoreMetricsHolder> instances = new ConcurrentHashMap<String, StoreMetricsHolder>();
|
||||
private static final Logger logger = LoggerFactory.getLogger(SinkCollector.class);
|
||||
private static final String PRODUCE = "canal_instance_store_produce_seq";
|
||||
private static final String CONSUME = "canal_instance_store_consume_seq";
|
||||
private static final String STORE = "canal_instance_store";
|
||||
private static final String PRODUCE_MEM = "canal_instance_store_produce_mem";
|
||||
private static final String CONSUME_MEM = "canal_instance_store_consume_mem";
|
||||
private static final String PRODUCE_HELP = "Produced events counter of canal instance";
|
||||
private static final String CONSUME_HELP = "Consumed events counter of canal instance";
|
||||
private static final String STORE_HELP = "Canal instance info";
|
||||
private static final String PRODUCE_MEM_HELP = "Produced mem bytes of canal instance";
|
||||
private static final String CONSUME_MEM_HELP = "Consumed mem bytes of canal instance";
|
||||
private final ConcurrentMap<String, StoreMetricsHolder> instances = new ConcurrentHashMap<String, StoreMetricsHolder>();
|
||||
private final List<String> storeLabelsList = Arrays.asList(DEST, "batchMode");
|
||||
|
||||
private StoreCollector() {}
|
||||
|
||||
public StoreCollector(CanalEventStore store, String destination) {
|
||||
this.destination = destination;
|
||||
if (!(store instanceof MemoryEventStoreWithBuffer)) {
|
||||
throw new IllegalArgumentException("EventStore must be MemoryEventStoreWithBuffer");
|
||||
}
|
||||
MemoryEventStoreWithBuffer ms = (MemoryEventStoreWithBuffer) store;
|
||||
putSequence = getDeclaredValue(ms, "putSequence");
|
||||
ackSequence = getDeclaredValue(ms, "ackSequence");
|
||||
private static class SingletonHolder {
|
||||
private static final StoreCollector SINGLETON = new StoreCollector();
|
||||
}
|
||||
|
||||
public static StoreCollector instance() {
|
||||
return SingletonHolder.SINGLETON;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MetricFamilySamples> collect() {
|
||||
List<MetricFamilySamples> mfs = new ArrayList<MetricFamilySamples>();
|
||||
CounterMetricFamily put = new CounterMetricFamily("canal_instance_store_produce_seq",
|
||||
putHelp, Arrays.asList(CanalInstanceExports.DEST_LABELS));
|
||||
put.addMetric(Collections.singletonList(destination), putSequence.doubleValue());
|
||||
CounterMetricFamily put = new CounterMetricFamily(PRODUCE,
|
||||
PRODUCE_HELP, DEST_LABELS_LIST);
|
||||
CounterMetricFamily ack = new CounterMetricFamily(CONSUME,
|
||||
CONSUME_HELP, DEST_LABELS_LIST);
|
||||
GaugeMetricFamily store = new GaugeMetricFamily(STORE,
|
||||
STORE_HELP, storeLabelsList);
|
||||
CounterMetricFamily putMem = new CounterMetricFamily(PRODUCE_MEM,
|
||||
PRODUCE_MEM_HELP, DEST_LABELS_LIST);
|
||||
CounterMetricFamily ackMem = new CounterMetricFamily(CONSUME_MEM,
|
||||
CONSUME_MEM_HELP, DEST_LABELS_LIST);
|
||||
boolean hasMem = false;
|
||||
for (StoreMetricsHolder smh : instances.values()) {
|
||||
final boolean isMem = smh.batchMode.isMemSize();
|
||||
put.addMetric(smh.destLabelValues, smh.putSeq.doubleValue());
|
||||
ack.addMetric(smh.destLabelValues, smh.ackSeq.doubleValue());
|
||||
store.addMetric(smh.storeLabelValues, 1);
|
||||
if (isMem) {
|
||||
hasMem = true;
|
||||
putMem.addMetric(smh.destLabelValues, smh.putMemSize.doubleValue());
|
||||
ackMem.addMetric(smh.destLabelValues, smh.ackMemSize.doubleValue());
|
||||
}
|
||||
}
|
||||
mfs.add(put);
|
||||
CounterMetricFamily ack = new CounterMetricFamily("canal_instance_store_consume_seq",
|
||||
ackHelp, Arrays.asList(CanalInstanceExports.DEST_LABELS));
|
||||
ack.addMetric(Collections.singletonList(destination), ackSequence.doubleValue());
|
||||
mfs.add(ack);
|
||||
mfs.add(store);
|
||||
if (hasMem) {
|
||||
mfs.add(putMem);
|
||||
mfs.add(ackMem);
|
||||
}
|
||||
return mfs;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private static <T> T getDeclaredValue(MemoryEventStoreWithBuffer store, String name) {
|
||||
T value;
|
||||
try {
|
||||
Field putField = clazz.getDeclaredField(name);
|
||||
putField.setAccessible(true);
|
||||
value = (T) putField.get(store);
|
||||
} catch (NoSuchFieldException e) {
|
||||
throw new CanalStoreException(e);
|
||||
} catch (IllegalAccessException e) {
|
||||
throw new CanalStoreException(e);
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
@Override public void register(CanalInstance instance) {
|
||||
|
||||
final String destination = instance.getDestination();
|
||||
StoreMetricsHolder holder = new StoreMetricsHolder();
|
||||
CanalEventStore store = instance.getEventStore();
|
||||
if (!(store instanceof MemoryEventStoreWithBuffer)) {
|
||||
throw new IllegalArgumentException("EventStore must be MemoryEventStoreWithBuffer");
|
||||
}
|
||||
MemoryEventStoreWithBuffer memStore = (MemoryEventStoreWithBuffer) store;
|
||||
holder.batchMode = memStore.getBatchMode();
|
||||
holder.putSeq = memStore.getPutSequence();
|
||||
holder.ackSeq = memStore.getAckSequence();
|
||||
holder.destLabelValues = Collections.singletonList(destination);
|
||||
holder.storeLabelValues = Arrays.asList(destination, memStore.getBatchMode().name());
|
||||
Preconditions.checkNotNull(holder.batchMode);
|
||||
Preconditions.checkNotNull(holder.putSeq);
|
||||
Preconditions.checkNotNull(holder.ackSeq);
|
||||
if (holder.batchMode.isMemSize()) {
|
||||
holder.putMemSize = memStore.getPutMemSize();
|
||||
holder.ackMemSize = memStore.getAckMemSize();
|
||||
Preconditions.checkNotNull(holder.putMemSize);
|
||||
Preconditions.checkNotNull(holder.ackMemSize);
|
||||
}
|
||||
StoreMetricsHolder old = instances.putIfAbsent(destination, holder);
|
||||
if (old != null) {
|
||||
logger.warn("Remote stale StoreCollector for instance {}.", destination);
|
||||
}
|
||||
}
|
||||
|
||||
@Override public void unregister(CanalInstance instance) {
|
||||
|
||||
final String destination = instance.getDestination();
|
||||
instances.remove(destination);
|
||||
}
|
||||
|
||||
private class StoreMetricsHolder {
|
||||
private AtomicLong putSeq;
|
||||
private AtomicLong ackSeq;
|
||||
private AtomicLong putSeq;
|
||||
private AtomicLong ackSeq;
|
||||
private BatchMode batchMode;
|
||||
private AtomicLong putMemSize;
|
||||
private AtomicLong ackMemSize;
|
||||
private List<String> destLabelValues;
|
||||
private List<String> storeLabelValues;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user