Skip to content

Commit

Permalink
chore: use json logger as default
Browse files Browse the repository at this point in the history
  • Loading branch information
dweber019 committed Oct 18, 2023
1 parent 7af19f9 commit 3274999
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 35 deletions.
2 changes: 1 addition & 1 deletion http-client.env.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"url": "http://localhost:8080"
},
"incubator": {
"url": "https://gabelstapler-buggyapp.apps.baloise.dev"
"url": "https://gabelstapler-observability-app-1.apps.baloise.dev"
}
}
11 changes: 8 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,15 @@
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.github.loki4j</groupId>-->
<!-- <artifactId>loki-logback-appender</artifactId>-->
<!-- <version>1.4.2</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.github.loki4j</groupId>
<artifactId>loki-logback-appender</artifactId>
<version>1.4.2</version>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
<version>7.4</version>
</dependency>

<dependency>
Expand Down
73 changes: 42 additions & 31 deletions src/main/resources/logback-spring.xml
Original file line number Diff line number Diff line change
@@ -1,39 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>

<include resource="org/springframework/boot/logging/logback/base.xml" />
<springProfile name="local">
<include resource="org/springframework/boot/logging/logback/base.xml"/>
</springProfile>

<springProperty name="name" source="spring.application.name" />
<springProperty name="lokiurl" source="loki.url" />
<springProfile name="default">
<appender name="jsonConsoleAppender" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
</appender>
<root level="INFO">
<appender-ref ref="jsonConsoleAppender"/>
</root>
</springProfile>

<appender name="LOKI" class="com.github.loki4j.logback.Loki4jAppender">
<http>
<url>${lokiurl}</url>
</http>
<format>
<label>
<pattern>app=${name},host=${HOSTNAME},traceID=%X{traceId:-NONE},level=%level</pattern>
<readMarkers>true</readMarkers>
</label>
<message>
<pattern>
{
"level":"%level",
"class":"%logger{36}",
"thread":"%thread",
"message": "%message",
"traceId": "%X{traceId:-}",
"spanId": "%X{spanId:-}",
"stackTrace": "%ex"
}
</pattern>
</message>
<sortByTime>true</sortByTime>
</format>
</appender>
<!-- <springProperty name="name" source="spring.application.name" />-->
<!-- <springProperty name="lokiurl" source="loki.url" />-->

<root level="INFO">
<appender-ref ref="LOKI" />
</root>
<!-- <appender name="LOKI" class="com.github.loki4j.logback.Loki4jAppender">-->
<!-- <http>-->
<!-- <url>${lokiurl}</url>-->
<!-- </http>-->
<!-- <format>-->
<!-- <label>-->
<!-- <pattern>app=${name},host=${HOSTNAME},traceID=%X{traceId:-NONE},level=%level</pattern>-->
<!-- <readMarkers>true</readMarkers>-->
<!-- </label>-->
<!-- <message>-->
<!-- <pattern>-->
<!-- {-->
<!-- "level":"%level",-->
<!-- "class":"%logger{36}",-->
<!-- "thread":"%thread",-->
<!-- "message": "%message",-->
<!-- "trace_id": "%X{traceId:-}",-->
<!-- "span_id": "%X{spanId:-}",-->
<!-- "stackTrace": "%ex"-->
<!-- }-->
<!-- </pattern>-->
<!-- </message>-->
<!-- <sortByTime>true</sortByTime>-->
<!-- </format>-->
<!-- </appender>-->

<!-- <root level="INFO">-->
<!-- <appender-ref ref="LOKI" />-->
<!-- </root>-->

</configuration>

0 comments on commit 3274999

Please sign in to comment.