diff --git a/provider/crs-converter-gcp/crs-converter-gae/pom.xml b/provider/crs-converter-gcp/crs-converter-gae/pom.xml index 0aa2ebbfad64a500af7f2440bb1b5481bcf49850..3f331f09308db12abdf9b9ed601809bcb059a281 100644 --- a/provider/crs-converter-gcp/crs-converter-gae/pom.xml +++ b/provider/crs-converter-gcp/crs-converter-gae/pom.xml @@ -43,6 +43,18 @@ <artifactId>spring-security-jwt</artifactId> <version>1.0.10.RELEASE</version> </dependency> + + <dependency> + <groupId>org.opengroup.osdu</groupId> + <artifactId>core-lib-gcp</artifactId> + <version>0.6.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>ch.qos.logback.contrib</groupId> + <artifactId>logback-json-classic</artifactId> + <version>0.1.5</version> + </dependency> </dependencies> <build> diff --git a/provider/crs-converter-gcp/crs-converter-gae/src/main/resources/logback.xml b/provider/crs-converter-gcp/crs-converter-gae/src/main/resources/logback.xml new file mode 100644 index 0000000000000000000000000000000000000000..e6bb61f96ec8c70237a16b73f2b6d2ede74a19fd --- /dev/null +++ b/provider/crs-converter-gcp/crs-converter-gae/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 diff --git a/provider/crs-converter-gcp/crs-converter-gke/pom.xml b/provider/crs-converter-gcp/crs-converter-gke/pom.xml index eb4150624f08b6f29af51542abcb46a2e4beb7e9..492dc02f0015c06c467ca687b3a7c836a18123c4 100644 --- a/provider/crs-converter-gcp/crs-converter-gke/pom.xml +++ b/provider/crs-converter-gcp/crs-converter-gke/pom.xml @@ -39,6 +39,18 @@ <artifactId>spring-security-jwt</artifactId> <version>1.0.10.RELEASE</version> </dependency> + + <dependency> + <groupId>org.opengroup.osdu</groupId> + <artifactId>core-lib-gcp</artifactId> + <version>0.6.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>ch.qos.logback.contrib</groupId> + <artifactId>logback-json-classic</artifactId> + <version>0.1.5</version> + </dependency> </dependencies> <build> diff --git a/provider/crs-converter-gcp/crs-converter-gke/src/main/resources/logback.xml b/provider/crs-converter-gcp/crs-converter-gke/src/main/resources/logback.xml new file mode 100644 index 0000000000000000000000000000000000000000..e6bb61f96ec8c70237a16b73f2b6d2ede74a19fd --- /dev/null +++ b/provider/crs-converter-gcp/crs-converter-gke/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