Instance tracking leftovers (hazelcast#17416)

Instance tracking leftovers

- added jet and jet EE as products to be referenced from jet code
- add test for "server" mode

Author: mmedenjak

hazelcast/src/main/java/com/hazelcast/config/InstanceTrackingConfig.java

@@ -256,7 +256,15 @@ public enum InstanceProductName {
         /**
          * Hazelcast java enterprise client
          */
-        HAZELCAST_CLIENT_EE("Hazelcast Client Enterprise");
+        HAZELCAST_CLIENT_EE("Hazelcast Client Enterprise"),
+        /**
+         * Hazelcast Jet open-source
+         */
+        HAZELCAST_JET("Hazelcast Jet"),
+        /**
+         * Hazelcast Jet enterprise
+         */
+        HAZELCAST_JET_EE("Hazelcast Jet Enterprise");
 
         private final String productName;
 

hazelcast/src/test/java/com/hazelcast/instance/InstanceTrackingInfoTest.java

@@ -50,6 +50,8 @@ public class InstanceTrackingInfoTest extends HazelcastTestSupport {
     public void testJsonFormat() throws IOException {
         assertTrackingFileContents(null, content -> {
             JsonObject json = Json.parse(content).asObject();
+            // since we didn't start with HazelcastMemberStarter
+            // the mode will be "embedded"
             assertEquals("embedded", json.getString("mode", ""));
             assertEquals("Hazelcast", json.getString("product", ""));
             assertEquals(0, json.getInt("licensed", -1));
@@ -97,8 +99,6 @@ public void testCustomFileName() throws IOException {
         assertEquals("dummy", bytesToString(Files.readAllBytes(files[0].toPath())));
     }
 
-    // test hazelcast.tracking.server
-
     private void assertTrackingFileContents(String pattern, Consumer<String> contentAssertion) throws IOException {
         Config config = new Config();
         File tempFile = tempFolder.newFile();

hazelcast/src/test/java/com/hazelcast/instance/InstanceTrackingServerModeTest.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved.
+ *
+ * Licensed 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 com.hazelcast.instance;
+
+import com.hazelcast.core.Hazelcast;
+import com.hazelcast.core.server.HazelcastMemberStarter;
+import com.hazelcast.internal.json.Json;
+import com.hazelcast.internal.json.JsonObject;
+import com.hazelcast.test.HazelcastSerialClassRunner;
+import com.hazelcast.test.HazelcastTestSupport;
+import com.hazelcast.test.OverridePropertyRule;
+import com.hazelcast.test.annotation.QuickTest;
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+
+import static com.hazelcast.test.OverridePropertyRule.set;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Separate test because it cannot run in parallel with any other instance
+ * tracking tests.
+ */
+@RunWith(HazelcastSerialClassRunner.class)
+@Category(QuickTest.class)
+public class InstanceTrackingServerModeTest extends HazelcastTestSupport {
+
+    @Rule
+    public final TemporaryFolder tempFolder = new TemporaryFolder();
+
+    @Rule
+    public final OverridePropertyRule configOverrideRule
+            = set("hazelcast.config", "classpath:hazelcast-instance-tracking-test.xml");
+
+    @After
+    public void tearDown() {
+        System.clearProperty("instance_tracking_filename");
+        Hazelcast.shutdownAll();
+    }
+
+    @Test
+    public void testServerMode() throws Exception {
+        File tempFile = tempFolder.newFile();
+        System.setProperty("instance_tracking_filename", tempFile.getAbsolutePath());
+
+        HazelcastMemberStarter.main(new String[]{});
+
+        String actualContents = new String(Files.readAllBytes(tempFile.toPath()), StandardCharsets.UTF_8);
+        JsonObject json = Json.parse(actualContents).asObject();
+        assertEquals("server", json.getString("mode", ""));
+    }
+
+}

hazelcast/src/test/resources/hazelcast-instance-tracking-test.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved.
+  ~
+  ~ Licensed 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.
+  -->
+<hazelcast xmlns="http://www.hazelcast.com/schema/config"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.hazelcast.com/schema/config
+           http://www.hazelcast.com/schema/config/hazelcast-config-4.1.xsd">
+
+    <instance-tracking enabled="true">
+        <file-name>${instance_tracking_filename}</file-name>
+    </instance-tracking>
+
+</hazelcast>