Skip to content
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

package io.spine.logging.backend.jul;

import io.spine.logging.flogger.backend.LoggerBackend;
import io.spine.logging.jvm.backend.LoggerBackend;

import java.util.logging.Filter;
import java.util.logging.Handler;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@

package io.spine.logging.backend.jul;

import io.spine.logging.flogger.backend.LogData;
import io.spine.logging.flogger.backend.LogMessageFormatter;
import io.spine.logging.flogger.backend.MessageUtils;
import io.spine.logging.flogger.backend.Metadata;
import io.spine.logging.flogger.backend.MetadataProcessor;
import io.spine.logging.flogger.backend.SimpleMessageFormatter;
import io.spine.logging.jvm.backend.LogData;
import io.spine.logging.jvm.backend.LogMessageFormatter;
import io.spine.logging.jvm.backend.MessageUtils;
import io.spine.logging.jvm.backend.Metadata;
import io.spine.logging.jvm.backend.MetadataProcessor;
import io.spine.logging.jvm.backend.SimpleMessageFormatter;
import com.google.errorprone.annotations.CanIgnoreReturnValue;

import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@

package io.spine.logging.backend.jul;

import io.spine.logging.flogger.LogContext;
import io.spine.logging.flogger.backend.LogData;
import io.spine.logging.flogger.backend.Metadata;
import io.spine.logging.jvm.LogContext;
import io.spine.logging.jvm.backend.LogData;
import io.spine.logging.jvm.backend.Metadata;

import java.util.logging.LogRecord;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@

package io.spine.logging.backend.jul

import io.spine.logging.flogger.backend.LogData
import io.spine.logging.flogger.backend.LoggerBackend
import io.spine.logging.flogger.backend.Platform
import io.spine.logging.jvm.backend.LogData
import io.spine.logging.jvm.backend.LoggerBackend
import io.spine.logging.jvm.backend.Platform
import java.util.logging.Handler
import java.util.logging.Level
import java.util.logging.LogRecord
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

package io.spine.logging.backend.jul

import io.spine.logging.flogger.backend.BackendFactory
import io.spine.logging.flogger.backend.LoggerBackend
import io.spine.logging.jvm.backend.BackendFactory
import io.spine.logging.jvm.backend.LoggerBackend

