Skip to content
Merged
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
13 changes: 6 additions & 7 deletions hildr-node/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,21 @@ dependencies {
implementation 'io.micrometer:micrometer-tracing'
implementation 'io.micrometer:micrometer-tracing-bridge-otel'

// Log4j
implementation(platform("org.apache.logging.log4j:log4j-bom:2.20.0"))
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.logging.log4j:log4j-core'
implementation 'org.apache.logging.log4j:log4j-slf4j2-impl'
// Logback
implementation 'ch.qos.logback:logback-core:1.4.7'
implementation 'ch.qos.logback:logback-classic:1.4.7'
implementation 'org.slf4j:slf4j-api:2.0.7'

implementation platform("io.opentelemetry:opentelemetry-bom-alpha:1.26.0-alpha")
implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.26.0-alpha")
// OpenTelemetry core
implementation(platform("io.opentelemetry:opentelemetry-bom:1.26.0"))
implementation 'io.opentelemetry:opentelemetry-api'
implementation 'io.opentelemetry:opentelemetry-sdk'
implementation 'io.opentelemetry:opentelemetry-sdk-logs'

// OpenTelemetry log4j appenders
implementation 'io.opentelemetry.instrumentation:opentelemetry-log4j-context-data-2.17-autoconfigure'
implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.26.0-alpha")
runtimeOnly 'io.opentelemetry.instrumentation:opentelemetry-logback-mdc-1.0'


implementation 'info.picocli:picocli:4.7.3'
Expand Down
22 changes: 0 additions & 22 deletions hildr-node/src/main/resources/log4j2.xml

This file was deleted.

29 changes: 29 additions & 0 deletions hildr-node/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} trace_id=%X{trace_id} span_id=%X{span_id} trace_flags=%X{trace_flags} %msg%n</pattern>
</encoder>
</appender>

<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/app.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>app-%d{yyyy-MM-dd HH}.gz</fileNamePattern>
<maxHistory>30</maxHistory>
<totalSizeCap>3GB</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} trace_id=%X{trace_id} span_id=%X{span_id} trace_flags=%X{trace_flags} %msg%n</pattern>
</encoder>
</appender>

<appender name="OTEL" class="io.opentelemetry.instrumentation.logback.mdc.v1_0.OpenTelemetryAppender">
<appender-ref ref="FILE"/>
</appender>
<root level="debug">
<appender-ref ref="CONSOLE" />
<!-- <appender-ref ref="FILE" />-->
<appender-ref ref="OTEL" />
</root>
</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ void testLogging() throws InterruptedException {
() -> {
Tracer tracer = Logging.INSTANCE.getTracer();
Span span = tracer.nextSpan().name("my-span").start();
logger.debug("step 1:parent {} log", logId);
logger.info("step 1:parent {} log", logId);
try (var unusedScope1 = Logging.INSTANCE.getTracer().withSpan(span)) {
logger.debug("step 2:parent {} log", logId);
logger.info("step 2:parent {} log", logId);
Span childSpan = tracer.nextSpan().name("childSpan").start();
try (var unusedBag2 = tracer.withSpan(childSpan)) {
logger.debug("step 3:parent {} log", logId);
logger.info("step 3:parent {} log", logId);
throw new RuntimeException("test error for span");
} catch (Exception e) {
logger.error("catch a throw in scope", e);
Expand Down