Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion core/src/main/java/dev/faststats/SimpleContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,32 @@ public void updateConfig(final Config config) throws IllegalArgumentException {
loggerFactory.setDebug(config.debug());
}

void appendDefaultMetrics(final JsonObject metrics) {
private static final String javaVendor = System.getProperty("java.vendor");
private static final String javaVersion = System.getProperty("java.version");
private static final String osArch = System.getProperty("os.arch");
private static final String osName = System.getProperty("os.name");
private static final String osVersion = System.getProperty("os.version");
private static final int coreCount = Runtime.getRuntime().availableProcessors();

/**
* Appends the SDK's runtime data (Java, OS) and the platform's default data
* (server type, versions, ...) to the given object.
* <p>
* Used by both metrics and error reports, so the platform data is present
* even when no metrics instance is configured.
*/
void appendPlatformData(final JsonObject metrics) {
metrics.addProperty("client", clientApplication);
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);
appendDefaultMetrics(metrics);
}

private void appendDefaultMetrics(final JsonObject metrics) {
try {
if (defaultMetrics != null) defaultMetrics.accept(this, metrics);
} catch (final Throwable t) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,8 @@ private void submit() {
data.addProperty("sdk_version", context.getSdkInfo().getVersion());

final var defaultContext = new JsonObject();
context.metrics().ifPresent(metrics -> {
final var simpleMetrics = (SimpleMetrics) metrics;
simpleMetrics.appendData(defaultContext);
});
context.appendPlatformData(defaultContext);
context.metrics().ifPresent(metrics -> ((SimpleMetrics) metrics).appendCustomData(defaultContext));
globalErrorTracker.getAttributes().forEachPrimitive(defaultContext::add);
data.add("context", defaultContext);

Expand Down
28 changes: 3 additions & 25 deletions core/src/main/java/dev/faststats/SimpleMetrics.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,24 +58,7 @@ protected String serverType() {
return "metrics";
}

private static final String javaVendor = System.getProperty("java.vendor");
private static final String javaVersion = System.getProperty("java.version");
private static final String osArch = System.getProperty("os.arch");
private static final String osName = System.getProperty("os.name");
private static final String osVersion = System.getProperty("os.version");
private static final int coreCount = Runtime.getRuntime().availableProcessors();

private void appendInternalData(final JsonObject metrics) {
metrics.addProperty("client", context.isClientApplication());
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);
}

private void appendCustomData(final JsonObject metrics) {
void appendCustomData(final JsonObject metrics) {
if (!context.getConfig().additionalMetrics()) return;
this.metrics.forEach(metric -> {
try {
Expand All @@ -92,17 +75,12 @@ private void appendCustomData(final JsonObject metrics) {
});
}

public void appendData(final JsonObject metrics) {
appendInternalData(metrics);
context.appendDefaultMetrics(metrics);
appendCustomData(metrics);
}

private JsonObject createData() {
final var data = new JsonObject();
final var metrics = new JsonObject();

appendData(metrics);
context.appendPlatformData(metrics);
appendCustomData(metrics);

data.addProperty("project_name", context.getProjectName());
data.addProperty("identifier", context.getConfig().serverId().toString());
Expand Down
33 changes: 33 additions & 0 deletions core/src/test/java/dev/faststats/ErrorReportContextTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package dev.faststats;

import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class ErrorReportContextTest {
@Test
public void platformDataIsReportedWithoutMetrics() {
final var tracker = (SimpleErrorTracker) ErrorTracker.contextUnaware();
final var context = new MockContext.Factory()
.defaultMetrics((ctx, data) -> data.addProperty("server_type", "Paper"))
.errorTrackerService(tracker)
.create();
try {
assertTrue(context.metrics().isEmpty());
tracker.trackError("boom");

final var service = (SimpleErrorTrackerService) context.errorTrackerService().orElseThrow();
final var data = service.createData();
assertNotNull(data);

final var reportContext = data.getAsJsonObject("context");
assertEquals("Paper", reportContext.get("server_type").getAsString());
assertTrue(reportContext.has("java_version"));
assertTrue(reportContext.has("os_name"));
} finally {
context.shutdown();
}
}
}
7 changes: 7 additions & 0 deletions core/src/test/java/dev/faststats/MockContext.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package dev.faststats;

import com.google.gson.JsonObject;
import dev.faststats.internal.Logger;
import dev.faststats.internal.PlatformLoggerFactory;
import org.jspecify.annotations.Nullable;

import java.util.UUID;
import java.util.function.BiConsumer;
import java.util.function.Function;

public final class MockContext {
Expand Down Expand Up @@ -48,6 +50,11 @@ public Factory metrics(final Function<Metrics.Factory, Metrics> metrics) {
return this;
}

public Factory defaultMetrics(final BiConsumer<SimpleContext, JsonObject> defaultMetrics) {
builder.defaultMetrics(defaultMetrics);
return this;
}

public Factory errorTrackerService(final ErrorTracker errorTracker) {
builder.errorTrackerService(errorTracker);
return this;
Expand Down
Loading