Bump Kubernetes client-java version (#6920)

CHANGES.md

@@ -6,6 +6,7 @@ Release Notes.
 ------------------
 #### Project
 * Add OpenSearch as storage option.
+* Upgrade Kubernetes Java client dependency to 11.0.
 
 #### Java Agent
 * Add `trace_segment_ref_limit_per_span` configuration mechanism to avoid OOM.

dist-material/release-docs/LICENSE

@@ -307,12 +307,12 @@ The text of each license is the standard Apache 2.0 license.
     HikariCP 3.1.0: https://github.com/brettwooldridge/HikariCP, Apache 2.0
     zipkin 2.9.1: https://github.com/openzipkin/zipkin, Apache 2.0
     sharding-jdbc-core 2.0.3: https://github.com/sharding-sphere/sharding-sphere, Apache 2.0
-    kubernetes-client 10.0.0: https://github.com/kubernetes-client/java, Apache 2.0
+    kubernetes-client 11.0.0: https://github.com/kubernetes-client/java, Apache 2.0
     proto files from istio/istio: https://github.com/istio/istio  Apache 2.0
     proto files from istio/api: https://github.com/istio/api      Apache 2.0
     nacos 1.3.1: https://github.com/alibaba/nacos, Apache 2.0
     consul-client 1.2.6: https://github.com/rickfast/consul-client, Apache 2.0
-    okhttp 3.9.0: https://github.com/square/okhttp, Apache 2.0
+    okhttp 3.14.9: https://github.com/square/okhttp, Apache 2.0
     prometheus client_java(simpleclient) 0.6.0: https://github.com/prometheus/client_java, Apache 2.0
     proto files from istio/istio: https://github.com/istio/istio  Apache 2.0
     proto files from istio/api: https://github.com/istio/api      Apache 2.0
@@ -332,11 +332,8 @@ The text of each license is the standard Apache 2.0 license.
     moshi 1.5.0: https://github.com/square/moshi, Apache 2.0
     logging-interceptor 3.13.1: https://github.com/square/okhttp/tree/master/okhttp-logging-interceptor, Apache 2.0
     msgpack-core 0.8.16: https://github.com/msgpack/msgpack-java, Apache 2.0
-    sundr-codegen 0.22.0: https://mvnrepository.com/artifact/io.sundr/sundr-codegen, Apache 2.0
-    sundr-core 0.22.0: https://mvnrepository.com/artifact/io.sundr/sundr-core, Apache 2.0
     swagger-annotations 1.6.2: https://mvnrepository.com/artifact/io.swagger.core.v3/swagger-annotations, Apache 2.0
-    resourcecify-annotations 0.22.0: https://mvnrepository.com/artifact/io.sundr/resourcecify-annotations, Apache 2.0
-    jose4j 0.7.2: https://mvnrepository.com/artifact/org.bitbucket.b_c/jose4j, Apache 2.0
+    jose4j 0.7.3: https://mvnrepository.com/artifact/org.bitbucket.b_c/jose4j, Apache 2.0
     converter-moshi 2.5.0: https://mvnrepository.com/artifact/com.squareup.retrofit2/converter-moshi, Apache 2.0
     vavr 0.10.3: https://github.com/vavr-io/vavr, Apache 2.0
     kafka-clients 2.4.1: https://github.com/apache/kafka, Apache 2.0
@@ -344,7 +341,7 @@ The text of each license is the standard Apache 2.0 license.
     snappy-java 1.1.7.3: https://github.com/xerial/snappy-java, Apache 2.0
     slf4j-api 1.7.28: http://www.slf4j.org, Apache 2.0
     mvel 2.4.8: https://github.com/mvel/mvel, Apache 2.0
-    okio 1.13.0: https://github.com/square/okio Apache 2.0
+    okio 1.17.2: https://github.com/square/okio Apache 2.0
     caffeine 2.6.2: https://github.com/ben-manes/caffeine Apache 2.0
     simpleclient_httpserver from prometheus https://github.com/prometheus/client_java Apache 2.0
 
@@ -451,7 +448,7 @@ popper.js	1.14.7:	https://github.com/FezVrasta/popper.js	MIT
 vue-datepicker-local	1.0.19:	https://github.com/weifeiyue/vue-datepicker-local	MIT
 vue-js-modal	1.3.31:	https://github.com/euvl/vue-js-modal	MIT
 lodash	4.17.15:	https://github.com/lodash/lodash	MIT
-gson-fire	1.8.4:	https://mvnrepository.com/artifact/io.gsonfire/gson-fire	MIT
+gson-fire	1.8.5:	https://mvnrepository.com/artifact/io.gsonfire/gson-fire	MIT
 vue-i18n 8.10.0:  https://github.com/kazupon/vue-i18n   MIT
 
 ========================================

oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/k8s/K8sInfoRegistry.java

@@ -97,7 +97,8 @@ public class K8sInfoRegistry {
                 null,
                 null,
                 params.resourceVersion,
-                300,
+                null,
+                params.timeoutSeconds,
                 params.watch,
                 null
             ),
@@ -131,7 +132,8 @@ public class K8sInfoRegistry {
                 null,
                 null,
                 params.resourceVersion,
-                300,
+                null,
+                params.timeoutSeconds,
                 params.watch,
                 null
             ),

oap-server/pom.xml

@@ -68,10 +68,10 @@
         <commons-io.version>2.6</commons-io.version>
         <elasticsearch.version>6.3.2</elasticsearch.version>
         <joda-time.version>2.10.5</joda-time.version>
-        <kubernetes.version>10.0.0</kubernetes.version>
+        <kubernetes.version>11.0.0</kubernetes.version>
         <hikaricp.version>3.1.0</hikaricp.version>
         <zipkin.version>2.9.1</zipkin.version>
-        <okhttp.version>3.9.0</okhttp.version>
+        <okhttp.version>3.14.9</okhttp.version>
         <jackson-core.version>2.9.5</jackson-core.version>
         <jackson-annotations.version>2.9.5</jackson-annotations.version>
         <jackson-databind.version>2.9.5</jackson-databind.version>

oap-server/server-bootstrap/src/test/java/org/apache/skywalking/oap/server/starter/ComponentLibrariesTest.java

@@ -21,7 +21,7 @@ package org.apache.skywalking.oap.server.starter;
 import java.io.Reader;
 import java.lang.reflect.Field;
 import java.util.Map;
-import org.apache.commons.collections.map.CaseInsensitiveMap;
+import org.apache.commons.collections4.map.CaseInsensitiveMap;
 import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
 import org.apache.skywalking.apm.network.trace.component.OfficialComponent;
 import org.apache.skywalking.oap.server.library.util.ResourceUtils;
@@ -41,7 +41,7 @@ public class ComponentLibrariesTest {
     public void testComponentsAreInSync() throws Exception {
         final Reader reader = ResourceUtils.read("component-libraries.yml");
         final Map map = new Yaml().loadAs(reader, Map.class);
-        final CaseInsensitiveMap caseInsensitiveMap = new CaseInsensitiveMap(map);
+        final CaseInsensitiveMap<String, Object> caseInsensitiveMap = new CaseInsensitiveMap<>(map);
         for (final Field field : ComponentsDefine.class.getFields()) {
             final OfficialComponent component = (OfficialComponent) field.get(null);
             final String normalizedComponentName = component.getName().replaceAll("\\.", "");

oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/NamespacedPodListInformer.java

@@ -85,7 +85,7 @@ public enum NamespacedPodListInformer {
         SharedIndexInformer<V1Pod> podSharedIndexInformer = factory.sharedIndexInformerFor(
             params -> coreV1Api.listNamespacedPodCall(
                 podConfig.getNamespace(), null, null, null, null,
-                podConfig.getLabelSelector(), Integer.MAX_VALUE, params.resourceVersion, 300,
+                podConfig.getLabelSelector(), Integer.MAX_VALUE, params.resourceVersion, null, params.timeoutSeconds,
                 params.watch, null
             ),
             V1Pod.class, V1PodList.class

oap-server/server-configuration/configuration-k8s-configmap/src/main/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigurationConfigmapInformer.java

@@ -75,7 +75,7 @@ public class ConfigurationConfigmapInformer {
         SharedIndexInformer<V1ConfigMap> configMapSharedIndexInformer = factory.sharedIndexInformerFor(
             params -> coreV1Api.listNamespacedConfigMapCall(
                 settings.getNamespace(), null, null, null, null, settings.getLabelSelector()
-                , 1, params.resourceVersion, 300, params.watch, null
+                , 1, params.resourceVersion, null, params.timeoutSeconds, params.watch, null
             ),
             V1ConfigMap.class, V1ConfigMapList.class
         );

oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/K8SServiceRegistry.java

@@ -107,7 +107,8 @@ public class K8SServiceRegistry {
                 null,
                 null,
                 params.resourceVersion,
-                300,
+                null,
+                params.timeoutSeconds,
                 params.watch,
                 null
             ),
@@ -141,7 +142,8 @@ public class K8SServiceRegistry {
                 null,
                 null,
                 params.resourceVersion,
-                300,
+                null,
+                params.timeoutSeconds,
                 params.watch,
                 null
             ),
@@ -175,7 +177,8 @@ public class K8SServiceRegistry {
                 null,
                 null,
                 params.resourceVersion,
-                300,
+                null,
+                params.timeoutSeconds,
                 params.watch,
                 null
             ),

oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/persistence/LogsPersistence.java

@@ -64,6 +64,10 @@ public class LogsPersistence implements ALSHTTPAnalysis {
         final Role role
     ) {
         try {
+            if (result.getService() == null) {
+                return result;
+            }
+
             final LogData logData = convertToLogData(entry, result);
             logAnalyzerService.doAnalysis(logData);
         } catch (final Exception e) {

oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/persistence/TCPLogsPersistence.java

@@ -64,6 +64,10 @@ public class TCPLogsPersistence implements TCPAccessLogAnalyzer {
         final Role role
     ) {
         try {
+            if (result.getService() == null) {
+                return result;
+            }
+
             final LogData logData = convertToLogData(entry, result);
             logAnalyzerService.doAnalysis(logData);
         } catch (final Exception e) {

tools/dependencies/known-oap-backend-dependencies-es7.txt

@@ -8,11 +8,10 @@ apollo-core-1.4.0.jar
 bcpkix-jdk15on-1.66.jar
 bcprov-ext-jdk15on-1.66.jar
 bcprov-jdk15on-1.66.jar
-builder-annotations-0.22.0.jar
 checker-qual-2.8.1.jar
-client-java-10.0.0.jar
-client-java-api-10.0.0.jar
-client-java-proto-10.0.0.jar
+client-java-11.0.0.jar
+client-java-api-11.0.0.jar
+client-java-proto-11.0.0.jar
 commons-codec-1.11.jar
 commons-collections4-4.4.jar
 commons-compress-1.20.jar
@@ -57,7 +56,7 @@ grpc-protobuf-1.32.1.jar
 grpc-protobuf-lite-1.32.1.jar
 grpc-stub-1.32.1.jar
 gson-2.8.6.jar
-gson-fire-1.8.4.jar
+gson-fire-1.8.5.jar
 guava-28.1-jre.jar
 guice-4.1.0.jar
 h2-1.4.196.jar
@@ -98,7 +97,7 @@ jna-4.5.1.jar
 joda-convert-2.2.1.jar
 joda-time-2.10.5.jar
 jopt-simple-4.6.jar
-jose4j-0.7.2.jar
+jose4j-0.7.3.jar
 json-flattener-0.6.0.jar
 jsr305-3.0.2.jar
 kotlin-reflect-1.1.1.jar
@@ -145,15 +144,14 @@ netty-resolver-4.1.42.Final.jar
 netty-resolver-dns-4.1.42.Final.jar
 netty-tcnative-boringssl-static-2.0.26.Final.jar
 netty-transport-4.1.42.Final.jar
-okhttp-3.9.0.jar
-okio-1.13.0.jar
+okhttp-3.14.9.jar
+okio-1.17.2.jar
 perfmark-api-0.19.0.jar
 proto-google-common-protos-1.17.0.jar
 protobuf-java-3.13.0.jar
 protobuf-java-util-3.12.4.jar
 reactive-streams-1.0.2.jar
 reflectasm-1.11.7.jar
-resourcecify-annotations-0.22.0.jar
 retrofit-2.3.0.jar
 simpleclient-0.6.0.jar
 simpleclient_common-0.6.0.jar
@@ -161,8 +159,6 @@ simpleclient_hotspot-0.6.0.jar
 simpleclient_httpserver-0.9.0.jar
 slf4j-api-1.7.25.jar
 snakeyaml-1.18.jar
-sundr-codegen-0.22.0.jar
-sundr-core-0.22.0.jar
 swagger-annotations-1.6.2.jar
 t-digest-3.2.jar
 vavr-0.10.3.jar

tools/dependencies/known-oap-backend-dependencies.txt

@@ -10,11 +10,10 @@ apollo-core-1.4.0.jar
 bcpkix-jdk15on-1.66.jar
 bcprov-ext-jdk15on-1.66.jar
 bcprov-jdk15on-1.66.jar
-builder-annotations-0.22.0.jar
 checker-qual-2.8.1.jar
-client-java-10.0.0.jar
-client-java-api-10.0.0.jar
-client-java-proto-10.0.0.jar
+client-java-11.0.0.jar
+client-java-api-11.0.0.jar
+client-java-proto-11.0.0.jar
 commons-codec-1.11.jar
 commons-collections4-4.4.jar
 commons-compress-1.20.jar
@@ -53,7 +52,7 @@ grpc-protobuf-1.32.1.jar
 grpc-protobuf-lite-1.32.1.jar
 grpc-stub-1.32.1.jar
 gson-2.8.6.jar
-gson-fire-1.8.4.jar
+gson-fire-1.8.5.jar
 guava-28.1-jre.jar
 guice-4.1.0.jar
 h2-1.4.196.jar
@@ -92,7 +91,7 @@ jna-4.5.1.jar
 joda-convert-2.2.1.jar
 joda-time-2.10.5.jar
 jopt-simple-4.6.jar
-jose4j-0.7.2.jar
+jose4j-0.7.3.jar
 json-flattener-0.6.0.jar
 jsr305-3.0.2.jar
 kotlin-reflect-1.1.1.jar
@@ -139,8 +138,8 @@ netty-resolver-4.1.42.Final.jar
 netty-resolver-dns-4.1.42.Final.jar
 netty-tcnative-boringssl-static-2.0.26.Final.jar
 netty-transport-4.1.42.Final.jar
-okhttp-3.9.0.jar
-okio-1.13.0.jar
+okhttp-3.14.9.jar
+okio-1.17.2.jar
 parent-join-client-6.3.2.jar
 perfmark-api-0.19.0.jar
 proto-google-common-protos-1.17.0.jar
@@ -149,7 +148,6 @@ protobuf-java-util-3.12.4.jar
 rank-eval-client-6.3.2.jar
 reactive-streams-1.0.2.jar
 reflectasm-1.11.7.jar
-resourcecify-annotations-0.22.0.jar
 retrofit-2.3.0.jar
 simpleclient-0.6.0.jar
 simpleclient_common-0.6.0.jar
@@ -157,8 +155,6 @@ simpleclient_hotspot-0.6.0.jar
 simpleclient_httpserver-0.9.0.jar
 slf4j-api-1.7.25.jar
 snakeyaml-1.18.jar
-sundr-codegen-0.22.0.jar
-sundr-core-0.22.0.jar
 swagger-annotations-1.6.2.jar
 t-digest-3.2.jar
 vavr-0.10.3.jar