This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 12d4a4670e QPID-8613 - [Broker-J] Graylog plugin update
12d4a4670e is described below
commit 12d4a4670e51d88406bb4389d20420249510218c
Author: Tomas Vavricka <[email protected]>
AuthorDate: Thu Mar 2 12:28:52 2023 +0000
QPID-8613 - [Broker-J] Graylog plugin update
---
.../server/logging/logback/event/LoggingEvent.java | 31 ++++++++++++++-
.../logging/logback/event/LoggingEventTest.java | 45 ++++++++++++++++++++++
.../logging/logback/event/TestLoggingEvent.java | 43 +++++++++++++++++++--
3 files changed, 114 insertions(+), 5 deletions(-)
diff --git
a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/event/LoggingEvent.java
b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/event/LoggingEvent.java
index 5bbfaff40f..ae5276a6e2 100644
---
a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/event/LoggingEvent.java
+++
b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/event/LoggingEvent.java
@@ -27,7 +27,10 @@ import ch.qos.logback.classic.spi.LoggerContextVO;
import org.apache.qpid.server.logging.CallerDataFilter;
import org.apache.qpid.server.util.ArrayUtils;
import org.slf4j.Marker;
+import org.slf4j.event.KeyValuePair;
+import java.time.Instant;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -114,9 +117,9 @@ public final class LoggingEvent implements ILoggingEvent
}
@Override
- public Marker getMarker()
+ public List<Marker> getMarkerList()
{
- return _event.getMarker();
+ return _event.getMarkerList();
}
@Override
@@ -141,6 +144,30 @@ public final class LoggingEvent implements ILoggingEvent
return _event.getTimeStamp();
}
+ @Override
+ public Instant getInstant()
+ {
+ return _event.getInstant();
+ }
+
+ @Override
+ public int getNanoseconds()
+ {
+ return _event.getNanoseconds();
+ }
+
+ @Override
+ public long getSequenceNumber()
+ {
+ return _event.getSequenceNumber();
+ }
+
+ @Override
+ public List<KeyValuePair> getKeyValuePairs()
+ {
+ return _event.getKeyValuePairs();
+ }
+
@Override
public void prepareForDeferredProcessing()
{
diff --git
a/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/event/LoggingEventTest.java
b/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/event/LoggingEventTest.java
index b78cd6ac5f..a36b748e19 100644
---
a/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/event/LoggingEventTest.java
+++
b/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/event/LoggingEventTest.java
@@ -265,6 +265,15 @@ public class LoggingEventTest extends UnitTestBase
assertEquals(event.getMarker(), wrapper.getMarker());
}
+ @Test
+ public void testGetMarkerList()
+ {
+ TestLoggingEvent event = new TestLoggingEvent();
+ ILoggingEvent wrapper = LoggingEvent.wrap(event);
+ assertNotNull(wrapper);
+ assertEquals(event.getMarkerList(), wrapper.getMarkerList());
+ }
+
@Test
public void tesGetMDCPropertyMap()
{
@@ -308,6 +317,42 @@ public class LoggingEventTest extends UnitTestBase
assertEquals(event.getTimeStamp(), wrapper.getTimeStamp());
}
+ @Test
+ public void testGetInstant()
+ {
+ TestLoggingEvent event = new TestLoggingEvent();
+ ILoggingEvent wrapper = LoggingEvent.wrap(event);
+ assertNotNull(wrapper);
+ assertEquals(event.getInstant(), wrapper.getInstant());
+ }
+
+ @Test
+ public void testGetNanoseconds()
+ {
+ TestLoggingEvent event = new TestLoggingEvent();
+ ILoggingEvent wrapper = LoggingEvent.wrap(event);
+ assertNotNull(wrapper);
+ assertEquals(event.getNanoseconds(), wrapper.getNanoseconds());
+ }
+
+ @Test
+ public void testGetSequenceNumber()
+ {
+ TestLoggingEvent event = new TestLoggingEvent();
+ ILoggingEvent wrapper = LoggingEvent.wrap(event);
+ assertNotNull(wrapper);
+ assertEquals(event.getSequenceNumber(), wrapper.getSequenceNumber());
+ }
+
+ @Test
+ public void testGetKeyValuePairs()
+ {
+ TestLoggingEvent event = new TestLoggingEvent();
+ ILoggingEvent wrapper = LoggingEvent.wrap(event);
+ assertNotNull(wrapper);
+ assertEquals(event.getKeyValuePairs(), wrapper.getKeyValuePairs());
+ }
+
@Test
public void testPrepareForDeferredProcessing()
{
diff --git
a/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/event/TestLoggingEvent.java
b/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/event/TestLoggingEvent.java
index affb1c1d01..cc229f4f3d 100644
---
a/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/event/TestLoggingEvent.java
+++
b/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/event/TestLoggingEvent.java
@@ -28,9 +28,12 @@ import ch.qos.logback.classic.spi.IThrowableProxy;
import ch.qos.logback.classic.spi.LoggerContextVO;
import ch.qos.logback.classic.spi.StackTraceElementProxy;
import org.slf4j.Marker;
+import org.slf4j.event.KeyValuePair;
+import java.time.Instant;
import java.util.Collections;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
public class TestLoggingEvent implements ILoggingEvent
@@ -41,6 +44,8 @@ public class TestLoggingEvent implements ILoggingEvent
private final LoggerContextVO _loggerContext = new LoggerContextVO(new
LoggerContext());
+ private final Instant _instant = Instant.now();
+
private final long _timeStamp = System.currentTimeMillis();
private final Marker _marker = new Marker()
@@ -93,7 +98,9 @@ public class TestLoggingEvent implements ILoggingEvent
}
};
- private final Map<String, String> _mdcMap = Collections.singletonMap("A",
"B");
+ private final Map<String, String> _mdcMap = Map.of("A", "B");
+
+ private final List<KeyValuePair> keyValuePairs = List.of(new
KeyValuePair("C", "D"));
private boolean preparedForDeferredProcessing = false;
@@ -134,6 +141,12 @@ public class TestLoggingEvent implements ILoggingEvent
{
return new IThrowableProxy[0];
}
+
+ @Override
+ public boolean isCyclic()
+ {
+ return false;
+ }
};
private StackTraceElement[] _callerData;
@@ -199,9 +212,9 @@ public class TestLoggingEvent implements ILoggingEvent
}
@Override
- public Marker getMarker()
+ public List<Marker> getMarkerList()
{
- return _marker;
+ return List.of(_marker);
}
@Override
@@ -226,6 +239,30 @@ public class TestLoggingEvent implements ILoggingEvent
return _timeStamp;
}
+ @Override
+ public int getNanoseconds()
+ {
+ return _instant.getNano();
+ }
+
+ @Override
+ public Instant getInstant()
+ {
+ return _instant;
+ }
+
+ @Override
+ public long getSequenceNumber()
+ {
+ return 1234;
+ }
+
+ @Override
+ public List<KeyValuePair> getKeyValuePairs()
+ {
+ return keyValuePairs;
+ }
+
@Override
public void prepareForDeferredProcessing()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
