fix: Add cluster information in telemetry login information (#321)

Fixes #317

Signed-off-by: Jeff MAURY <[email protected]>

Author: jeffmaury

USAGE_DATA.md

@@ -8,6 +8,10 @@
     * action duration time
     * action error message (in case of exception)
     * action specific data if applicable (see details below)
+* when connecting to a cluster
+    * Kubernetes version
+    * flag for Kubernetes/OpenShift cluster
+    * OpenShift version
 * when plugin is shut down
 
 ### Specific data collected

build.gradle

@@ -65,10 +65,10 @@ dependencies {
     compile 'org.apache.commons:commons-compress:1.19'
     compile 'org.apache.commons:commons-exec:1.3'
     compile 'org.apache.commons:commons-lang3:3.9'
-    compile 'com.redhat.devtools.intellij:intellij-common:1.1.0'
+    compile 'com.redhat.devtools.intellij:intellij-common:1.2.0-SNAPSHOT'
     testCompile 'org.mockito:mockito-core:2.28.2'
     testCompile 'org.easytesting:fest-assert:1.4'
-    testCompile 'com.redhat.devtools.intellij:intellij-common:1.1.0:test'
+    testCompile 'com.redhat.devtools.intellij:intellij-common:1.2.0-SNAPSHOT:test'
 }
 
 sonarqube {

src/main/java/org/jboss/tools/intellij/openshift/telemetry/TelemetryService.java

@@ -21,6 +21,7 @@ public enum TelemetryResult {
 
     public static final String VALUE_ABORTED = "aborted";
     public static final String PREFIX_ACTION = "ui-";
+    public static final String NAME_PREFIX_MISC = "misc-";
 
     public static final String PROP_COMPONENT_SOURCE_TYPE = "component_sourcetype";
     public static final String PROP_COMPONENT_KIND = "component_kind";
@@ -31,6 +32,10 @@ public enum TelemetryResult {
 
     public static final String PROP_DEBUG_COMPONENT_LANGUAGE = "debug_component_language";
 
+    public static final String KUBERNETES_VERSION = "kubernetes_version";
+    public static final String IS_OPENSHIFT = "is_openshift";
+    public static final String OPENSHIFT_VERSION = "openshift_version";
+
     private static TelemetryService instance;
 
     private final Lazy<TelemetryMessageBuilder> builder = new Lazy<>(() -> new TelemetryMessageBuilder(TelemetryService.class.getClassLoader()));

src/main/java/org/jboss/tools/intellij/openshift/utils/odo/OdoCli.java

@@ -16,8 +16,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.deser.std.StdNodeBasedDeserializer;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.redhat.devtools.intellij.common.kubernetes.ClusterHelper;
+import com.redhat.devtools.intellij.common.kubernetes.ClusterInfo;
 import com.redhat.devtools.intellij.common.utils.ExecHelper;
 import com.redhat.devtools.intellij.common.utils.NetworkUtils;
+import com.redhat.devtools.intellij.telemetry.core.service.TelemetryMessageBuilder;
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.LabelSelector;
 import io.fabric8.kubernetes.api.model.LabelSelectorBuilder;
@@ -33,6 +36,7 @@
 import io.fabric8.servicecatalog.client.ServiceCatalogClient;
 import org.apache.commons.lang3.StringUtils;
 import org.jboss.tools.intellij.openshift.KubernetesLabels;
+import org.jboss.tools.intellij.openshift.telemetry.TelemetryService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,6 +62,9 @@
 import static org.jboss.tools.intellij.openshift.Constants.OCP4_CONSOLE_URL_KEY_NAME;
 import static org.jboss.tools.intellij.openshift.Constants.PLUGIN_FOLDER;
 import static org.jboss.tools.intellij.openshift.KubernetesLabels.NAME_LABEL;
+import static org.jboss.tools.intellij.openshift.telemetry.TelemetryService.IS_OPENSHIFT;
+import static org.jboss.tools.intellij.openshift.telemetry.TelemetryService.KUBERNETES_VERSION;
+import static org.jboss.tools.intellij.openshift.telemetry.TelemetryService.OPENSHIFT_VERSION;
 
 public class OdoCli implements Odo {
 
@@ -82,8 +89,23 @@ public class OdoCli implements Odo {
         } catch (URISyntaxException e) {
             this.envVars = Collections.emptyMap();
         }
+        reportTelemetry();
     }
 
+    private void reportTelemetry() {
+        TelemetryMessageBuilder.ActionMessage telemetry = TelemetryService.instance().getBuilder().action(TelemetryService.NAME_PREFIX_MISC + "login");
+        try {
+            ClusterInfo info = ClusterHelper.getClusterInfo(client);
+            telemetry.property(KUBERNETES_VERSION, info.getKubernetesVersion());
+            telemetry.property(IS_OPENSHIFT, Boolean.toString(info.isOpenshift()));
+            telemetry.property(OPENSHIFT_VERSION, info.getOpenshiftVersion());
+            telemetry.send();
+        } catch (RuntimeException e) {
+            telemetry.error(e).send();
+        }
+    }
+
+
     private ObjectMapper configureObjectMapper(final StdNodeBasedDeserializer<? extends List<?>> deserializer) {
         final SimpleModule module = new SimpleModule();
         module.addDeserializer(List.class, deserializer);