/**
* A [BackendFactory] producing [LoggerBackend] which supports publishing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ import io.kotest.matchers.string.shouldContain
import io.kotest.matchers.string.shouldEndWith
import io.kotest.matchers.string.shouldNotContain
import io.kotest.matchers.types.shouldBeSameInstanceAs
import io.spine.logging.flogger.FloggerMetadataKey
import io.spine.logging.flogger.LogContext.Key
import io.spine.logging.flogger.backend.Metadata
import io.spine.logging.flogger.backend.given.FakeLogData
import io.spine.logging.flogger.backend.given.FakeMetadata
import io.spine.logging.flogger.context.Tags
import io.spine.logging.flogger.parser.ParseException
import io.spine.logging.flogger.singleKey
import io.spine.logging.jvm.JvmMetadataKey
import io.spine.logging.jvm.LogContext.Key
import io.spine.logging.jvm.backend.Metadata
import io.spine.logging.jvm.backend.given.FakeLogData
import io.spine.logging.jvm.backend.given.FakeMetadata
import io.spine.logging.jvm.context.Tags
import io.spine.logging.jvm.parser.ParseException
import io.spine.logging.jvm.singleKey
import java.time.Instant.ofEpochMilli
import java.util.concurrent.TimeUnit.NANOSECONDS
import java.util.logging.Level
Expand All @@ -62,7 +62,7 @@ internal class JulRecordSpec {
private val INT_KEY = singleKey<Int>("int")
private val STR_KEY = singleKey<String>("str")
private val PATH_KEY =
object : FloggerMetadataKey<String>("path", String::class.java, true) {
object : JvmMetadataKey<String>("path", String::class.java, true) {
override fun emitRepeated(values: Iterator<String>, out: KeyValueHandler) {
val joined = values.asSequence().joinToString("/")
out.handle(label, joined)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
package io.spine.logging.backend.jul.given

import io.spine.logging.backend.jul.AbstractJulRecord
import io.spine.logging.flogger.backend.LogData
import io.spine.logging.flogger.backend.LogMessageFormatter
import io.spine.logging.flogger.backend.Metadata
import io.spine.logging.flogger.backend.MetadataProcessor
import io.spine.logging.flogger.backend.SimpleMessageFormatter
import io.spine.logging.flogger.backend.given.FakeLogData
import io.spine.logging.jvm.backend.LogData
import io.spine.logging.jvm.backend.LogMessageFormatter
import io.spine.logging.jvm.backend.Metadata
import io.spine.logging.jvm.backend.MetadataProcessor
import io.spine.logging.jvm.backend.SimpleMessageFormatter
import io.spine.logging.jvm.backend.given.FakeLogData

/**
* An instantiatable [AbstractJulRecord].
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ package io.spine.logging.backend.jul.given

import io.spine.logging.backend.jul.AbstractJulBackend
import io.spine.logging.backend.jul.given.MemoizingJulBackend.ForcingLogger
import io.spine.logging.flogger.backend.LogData
import io.spine.logging.jvm.backend.LogData
import java.util.logging.Handler
import java.util.logging.Level
import java.util.logging.LogRecord
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

package io.spine.logging.backend.log4j2;

import io.spine.logging.flogger.backend.LoggerBackend;
import io.spine.logging.flogger.backend.BackendFactory;
import io.spine.logging.jvm.backend.LoggerBackend;
import io.spine.logging.jvm.backend.BackendFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Logger;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@

package io.spine.logging.backend.log4j2;

import static io.spine.logging.flogger.backend.MetadataProcessor.forScopeAndLogSite;
import static io.spine.logging.jvm.backend.MetadataProcessor.forScopeAndLogSite;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import static java.util.logging.Level.WARNING;

import io.spine.logging.flogger.LogContext;
import io.spine.logging.flogger.FloggerLogSite;
import io.spine.logging.flogger.FloggerMetadataKey;
import io.spine.logging.flogger.backend.BaseMessageFormatter;
import io.spine.logging.flogger.backend.LogData;
import io.spine.logging.flogger.backend.MessageUtils;
import io.spine.logging.flogger.backend.Metadata;
import io.spine.logging.flogger.backend.MetadataHandler;
import io.spine.logging.flogger.backend.Platform;
import io.spine.logging.flogger.backend.SimpleMessageFormatter;
import io.spine.logging.flogger.context.ScopedLoggingContext;
import io.spine.logging.flogger.context.Tags;
import io.spine.logging.jvm.LogContext;
import io.spine.logging.jvm.JvmLogSite;
import io.spine.logging.jvm.JvmMetadataKey;
import io.spine.logging.jvm.backend.BaseMessageFormatter;
import io.spine.logging.jvm.backend.LogData;
import io.spine.logging.jvm.backend.MessageUtils;
import io.spine.logging.jvm.backend.Metadata;
import io.spine.logging.jvm.backend.MetadataHandler;
import io.spine.logging.jvm.backend.Platform;
import io.spine.logging.jvm.backend.SimpleMessageFormatter;
import io.spine.logging.jvm.context.ScopedLoggingContext;
import io.spine.logging.jvm.context.Tags;
import java.util.logging.Level;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
Expand Down Expand Up @@ -111,7 +111,7 @@ private static LogEvent toLog4jLogEvent(
org.apache.logging.log4j.Level level,
Throwable thrown) {

FloggerLogSite logSite = logData.getLogSite();
JvmLogSite logSite = logData.getLogSite();
StackTraceElement locationInfo =
new StackTraceElement(
logSite.getClassName(),
Expand Down Expand Up @@ -205,11 +205,11 @@ private static void appendLogData(LogData data, StringBuilder out) {
out.append("\n line number: ").append(data.getLogSite().getLineNumber());
}

private static final MetadataHandler<FloggerMetadataKey.KeyValueHandler> HANDLER =
private static final MetadataHandler<JvmMetadataKey.KeyValueHandler> HANDLER =
MetadataHandler.builder(Log4j2LogEventUtil::handleMetadata).build();

private static void handleMetadata(
FloggerMetadataKey<Object> key, Object value, FloggerMetadataKey.KeyValueHandler kvh) {
JvmMetadataKey<Object> key, Object value, JvmMetadataKey.KeyValueHandler kvh) {
if (key.getClass().equals(LogContext.Key.TAGS.getClass())) {
processTags(key, value, kvh);
} else {
Expand All @@ -225,7 +225,7 @@ private static void handleMetadata(
}

private static void processTags(
FloggerMetadataKey<Object> key, Object value, FloggerMetadataKey.KeyValueHandler kvh) {
JvmMetadataKey<Object> key, Object value, JvmMetadataKey.KeyValueHandler kvh) {
ValueQueue valueQueue = ValueQueue.appendValueToNewQueue(value);
// Unlike single metadata (which is usually formatted as a single value), tags are always
// formatted as a list.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

package io.spine.logging.backend.log4j2;

import io.spine.logging.flogger.backend.LogData;
import io.spine.logging.flogger.backend.LoggerBackend;
import io.spine.logging.jvm.backend.LogData;
import io.spine.logging.jvm.backend.LoggerBackend;
import org.apache.logging.log4j.core.Logger;

import static io.spine.logging.backend.log4j2.Log4j2LogEventUtil.toLog4jLevel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

package io.spine.logging.backend.log4j2;

import static io.spine.logging.flogger.util.Checks.checkNotNull;
import static io.spine.logging.jvm.util.Checks.checkNotNull;

import io.spine.logging.flogger.FloggerMetadataKey.KeyValueHandler;
import io.spine.logging.flogger.context.Tags;
import io.spine.logging.jvm.JvmMetadataKey.KeyValueHandler;
import io.spine.logging.jvm.context.Tags;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

package io.spine.logging.backend.log4j2

import io.spine.logging.flogger.backend.BackendFactory
import io.spine.logging.jvm.backend.BackendFactory
import io.kotest.matchers.collections.shouldHaveSize
import io.kotest.matchers.nulls.shouldNotBeNull
import io.kotest.matchers.types.shouldBeInstanceOf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ import io.kotest.matchers.shouldBe
import io.kotest.matchers.string.shouldContain
import io.kotest.matchers.types.shouldBeSameInstanceAs
import io.spine.logging.backend.log4j2.given.MemoizingAppender
import io.spine.logging.flogger.FloggerLogSite
import io.spine.logging.flogger.LogContext.Key
import io.spine.logging.flogger.backend.given.FakeLogData
import io.spine.logging.flogger.given.FakeLogSite
import io.spine.logging.flogger.parser.ParseException
import io.spine.logging.flogger.repeatedKey
import io.spine.logging.flogger.singleKey
import io.spine.logging.jvm.JvmLogSite
import io.spine.logging.jvm.LogContext.Key
import io.spine.logging.jvm.backend.given.FakeLogData
import io.spine.logging.jvm.given.FakeLogSite
import io.spine.logging.jvm.parser.ParseException
import io.spine.logging.jvm.repeatedKey
import io.spine.logging.jvm.singleKey
import java.util.concurrent.atomic.AtomicInteger
import org.apache.logging.log4j.LogManager
import org.apache.logging.log4j.core.Appender
Expand Down Expand Up @@ -175,7 +175,7 @@ internal class Log4j2LoggerBackendSpec {
testLogSite(logSite)
}

private fun testLogSite(logSite: FloggerLogSite) {
private fun testLogSite(logSite: JvmLogSite) {
val data = FakeLogData("")
.setLogSite(logSite)
backend.log(data)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ package io.spine.logging.backend.log4j2
import io.kotest.matchers.collections.shouldHaveSize
import io.kotest.matchers.shouldBe
import io.spine.logging.backend.log4j2.given.MemoizingAppender
import io.spine.logging.flogger.LogContext.Key
import io.spine.logging.flogger.context.ContextDataProvider
import io.spine.logging.flogger.context.Tags
import io.spine.logging.flogger.given.ConfigurableLogger
import io.spine.logging.flogger.repeatedKey
import io.spine.logging.flogger.singleKey
import io.spine.logging.jvm.LogContext.Key
import io.spine.logging.jvm.context.ContextDataProvider
import io.spine.logging.jvm.context.Tags
import io.spine.logging.jvm.given.ConfigurableLogger
import io.spine.logging.jvm.repeatedKey
import io.spine.logging.jvm.singleKey
import java.util.concurrent.atomic.AtomicInteger
import org.apache.logging.log4j.Level
import org.apache.logging.log4j.LogManager
Expand All @@ -48,7 +48,7 @@ import org.junit.jupiter.api.Nested
import org.junit.jupiter.api.Test

/**
* Tests for interaction between [ScopedLoggingContext][io.spine.logging.flogger.context.ScopedLoggingContext]
* Tests for interaction between [ScopedLoggingContext][io.spine.logging.jvm.context.ScopedLoggingContext]
* and [Log4j2LoggerBackend].
*
* `ScopedLoggingContext` is abstract. To test it with Log4j backend,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

package io.spine.logging.backend.probe

import io.spine.logging.flogger.backend.LogData
import io.spine.logging.jvm.backend.LogData

/**
* Runs the given [action], capturing all log data that are passed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

package io.spine.logging.backend.probe

import io.spine.logging.flogger.backend.LoggerBackend
import io.spine.logging.flogger.backend.BackendFactory
import io.spine.logging.jvm.backend.LoggerBackend
import io.spine.logging.jvm.backend.BackendFactory
import io.spine.logging.backend.jul.JulBackendFactory

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
package io.spine.logging.backend.probe

import com.google.auto.service.AutoService
import io.spine.logging.flogger.backend.LoggerBackend
import io.spine.logging.flogger.backend.BackendFactory
import io.spine.logging.jvm.backend.LoggerBackend
import io.spine.logging.jvm.backend.BackendFactory

/**
* Adapts [DynamicBackendFactory] to be used with Java's
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

package io.spine.logging.backend.probe

import io.spine.logging.flogger.backend.LoggerBackend
import io.spine.logging.jvm.backend.LoggerBackend

/**
* A backend factory that stores the created instances of [LoggerBackend].
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

package io.spine.logging.backend.probe

import io.spine.logging.flogger.backend.given.MemoizingLoggerBackend
import io.spine.logging.jvm.backend.given.MemoizingLoggerBackend

/**
* A factory of [MemoizingLoggerBackend].
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

package io.spine.logging.backend.probe

import io.spine.logging.flogger.backend.LoggerBackend
import io.spine.logging.jvm.backend.LoggerBackend

/**
* A typed [BackendFactory][io.spine.logging.backend.system.BackendFactory].
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ package io.spine.dependency.lib
// https://github.com/google/flogger
@Deprecated("Please use Spine Logging library instead.")
@Suppress("unused", "ConstPropertyName")
object Flogger {
object Jvm {
internal const val version = "0.7.4"
const val lib = "com.google.flogger:flogger:$version"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@

package io.spine.logging.context.grpc;

import io.spine.logging.flogger.LoggingScope;
import io.spine.logging.flogger.context.ContextMetadata;
import io.spine.logging.flogger.context.LogLevelMap;
import io.spine.logging.flogger.context.ScopeType;
import io.spine.logging.flogger.context.ScopedLoggingContext.ScopeList;
import io.spine.logging.flogger.context.Tags;
import io.spine.logging.jvm.LoggingScope;
import io.spine.logging.jvm.context.ContextMetadata;
import io.spine.logging.jvm.context.LogLevelMap;
import io.spine.logging.jvm.context.ScopeType;
import io.spine.logging.jvm.context.ScopedLoggingContext.ScopeList;
import io.spine.logging.jvm.context.Tags;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;
import org.jspecify.annotations.Nullable;
Expand Down
Loading
Loading