Fix some bugs with browser (#5683)

* fix query browser error log  bug

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/IDManager.java

@@ -39,7 +39,7 @@ public class IDManager {
          * @return encoded service id
          */
         public static String buildId(String name, NodeType type) {
-            return buildId(name, type.equals(NodeType.Normal));
+            return buildId(name, type.equals(NodeType.Normal) || type.equals(NodeType.Browser));
         }
 
         public static String buildId(String name, boolean isNormal) {

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppTrafficSource.java

@@ -20,7 +20,6 @@ package org.apache.skywalking.oap.server.core.browser.source;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.skywalking.oap.server.core.analysis.NodeType;
-import org.apache.skywalking.oap.server.core.source.ScopeDefaultColumn;
 import org.apache.skywalking.oap.server.core.source.Source;
 
 /**
@@ -29,9 +28,7 @@ import org.apache.skywalking.oap.server.core.source.Source;
 @Setter
 @Getter
 public abstract class BrowserAppTrafficSource extends Source {
-    @ScopeDefaultColumn.DefinedByField(columnName = "name", requireDynamicActive = true)
     protected String name;
-
     protected final NodeType nodeType = NodeType.Browser;
 
     private final int count = 1;

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/BrowserLogQueryService.java

@@ -53,6 +53,7 @@ public class BrowserLogQueryService implements Service {
                                                   final Pagination paging) throws IOException {
         PaginationUtils.Page page = PaginationUtils.INSTANCE.exchange(paging);
         BrowserErrorCategory errorCategory = Optional.ofNullable(category)
+                                                     .filter(c -> !c.equals(ErrorCategory.ALL)) // ErrorCategory.All stands for query all.
                                                      .map(c -> BrowserErrorCategory.valueOf(c.name()))
                                                      .orElse(null);
 

test/e2e/e2e-test/src/test/resources/expected/browser/page-path.yml

@@ -14,5 +14,5 @@
 # limitations under the License.
 
 endpoints:
-  - key: ZTJl.0_L2UyZS1icm93c2Vy
+  - key: ZTJl.1_L2UyZS1icm93c2Vy
     label: /e2e-browser

test/e2e/e2e-test/src/test/resources/expected/browser/services.yml

@@ -14,5 +14,5 @@
 # limitations under the License.
 
 services:
-  - key: ZTJl.0
+  - key: ZTJl.1
     label: "e2e"

test/e2e/e2e-test/src/test/resources/expected/browser/version.yml

@@ -14,5 +14,5 @@
 # limitations under the License.
 
 instances:
-  - key: ZTJl.0_djEuMC4w
+  - key: ZTJl.1_djEuMC4w
     label: not null