chore: fix Warn messages (#3776)

* chore: using caffeine cache for Spring Cloud LoadBalancer Signed-off-by: nx673747 <[email protected]> * chore: hide WARN messages for BeanPostProcessorChecker Signed-off-by: nx673747 <[email protected]> * replace deprecated attribute from the logback configuration and hide tls message from CS Signed-off-by: Andrea Tabone <[email protected]> * set the instanceInfoReplicationIntervalSeconds to avoid overcoming the limit of request for the demand update Signed-off-by: Andrea Tabone <[email protected]> * fix deprecated velocity property Signed-off-by: Andrea Tabone <[email protected]> * hide message from SSLUtilBase Signed-off-by: Andrea Tabone <[email protected]> * address pr comment Signed-off-by: Andrea Tabone <[email protected]> * remove unused variable Signed-off-by: Andrea Tabone <[email protected]> --------- Signed-off-by: nx673747 <[email protected]> Signed-off-by: Andrea Tabone <[email protected]> Co-authored-by: nx673747 <[email protected]> Co-authored-by: Andrea Tabone <[email protected]>
zowe · Sep 18, 2024 · d7dc7ed · d7dc7ed
1 parent 2513ff1
commit d7dc7ed
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 8 deletions.
diff --git a/api-catalog-services/build.gradle b/api-catalog-services/build.gradle
@@ -73,6 +73,8 @@ dependencies {
 
     implementation libs.apache.velocity
 
+    implementation libs.caffeine
+
     implementation(libs.openapidiff) {
         exclude group: "io.swagger.core.v3", module: "swagger-core"
         // Remove deprecated HTTP client (unused transitive dependency of openDiff)

diff --git a/...-services/src/main/java/org/zowe/apiml/apicatalog/swagger/SubstituteSwaggerGenerator.java b/...-services/src/main/java/org/zowe/apiml/apicatalog/swagger/SubstituteSwaggerGenerator.java
@@ -29,7 +29,7 @@ public class SubstituteSwaggerGenerator {
     private final VelocityEngine ve = new VelocityEngine();
 
     public SubstituteSwaggerGenerator() {
-        ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
+        ve.setProperty(RuntimeConstants.RESOURCE_LOADERS, "classpath");
         ve.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName());
         ve.init();
     }

diff --git a/api-catalog-services/src/main/resources/application.yml b/api-catalog-services/src/main/resources/application.yml
@@ -33,6 +33,7 @@ logging:
         com.netflix.discovery.shared.transport.decorator.RedirectingEurekaHttpClient: OFF
         com.netflix.discovery.DiscoveryClient: OFF
         org.springframework.boot.web.embedded.tomcat.TomcatWebServer: INFO
+        org.springframework.context.support.[PostProcessorRegistrationDelegate$BeanPostProcessorChecker]: ERROR
         org.ehcache: WARN
         org.springframework.security.config.annotation.web.builders.WebSecurity: ERROR
         org.springframework.security.web: INFO
@@ -205,8 +206,10 @@ logging:
         ROOT: INFO
         org.zowe.apiml: DEBUG
         org.springframework: INFO
+        org.springframework.context.support.[PostProcessorRegistrationDelegate$BeanPostProcessorChecker]: DEBUG
         org.apache: INFO
         org.apache.http: DEBUG
+        org.apache.tomcat.util.net: DEBUG
         com.netflix: INFO
         org.ehcache: INFO
         com.netflix.discovery.shared.transport.decorator: DEBUG

diff --git a/apiml-common/src/main/resources/logback.xml b/apiml-common/src/main/resources/logback.xml
@@ -19,7 +19,7 @@
             </turboFilter>
         </else>
     </if>
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter" />
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="org.zowe.apiml.product.logging.MaskingLogPatternLayout">

diff --git a/caching-service/src/main/resources/application.yml b/caching-service/src/main/resources/application.yml
@@ -37,6 +37,7 @@ logging:
         com.netflix.discovery.DiscoveryClient: OFF
         org.springframework.boot.web.embedded.tomcat.TomcatWebServer: INFO
         org.apache.http.conn.ssl.DefaultHostnameVerifier: DEBUG #logs only SSLException
+        org.apache.tomcat.util.net.SSLUtilBase: ERROR
         org.springframework.security.config.annotation.web.builders.WebSecurity: ERROR
         javax.net.ssl: ERROR
 
@@ -170,6 +171,7 @@ logging:
         org.springframework.web.servlet.PageNotFound: WARN
         org.ehcache: INFO
         com.netflix.discovery.shared.transport.decorator: DEBUG
+        org.apache.tomcat.util.net: DEBUG
         org.springframework.security.web: INFO
         javax.net.ssl: INFO
 
@@ -194,3 +196,11 @@ eureka:
     instance:
         nonSecurePortEnabled: true
         securePortEnabled: false
+
+---
+spring.config.activate.on-profile: debug
+
+logging:
+    level:
+        ROOT: INFO
+        org.apache.tomcat.util.net: DEBUG
diff --git a/caching-service/src/main/resources/logback.xml b/caching-service/src/main/resources/logback.xml
@@ -15,7 +15,7 @@
             <turboFilter class="org.zowe.apiml.product.logging.ApimlDependencyLogHider"/>
         </else>
     </if>
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter" />
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="org.zowe.apiml.product.logging.MaskingLogPatternLayout">

diff --git a/discoverable-client/src/main/resources/logback.xml b/discoverable-client/src/main/resources/logback.xml
@@ -5,7 +5,7 @@
     <turboFilter class="ch.qos.logback.classic.turbo.DuplicateMessageFilter">
         <AllowedRepetitions>0</AllowedRepetitions>
     </turboFilter>
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter" />
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS,UTC} %clr(&lt;${logbackService:-${logbackServiceName}}:%thread:${PID:- }&gt;){magenta} %X{userid:-} %clr(%-5level) %clr(\(%logger{15}\)){cyan} %msg%n</pattern>

diff --git a/discovery-service/build.gradle b/discovery-service/build.gradle
@@ -61,6 +61,7 @@ dependencies {
 
     implementation libs.apache.commons.lang3
     implementation libs.jackson.dataformat.yaml
+    implementation libs.caffeine
 
     testImplementation(testFixtures(project(":apiml-common")))
 

diff --git a/discovery-service/src/main/resources/application.yml b/discovery-service/src/main/resources/application.yml
@@ -9,6 +9,7 @@ logging:
         com.netflix.discovery.shared.transport.decorator.RedirectingEurekaHttpClient: OFF
         com.netflix.discovery.DiscoveryClient: OFF
         org.springframework.boot.web.embedded.tomcat.TomcatWebServer: INFO
+        org.springframework.context.support.[PostProcessorRegistrationDelegate$BeanPostProcessorChecker]: ERROR
         com.sun.jersey.server.impl.application.WebApplicationImpl: WARN
         org.ehcache: WARN
         org.springframework.security.config.annotation.web.builders.WebSecurity: ERROR
@@ -160,8 +161,10 @@ logging:
         ROOT: DEBUG
         org.zowe.apiml: DEBUG
         org.springframework: INFO
+        org.springframework.context.support.[PostProcessorRegistrationDelegate$BeanPostProcessorChecker]: DEBUG
         org.apache: INFO
         org.apache.http: DEBUG
+        org.apache.tomcat.util.net: DEBUG
         com.netflix: INFO
         com.sun.jersey.server.impl.application.WebApplicationImpl: INFO
         org.ehcache: INFO

diff --git a/gateway-service/build.gradle b/gateway-service/build.gradle
@@ -78,6 +78,7 @@ dependencies {
     implementation libs.jjwt.jackson
     implementation libs.nimbus.jose.jwt
     implementation libs.bcpkix
+    implementation libs.caffeine
 
     implementation libs.swagger2.parser
     implementation libs.swagger3.parser

diff --git a/gateway-service/src/main/resources/application.yml b/gateway-service/src/main/resources/application.yml
@@ -39,6 +39,7 @@ eureka:
     client:
         fetchRegistry: true
         registerWithEureka: true
+        instanceInfoReplicationIntervalSeconds: 1
         region: default
         serviceUrl:
             defaultZone: ${apiml.service.discoveryServiceUrls}
@@ -130,9 +131,11 @@ logging:
         org.springframework.cloud.gateway.route: WARN
         org.springframework.context.support: WARN
         org.springframework.beans: WARN
+        org.springframework.context.support.[PostProcessorRegistrationDelegate$BeanPostProcessorChecker]: ERROR
         reactor.netty.http.client: INFO
         reactor.netty.http.client.HttpClientConnect: OFF
         javax.net.ssl: ERROR
+        org.apache.tomcat.util.net.SSLUtilBase: ERROR
 
 management:
     endpoint:
@@ -154,6 +157,7 @@ logging:
     level:
         org.zowe.apiml: DEBUG
         org.springframework.cloud.gateway: DEBUG
+        org.springframework.context.support.[PostProcessorRegistrationDelegate$BeanPostProcessorChecker]: DEBUG
         org.springframework.security: DEBUG
         org.springframework.web.reactive: DEBUG
         org.springframework.web.reactive.socket: DEBUG

diff --git a/gateway-service/src/main/resources/logback.xml b/gateway-service/src/main/resources/logback.xml
@@ -15,7 +15,7 @@
             <turboFilter class="org.zowe.apiml.product.logging.LogLevelInfoFilter"/>
         </else>
     </if>
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter" />
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="org.zowe.apiml.product.logging.MaskingLogPatternLayout">

diff --git a/onboarding-enabler-micronaut-sample-app/src/main/resources/logback.xml b/onboarding-enabler-micronaut-sample-app/src/main/resources/logback.xml
@@ -4,7 +4,7 @@
     <turboFilter class="ch.qos.logback.classic.turbo.DuplicateMessageFilter">
         <AllowedRepetitions>0</AllowedRepetitions>
     </turboFilter>
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter" />
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%cyan(%d{yyyy-MM-dd HH:mm:ss.SSS,UTC}) %gray(&lt;${logbackService:-${logbackServiceName}}:%thread:${PID:- }&gt;){magenta} %X{userid:-} %highlight(%-5level) %magenta(\(%logger{15}\)){cyan} %msg%n</pattern>

diff --git a/zaas-service/build.gradle b/zaas-service/build.gradle
@@ -92,6 +92,8 @@ dependencies {
 
     implementation libs.guava
 
+    implementation libs.caffeine
+
     implementation libs.jjwt.impl
     implementation libs.jjwt.jackson
 

diff --git a/zaas-service/src/main/resources/application.yml b/zaas-service/src/main/resources/application.yml
@@ -16,6 +16,7 @@ logging:
         org.ehcache: WARN
         org.springframework.security.config.annotation.web.builders.WebSecurity: ERROR
         org.springframework.cloud.client.loadbalancer.reactive.[ReactorLoadBalancerClientAutoConfiguration$ReactorLoadBalancerClientRibbonWarnLogger]: ERROR
+        org.springframework.context.support.[PostProcessorRegistrationDelegate$BeanPostProcessorChecker]: ERROR
 
         # New Config
         org.apache: WARN  #org.apache.catalina, org.apache.coyote, org.apache.tomcat
@@ -214,8 +215,10 @@ logging:
         ROOT: INFO
         org.zowe.apiml: DEBUG
         org.springframework: INFO
+        org.springframework.context.support.[PostProcessorRegistrationDelegate$BeanPostProcessorChecker]: DEBUG
         org.apache: INFO
         org.apache.http: DEBUG
+        org.apache.tomcat.util.net: DEBUG
         com.netflix: DEBUG
         org.hibernate: INFO
         org.springframework.web.servlet.PageNotFound: WARN

diff --git a/zaas-service/src/main/resources/logback.xml b/zaas-service/src/main/resources/logback.xml
@@ -15,7 +15,7 @@
             <turboFilter class="org.zowe.apiml.product.logging.LogLevelInfoFilter"/>
         </else>
     </if>
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter" />
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="org.zowe.apiml.product.logging.MaskingLogPatternLayout">

diff --git a/zowe-cli-id-federation-plugin/__tests__/__integration__/cli/map/cli.map.integration.test.ts b/zowe-cli-id-federation-plugin/__tests__/__integration__/cli/map/cli.map.integration.test.ts
@@ -10,7 +10,7 @@
 
 import * as fs from "fs";
 import * as path from "path";
-import {ITestEnvironment, runCliScript, stripProfileDeprecationMessages, TestEnvironment} from "@zowe/cli-test-utils";
+import {ITestEnvironment, runCliScript, TestEnvironment} from "@zowe/cli-test-utils";
 import {ITestPropertiesSchema} from "../../../__src__/environment/doc/ITestPropertiesSchema";
 import {Constants} from "../../../../src/api/Constants";
 import {expect, describe, it, beforeAll, afterAll} from '@jest/globals';