Skip to content

Bump versions.metrics from 4.2.2 to 4.2.4 #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump versions.metrics from 4.2.2 to 4.2.4 #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f52325
Add json appender for logback (#486)
billoneil Nov 20, 2021
b227c4a
Bump versions.metrics from 4.2.2 to 4.2.4
dependabot[bot] Nov 20, 2021
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: 8 additions & 5 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ ext {
okhttp : '4.9.1', // HTTP Client
slf4j : '1.7.31', // Logging
logback : '1.2.5', // Logging
undertow : '2.2.8.Final',// Webserver
metrics : '4.2.2', // Metrics
guava : '30.1.1-jre', // Common / Helper libraries
logbackJson : '0.1.5',
undertow : '2.2.8.Final', // Webserver
metrics : '4.2.4', // Metrics
guava : '30.1.1-jre', // Common / Helper libraries
typesafeConfig : '1.4.1', // Configuration
handlebars : '4.2.0', // HTML templating
htmlCompressor : '1.5.2', // HTML compression
hikaricp : '4.0.3', // JDBC connection pool
jool : '0.9.14', // Functional Utils
hsqldb : '2.6.0', // In memory SQL db
aws : '1.12.62', // AWS Java SDK
aws : '1.12.62', // AWS Java SDK
flyway : '5.1.4', // DB migrations
connectorj : '8.0.25', // JDBC MYSQL driver
jooq : '3.15.0', // jOOQ
Expand All @@ -25,7 +26,7 @@ ext {
sitemapgen4j : '1.1.2', // Sitemap generator for SEO
jbcrypt : '0.4', // BCrypt salted hashing library
romeRss : '1.0', // RSS Library
kotlin : '1.4.0', // Kotlin
kotlin : '1.4.0', // Kotlin
javax : '1.3.2',
jbossLogging : '3.4.2.Final',
jbossThreads : '3.4.0.Final',
Expand Down Expand Up @@ -55,6 +56,8 @@ ext {
slf4jLog4j : "org.slf4j:log4j-over-slf4j:$versions.slf4j",
logback : "ch.qos.logback:logback-classic:$versions.logback",
logbackCore : "ch.qos.logback:logback-core:$versions.logback",
logbackJson : "ch.qos.logback.contrib:logback-json-classic:$versions.logbackJson",
logbackJackson : "ch.qos.logback.contrib:logback-jackson:$versions.logbackJson",
guava : "com.google.guava:guava:$versions.guava",
typesafeConfig : "com.typesafe:config:$versions.typesafeConfig",
handlebars : "com.github.jknack:handlebars:$versions.handlebars",
Expand Down
5 changes: 5 additions & 0 deletions k8s/chart/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@ description: Helm chart to deploy StubbornJava
type: application
version: 0.1.0
appVersion: 1.0.0

dependencies:
- name: promtail
version: 3.8.2
repository: https://grafana.github.io/helm-charts
2 changes: 2 additions & 0 deletions k8s/chart/templates/stubbornjava.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ spec:
env:
- name: ENV
value: "prod"
- name: LOG_APPENDER
value: "JSON"
- name: github.clientId
valueFrom:
secretKeyRef:
Expand Down
2 changes: 2 additions & 0 deletions stubbornjava-common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ dependencies {
api project(':stubbornjava-undertow')
api libs.slf4j
api libs.logback
api libs.logbackJson
api libs.logbackJackson
api libs.jacksonCore
api libs.jacksonDatabind
api libs.jacksonDatabind
Expand Down
16 changes: 15 additions & 1 deletion stubbornjava-webapp/src/main/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<configuration>

<property name="LOG_APPENDER" value="${LOG_APPENDER:-STDOUT}" />

<!-- This appender is primarily used for local development -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are by default assigned the type
ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
Expand All @@ -8,8 +11,19 @@
</encoder>
</appender>

<!-- The JSON appender is meant to be machine friendly for log parsing -->
<appender name="JSON" class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.contrib.json.classic.JsonLayout">
<jsonFormatter
class="ch.qos.logback.contrib.jackson.JacksonJsonFormatter">
<prettyPrint>true</prettyPrint>
</jsonFormatter>
<timestampFormat>yyyy-MM-dd' 'HH:mm:ss.SSS</timestampFormat>
</layout>
</appender>

<root level="INFO">
<appender-ref ref="STDOUT" />
<appender-ref ref="${LOG_APPENDER}" />
</root>

<!--
Expand Down