Re #134: Seting endianness when accessing buffers.

tkowalcz · Dec 20, 2024 · aefa292 · aefa292
1 parent 893e2f9
commit aefa292
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 38 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -82,31 +82,31 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.6.2</version>
+            <version>5.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.6.2</version>
+            <version>5.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.6.2</version>
+            <version>5.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.14.3</version>
+            <version>1.20.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>1.14.3</version>
+            <version>1.20.1</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/LabelSerializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/LabelSerializer.java
@@ -3,6 +3,8 @@
 import org.agrona.DirectBuffer;
 import org.agrona.ExpandableArrayBuffer;
 
+import java.nio.ByteOrder;
+
 public class LabelSerializer {
 
     private final ExpandableArrayBuffer buffer = new ExpandableArrayBuffer();
@@ -48,7 +50,9 @@ public LabelSerializer appendPartialLabelValue(CharSequence value) {
     public LabelSerializer finishAppendingLabelValue() {
         buffer.putInt(
                 lastSizePosition,
-                cursor - lastSizePosition - Integer.BYTES);
+                cursor - lastSizePosition - Integer.BYTES,
+                ByteOrder.LITTLE_ENDIAN
+        );
 
         return this;
     }

diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/LogBufferSerializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/LogBufferSerializer.java
@@ -3,6 +3,7 @@
 import org.agrona.concurrent.AtomicBuffer;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 
 public class LogBufferSerializer {
 
@@ -51,13 +52,13 @@ private int writeHeader(
             long nanoOfMillisecond,
             LabelSerializer serializedLabels
     ) {
-        buffer.putLong(cursor, epochMillisecond);
+        buffer.putLong(cursor, epochMillisecond, ByteOrder.LITTLE_ENDIAN);
         cursor += Long.BYTES;
 
-        buffer.putLong(cursor, nanoOfMillisecond);
+        buffer.putLong(cursor, nanoOfMillisecond, ByteOrder.LITTLE_ENDIAN);
         cursor += Long.BYTES;
 
-        buffer.putInt(cursor, serializedLabels.getLabelsCount());
+        buffer.putInt(cursor, serializedLabels.getLabelsCount(), ByteOrder.LITTLE_ENDIAN);
         cursor += Integer.BYTES;
         return cursor;
     }
@@ -70,7 +71,7 @@ private int writeLabels(int cursor, LabelSerializer serializedLabels) {
     }
 
     private void writeLogLine(int cursor, ByteBuffer line) {
-        buffer.putInt(cursor, line.remaining());
+        buffer.putInt(cursor, line.remaining(), ByteOrder.LITTLE_ENDIAN);
         cursor += Integer.BYTES;
 
         buffer.putBytes(

diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/LogBufferTranscoder.java b/core/src/main/java/pl/tkowalcz/tjahzi/LogBufferTranscoder.java
@@ -8,6 +8,7 @@
 import pl.tkowalcz.tjahzi.utils.TextBuilders;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.Map;
 
 public class LogBufferTranscoder {
@@ -30,10 +31,10 @@ public LogBufferTranscoder(Map<String, String> staticLabels, AtomicBuffer buffer
     }
 
     public void deserializeIntoByteBuf(DirectBuffer buffer, int index, OutputBuffer outputBuffer) {
-        long epochMillisecond = buffer.getLong(index);
+        long epochMillisecond = buffer.getLong(index, ByteOrder.LITTLE_ENDIAN);
         index += Long.BYTES;
 
-        long nanoOfMillisecond = buffer.getLong(index);
+        long nanoOfMillisecond = buffer.getLong(index, ByteOrder.LITTLE_ENDIAN);
         index += Long.BYTES;
 
         TextBuilder labelsBuilder = TextBuilders.threadLocal();
@@ -65,13 +66,13 @@ private int readLabels(
             int index,
             TextBuilder labelsBuilder
     ) {
-        int labelsCount = buffer.getInt(index);
+        int labelsCount = buffer.getInt(index, ByteOrder.LITTLE_ENDIAN);
         index += Integer.BYTES;
 
         for (int i = 0; i < labelsCount; i++) {
-            index += buffer.getStringAscii(index, labelsBuilder) + Integer.BYTES;
+            index += buffer.getStringAscii(index, labelsBuilder, ByteOrder.LITTLE_ENDIAN) + Integer.BYTES;
             labelsBuilder.append("=").append("\"");
-            index += buffer.getStringAscii(index, labelsBuilder) + Integer.BYTES;
+            index += buffer.getStringAscii(index, labelsBuilder, ByteOrder.LITTLE_ENDIAN) + Integer.BYTES;
             labelsBuilder.append("\",");
         }
 

diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java
@@ -10,6 +10,7 @@
 import pl.tkowalcz.tjahzi.stats.MonitoringModule;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.Map;
 
 public class TjahziInitializer {
@@ -98,9 +99,11 @@ private ByteBuffer allocateJavaBuffer(
         int totalSize = bufferSize + RingBufferDescriptor.TRAILER_LENGTH;
 
         if (offHeap) {
-            return ByteBuffer.allocateDirect(totalSize);
+            return ByteBuffer.allocateDirect(totalSize)
+                    .order(ByteOrder.LITTLE_ENDIAN);
         }
 
-        return ByteBuffer.allocate(totalSize);
+        return ByteBuffer.allocate(totalSize)
+                .order(ByteOrder.LITTLE_ENDIAN);
     }
 }
diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/EntrySerializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/EntrySerializer.java
@@ -17,7 +17,7 @@ public static void serialize(
             ByteBuf target
     ) {
         int messageStartIndex = target.writerIndex();
-        target.writeInt(0);
+        target.writeIntLE(0);
 
         target.writeByte(TIMESTAMP_FIELD_NUMBER << 3 | LENGTH_DELIMITED_TYPE);
         TimestampSerializer.serialize(epochMillisecond, nanoOfMillisecond, target);

diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/Protobuf.java b/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/Protobuf.java
@@ -9,7 +9,7 @@ public class Protobuf {
 
     public static void writeSize(ByteBuf target, int messageStartIndex) {
         int messageSize = target.writerIndex() - messageStartIndex - Integer.BYTES;
-        target.setInt(
+        target.setIntLE(
                 messageStartIndex,
                 getFixed32Varint(messageSize)
         );
@@ -21,7 +21,7 @@ public static int getFixed32Varint(int value) {
         int byte3 = ((value >>> 14) & 0x07F) | 0x80;
         int byte4 = ((value >>> 21) & 0x07F);
 
-        return intFromBytes(
+        return intFromBytesLE(
                 (byte) byte1,
                 (byte) byte2,
                 (byte) byte3,
@@ -41,10 +41,10 @@ public static void writeUnsignedVarint(long value, ByteBuf target) {
         }
     }
 
-    public static int intFromBytes(byte byte1, byte byte2, byte byte3, byte byte4) {
-        return (byte1 & 0xFF) << 24
-                | (byte2 & 0xFF) << 16
-                | (byte3 & 0xFF) << 8
-                | (byte4 & 0xFF);
+    public static int intFromBytesLE(byte byte1, byte byte2, byte byte3, byte byte4) {
+        return (byte1 & 0xFF)
+               | (byte2 & 0xFF) << 8
+               | (byte3 & 0xFF) << 16
+               | (byte4 & 0xFF) << 24;
     }
 }
diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/StreamSerializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/StreamSerializer.java
@@ -17,7 +17,7 @@ public static void serialize(
             ByteBuf target
     ) {
         int messageStartIndex = target.writerIndex();
-        target.writeInt(0);
+        target.writeIntLE(0);
 
         target.writeByte(LABELS_FIELD_NUMBER << 3 | LENGTH_DELIMITED_TYPE);
         StringSerializer.serialize(labels, target);

diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/TimestampSerializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/TimestampSerializer.java
@@ -17,7 +17,7 @@ public static void serialize(
 
         int messageStartIndex = target.writerIndex();
 
-        target.writeInt(0);
+        target.writeIntLE(0);
         target.writeByte(1 << 3 | VARINT_TYPE);
         writeUnsignedVarint(timestampSeconds, target);
         target.writeByte(2 << 3 | VARINT_TYPE);

diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/http/PipelinedHttpRequestTimerTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/http/PipelinedHttpRequestTimerTest.java
@@ -4,8 +4,8 @@
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.handler.codec.http.*;
 import io.netty.handler.ssl.SslContext;
+import org.agrona.collections.MutableLong;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.org.apache.commons.lang.mutable.MutableLong;
 import pl.tkowalcz.tjahzi.stats.SettableClock;
 import pl.tkowalcz.tjahzi.stats.StandardMonitoringModule;
 
@@ -132,7 +132,7 @@ public Clock getClock() {
 
             @Override
             public void recordResponseTime(long time) {
-                requestRTT.setValue(time);
+                requestRTT.set(time);
             }
         };
 
@@ -193,7 +193,7 @@ public Clock getClock() {
 
             @Override
             public void recordResponseTime(long time) {
-                requestRTT.setValue(time);
+                requestRTT.set(time);
             }
         };
 

diff --git a/logback-appender/pom.xml b/logback-appender/pom.xml
@@ -78,44 +78,44 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.14.3</version>
+            <version>1.20.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>1.14.3</version>
+            <version>1.20.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>nginx</artifactId>
-            <version>1.14.3</version>
+            <version>1.20.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.6.2</version>
+            <version>5.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.6.2</version>
+            <version>5.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.6.2</version>
+            <version>5.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
-            <version>5.6.2</version>
+            <version>5.11.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>