Merge branch 'ClusterServiceFix' into 'master'

ClusterService introduced - rename to udp - BUG FIX - revert metrics name change

See merge request exedio/cope!1753

Author: rw7

runtime/src/com/exedio/cope/Cluster.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2004-2015  exedio GmbH (www.exedio.com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package com.exedio.cope;
+
+/**
+ * This class is just used for naming metrics.
+ */
+final class Cluster
+{
+	private Cluster()
+	{
+		// prevent instantiation
+	}
+}

runtime/src/com/exedio/cope/ClusterUdpService.java

@@ -34,7 +34,7 @@ final class ClusterUdpService extends ClusterService
 			final Connect connect)
 	{
 		super(properties);
-		final ModelMetrics metrics = metricsTemplate.name(ClusterUdpService.class);
+		final ModelMetrics metrics = metricsTemplate.name(Cluster.class);
 		this.properties = properties;
 		this.sender   = new ClusterUdpSenderMulticast(properties, metrics);
 		this.listener = new ClusterUdpListenerMulticast(properties, metrics, sender, types.concreteTypeCount, connect);

runtime/testsrc/com/exedio/cope/ClusterUdpListenerMock.java

@@ -30,7 +30,7 @@ final class ClusterUdpListenerMock extends ClusterUdpListener
 			final ClusterUdpProperties properties,
 			final int typeLength)
 	{
-		super(properties, ModelMetricsNonConnected.create("MOCK_MODEL_NAME").name(ClusterUdpService.class), typeLength);
+		super(properties, ModelMetricsNonConnected.create("MOCK_MODEL_NAME").name(Cluster.class), typeLength);
 	}
 
 	@Override

runtime/testsrc/com/exedio/cope/ClusterUdpNetworkPingTest.java

@@ -241,7 +241,7 @@ static void assertLastRoundTripSet(
 			assertNull(actual.getMinimumRoundTrip());
 			assertNull(actual.getMaximumRoundTrip());
 		}
-		assertEquals(expected, ((Timer)PrometheusMeterRegistrar.meter(ClusterUdpService.class, "roundTrip",
+		assertEquals(expected, ((Timer)PrometheusMeterRegistrar.meter(Cluster.class, "roundTrip",
 				Tags.of(
 						"model", expectedLocalModel.toString(),
 						"id", actual.getIDString(),
@@ -267,7 +267,7 @@ static double gauge(final String nameSuffix, final Model model)
 	private static Meter meter(final String nameSuffix, final Model model)
 	{
 		return PrometheusMeterRegistrar.meter(
-				ClusterUdpService.class, nameSuffix,
+				Cluster.class, nameSuffix,
 				Tags.of("model", model.toString()));
 	}
 
@@ -301,7 +301,7 @@ private Meter meterSequence(
 
 		final ClusterSenderInfo sendInfo = sendModel.getClusterSenderInfo();
 		return PrometheusMeterRegistrar.meter(
-				ClusterUdpService.class, nameSuffix,
+				Cluster.class, nameSuffix,
 				tags.and(
 						"model", listenModel.toString(),
 						"id", sendInfo.getNodeIDString(),

runtime/testsrc/com/exedio/cope/ClusterUdpSenderMock.java

@@ -27,7 +27,7 @@ final class ClusterUdpSenderMock extends ClusterUdpSender
 
 	ClusterUdpSenderMock(final ClusterUdpProperties properties)
 	{
-		super(properties, ModelMetricsNonConnected.create("MOCK_MODEL_NAME").name(ClusterUdpService.class));
+		super(properties, ModelMetricsNonConnected.create("MOCK_MODEL_NAME").name(Cluster.class));
 	}
 
 	@Override

runtime/testsrc/com/exedio/cope/ClusterUdpSenderMulticastTest.java

@@ -43,7 +43,7 @@ public final class ClusterUdpSenderMulticastTest
 				single("packetSize", 47),
 				single("secret", SECRET)
 			));
-		sender = new ClusterUdpSenderMulticast(properties, ModelMetricsNonConnected.create("SENDER_TEST_MODEL_NAME").name(ClusterUdpService.class));
+		sender = new ClusterUdpSenderMulticast(properties, ModelMetricsNonConnected.create("SENDER_TEST_MODEL_NAME").name(Cluster.class));
 	}
 
 	@AfterEach void tearDown()

runtime/testsrc/com/exedio/cope/ClusterUdpTest.java

@@ -928,7 +928,7 @@ private void assertInfo(
 	private static double count(final String nameSuffix)
 	{
 		return ((Counter)PrometheusMeterRegistrar.meter(
-				ClusterUdpService.class, nameSuffix,
+				Cluster.class, nameSuffix,
 				Tags.of("model", "MOCK_MODEL_NAME"))).count();
 	}
 
@@ -937,7 +937,7 @@ private static double countSequence(
 			final String result)
 	{
 		return ((Counter)PrometheusMeterRegistrar.meter(
-				ClusterUdpService.class, "sequence",
+				Cluster.class, "sequence",
 				Tags.of(
 						"model", "MOCK_MODEL_NAME",
 						"id", "11224433",
@@ -964,7 +964,7 @@ private static double countSequenceBefore(
 	private static double gauge(final String nameSuffix)
 	{
 		return ((Gauge)PrometheusMeterRegistrar.meter(
-				ClusterUdpService.class, nameSuffix,
+				Cluster.class, nameSuffix,
 				Tags.of("model", "MOCK_MODEL_NAME"))).value();
 	}