Apply version to usage tracking

Author: simon622

hivemq-edge/src/main/java/com/hivemq/edge/impl/HiveMQEdgeHttpServiceImpl.java

@@ -15,7 +15,6 @@
  */
 package com.hivemq.edge.impl;
 
-import ch.qos.logback.core.joran.conditional.ElseAction;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hivemq.edge.model.HiveMQEdgeEvent;
 import com.hivemq.edge.model.HiveMQEdgeRemoteConfiguration;
@@ -25,7 +24,6 @@
 import com.hivemq.http.core.HttpConstants;
 import com.hivemq.http.core.HttpResponse;
 import com.hivemq.http.core.HttpUrlConnectionClient;
-import com.sun.source.tree.CatchTree;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

hivemq-edge/src/main/java/com/hivemq/edge/impl/HiveMQRemoteServiceImpl.java

@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hivemq.common.shutdown.HiveMQShutdownHook;
 import com.hivemq.common.shutdown.ShutdownHooks;
+import com.hivemq.configuration.info.SystemInformation;
 import com.hivemq.configuration.service.ConfigurationService;
 import com.hivemq.edge.HiveMQEdgeRemoteService;
 import com.hivemq.edge.model.HiveMQEdgeEvent;
@@ -43,16 +44,20 @@ public class HiveMQRemoteServiceImpl implements HiveMQEdgeRemoteService, HiveMQS
     private @NotNull final HiveMQEdgeHttpServiceImpl hiveMQEdgeHttpService;
     private @NotNull HiveMQEdgeRemoteConfiguration localConfiguration;
     private @NotNull ConfigurationService configurationService;
+    private @NotNull SystemInformation systemInformation;
+
     private final Object lock = new Object();
 
     @Inject
     public HiveMQRemoteServiceImpl(
+            @NotNull final SystemInformation systemInformation,
             @NotNull final ConfigurationService configurationService,
             @NotNull final ObjectMapper objectMapper,
             @NotNull final ShutdownHooks shutdownHooks) {
         final long start = System.currentTimeMillis();
         this.configurationService = configurationService;
         this.objectMapper = objectMapper;
+        this.systemInformation = systemInformation;
         this.hiveMQEdgeHttpService = initHttpService();
         shutdownHooks.add(this);
         HiveMQEdgeEvent event = new HiveMQEdgeEvent(HiveMQEdgeEvent.EVENT_TYPE.EDGE_STARTED);
@@ -84,6 +89,7 @@ public HiveMQEdgeRemoteConfiguration getConfiguration() {
     public void fireUsageEvent(final HiveMQEdgeEvent event) {
         if(configurationService.usageTrackingConfiguration().isUsageTrackingEnabled()){
             //only queue if its a startup event
+            event.setEdgeVersion(systemInformation.getHiveMQVersion());
             hiveMQEdgeHttpService.fireEvent(event, event.getEventType() == HiveMQEdgeEvent.EVENT_TYPE.EDGE_STARTED);
         }
     }

hivemq-edge/src/main/java/com/hivemq/edge/model/HiveMQEdgeEvent.java

@@ -25,9 +25,11 @@ public enum EVENT_TYPE {
     public final Date created = new Date();
     public final EVENT_TYPE eventType;
     public String installationToken;
+    public String edgeVersion;
 
     public HiveMQEdgeEvent(final EVENT_TYPE eventType) {
         this.eventType = eventType;
+        this.edgeVersion = edgeVersion;
         this.installationToken = HiveMQEdgeEnvironmentUtils.generateInstallationToken();
     }
 
@@ -43,6 +45,14 @@ public String getInstallationToken() {
         return installationToken;
     }
 
+    public String getEdgeVersion() {
+        return edgeVersion;
+    }
+
+    public void setEdgeVersion(final String edgeVersion) {
+        this.edgeVersion = edgeVersion;
+    }
+
     public Map<String, String> getUserData() {
         return userData;
     }

hivemq-edge/src/main/java/com/hivemq/edge/modules/ioc/RemoteServiceModule.java

@@ -17,6 +17,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hivemq.common.shutdown.ShutdownHooks;
+import com.hivemq.configuration.info.SystemInformation;
 import com.hivemq.configuration.service.ConfigurationService;
 import com.hivemq.edge.HiveMQEdgeRemoteService;
 import com.hivemq.edge.ModulesAndExtensionsService;
@@ -38,10 +39,11 @@ public class RemoteServiceModule {
 
     @Provides
     @Singleton
-    static @NotNull HiveMQEdgeRemoteService remoteConfigurationService(@NotNull final ConfigurationService configurationService,
+    static @NotNull HiveMQEdgeRemoteService remoteConfigurationService(@NotNull final SystemInformation systemInformation,
+                                                                        @NotNull final ConfigurationService configurationService,
                                                                         @NotNull final ObjectMapper objectMapper,
                                                                        @NotNull final ShutdownHooks shutdownHooks){
-        return new HiveMQRemoteServiceImpl(configurationService, objectMapper, shutdownHooks);
+        return new HiveMQRemoteServiceImpl(systemInformation, configurationService, objectMapper, shutdownHooks);
     }
 
     @Provides