From a5f405296597a5b8b18adbcb244319b00b493599 Mon Sep 17 00:00:00 2001 From: Kdump Date: Tue, 6 Oct 2020 21:44:23 +0800 Subject: [PATCH] fix INEFFICIENT_KEYSET_ITERATOR (#5612) * fix INEFFICIENT_KEYSET_ITERATOR --- .../customize/interceptor/BaseInterceptorMethods.java | 11 +++++------ .../storage/plugin/elasticsearch/base/EsDAO.java | 6 ++++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/BaseInterceptorMethods.java b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/BaseInterceptorMethods.java index e8edcbe6a..109766349 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/BaseInterceptorMethods.java +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/BaseInterceptorMethods.java @@ -56,15 +56,14 @@ class BaseInterceptorMethods { } } if (tags != null && !tags.isEmpty()) { - for (String key : tags.keySet()) { - String expression = tags.get(key); - spanTags.put(key, CustomizeExpression.parseExpression(expression, context)); + for (Map.Entry expression: tags.entrySet()) { + spanTags.put(expression.getKey(), CustomizeExpression.parseExpression(expression.getValue(), context)); } } if (logs != null && !logs.isEmpty()) { - for (String key : logs.keySet()) { - String expression = logs.get(key); - spanLogs.put(key, CustomizeExpression.parseExpression(expression, context)); + for (Map.Entry entries : logs.entrySet()) { + String expression = logs.get(entries.getKey()); + spanLogs.put(entries.getKey(), CustomizeExpression.parseExpression(expression, context)); } } operationName = operationNameSuffix.insert(0, operationName).toString(); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/EsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/EsDAO.java index 396e71cdd..f586b6f22 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/EsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/EsDAO.java @@ -20,6 +20,7 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base; import java.io.IOException; import java.util.Map; + import org.apache.skywalking.oap.server.core.storage.AbstractDAO; import org.apache.skywalking.oap.server.core.storage.type.StorageDataComplexObject; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; @@ -34,8 +35,9 @@ public abstract class EsDAO extends AbstractDAO { protected XContentBuilder map2builder(Map objectMap) throws IOException { XContentBuilder builder = XContentFactory.jsonBuilder().startObject(); - for (String key : objectMap.keySet()) { - Object value = objectMap.get(key); + for (Map.Entry entries: objectMap.entrySet()) { + Object value = entries.getValue(); + String key = entries.getKey(); if (value instanceof StorageDataComplexObject) { builder.field(key, ((StorageDataComplexObject) value).toStorageData()); } else {