fix: use a fresh builder each time a new msg is built (#72)

* fix: use a fresh builder each time a new msg is built
* corrected imports and instance var ordering

Signed-off-by: Andre Dietisheim <adietish@redhat.com>

Author: adietish

src/main/java/com/redhat/devtools/intellij/telemetry/core/service/TelemetryMessageBuilder.java

@@ -10,26 +10,24 @@
  ******************************************************************************/
 package com.redhat.devtools.intellij.telemetry.core.service;
 
-import com.intellij.ide.AppLifecycleListener;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.components.ComponentManager;
-import com.intellij.openapi.components.ServiceManager;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.util.messages.MessageBusConnection;
-import com.redhat.devtools.intellij.telemetry.core.ITelemetryService;
-import com.redhat.devtools.intellij.telemetry.core.util.TimeUtils;
+import static com.redhat.devtools.intellij.telemetry.core.service.TelemetryEvent.Type.ACTION;
+import static com.redhat.devtools.intellij.telemetry.core.service.TelemetryEvent.Type.SHUTDOWN;
+import static com.redhat.devtools.intellij.telemetry.core.service.TelemetryEvent.Type.STARTUP;
+import static com.redhat.devtools.intellij.telemetry.core.util.AnonymizeUtils.anonymize;
+import static com.redhat.devtools.intellij.telemetry.core.util.TimeUtils.toLocalTime;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.redhat.devtools.intellij.telemetry.core.service.TelemetryEvent.Type;
-import static com.redhat.devtools.intellij.telemetry.core.service.TelemetryEvent.Type.ACTION;
-import static com.redhat.devtools.intellij.telemetry.core.service.TelemetryEvent.Type.SHUTDOWN;
-import static com.redhat.devtools.intellij.telemetry.core.service.TelemetryEvent.Type.STARTUP;
-import static com.redhat.devtools.intellij.telemetry.core.util.AnonymizeUtils.anonymize;
-import static com.redhat.devtools.intellij.telemetry.core.util.TimeUtils.toLocalTime;
+import com.intellij.ide.AppLifecycleListener;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.util.messages.MessageBusConnection;
+import com.redhat.devtools.intellij.telemetry.core.ITelemetryService;
+import com.redhat.devtools.intellij.telemetry.core.service.TelemetryEvent.Type;
+import com.redhat.devtools.intellij.telemetry.core.util.TimeUtils;
 
 public class TelemetryMessageBuilder {
 

src/main/java/com/redhat/devtools/intellij/telemetry/core/service/TelemetryService.java

@@ -10,21 +10,22 @@
  ******************************************************************************/
 package com.redhat.devtools.intellij.telemetry.core.service;
 
+import static com.redhat.devtools.intellij.telemetry.core.configuration.TelemetryConfiguration.KEY_MODE;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.util.messages.MessageBusConnection;
 import com.redhat.devtools.intellij.telemetry.core.IMessageBroker;
 import com.redhat.devtools.intellij.telemetry.core.ITelemetryService;
 import com.redhat.devtools.intellij.telemetry.core.configuration.TelemetryConfiguration;
+import com.redhat.devtools.intellij.telemetry.core.configuration.TelemetryConfiguration.ConfigurationChangedListener;
+import com.redhat.devtools.intellij.telemetry.core.configuration.TelemetryConfiguration.Mode;
+import com.redhat.devtools.intellij.telemetry.core.service.TelemetryEvent.Type;
 import com.redhat.devtools.intellij.telemetry.core.util.CircularBuffer;
 import com.redhat.devtools.intellij.telemetry.ui.TelemetryNotifications;
 
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static com.redhat.devtools.intellij.telemetry.core.configuration.TelemetryConfiguration.*;
-import static com.redhat.devtools.intellij.telemetry.core.service.TelemetryEvent.*;
-
 public class TelemetryService implements ITelemetryService {
 
     private static final Logger LOGGER = Logger.getInstance(TelemetryService.class);

src/main/java/com/redhat/devtools/intellij/telemetry/core/service/TelemetryServiceFactory.java

@@ -10,8 +10,6 @@
  ******************************************************************************/
 package com.redhat.devtools.intellij.telemetry.core.service;
 
-import com.intellij.openapi.application.ApplicationInfo;
-import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.project.DumbAware;
 import com.redhat.devtools.intellij.telemetry.core.IMessageBroker;
 import com.redhat.devtools.intellij.telemetry.core.configuration.TelemetryConfiguration;
@@ -20,12 +18,15 @@
 
 public class TelemetryServiceFactory implements DumbAware {
 
-    private final Environment.Builder builder = new Environment.Builder()
-            .ide(new IDE.Factory().create()
-                    .setJavaVersion());
+    private final IDE ide = new IDE.Factory()
+            .create()
+            .setJavaVersion();
 
     public TelemetryService create(ClassLoader classLoader) {
-        Environment environment = builder.plugin(classLoader).build();
+        Environment environment = new Environment.Builder()
+                .ide(ide)
+                .plugin(classLoader)
+                .build();
         TelemetryConfiguration configuration = TelemetryConfiguration.getInstance();
         IMessageBroker broker = createSegmentBroker(configuration.isDebug(), classLoader, environment);
         return new TelemetryService(configuration, broker);

src/main/java/com/redhat/devtools/intellij/telemetry/core/service/segment/IdentifyTraitsPersistence.java

@@ -26,9 +26,9 @@
  */
 public class IdentifyTraitsPersistence {
 
+    public static final IdentifyTraitsPersistence INSTANCE = new IdentifyTraitsPersistence();
     private static final Logger LOGGER = Logger.getInstance(IdentifyTraitsPersistence.class);
 
-    public static final IdentifyTraitsPersistence INSTANCE = new IdentifyTraitsPersistence();
     private static final Path FILE = Directories.RED_HAT.resolve("segment-identify-traits.json");
 
     private IdentifyTraits identifyTraits = null;