eventParameters() {
- // ok because the builder cannot be reused
- return eventParameters;
+ return new LinkedHashMap<>(eventParameters);
}
@SuppressWarnings("unchecked")
@@ -163,7 +158,9 @@ public Analytics build() {
}
@Override
- public int messages() {return messages; }
+ public int messages() {
+ return messages;
+ }
@Override
public long duration() {
diff --git a/src/main/java/net/openhft/chronicle/analytics/internal/package-info.java b/src/main/java/net/openhft/chronicle/analytics/internal/package-info.java
index 964b722..1ea90c1 100644
--- a/src/main/java/net/openhft/chronicle/analytics/internal/package-info.java
+++ b/src/main/java/net/openhft/chronicle/analytics/internal/package-info.java
@@ -2,8 +2,8 @@
* This package and any and all sub-packages contains strictly internal classes for this Chronicle library.
* Internal classes shall never be used directly.
*
- * Specifically, the following actions (including, but not limited to) are not allowed
- * on internal classes and packages:
+ * Specifically, the following actions (including, but not limited to) are not allowed
+ * on internal classes and packages:
*
* - Casting to
* - Reflection of any kind
diff --git a/src/test/java/net/openhft/chronicle/analytics/AnalyticsExampleMain.java b/src/test/java/net/openhft/chronicle/analytics/AnalyticsExampleMain.java
index 47f5ec6..2281737 100644
--- a/src/test/java/net/openhft/chronicle/analytics/AnalyticsExampleMain.java
+++ b/src/test/java/net/openhft/chronicle/analytics/AnalyticsExampleMain.java
@@ -1,7 +1,5 @@
/*
- * Copyright 2016-2020 chronicle.software
- *
- * https://chronicle.software
+ * Copyright 2016-2025 chronicle.software
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/analytics/AnalyticsTest.java b/src/test/java/net/openhft/chronicle/analytics/AnalyticsTest.java
index 728e1a7..ac08319 100644
--- a/src/test/java/net/openhft/chronicle/analytics/AnalyticsTest.java
+++ b/src/test/java/net/openhft/chronicle/analytics/AnalyticsTest.java
@@ -1,7 +1,5 @@
/*
- * Copyright 2016-2022 chronicle.software
- *
- * https://chronicle.software
+ * Copyright 2016-2025 chronicle.software
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,10 +18,11 @@
import org.junit.jupiter.api.Test;
+import java.util.Collections;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
class AnalyticsTest {
@@ -32,15 +31,30 @@ class AnalyticsTest {
@Test
void sendEvent() {
final AtomicReference sendName = new AtomicReference<>();
- final Analytics analytics = (name, additionalEventParameters) -> sendName.set(name);
+ final AtomicReference> sendParameters = new AtomicReference<>();
+ final Analytics analytics = (name, additionalEventParameters) -> {
+ sendName.set(name);
+ sendParameters.set(additionalEventParameters);
+ };
analytics.sendEvent(TEST_STRING);
assertEquals(TEST_STRING, sendName.get());
+ assertEquals(Collections.emptyMap(), sendParameters.get());
+ }
+
+ @Test
+ void sendEventWithAdditionalParameters() {
+ final Map parameters = Collections.singletonMap("key", "value");
+ final AtomicReference> capturedParameters = new AtomicReference<>();
+ final Analytics analytics = (name, additionalEventParameters) -> capturedParameters.set(additionalEventParameters);
+
+ analytics.sendEvent(TEST_STRING, parameters);
+ assertSame(parameters, capturedParameters.get());
}
@Test
void builder() {
- Analytics.Builder builder= Analytics.builder(TEST_STRING, TEST_STRING);
+ Analytics.Builder builder = Analytics.builder(TEST_STRING, TEST_STRING);
assertNotNull(builder);
}
}
diff --git a/src/test/java/net/openhft/chronicle/analytics/GoogleAnalytics3Main.java b/src/test/java/net/openhft/chronicle/analytics/GoogleAnalytics3Main.java
index 25c396f..0985a0b 100644
--- a/src/test/java/net/openhft/chronicle/analytics/GoogleAnalytics3Main.java
+++ b/src/test/java/net/openhft/chronicle/analytics/GoogleAnalytics3Main.java
@@ -1,7 +1,5 @@
/*
- * Copyright 2016-2022 chronicle.software
- *
- * https://chronicle.software
+ * Copyright 2016-2025 chronicle.software
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/ClientIdUtilTest.java b/src/test/java/net/openhft/chronicle/analytics/internal/ClientIdUtilTest.java
index 777cdb4..5bd56ba 100644
--- a/src/test/java/net/openhft/chronicle/analytics/internal/ClientIdUtilTest.java
+++ b/src/test/java/net/openhft/chronicle/analytics/internal/ClientIdUtilTest.java
@@ -1,7 +1,5 @@
/*
- * Copyright 2016-2022 chronicle.software
- *
- * https://chronicle.software
+ * Copyright 2016-2025 chronicle.software
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,11 +16,12 @@
package net.openhft.chronicle.analytics.internal;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
-import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@@ -31,40 +30,38 @@
class ClientIdUtilTest {
- private static final String FILE_NAME = "client.id";
+ @TempDir
+ java.nio.file.Path tempDir;
+
+ private java.nio.file.Path clientIdPath;
private List debugMessages;
@BeforeEach
void beforeEach() {
- cleanupFile();
+ clientIdPath = tempDir.resolve("client.id");
debugMessages = new ArrayList<>();
}
- @AfterEach
- void afterEach() {
- cleanupFile();
- }
-
@Test
void acquireClientId() {
// First time
- final String clientId = FilesUtil.acquireClientId(FILE_NAME, debugMessages::add);
+ final String clientId = FilesUtil.acquireClientId(clientIdPath.toString(), debugMessages::add);
assertDoesNotThrow(() -> UUID.fromString(clientId));
assertEquals(1, debugMessages.size());
final String msg = debugMessages.get(0);
assertTrue(msg.contains("file not present"));
- assertTrue(msg.contains(FILE_NAME));
+ assertTrue(msg.contains(clientIdPath.toString()));
// Second time should give the same id
final List debugMessages2 = new ArrayList<>();
- final String clientId2 = FilesUtil.acquireClientId(FILE_NAME, debugMessages2::add);
+ final String clientId2 = FilesUtil.acquireClientId(clientIdPath.toString(), debugMessages2::add);
assertEquals(clientId, clientId2);
assertTrue(debugMessages2.isEmpty());
}
@Test
void acquireClientIdIllegalFile() {
- final String illegalFileName = ".";
+ final String illegalFileName = tempDir.toString();
final String clientId = FilesUtil.acquireClientId(illegalFileName, debugMessages::add);
assertNotNull(clientId);
@@ -74,7 +71,29 @@ void acquireClientIdIllegalFile() {
}
- private void cleanupFile() {
- new File(FILE_NAME).delete();
+ @Test
+ void acquireClientIdAllowsParentSegments() throws Exception {
+ final String relativeName = "../client-id-parent-test";
+
+ final String originalUserDir = System.getProperty("user.dir");
+ Path targetFile = null;
+ try {
+ assertNotNull(tempDir.getParent(), "Temp directory must have a parent for this test");
+ System.setProperty("user.dir", tempDir.toString());
+ final Path resolved = java.nio.file.Paths.get(relativeName).normalize();
+ targetFile = resolved.isAbsolute() ? resolved : resolved.toAbsolutePath().normalize();
+ Files.deleteIfExists(targetFile);
+ final List debugMessagesLocal = new ArrayList<>();
+ final String clientId = FilesUtil.acquireClientId(relativeName, debugMessagesLocal::add);
+ assertDoesNotThrow(() -> UUID.fromString(clientId));
+ assertTrue(Files.exists(targetFile));
+ assertFalse(debugMessagesLocal.isEmpty());
+ assertTrue(debugMessagesLocal.get(0).contains("file not present"));
+ } finally {
+ System.setProperty("user.dir", originalUserDir);
+ if (targetFile != null) {
+ Files.deleteIfExists(targetFile);
+ }
+ }
}
}
diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/FilesUtilTest.java b/src/test/java/net/openhft/chronicle/analytics/internal/FilesUtilTest.java
new file mode 100644
index 0000000..039c75f
--- /dev/null
+++ b/src/test/java/net/openhft/chronicle/analytics/internal/FilesUtilTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016-2025 chronicle.software
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.openhft.chronicle.analytics.internal;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+class FilesUtilTest {
+
+ @TempDir
+ Path tempDir;
+
+ @Test
+ void touchLastContentHandlesMissingParent() {
+ final Path missingParentFile = tempDir.resolve("missing").resolve("chronicle-last.txt");
+ assertDoesNotThrow(() -> FilesUtil.touchLastContent(missingParentFile));
+ }
+
+ @Test
+ void removeLastUsedFileTimeStampSecondHandlesDirectory() throws IOException {
+ final Path customHome = tempDir.resolve("home");
+ Files.createDirectories(customHome);
+ final String originalUserHome = System.getProperty("user.home");
+ try {
+ System.setProperty("user.home", customHome.toString());
+ final Path directory = customHome.resolve(".chronicle.analytics.last");
+ Files.createDirectories(directory.resolve("child"));
+ assertDoesNotThrow(FilesUtil::removeLastUsedFileTimeStampSecond);
+ assertNotNull(System.getProperty("user.home")); // ensure property remains accessible
+ } finally {
+ System.setProperty("user.home", originalUserHome);
+ }
+ }
+}
diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalytics3Test.java b/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalytics3Test.java
new file mode 100644
index 0000000..865ab6b
--- /dev/null
+++ b/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalytics3Test.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2016-2025 chronicle.software
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.openhft.chronicle.analytics.internal;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.file.Path;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+import static net.openhft.chronicle.analytics.internal.FilesUtil.removeLastUsedFileTimeStampSecond;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+final class GoogleAnalytics3Test {
+
+ @TempDir
+ Path tempDir;
+
+ @Test
+ void bodyForIncludesBuilderAndAdditionalParameters() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ removeLastUsedFileTimeStampSecond();
+
+ final Map builderEventParameters = new LinkedHashMap<>();
+ builderEventParameters.put("app_version", "9.9.9");
+ builderEventParameters.put("builderKey", "builderValue");
+
+ final Map userProperties = new LinkedHashMap<>();
+ userProperties.put("userKey", "userValue");
+
+ final TestAnalyticsConfiguration configuration = new TestAnalyticsConfiguration(
+ "UA-TEST-123",
+ "secret",
+ userProperties,
+ builderEventParameters,
+ tempDir.resolve("client.id").toString()
+ );
+
+ final GoogleAnalytics3 analytics = new GoogleAnalytics3(configuration);
+
+ final Map merged = new LinkedHashMap<>(builderEventParameters);
+ merged.put("extraKey", "extraValue");
+
+ final Method bodyFor = GoogleAnalytics3.class.getDeclaredMethod(
+ "bodyFor",
+ String.class,
+ String.class,
+ Map.class,
+ Map.class
+ );
+ bodyFor.setAccessible(true);
+
+ final String payload = (String) bodyFor.invoke(analytics, "boot", "client-123", merged, userProperties);
+
+ assertTrue(payload.contains("tid=UA-TEST-123"));
+ assertTrue(payload.contains("cid=client-123"));
+ assertTrue(payload.contains("cd=boot"));
+ assertTrue(payload.contains("an=secret"));
+ assertTrue(payload.contains("av=9.9.9"));
+ assertTrue(payload.contains("cd1=builderValue"));
+ assertTrue(payload.contains("cd2=extraValue"));
+ assertTrue(payload.contains("cd3=userValue"));
+ assertFalse(merged.containsKey("app_version"));
+ }
+
+ private static final class TestAnalyticsConfiguration implements AnalyticsConfiguration {
+
+ private final String measurementId;
+ private final String apiSecret;
+ private final Map userProperties;
+ private final Map eventParameters;
+ private final String clientIdFileName;
+
+ private TestAnalyticsConfiguration(@NotNull final String measurementId,
+ @NotNull final String apiSecret,
+ @NotNull final Map userProperties,
+ @NotNull final Map eventParameters,
+ @NotNull final String clientIdFileName) {
+ this.measurementId = measurementId;
+ this.apiSecret = apiSecret;
+ this.userProperties = userProperties;
+ this.eventParameters = eventParameters;
+ this.clientIdFileName = clientIdFileName;
+ }
+
+ @Override
+ public @NotNull String measurementId() {
+ return measurementId;
+ }
+
+ @Override
+ public @NotNull String apiSecret() {
+ return apiSecret;
+ }
+
+ @Override
+ public @NotNull Map userProperties() {
+ return userProperties;
+ }
+
+ @Override
+ public @NotNull Map eventParameters() {
+ return eventParameters;
+ }
+
+ @Override
+ public @NotNull Consumer errorLogger() {
+ return s -> {
+ };
+ }
+
+ @Override
+ public @NotNull Consumer debugLogger() {
+ return s -> {
+ };
+ }
+
+ @Override
+ public long duration() {
+ return 0;
+ }
+
+ @Override
+ public int messages() {
+ return 0;
+ }
+
+ @Override
+ public @NotNull TimeUnit timeUnit() {
+ return TimeUnit.SECONDS;
+ }
+
+ @Override
+ public @NotNull String clientIdFileName() {
+ return clientIdFileName;
+ }
+
+ @Override
+ public @NotNull String url() {
+ return "https://example.invalid";
+ }
+ }
+}
diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalyticsTest.java b/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalyticsTest.java
index 136dd26..7ce86c3 100644
--- a/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalyticsTest.java
+++ b/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalyticsTest.java
@@ -1,7 +1,5 @@
/*
- * Copyright 2016-2022 chronicle.software
- *
- * https://chronicle.software
+ * Copyright 2016-2025 chronicle.software
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/HttpUtilTest.java b/src/test/java/net/openhft/chronicle/analytics/internal/HttpUtilTest.java
index b743340..49aee0c 100644
--- a/src/test/java/net/openhft/chronicle/analytics/internal/HttpUtilTest.java
+++ b/src/test/java/net/openhft/chronicle/analytics/internal/HttpUtilTest.java
@@ -1,7 +1,5 @@
/*
- * Copyright 2016-2022 chronicle.software
- *
- * https://chronicle.software
+ * Copyright 2016-2025 chronicle.software
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -80,6 +78,29 @@ void sendIllegalURL() {
assertTrue(debugResponses.isEmpty());
}
+ @Test
+ void sendUsesBackgroundExecutor() throws IOException, InterruptedException {
+ final MockWebServer server = new MockWebServer();
+ server.enqueue(new MockResponse().setBody(TEST_RESPONSE));
+
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ server.start();
+ try {
+ final HttpUrl url = server.url("mp/collect");
+ HttpUtil.send(url.url().toString(), "{}", errorResponses::add, msg -> {
+ debugResponses.add(msg);
+ latch.countDown();
+ });
+
+ assertTrue(latch.await(2, TimeUnit.SECONDS));
+ assertTrue(errorResponses.isEmpty());
+ assertEquals(singletonList(TEST_RESPONSE.replaceAll("\\s+", " ").trim()), debugResponses);
+ } finally {
+ server.shutdown();
+ }
+ }
+
@Test
void urlEncode() {
final List logMessages = new ArrayList<>();
@@ -120,7 +141,7 @@ void hungHttpServer() throws IOException {
@Override
public @NotNull MockResponse dispatch(@NotNull RecordedRequest recordedRequest) {
int cnt = 0;
- for (int i = 0; i < delayMs/latchPollMs; i++) {
+ for (int i = 0; i < delayMs / latchPollMs; i++) {
try {
if (countDownLatch.await(latchPollMs, TimeUnit.MILLISECONDS))
break;
diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/InternalAnalyticsExceptionTest.java b/src/test/java/net/openhft/chronicle/analytics/internal/InternalAnalyticsExceptionTest.java
index 74312a4..61fdc75 100644
--- a/src/test/java/net/openhft/chronicle/analytics/internal/InternalAnalyticsExceptionTest.java
+++ b/src/test/java/net/openhft/chronicle/analytics/internal/InternalAnalyticsExceptionTest.java
@@ -1,7 +1,5 @@
/*
- * Copyright 2016-2022 chronicle.software
- *
- * https://chronicle.software
+ * Copyright 2016-2025 chronicle.software
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/JUnitUtilTest.java b/src/test/java/net/openhft/chronicle/analytics/internal/JUnitUtilTest.java
index 9e070c0..efffc48 100644
--- a/src/test/java/net/openhft/chronicle/analytics/internal/JUnitUtilTest.java
+++ b/src/test/java/net/openhft/chronicle/analytics/internal/JUnitUtilTest.java
@@ -1,7 +1,5 @@
/*
- * Copyright 2016-2022 chronicle.software
- *
- * https://chronicle.software
+ * Copyright 2016-2025 chronicle.software
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +30,7 @@ void isJUnitAvailable() {
@Test
void isClassAvailableString() {
- assertTrue(JUnitUtil.isClassAvailable(String.class.getName()));
+ assertTrue(JUnitUtil.isClassAvailable(String.class.getName()));
}
@Test
diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/MuteAnalyticsTest.java b/src/test/java/net/openhft/chronicle/analytics/internal/MuteAnalyticsTest.java
index 303b40d..4eec05c 100644
--- a/src/test/java/net/openhft/chronicle/analytics/internal/MuteAnalyticsTest.java
+++ b/src/test/java/net/openhft/chronicle/analytics/internal/MuteAnalyticsTest.java
@@ -1,7 +1,5 @@
/*
- * Copyright 2016-2022 chronicle.software
- *
- * https://chronicle.software
+ * Copyright 2016-2025 chronicle.software
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/VanillaAnalyticsBuilderTest.java b/src/test/java/net/openhft/chronicle/analytics/internal/VanillaAnalyticsBuilderTest.java
index 3ea98c5..864a629 100644
--- a/src/test/java/net/openhft/chronicle/analytics/internal/VanillaAnalyticsBuilderTest.java
+++ b/src/test/java/net/openhft/chronicle/analytics/internal/VanillaAnalyticsBuilderTest.java
@@ -1,7 +1,5 @@
/*
- * Copyright 2016-2022 chronicle.software
- *
- * https://chronicle.software
+ * Copyright 2016-2025 chronicle.software
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.