Merge branch 'release_v4.7.6' into feature/test_isolated3

Author: 317787106

framework/src/main/java/org/tron/core/services/filter/HttpInterceptor.java

@@ -18,7 +18,6 @@
 @Slf4j(topic = "httpInterceptor")
 public class HttpInterceptor implements Filter {
 
-  private String endpoint;
   private final int HTTP_SUCCESS = 200;
   private final int HTTP_BAD_REQUEST = 400;
   private final int HTTP_NOT_ACCEPTABLE = 406;
@@ -29,6 +28,7 @@ public void init(FilterConfig filterConfig) {
 
   @Override
   public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) {
+    String endpoint = MetricLabels.UNDEFINED;
     try {
       if (!(request instanceof HttpServletRequest)) {
         chain.doFilter(request, response);

framework/src/test/java/org/tron/core/capsule/utils/MerkleTreeTest.java

@@ -8,6 +8,7 @@
 import java.util.stream.IntStream;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -185,6 +186,7 @@ public void testAnyHashNum() {
   }
 
   @Test
+  @Ignore
   public void testConcurrent() {
     Sha256Hash root1 = Sha256Hash.wrap(
         ByteString.fromHex("6cb38b4f493db8bacf26123cd4253bbfc530c708b97b3747e782f64097c3c482"));