diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index ee4f9bd9..bede1793 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -204,6 +204,7 @@ + diff --git a/spark-operator/src/main/java/org/apache/spark/k8s/operator/metrics/source/KubernetesMetricsInterceptor.java b/spark-operator/src/main/java/org/apache/spark/k8s/operator/metrics/source/KubernetesMetricsInterceptor.java index 25c54d1e..35f2fd70 100644 --- a/spark-operator/src/main/java/org/apache/spark/k8s/operator/metrics/source/KubernetesMetricsInterceptor.java +++ b/spark-operator/src/main/java/org/apache/spark/k8s/operator/metrics/source/KubernetesMetricsInterceptor.java @@ -35,9 +35,9 @@ import com.codahale.metrics.MetricRegistry; import io.fabric8.kubernetes.client.http.*; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.tuple.Pair; import org.apache.spark.metrics.source.Source; +import org.apache.spark.util.Pair; /** Interceptor for Kubernetes client to collect metrics. */ @Slf4j @@ -174,9 +174,9 @@ private void updateRequestMetrics(HttpRequest request) { parseNamespaceScopedResource(request.uri().getPath()); resourceNamePairOptional.ifPresent( pair -> { - getMeterByRequestMethodAndResourceName(pair.getValue(), request.method()).mark(); + getMeterByRequestMethodAndResourceName(pair.getRight(), request.method()).mark(); getMeterByRequestMethodAndResourceName( - pair.getKey() + "." + pair.getValue(), request.method()) + pair.getLeft() + "." + pair.getRight(), request.method()) .mark(); }); }