fixed docker build

This commit is contained in:
七锋
2018-08-17 19:55:07 +08:00
committed by Chuanyi Li
parent 10114f4a9f
commit cc31e2db7c
16 changed files with 74 additions and 97 deletions
@@ -22,7 +22,6 @@ public class PrometheusService implements CanalMetricsService {
private static final Logger logger = LoggerFactory.getLogger(PrometheusService.class);
private final CanalInstanceExports instanceExports;
private volatile boolean running = false;
private int port;
private HTTPServer server;
private final ClientInstanceProfiler clientProfiler;
@@ -42,9 +41,9 @@ public class PrometheusService implements CanalMetricsService {
@Override
public void initialize() {
try {
logger.info("Start prometheus HTTPServer on port {}.", port);
//TODO 2.Https?
server = new HTTPServer(port);
//TODO 1.Configurable port
//TODO 2.Https
server = new HTTPServer(11112);
} catch (IOException e) {
logger.warn("Unable to start prometheus HTTPServer.", e);
return;
@@ -113,9 +112,4 @@ public class PrometheusService implements CanalMetricsService {
logger.info("Unregister metrics for destination {}.", instance.getDestination());
}
@Override
public void setServerPort(int port) {
this.port = port;
}
}
@@ -21,6 +21,7 @@ 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;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
/**
* @author Chuanyi Li
@@ -40,7 +40,7 @@ public class StoreCollector extends Collector implements InstanceRegistry {
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", "size");
private final List<String> storeLabelsList = Arrays.asList(DEST, "batchMode");
private StoreCollector() {}
@@ -100,8 +100,7 @@ public class StoreCollector extends Collector implements InstanceRegistry {
holder.putSeq = memStore.getPutSequence();
holder.ackSeq = memStore.getAckSequence();
holder.destLabelValues = Collections.singletonList(destination);
holder.size = memStore.getBufferSize();
holder.storeLabelValues = Arrays.asList(destination, holder.batchMode.name(), Integer.toString(holder.size));
holder.storeLabelValues = Arrays.asList(destination, memStore.getBatchMode().name());
Preconditions.checkNotNull(holder.batchMode);
Preconditions.checkNotNull(holder.putSeq);
Preconditions.checkNotNull(holder.ackSeq);
@@ -129,7 +128,6 @@ public class StoreCollector extends Collector implements InstanceRegistry {
private BatchMode batchMode;
private AtomicLong putMemSize;
private AtomicLong ackMemSize;
private int size;
private List<String> destLabelValues;
private List<String> storeLabelValues;
}