kezhenxu94 commented on a change in pull request #7215:
URL: https://github.com/apache/skywalking/pull/7215#discussion_r662031847
##########
File path: CHANGES.md
##########
@@ -60,9 +60,10 @@ Release Notes.
* Performance: cache regex pattern and result, optimize string concatenation
in Envy ALS analyzer.
* Performance: cache metrics id and entity id in `Metrics` and `ISource`.
* Performance: enhance persistent session mechanism, about differentiating
cache timeout for different dimensionality
- metrics. The timeout of the cache for minute and hour level metrics has been
prolonged to ~5 min.
+ metrics. The timeout of the cache for minute and hour level metrics has been
prolonged to ~5 min.
Review comment:
Why this line keeps changing in PRs? I think trimming tailing spaces is
correct but you're adding a space here
##########
File path: CHANGES.md
##########
@@ -60,9 +60,10 @@ Release Notes.
* Performance: cache regex pattern and result, optimize string concatenation
in Envy ALS analyzer.
* Performance: cache metrics id and entity id in `Metrics` and `ISource`.
* Performance: enhance persistent session mechanism, about differentiating
cache timeout for different dimensionality
- metrics. The timeout of the cache for minute and hour level metrics has been
prolonged to ~5 min.
+ metrics. The timeout of the cache for minute and hour level metrics has been
prolonged to ~5 min.
* Performance: Add L1 aggregation flush period, which reduce the CPU load and
help young GC.
* Support connectTimeout and socketTimeout settings for ElasticSearch6 and
ElasticSearch7 storages.
+* Upgrade etcd to v3.x.
Review comment:
```suggestion
* Upgrade etcd cluster coordinator and dynamic configuration to v3.x.
```
##########
File path: tools/dependencies/known-oap-backend-dependencies.txt
##########
@@ -90,7 +94,6 @@ jna-4.5.1.jar
joda-time-2.10.5.jar
jopt-simple-4.6.jar
jose4j-0.7.6.jar
-json-flattener-0.6.0.jar
Review comment:
Remove corresponding item in `dist/LICENSE` file
##########
File path:
oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/ITEtcdConfigurationTest.java
##########
@@ -18,99 +18,111 @@
package org.apache.skywalking.oap.server.configuration.etcd;
+import com.google.common.collect.Lists;
+import io.etcd.jetcd.ByteSequence;
+import io.etcd.jetcd.Client;
+import io.etcd.jetcd.KV;
import java.io.FileNotFoundException;
import java.io.Reader;
-import java.net.URI;
-import java.util.List;
+import java.nio.charset.Charset;
import java.util.Map;
import java.util.Properties;
-import mousio.etcd4j.EtcdClient;
-import mousio.etcd4j.promises.EtcdResponsePromise;
-import mousio.etcd4j.responses.EtcdKeysResponse;
+import java.util.concurrent.TimeUnit;
+import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.apm.util.PropertyPlaceholderHelper;
import
org.apache.skywalking.oap.server.library.module.ApplicationConfiguration;
+import org.apache.skywalking.oap.server.library.module.ModuleConfigException;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
+import org.apache.skywalking.oap.server.library.module.ModuleNotFoundException;
+import org.apache.skywalking.oap.server.library.module.ModuleStartException;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
import org.apache.skywalking.oap.server.library.util.ResourceUtils;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
import org.yaml.snakeyaml.Yaml;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+@Slf4j
public class ITEtcdConfigurationTest {
+ private static final GenericContainer CONTAINER = new
GenericContainer(DockerImageName.parse("bitnami/etcd:3.5.0"));
+ private static EtcdConfigurationTestProvider PROVIDER;
- private static final Logger LOGGER =
LoggerFactory.getLogger(ITEtcdConfigurationTest.class);
+ private static final String TEST_VALUE = "value";
- private final Yaml yaml = new Yaml();
+ @BeforeClass
+ public static void beforeClass() throws FileNotFoundException,
ModuleConfigException, ModuleNotFoundException, ModuleStartException {
+ CONTAINER.setEnv(Lists.newArrayList(
+ "ALLOW_NONE_AUTHENTICATION=yes"
+ ));
+ CONTAINER.start();
Review comment:
Need some `waitStrategy` to wait for the container's healthiness.
##########
File path: tools/dependencies/known-oap-backend-dependencies.txt
##########
@@ -117,26 +120,23 @@ lucene-spatial-extras-7.3.1.jar
lucene-spatial3d-7.3.1.jar
lucene-suggest-7.3.1.jar
lz4-java-1.6.0.jar
-minimal-json-0.9.5.jar
moshi-1.5.0.jar
msgpack-core-0.8.16.jar
mvel2-2.4.8.Final.jar
nacos-api-1.4.2.jar
nacos-client-1.4.2.jar
nacos-common-1.4.2.jar
-netty-buffer-4.1.65.Final.jar
-netty-codec-4.1.65.Final.jar
-netty-codec-dns-4.1.65.Final.jar
+netty-buffer-4.1.51.Final.jar
+netty-codec-4.1.51.Final.jar
netty-codec-http-4.1.65.Final.jar
netty-codec-http2-4.1.51.Final.jar
netty-codec-socks-4.1.51.Final.jar
-netty-common-4.1.65.Final.jar
+netty-common-4.1.51.Final.jar
netty-handler-4.1.65.Final.jar
netty-handler-proxy-4.1.51.Final.jar
-netty-resolver-4.1.65.Final.jar
-netty-resolver-dns-4.1.65.Final.jar
+netty-resolver-4.1.51.Final.jar
netty-tcnative-boringssl-static-2.0.39.Final.jar
-netty-transport-4.1.65.Final.jar
+netty-transport-4.1.51.Final.jar
Review comment:
I don't think you should change these versions, they are upgraded before
due to CVEs
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
