diff --git a/core/pom.xml b/core/pom.xml
index 5224495..bf59bda 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
pl.tkowalcz.tjahzitjahzi-parent
- 0.9.11-SNAPSHOT
+ 0.9.13-SNAPSHOTcore
@@ -36,7 +36,7 @@
pl.tkowalcz.tjahziloki-protobuf
- 0.9.11-SNAPSHOT
+ 0.9.13-SNAPSHOTtest
diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/HeadersTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/HeadersTest.java
index dc5146b..0cf0f13 100644
--- a/core/src/test/java/pl/tkowalcz/tjahzi/HeadersTest.java
+++ b/core/src/test/java/pl/tkowalcz/tjahzi/HeadersTest.java
@@ -212,7 +212,7 @@ class HeadersTest {
wireMockServer.verify(
postRequestedFor(urlMatching("/loki/api/v1/push"))
.withHeader("content-type", matching("application/x-protobuf"))
- .withHeader("content-length", matching("50|51"))
+ .withHeader("content-length", matching("[4-5][0-9]"))
.withHeader("host", matching("localhost"))
));
}
diff --git a/log4j2-appender-nodep/pom.xml b/log4j2-appender-nodep/pom.xml
index 2c142f6..6b72ff0 100644
--- a/log4j2-appender-nodep/pom.xml
+++ b/log4j2-appender-nodep/pom.xml
@@ -5,7 +5,7 @@
pl.tkowalcz.tjahzitjahzi-parent
- 0.9.11-SNAPSHOT
+ 0.9.13-SNAPSHOTlog4j2-appender-nodep
diff --git a/log4j2-appender/README.md b/log4j2-appender/README.md
index d91f847..1072c45 100644
--- a/log4j2-appender/README.md
+++ b/log4j2-appender/README.md
@@ -1,7 +1,7 @@
# Log4j2 Appender
-On top of a `Core` component with rather simplistic API we intend to build several layers that make it truly useful. Log4j2
-appender seemed like a good first.
+On top of a `Core` component with rather simplistic API we intend to build several layers that make it truly useful.
+Log4j2 appender seemed like a good first.
## Quick start guide
@@ -30,56 +30,57 @@ appender seemed like a good first.
1. Include minimal appender configuration:
```xml
-
- ${sys:loki.host}
- ${sys:loki.port}
+
+ ${sys:loki.host}
+ ${sys:loki.port}
-
- %X{tid} [%t] %d{MM-dd HH:mm:ss.SSS} %5p %c{1} - %m%n%exception{full}
-
+
+ %X{tid} [%t] %d{MM-dd HH:mm:ss.SSS} %5p %c{1} - %m%n%exception{full}
+
-
-
+
+
```
1. Reference the appender from inside one of your logger definitions:
```xml
-
-
-
+
+
+
```
### Note on Loki HTTP endpoint and host/port configuration
-Tjahzi sends `POST` requests to `/loki/api/v1/push` HTTP endpoint. Specifying e.g. `loki.mydomain.com3100`
+Tjahzi sends `POST` requests to `/loki/api/v1/push` HTTP endpoint. Specifying
+e.g. `loki.mydomain.com3100`
will configure the appender to call to URL: `http://loki.mydomain.com:3100/loki/api/v1/push`.
### Grafana Cloud configuration
Tjahzi can send logs to Grafana Cloud. It needs two things to be configured:
- Set port number to `443` which switches HTTP client into HTTPS mode.
-- Specify `username` and `password` for HTTP basic authentication that Grafana uses.
-
+- Specify `username` and `password` for HTTP basic authentication that Grafana uses.
+
Password is your "Grafana.com API Key" and can be generated in "Grafana datasource settings". The host in below example
is just for illustrative purposes.
```xml
-
-
- logs-prod-us-central1.grafana.net
- 443
+
+
+ logs-prod-us-central1.grafana.net
+ 443
- ...
- ...
- ...
-
+ ...
+ ...
+ ...
+
```
## Advanced configuration
-This example sets up a root logger with a Loki appender. Note that `pl.tkowalcz.tjahzi.log4j2` is added to `packages` attribute
-of configuration so that the appender can be found.
+This example sets up a root logger with a Loki appender. Note that `pl.tkowalcz.tjahzi.log4j2` is added to `packages`
+attribute of configuration so that the appender can be found.
```xml
@@ -102,7 +103,7 @@ of configuration so that the appender can be found.
-
+
log_level
@@ -111,12 +112,13 @@ of configuration so that the appender can be found.
### Lookups / variable substitution
-Contents of the properties are [automatically interpolated by Log4j2](https://logging.apache.org/log4j/log4j-2.2/manual/configuration.html#PropertySubstitution).
-All environment, system etc. variable references will be replaced by their values during initialization of the appender.
-The exception is context/MDC (`${ctx:foo}`) value lookup as it make sense only during runtime.
+Contents of the properties
+are [automatically interpolated by Log4j2](https://logging.apache.org/log4j/log4j-2.2/manual/configuration.html#PropertySubstitution)
+. All environment, system etc. variable references will be replaced by their values during initialization of the
+appender. The exception is context/MDC (`${ctx:foo}`) value lookup as it make sense only during runtime.
-NOTE: This process could have been executed for every lookup type at runtime (for each log message). This approach was
-deemed too expensive. If you need a mechanism to replace a variable (other than context/MDC) after logging system
+NOTE: This process could have been executed for every lookup type at runtime (for each log message). This approach was
+deemed too expensive. If you need a mechanism to replace a variable (other than context/MDC) after logging system
initialization I would love to hear your use case - please file an issue.
## Details
@@ -125,8 +127,8 @@ Let's go through the example config above and analyze configuration options (**N
#### Host (required)
-Network host address of Loki instance. Either IP address or host name. It will be passed to Netty and end up being resolved
-by call to `InetSocketAddress.createUnresolved`.
+Network host address of Loki instance. Either IP address or host name. It will be passed to Netty and end up being
+resolved by call to `InetSocketAddress.createUnresolved`.
#### Port (required)
@@ -143,48 +145,60 @@ Password for HTTP basic auth.
#### Header (optional)
-This tag can be used multiple times to specify additional headers that are passed to Loki instance. One example is to pass
-a `X-Scope-OrgID` header when [running Loki in multi-tenant mode](https://grafana.com/docs/loki/latest/operations/authentication/).
+This tag can be used multiple times to specify additional headers that are passed to Loki instance. One example is to
+pass a `X-Scope-OrgID` header
+when [running Loki in multi-tenant mode](https://grafana.com/docs/loki/latest/operations/authentication/).
#### Label (optional)
-Specify additional labels attached to each log line sent via this appender instance. See also note about [label naming](https://github.com/tkowalcz/tjahzi/wiki/Label-naming).
+Specify additional labels attached to each log line sent via this appender instance. See also note
+about [label naming](https://github.com/tkowalcz/tjahzi/wiki/Label-naming).
#### LogLevelLabel (optional)
-If defined then log level label of configured name will be added to each line sent to Loki. It will contain Log4j log level e.g. `INFO`, `WARN` etc. See also note about [label naming](https://github.com/tkowalcz/tjahzi/wiki/Label-naming).
+If defined then log level label of configured name will be added to each line sent to Loki. It will contain Log4j log
+level e.g. `INFO`, `WARN` etc. See also note about [label naming](https://github.com/tkowalcz/tjahzi/wiki/Label-naming).
-#### bufferSizeMegabytes (optional, default = 32 MB)
+#### bufferSizeMegabytes (optional, default = 32)
-Size of the `log buffer`. Must be power of two between 1MB and 1GB. See [log buffer sizing](https://github.com/tkowalcz/tjahzi/wiki/Log-buffer-sizing) for more explanations.
+Size of the `log buffer`. Must be power of two between 1MB and 1GB.
+See [log buffer sizing](https://github.com/tkowalcz/tjahzi/wiki/Log-buffer-sizing) for more explanations.
+
+#### maxLogLineSizeKilobytes (optional, default = 10)
+
+Size of an intermediate thread local buffer that is used by log4j to serialise single log message into. Log lines larger
+than that will be split into multiple log entries (
+see [wiki](https://github.com/tkowalcz/tjahzi/wiki/Log-buffer-sizing#note-on-thread-local-buffer) for discussion).
#### maxRetries (optional, default = 3)
-Maximum number of retries to perform when delivering log message to Loki. Log buffer data is delivered in order, one batch after
-the other, so too much retries will block delivery of subsequent log batches (on the other hand if we need to retry many times then
-next batches will probably fail too).
+Maximum number of retries to perform when delivering log message to Loki. Log buffer data is delivered in order, one
+batch after the other, so too much retries will block delivery of subsequent log batches (on the other hand if we need
+to retry many times then next batches will probably fail too).
-#### connectTimeoutMillis (optional, default = 5s)
+#### connectTimeoutMillis (optional, default = 5000)
-This configures socket connect timeout when connecting to Loki. After unsuccessful connection attempt it will continue to retry indefinitely
-employing exponential backoff (initial backoff = 250ms, maximum backoff = 30s, multiplier = 3).
+This configures socket connect timeout when connecting to Loki. After unsuccessful connection attempt it will continue
+to retry indefinitely employing exponential backoff (initial backoff = 250ms, maximum backoff = 30s, multiplier = 3).
-#### readTimeoutMillis (optional, default = 60s)
+#### readTimeoutMillis (optional, default = 60 000)
Sets socket read timeout on Loki connection.
#### useOffHeapBuffer (optional, default = true)
-Whether Tjahzi should allocate native buffer for `Log buffer` component. We can go into a rabbit hole of divagations what are the
-implications of this. Most important in our view is that having 10s or 100s of MB of space taken out of heap is not very
-friendly to garbage collector which might have to occasionally copy it around.
+Whether Tjahzi should allocate native buffer for `Log buffer` component. We can go into a rabbit hole of divagations
+what are the implications of this. Most important in our view is that having 10s or 100s of MB of space taken out of
+heap is not very friendly to garbage collector which might have to occasionally copy it around.
#### batchSize (optional, default = 10_2400)
-Like in [promtail configuration](https://grafana.com/docs/loki/latest/clients/promtail/configuration/) `maximum batch
-size (in bytes) of logs to accumulate before sending the batch to Loki`.
+Like
+in [promtail configuration](https://grafana.com/docs/loki/latest/clients/promtail/configuration/) `maximum batch size (in bytes) of logs to accumulate before sending the batch to Loki`
+.
-#### batchWait = (optional, default = 5s)
+#### batchWait (optional, default = 5s)
-Like in [promtail configuration](https://grafana.com/docs/loki/latest/clients/promtail/configuration/) `maximum amount
-of time to wait before sending a batch, even if that batch isn't full`.
+Like
+in [promtail configuration](https://grafana.com/docs/loki/latest/clients/promtail/configuration/) `maximum amount of time to wait before sending a batch, even if that batch isn't full`
+.
diff --git a/log4j2-appender/pom.xml b/log4j2-appender/pom.xml
index 3ebb967..27cd0ce 100644
--- a/log4j2-appender/pom.xml
+++ b/log4j2-appender/pom.xml
@@ -5,7 +5,7 @@
pl.tkowalcz.tjahzitjahzi-parent
- 0.9.11-SNAPSHOT
+ 0.9.13-SNAPSHOTlog4j2-appender
@@ -16,7 +16,7 @@
pl.tkowalcz.tjahzicore
- 0.9.11-SNAPSHOT
+ 0.9.13-SNAPSHOT
diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java
index 0fa33ab..fc42c4f 100644
--- a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java
+++ b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java
@@ -12,7 +12,6 @@ import pl.tkowalcz.tjahzi.log4j2.labels.LabelPrinter;
import java.io.Serializable;
import java.nio.ByteBuffer;
-import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.function.BiConsumer;
@@ -21,33 +20,36 @@ public class AppenderLogic implements BiConsumer {
private static final Logger LOGGER = StatusLogger.getLogger();
- private static final Map EMPTY_MAP = new HashMap<>();
-
private final LoggingSystem loggingSystem;
private final String logLevelLabel;
private final TjahziLogger logger;
private final Map lokiLabels;
+ private final ByteBufferDestinationRepository destinationRepository;
public AppenderLogic(
LoggingSystem loggingSystem,
String logLevelLabel,
- Map lokiLabels
+ Map lokiLabels,
+ int maxLogLineSizeBytes
) {
this.loggingSystem = loggingSystem;
this.logLevelLabel = logLevelLabel;
- logger = loggingSystem.createLogger();
+ this.logger = loggingSystem.createLogger();
this.lokiLabels = lokiLabels;
+ this.destinationRepository = new ByteBufferDestinationRepository(maxLogLineSizeBytes);
}
public void append(
Layout layout,
LogEvent event
) {
- ByteBufferDestinations destination = ByteBufferDestinations.threadLocal();
- destination.initialize(this, event);
+ TjahziByteBufferDestination destination = destinationRepository.threadLocalDestination(
+ this,
+ event
+ );
layout.encode(event, destination);
destination.drainRemaining();
diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinationRepository.java b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinationRepository.java
new file mode 100644
index 0000000..3caa8d0
--- /dev/null
+++ b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinationRepository.java
@@ -0,0 +1,33 @@
+package pl.tkowalcz.tjahzi.log4j2;
+
+import org.apache.logging.log4j.core.LogEvent;
+
+import java.nio.ByteBuffer;
+import java.util.function.BiConsumer;
+
+public class ByteBufferDestinationRepository {
+
+ public static final int DEFAULT_MAX_LINE_SIZE_BYTES = 10 * 1024;
+
+ private final ThreadLocal threadLocal = new ThreadLocal<>();
+ private final int maxLogLineSizeBytes;
+
+ public ByteBufferDestinationRepository(int maxLogLineSizeBytes) {
+ this.maxLogLineSizeBytes = maxLogLineSizeBytes;
+ }
+
+ public TjahziByteBufferDestination threadLocalDestination(
+ BiConsumer drain,
+ LogEvent context
+ ) {
+ TjahziByteBufferDestination result = threadLocal.get();
+
+ if (result == null) {
+ result = new TjahziByteBufferDestination(maxLogLineSizeBytes);
+ threadLocal.set(result);
+ }
+
+ result.initialize(drain, context);
+ return result;
+ }
+}
diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java
index 947d5be..a462b90 100644
--- a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java
+++ b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java
@@ -46,6 +46,7 @@ public class LokiAppender extends AbstractAppender {
Property[] properties,
String logLevelLabel,
Map lokiLabels,
+ int maxLogLineSizeKilobytes,
LoggingSystem loggingSystem,
MutableMonitoringModuleWrapper monitoringModuleWrapper
) {
@@ -63,7 +64,8 @@ public class LokiAppender extends AbstractAppender {
this.appenderLogic = new AppenderLogic(
loggingSystem,
logLevelLabel,
- lokiLabels
+ lokiLabels,
+ maxLogLineSizeKilobytes
);
}
diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderBuilder.java b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderBuilder.java
index de675ba..d538331 100644
--- a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderBuilder.java
+++ b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderBuilder.java
@@ -34,6 +34,7 @@ public class LokiAppenderBuilder> extends Abstr
private static final Logger LOGGER = StatusLogger.getLogger();
private static final int BYTES_IN_MEGABYTE = 1024 * 1024;
+ private static final int BYTES_IN_KILOBYTE = 1024;
@PluginBuilderAttribute
@Required(message = "No Loki address provided for LokiAppender")
@@ -68,10 +69,13 @@ public class LokiAppenderBuilder> extends Abstr
private String logLevelLabel;
@PluginBuilderAttribute
- private final long batchSize = 10_2400;
+ private long batchSize = 10_2400;
@PluginBuilderAttribute
- private final long batchWait = 5;
+ private long batchWait = 5;
+
+ @PluginBuilderAttribute
+ private int maxLogLineSizeKilobytes = 10;
@PluginBuilderAttribute
private int maxRequestsInFlight = 100;
@@ -137,6 +141,7 @@ public class LokiAppenderBuilder> extends Abstr
isUseOffHeapBuffer()
);
+ int maxLogLineSizeBytes = Math.toIntExact(getMaxLogLineSizeKilobytes() * BYTES_IN_KILOBYTE);
return new LokiAppender(
getName(),
getLayout(),
@@ -145,6 +150,7 @@ public class LokiAppenderBuilder> extends Abstr
getPropertyArray(),
logLevelLabel,
labelsDescriptor.getDynamicLabels(),
+ maxLogLineSizeBytes,
loggingSystem,
monitoringModuleWrapper
);
@@ -225,10 +231,26 @@ public class LokiAppenderBuilder> extends Abstr
return batchSize;
}
+ public void setBatchSize(long batchSize) {
+ this.batchSize = batchSize;
+ }
+
public long getBatchWait() {
return batchWait;
}
+ public void setBatchWait(long batchWait) {
+ this.batchWait = batchWait;
+ }
+
+ public void setMaxLogLineSizeKilobytes(int maxLogLineSizeKilobytes) {
+ this.maxLogLineSizeKilobytes = maxLogLineSizeKilobytes;
+ }
+
+ public long getMaxLogLineSizeKilobytes() {
+ return maxLogLineSizeKilobytes;
+ }
+
public void setMaxRequestsInFlight(int maxRequestsInFlight) {
this.maxRequestsInFlight = maxRequestsInFlight;
}
diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinations.java b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/TjahziByteBufferDestination.java
similarity index 65%
rename from log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinations.java
rename to log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/TjahziByteBufferDestination.java
index b2b0cfa..a6227db 100644
--- a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinations.java
+++ b/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/TjahziByteBufferDestination.java
@@ -7,24 +7,15 @@ import org.apache.logging.log4j.core.layout.ByteBufferDestinationHelper;
import java.nio.ByteBuffer;
import java.util.function.BiConsumer;
-public class ByteBufferDestinations implements ByteBufferDestination {
+public class TjahziByteBufferDestination implements ByteBufferDestination {
- private static final ThreadLocal THREAD_LOCAL = ThreadLocal.withInitial(ByteBufferDestinations::new);
-
- /**
- * 10kb should be enough for everyone. Even in case of 1000s of threads we will allocate at most 10s of MB of buffers.
- * Larger messages will be fragmented.
- */
- private final ByteBuffer buffer = ByteBuffer.allocate(10 * 1024);
+ private final ByteBuffer buffer;
private BiConsumer drain;
private LogEvent context;
- public static ByteBufferDestinations threadLocal() {
- ByteBufferDestinations result = THREAD_LOCAL.get();
- result.getByteBuffer().clear();
-
- return result;
+ public TjahziByteBufferDestination(int maxLogLineSizeBytes) {
+ buffer = ByteBuffer.allocate(maxLogLineSizeBytes);
}
public void drainRemaining() {
@@ -60,5 +51,7 @@ public class ByteBufferDestinations implements ByteBufferDestination {
public void initialize(BiConsumer drain, LogEvent context) {
this.context = context;
this.drain = drain;
+
+ buffer.clear();
}
}
diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogicTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogicTest.java
index cefdc9a..62eda7e 100644
--- a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogicTest.java
+++ b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogicTest.java
@@ -33,7 +33,8 @@ class AppenderLogicTest {
AppenderLogic logic = new AppenderLogic(
loggingSystem,
logLevelLabel,
- Map.of()
+ Map.of(),
+ ByteBufferDestinationRepository.DEFAULT_MAX_LINE_SIZE_BYTES
);
MutableLogEvent logEvent = new MutableLogEvent();
@@ -90,7 +91,8 @@ class AppenderLogicTest {
AppenderLogic logic = new AppenderLogic(
loggingSystem,
logLevelLabel,
- dynamicLabels
+ dynamicLabels,
+ ByteBufferDestinationRepository.DEFAULT_MAX_LINE_SIZE_BYTES
);
MutableLogEvent logEvent = new MutableLogEvent();
diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinationRepositoryTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinationRepositoryTest.java
new file mode 100644
index 0000000..a8d9dbb
--- /dev/null
+++ b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinationRepositoryTest.java
@@ -0,0 +1,100 @@
+package pl.tkowalcz.tjahzi.log4j2;
+
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.impl.MutableLogEvent;
+import org.junit.jupiter.api.Test;
+
+import java.nio.ByteBuffer;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ByteBufferDestinationRepositoryTest {
+
+ @Test
+ void shouldInitializeBufferToDesiredSize() {
+ // Given
+ int capacity = 42;
+ ByteBufferDestinationRepository repository = new ByteBufferDestinationRepository(capacity);
+
+ BiConsumer drain = (logEvent, byteBuffer) -> {
+ };
+ MutableLogEvent logEvent = new MutableLogEvent();
+
+ // When
+ TjahziByteBufferDestination destination = repository.threadLocalDestination(drain, logEvent);
+
+ // Then
+ assertThat(destination.getByteBuffer().capacity()).isEqualTo(capacity);
+ assertThat(destination.getByteBuffer().remaining()).isEqualTo(capacity);
+ }
+
+ @Test
+ void shouldClearBufferBeforeUse() {
+ // Given
+ int capacity = 42;
+ ByteBufferDestinationRepository repository = new ByteBufferDestinationRepository(capacity);
+
+ BiConsumer drain = (logEvent, byteBuffer) -> {
+ };
+ MutableLogEvent logEvent = new MutableLogEvent();
+
+ TjahziByteBufferDestination destination = repository.threadLocalDestination(drain, logEvent);
+ destination.writeBytes("blah".getBytes(), 0, 4);
+
+ // When
+ TjahziByteBufferDestination actual = repository.threadLocalDestination(drain, logEvent);
+
+ // Then
+ assertThat(actual.getByteBuffer().remaining()).isEqualTo(capacity);
+ assertThat(actual.getByteBuffer().capacity()).isEqualTo(capacity);
+ }
+
+ @Test
+ void shouldReturnSameBufferInsideSameThread() {
+ // Given
+ int capacity = 42;
+ ByteBufferDestinationRepository repository = new ByteBufferDestinationRepository(capacity);
+
+ BiConsumer drain = (logEvent, byteBuffer) -> {
+ };
+ MutableLogEvent logEvent = new MutableLogEvent();
+
+ // When
+ TjahziByteBufferDestination actual1 = repository.threadLocalDestination(drain, logEvent);
+ TjahziByteBufferDestination actual2 = repository.threadLocalDestination(drain, logEvent);
+
+ // Then
+ assertThat(actual1).isSameAs(actual2);
+ }
+
+ @Test
+ void shouldReturnDifferentSerializerInsideDifferentThreads() throws InterruptedException {
+ // Given
+ int capacity = 42;
+ ByteBufferDestinationRepository repository = new ByteBufferDestinationRepository(capacity);
+
+ BiConsumer drain = (logEvent, byteBuffer) -> {
+ };
+ MutableLogEvent logEvent = new MutableLogEvent();
+
+ AtomicReference captor1 = new AtomicReference<>();
+ AtomicReference captor2 = new AtomicReference<>();
+
+ // When
+ Thread thread1 = new Thread(() -> captor1.set(repository.threadLocalDestination(drain, logEvent)));
+ thread1.start();
+ thread1.join();
+
+ Thread thread2 = new Thread(() -> captor2.set(repository.threadLocalDestination(drain, logEvent)));
+ thread2.start();
+ thread2.join();
+
+ // Then
+ assertThat(captor1.get()).isNotNull();
+ assertThat(captor2.get()).isNotNull();
+
+ assertThat(captor1.get()).isNotSameAs(captor2.get());
+ }
+}
diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LogLineFragmentationTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LogLineFragmentationTest.java
new file mode 100644
index 0000000..1ca96ed
--- /dev/null
+++ b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LogLineFragmentationTest.java
@@ -0,0 +1,96 @@
+package pl.tkowalcz.tjahzi.log4j2;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.parsing.Parser;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.awaitility.Awaitility;
+import org.awaitility.Durations;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.BindMode;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.net.URI;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.hasItems;
+
+@Testcontainers
+class LogLineFragmentationTest {
+
+ @Container
+ public GenericContainer loki = new GenericContainer("grafana/loki:latest")
+ .withCommand("-config.file=/etc/loki-config.yaml")
+ .withClasspathResourceMapping("loki-config.yaml",
+ "/etc/loki-config.yaml",
+ BindMode.READ_ONLY
+ )
+ .waitingFor(
+ Wait.forHttp("/ready")
+ .forPort(3100)
+ )
+ .withExposedPorts(3100);
+
+ @Test
+ void shouldFragmentMessageOverLimit() throws Exception {
+ // Given
+ System.setProperty("loki.host", loki.getHost());
+ System.setProperty("loki.port", loki.getFirstMappedPort().toString());
+
+ URI uri = getClass()
+ .getClassLoader()
+ .getResource("appender-test-large-log-line-fragmentation.xml")
+ .toURI();
+
+ ((org.apache.logging.log4j.core.LoggerContext) LogManager.getContext(false))
+ .setConfigLocation(uri);
+
+ String unfragmentedLogLine = RandomStringUtils.randomAlphanumeric(100 * 1024 - 1);
+ String fragmentedLogLine = RandomStringUtils.randomAlphanumeric(110 * 1024);
+
+ long expectedTimestamp = System.currentTimeMillis();
+ Logger logger = LogManager.getLogger(LogLineFragmentationTest.class);
+
+ // When
+ logger.info(unfragmentedLogLine);
+ logger.info(fragmentedLogLine);
+
+ // Then
+ RestAssured.port = loki.getFirstMappedPort();
+ RestAssured.baseURI = "http://" + loki.getHost();
+ RestAssured.registerParser("text/plain", Parser.JSON);
+
+ Awaitility
+ .await()
+ .atMost(Durations.ONE_MINUTE)
+ .pollInterval(Durations.ONE_SECOND)
+ .ignoreExceptions()
+ .untilAsserted(() -> given()
+ .contentType(ContentType.URLENC)
+ .urlEncodingEnabled(false)
+ .formParam("&start=" + expectedTimestamp + "&limit=1000&query=%7Bserver%3D%22127.0.0.1%22%7D")
+ .when()
+ .get("/loki/api/v1/query_range")
+ .then()
+ .statusCode(200)
+ .body("status", equalTo("success"))
+ .body("data.result.size()", equalTo(1))
+ .body("data.result[0].stream.server", equalTo("127.0.0.1"))
+ .body("data.result[0].values.size()", equalTo(3))
+ .body(
+ "data.result.values",
+ hasItems(
+ hasItems(hasItems(fragmentedLogLine.substring(102_400, 110 * 1024))),
+ hasItems(hasItems(fragmentedLogLine.substring(0, 102_400))),
+ hasItems(hasItems(unfragmentedLogLine))
+ )
+ )
+ );
+ }
+}
diff --git a/log4j2-appender/src/test/resources/appender-test-large-log-line-fragmentation.xml b/log4j2-appender/src/test/resources/appender-test-large-log-line-fragmentation.xml
new file mode 100644
index 0000000..6cd15e7
--- /dev/null
+++ b/log4j2-appender/src/test/resources/appender-test-large-log-line-fragmentation.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+ ${sys:loki.host}
+ ${sys:loki.port}
+
+ 100
+
+
+
+ %m
+
+
+
+
+
+
+
diff --git a/logback-appender-nodep/pom.xml b/logback-appender-nodep/pom.xml
index 1ca01fc..7bee240 100644
--- a/logback-appender-nodep/pom.xml
+++ b/logback-appender-nodep/pom.xml
@@ -5,13 +5,13 @@
pl.tkowalcz.tjahzitjahzi-parent
- 0.9.11-SNAPSHOT
+ 0.9.13-SNAPSHOTlogback-appender-nodeplogback-appender-nodepjar
- 0.9.11-SNAPSHOT
+ 0.9.13-SNAPSHOT
@@ -22,7 +22,7 @@
pl.tkowalcz.tjahzilogback-appender
- 0.9.11-SNAPSHOT
+ 0.9.13-SNAPSHOT
diff --git a/logback-appender/pom.xml b/logback-appender/pom.xml
index 491a653..18e1f41 100644
--- a/logback-appender/pom.xml
+++ b/logback-appender/pom.xml
@@ -5,19 +5,19 @@
pl.tkowalcz.tjahzitjahzi-parent
- 0.9.11-SNAPSHOT
+ 0.9.13-SNAPSHOTlogback-appenderlogback-appenderjar
- 0.9.11-SNAPSHOT
+ 0.9.13-SNAPSHOTpl.tkowalcz.tjahzicore
- 0.9.11-SNAPSHOT
+ 0.9.13-SNAPSHOT
diff --git a/loki-protobuf/pom.xml b/loki-protobuf/pom.xml
index 257f3be..a96a2f2 100644
--- a/loki-protobuf/pom.xml
+++ b/loki-protobuf/pom.xml
@@ -5,7 +5,7 @@
pl.tkowalcz.tjahzitjahzi-parent
- 0.9.11-SNAPSHOT
+ 0.9.13-SNAPSHOTloki-protobuf
diff --git a/pom.xml b/pom.xml
index 5c35965..9dfca34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
pl.tkowalcz.tjahzitjahzi-parentpom
- 0.9.11-SNAPSHOT
+ 0.9.13-SNAPSHOTTjahziTjahzi is a low overhead logging client for Loki