You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/10/18 09:58:51 UTC
[skywalking] branch master updated: Fix some bugs with browser
(#5683)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 7e6b19d Fix some bugs with browser (#5683)
7e6b19d is described below
commit 7e6b19dfc03b9fb8f1a5d3a3685d607923dcc4ee
Author: zhang-wei <pk...@outlook.com>
AuthorDate: Sun Oct 18 17:58:29 2020 +0800
Fix some bugs with browser (#5683)
* fix query browser error log bug
---
.../java/org/apache/skywalking/oap/server/core/analysis/IDManager.java | 2 +-
.../oap/server/core/browser/source/BrowserAppTrafficSource.java | 3 ---
.../skywalking/oap/server/core/query/BrowserLogQueryService.java | 1 +
test/e2e/e2e-test/src/test/resources/expected/browser/page-path.yml | 2 +-
test/e2e/e2e-test/src/test/resources/expected/browser/services.yml | 2 +-
test/e2e/e2e-test/src/test/resources/expected/browser/version.yml | 2 +-
6 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/IDManager.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/IDManager.java
index 5c523be..00247de 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/IDManager.java
+++ b/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) {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppTrafficSource.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppTrafficSource.java
index d01b6df..f01eb70 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppTrafficSource.java
+++ b/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;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/BrowserLogQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/BrowserLogQueryService.java
index fcbe3bb..353f2b8 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/BrowserLogQueryService.java
+++ b/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);
diff --git a/test/e2e/e2e-test/src/test/resources/expected/browser/page-path.yml b/test/e2e/e2e-test/src/test/resources/expected/browser/page-path.yml
index 5112247..ba88cf7 100644
--- a/test/e2e/e2e-test/src/test/resources/expected/browser/page-path.yml
+++ b/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
\ No newline at end of file
diff --git a/test/e2e/e2e-test/src/test/resources/expected/browser/services.yml b/test/e2e/e2e-test/src/test/resources/expected/browser/services.yml
index 37e86cb..6287d11 100644
--- a/test/e2e/e2e-test/src/test/resources/expected/browser/services.yml
+++ b/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"
\ No newline at end of file
diff --git a/test/e2e/e2e-test/src/test/resources/expected/browser/version.yml b/test/e2e/e2e-test/src/test/resources/expected/browser/version.yml
index b868b15..efc980d 100644
--- a/test/e2e/e2e-test/src/test/resources/expected/browser/version.yml
+++ b/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
\ No newline at end of file