Append metrics data to error context

Author: NonSwag

core/src/main/java/dev/faststats/ErrorTrackingSink.java

@@ -38,7 +38,7 @@ final class ErrorTrackingSink {
     final Set<SimpleErrorTracker> errorTrackers = new CopyOnWriteArraySet<>();
     final Set<ScheduledFuture<?>> submissionJobs = new CopyOnWriteArraySet<>();
 
-    private @Nullable SimpleErrorTracker internalErrorTracker;
+    private volatile @Nullable SimpleErrorTracker internalErrorTracker;
     private volatile @Nullable ScheduledExecutorService submissionScheduler;
     private volatile @Nullable ScheduledFuture<?> errorSubmissionJob;
 
@@ -104,28 +104,12 @@ private static URI getErrorTrackerServerUrl() {
         return URI.create("https://metrics.faststats.dev/v1/error");
     }
 
-    JsonArray getData() {
-        final var data = new JsonArray();
-        if (internalErrorTracker != null) data.addAll(internalErrorTracker.getData());
-        errorTrackers.forEach(tracker -> data.addAll(tracker.getData()));
-        return data;
-    }
-
     // todo: improve logging to be less cluttered; dedupe code
     void submit() {
         if (!context.getConfig().errorTracking()) return;
 
-        final var errors = getData();
-        if (errors.isEmpty()) return;
-
-        final var data = new JsonObject();
-        context.getSdkInfo().getBuildId().ifPresent(id -> data.addProperty("buildId", id));
-        data.addProperty("identifier", context.getConfig().serverId().toString());
-        data.addProperty("project_name", context.getProjectName());
-        data.addProperty("sdk_name", context.getSdkInfo().getName());
-        data.addProperty("sdk_version", context.getSdkInfo().getVersion());
-        // data.add("context", ); // todo: add global attributes and default and custom metrics
-        data.add("errors", errors);
+        final var data = createData();
+        if (data == null) return;
 
         try (final var byteOutput = new ByteArrayOutputStream();
              final var output = new GZIPOutputStream(byteOutput)) {
@@ -171,8 +155,34 @@ void submit() {
         }
     }
 
+    private @Nullable JsonObject createData() {
+        final var internal = internalErrorTracker;
+        if (internal == null && errorTrackers.isEmpty()) return null;
+
+        final var data = new JsonObject();
+        context.getSdkInfo().getBuildId().ifPresent(id -> data.addProperty("buildId", id));
+        data.addProperty("identifier", context.getConfig().serverId().toString());
+        data.addProperty("project_name", context.getProjectName());
+        data.addProperty("sdk_name", context.getSdkInfo().getName());
+        data.addProperty("sdk_version", context.getSdkInfo().getVersion());
+
+        final var defaultContext = new JsonObject();
+        context.metrics().ifPresent(metrics -> {
+            final var simpleMetrics = (SimpleMetrics) metrics;
+            simpleMetrics.appendData(defaultContext);
+        });
+        data.add("context", defaultContext);
+
+        final var errors = new JsonArray();
+        if (internal != null) errors.addAll(internal.getData());
+        errorTrackers.forEach(tracker -> errors.addAll(tracker.getData()));
+        data.add("errors", errors);
+        return data;
+    }
+
     void clear() {
-        if (internalErrorTracker != null) internalErrorTracker.clear();
+        final var internal = internalErrorTracker;
+        if (internal != null) internal.clear();
         errorTrackers.forEach(SimpleErrorTracker::clear);
     }
 

core/src/main/java/dev/faststats/SimpleMetrics.java

@@ -179,33 +179,38 @@ public boolean submit() {
     private static final String osVersion = System.getProperty("os.version");
     private static final int coreCount = Runtime.getRuntime().availableProcessors();
 
-    protected JsonObject createData() {
-        final var data = new JsonObject();
-        final var metrics = new JsonObject();
-
+    private void appendInternalData(final JsonObject metrics) {
         metrics.addProperty("core_count", coreCount);
         metrics.addProperty("java_vendor", javaVendor);
         metrics.addProperty("java_version", javaVersion);
         metrics.addProperty("os_arch", osArch);
         metrics.addProperty("os_name", osName);
         metrics.addProperty("os_version", osVersion);
+    }
 
-        try {
-            appendDefaultData(metrics);
-        } catch (final Throwable t) {
-            logger.error("Failed to append default data", t);
-            context.trackInternalError(t);
-        }
-
+    private void appendCustomData(final JsonObject metrics) {
         this.metrics.forEach(metric -> {
             try {
+                // todo: prevent overriding and log warning if multiple similar metric ids are used
                 metric.getData().ifPresent(element -> metrics.add(metric.getId(), element));
             } catch (final Throwable t) {
-                logger.error("Failed to build metric data: %s", t, metric.getId());
+                logger.error("Failed to append custom metric data: %s", t, metric.getId());
                 context.trackInternalError(t);
             }
         });
+    }
+
+    public final void appendData(final JsonObject metrics) {
+        appendInternalData(metrics);
+        appendDefaultData(metrics);
+        appendCustomData(metrics);
+    }
+
+    private JsonObject createData() {
+        final var data = new JsonObject();
+        final var metrics = new JsonObject();
 
+        appendData(metrics);
 
         data.addProperty("project_name", context.getProjectName());
         data.addProperty("identifier", context.getConfig().serverId().toString());

core/src/test/java/dev/faststats/MockMetrics.java

@@ -18,11 +18,6 @@ void startTestSubmitting() {
         startSubmitting();
     }
 
-    @Override
-    public JsonObject createData() {
-        return super.createData();
-    }
-
     @Override
     protected void appendDefaultData(final JsonObject metrics) {
     }