From 27e17a95896feb9abcc9ea8c5296f5ba1a8fed24 Mon Sep 17 00:00:00 2001
From: Anastasiia_Gelmut <anastasiia_gelmut@epam.com>
Date: Sat, 20 Feb 2021 11:21:05 +0400
Subject: [PATCH] GONRG-1781 Added logback.xml and updated pom
---
.../partition/logging/AuditLoggerTest.java | 17 +++++++++
provider/partition-gcp/pom.xml | 8 ++++-
.../src/main/resources/logback.xml | 36 +++++++++++++++++++
3 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 provider/partition-gcp/src/main/resources/logback.xml
diff --git a/partition-core/src/test/java/org/opengroup/osdu/partition/logging/AuditLoggerTest.java b/partition-core/src/test/java/org/opengroup/osdu/partition/logging/AuditLoggerTest.java
index 408c1f28f..827c7c9a3 100644
--- a/partition-core/src/test/java/org/opengroup/osdu/partition/logging/AuditLoggerTest.java
+++ b/partition-core/src/test/java/org/opengroup/osdu/partition/logging/AuditLoggerTest.java
@@ -1,3 +1,20 @@
+/*
+ Copyright 2002-2021 Google LLC
+ Copyright 2002-2021 EPAM Systems, Inc
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
package org.opengroup.osdu.partition.logging;
import static org.mockito.ArgumentMatchers.any;
diff --git a/provider/partition-gcp/pom.xml b/provider/partition-gcp/pom.xml
index 54335188b..7cc347ad5 100644
--- a/provider/partition-gcp/pom.xml
+++ b/provider/partition-gcp/pom.xml
@@ -25,7 +25,13 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
- <version>0.3.25</version>
+ <version>0.6.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.logback.contrib</groupId>
+ <artifactId>logback-json-classic</artifactId>
+ <version>0.1.5</version>
</dependency>
<!-- Third party Apache 2.0 license packages -->
diff --git a/provider/partition-gcp/src/main/resources/logback.xml b/provider/partition-gcp/src/main/resources/logback.xml
new file mode 100644
index 000000000..e6bb61f96
--- /dev/null
+++ b/provider/partition-gcp/src/main/resources/logback.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+ <springProfile name="local">
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%yellow([%thread]) %highlight(| %-5level |) %green(%d) %cyan(| %logger{15} |) %highlight(%msg) %n</pattern>
+ <charset>utf8</charset>
+ </encoder>
+ </appender>
+ <root level="DEBUG">
+ <appender-ref ref="CONSOLE"/>
+ </root>
+ </springProfile>
+
+ <springProfile name="!local">
+ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="ch.qos.logback.contrib.json.classic.JsonLayout">
+ <timestampFormat>yyyy-MM-dd HH:mm:ss.SSS</timestampFormat>
+ <timestampFormatTimezoneId>Etc/UTC</timestampFormatTimezoneId>
+ <appendLineSeparator>true</appendLineSeparator>
+
+ <jsonFormatter class="org.opengroup.osdu.core.gcp.logging.formatter.GoogleJsonFormatter">
+ <prettyPrint>false</prettyPrint>
+ </jsonFormatter>
+ </layout>
+ </encoder>
+ </appender>
+
+ <root level="debug">
+ <appender-ref ref="stdout"/>
+ </root>
+ </springProfile>
+
+</configuration>
\ No newline at end of file
--
GitLab