[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: URL: https://github.com/apache/skywalking/pull/4228#discussion_r478009937 ## File path: docs/en/concepts-and-designs/oal.md ## @@ -53,6 +53,12 @@ In this case, input are request of each ServiceInstanceJVMCPU scope, avg is base > endpoint_percent = from(Endpoint.*).percent(status == true); In this case, all input are requests of each endpoint, condition is `endpoint.status == true`. +- `rate`. The rate expressed as a fraction of 100, for the condition matched input. Review comment: It has been merged into the master branch https://github.com/apache/skywalking/blob/master/docs/en/concepts-and-designs/oal.md#filter 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: URL: https://github.com/apache/skywalking/pull/4228#discussion_r475642025 ## File path: oap-server/server-bootstrap/src/main/resources/oal/browser.oal ## @@ -0,0 +1,73 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +*/ +// browser app Review comment: @wu-sheng @Fine0830 Some percentile associated metrics have been reduced, please review. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228:
URL: https://github.com/apache/skywalking/pull/4228#discussion_r474425460
##
File path:
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/RichPercentMetrics.java
##
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.skywalking.oap.server.core.analysis.metrics;
+
+import lombok.Getter;
+import lombok.Setter;
+import
org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance;
+import
org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Expression;
+import
org.apache.skywalking.oap.server.core.analysis.metrics.annotation.MetricsFunction;
+import org.apache.skywalking.oap.server.core.query.sql.Function;
+import org.apache.skywalking.oap.server.core.storage.annotation.Column;
+
+@MetricsFunction(functionName = "richPercent")
+public abstract class RichPercentMetrics extends Metrics implements
IntValueHolder {
Review comment:
done
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: URL: https://github.com/apache/skywalking/pull/4228#discussion_r473065948 ## File path: docs/en/concepts-and-designs/oal.md ## @@ -78,10 +78,15 @@ The parameter (2) is the status of this request. The status(success/failure) eff **percentile** is the first multiple value metrics, introduced since 7.0.0. As having multiple values, it could be query through `getMultipleLinearIntValues` GraphQL query. In this case, `p99`, `p95`, `p90`, `p75`, `p50` of all incoming request. The parameter is the precision of p99 latency calculation, such as in above case, 120ms and 124 are considered same. Before 7.0.0, use `p99`, `p95`, `p90`, `p75`, `p50` func(s) to calculate metrics separately. Still supported in 7.x, but don't be recommended, and don't be included in official OAL script. -> All_p99 = from(All.latency).p99(10); +> all_p99 = from(All.latency).p99(10); In this case, p99 value of all incoming requests. The parameter is the precision of p99 latency calculation, such as in above case, 120ms and 124 are considered same. +- `errorRate`. The error rate of browser traffic (only browser). Review comment: A new `richPercent` function is provided. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at
OAP
URL: https://github.com/apache/skywalking/pull/4228#discussion_r395953893
##
File path:
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/browser/BrowserE2E.java
##
@@ -0,0 +1,353 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.e2e.browser;
+
+import io.grpc.ManagedChannel;
+import io.grpc.internal.DnsNameResolverProvider;
+import io.grpc.netty.NettyChannelBuilder;
+import io.grpc.stub.StreamObserver;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.skywalking.apm.network.common.Commands;
+import org.apache.skywalking.apm.network.common.KeyIntValuePair;
+import org.apache.skywalking.apm.network.common.ServiceType;
+import org.apache.skywalking.apm.network.language.agent.BrowserErrorLog;
+import org.apache.skywalking.apm.network.language.agent.BrowserPerfData;
+import org.apache.skywalking.apm.network.language.agent.BrowserPerfServiceGrpc;
+import org.apache.skywalking.apm.network.language.agent.ErrorCategory;
+import org.apache.skywalking.apm.network.register.v2.RegisterGrpc;
+import org.apache.skywalking.apm.network.register.v2.ServiceInstance;
+import
org.apache.skywalking.apm.network.register.v2.ServiceInstanceRegisterMapping;
+import org.apache.skywalking.apm.network.register.v2.ServiceInstances;
+import org.apache.skywalking.apm.network.register.v2.ServiceRegisterMapping;
+import org.apache.skywalking.apm.network.register.v2.Services;
+import org.apache.skywalking.e2e.annotation.ContainerHostAndPort;
+import org.apache.skywalking.e2e.annotation.DockerCompose;
+import org.apache.skywalking.e2e.annotation.DockerContainer;
+import org.apache.skywalking.e2e.base.SkyWalkingE2E;
+import org.apache.skywalking.e2e.base.SkyWalkingTestAdapter;
+import org.apache.skywalking.e2e.base.TrafficController;
+import org.apache.skywalking.e2e.common.HostAndPort;
+import org.apache.skywalking.e2e.retryable.RetryableTest;
+import org.apache.skywalking.e2e.service.Service;
+import org.apache.skywalking.e2e.service.ServicesMatcher;
+import org.apache.skywalking.e2e.service.ServicesQuery;
+import org.apache.skywalking.e2e.service.endpoint.Endpoint;
+import org.apache.skywalking.e2e.service.endpoint.EndpointQuery;
+import org.apache.skywalking.e2e.service.endpoint.Endpoints;
+import org.apache.skywalking.e2e.service.endpoint.EndpointsMatcher;
+import org.apache.skywalking.e2e.service.instance.Instance;
+import org.apache.skywalking.e2e.service.instance.Instances;
+import org.apache.skywalking.e2e.service.instance.InstancesMatcher;
+import org.apache.skywalking.e2e.service.instance.InstancesQuery;
+import org.junit.jupiter.api.BeforeAll;
+import org.testcontainers.containers.ContainerState;
+import org.testcontainers.containers.DockerComposeContainer;
+
+import static java.util.Objects.nonNull;
+import static
org.apache.skywalking.e2e.metrics.BrowserMetricsQuery.ALL_BROWSER_METRICS;
+import static
org.apache.skywalking.e2e.metrics.BrowserMetricsQuery.ALL_BROWSER_PAGE_METRICS;
+import static
org.apache.skywalking.e2e.metrics.BrowserMetricsQuery.ALL_BROWSER_PAGE_MULTIPLE_LINEAR_METRICS;
+import static
org.apache.skywalking.e2e.metrics.BrowserMetricsQuery.ALL_BROWSER_SINGLE_VERSION_METRICS;
+import static org.apache.skywalking.e2e.metrics.MetricsMatcher.verifyMetrics;
+import static
org.apache.skywalking.e2e.metrics.MetricsMatcher.verifyPercentileMetrics;
+import static org.apache.skywalking.e2e.utils.Times.now;
+import static org.apache.skywalking.e2e.utils.Yamls.load;
+
+@Slf4j
+@SkyWalkingE2E
+public class BrowserE2E extends SkyWalkingTestAdapter {
+
+private static final int MAX_INBOUND_MESSAGE_SIZE = 1024 * 1024 * 50;
+
+private static final String BROWSER_NAME = "e2e";
+
+private static final String BROWSER_SINGLE_VERSION_NAME = "v1.0.0";
+
+@SuppressWarnings("unused")
+@DockerCompose({
+"docker/browser/docker-compose.${SW_STORAGE}.yml",
+})
+protected DockerComposeContainer compose;
+
+@SuppressWarnings("unused")
+@ContainerHostAndPort(name = "ui", port = 8080)
+
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at
OAP
URL: https://github.com/apache/skywalking/pull/4228#discussion_r395643702
##
File path:
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/ClusterE2E.java
##
@@ -122,18 +123,18 @@ void topology() throws Exception {
verifyServiceRelationMetrics(topology.getCalls());
final String clientId = topology.getNodes()
-.stream()
-.filter(n ->
n.getName().equals(providerName))
-.findFirst()
-.orElseThrow(NullPointerException::new)
-.getId();
+.stream()
+.filter(n -> n.getName().equals(providerName))
+.findFirst()
+.orElseThrow(NullPointerException::new)
+.getId();
Review comment:
done
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at
OAP
URL: https://github.com/apache/skywalking/pull/4228#discussion_r379828498
##
File path:
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppErrorTraffic.java
##
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.oap.server.core.browser.source;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.skywalking.oap.server.core.source.ScopeDeclaration;
+import org.apache.skywalking.oap.server.core.source.ScopeDefaultColumn;
+import org.apache.skywalking.oap.server.core.source.Source;
+
+import static
org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.BROWSER_APP_ERROR_TRAFFIC;
+import static
org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_CATALOG_NAME;
+
+@ScopeDeclaration(id = BROWSER_APP_ERROR_TRAFFIC, name =
"BrowserAppErrorTraffic", catalog = SERVICE_CATALOG_NAME)
+@ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName
= "entity_id", isID = true, type = String.class)
+public class BrowserAppErrorTraffic extends Source {
Review comment:
Only to OAL, record entity is generated by `BrowserErrorTraffic`.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at
OAP
URL: https://github.com/apache/skywalking/pull/4228#discussion_r379827368
##
File path:
test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsMatcher.java
##
@@ -64,15 +72,23 @@ public static void verifyMetrics(SimpleQueryClient
queryClient, String metricNam
}
public static void verifyPercentileMetrics(SimpleQueryClient queryClient,
String metricName, String id,
-final LocalDateTime minutesAgo, long retryInterval, Runnable
generateTraffic) throws Exception {
+ final LocalDateTime minutesAgo,
long retryInterval, Runnable generateTraffic) throws Exception {
+verifyPercentileMetrics(queryClient, metricName, id, minutesAgo,
LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1), retryInterval,
generateTraffic);
Review comment:
Has been rollback.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at
OAP
URL: https://github.com/apache/skywalking/pull/4228#discussion_r379827176
##
File path:
test/e2e/e2e-browser/e2e-browser-es/src/test/java/org/apache/skywalking/e2e/ESWithBrowserPerfITCase.java
##
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.skywalking.e2e;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.skywalking.e2e.browser.BrowserPerfITCase;
+
+@Slf4j
+public class ESWithBrowserPerfITCase extends BrowserPerfITCase {
Review comment:
done
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at OAP URL: https://github.com/apache/skywalking/pull/4228#discussion_r379827167 ## File path: .github/workflows/e2e.yaml ## @@ -118,3 +118,19 @@ jobs: run: export E2E_VERSION=jdk8-1.3 && bash -x test/e2e/run.sh e2e-profile/e2e-profile-test-runner --storage=elasticsearch - name: Profile Tests ES7(JDK8) run: export E2E_VERSION=jdk8-1.3 DIST_PACKAGE=apache-skywalking-apm-bin-es7.tar.gz ES_VERSION=7.4.2 && bash -x test/e2e/run.sh e2e-profile/e2e-profile-test-runner --storage=elasticsearch + + Browser: +runs-on: ubuntu-latest +steps: + - uses: actions/checkout@v1 +with: + submodules: true + - name: Set environment +run: export MAVEN_OPTS='-Dmaven.repo.local=~/.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g' + - name: Compile & Install Test Codes +run: | + ./mvnw checkstyle:check apache-rat:check + ./mvnw -Dcheckstyle.skip -Drat.skip -T2 -Dmaven.compile.fork -Dmaven.compiler.maxmem=3072 -DskipTests clean install + ./mvnw -f test/e2e/pom.xml -pl e2e-base clean install + - name: Browser Tests ES6(JDK8) +run: export E2E_VERSION=jdk8-1.3 && bash -x test/e2e/run.sh e2e-browser/e2e-browser-es Review comment: done 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at
OAP
URL: https://github.com/apache/skywalking/pull/4228#discussion_r379715955
##
File path:
test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsMatcher.java
##
@@ -64,15 +72,23 @@ public static void verifyMetrics(SimpleQueryClient
queryClient, String metricNam
}
public static void verifyPercentileMetrics(SimpleQueryClient queryClient,
String metricName, String id,
-final LocalDateTime minutesAgo, long retryInterval, Runnable
generateTraffic) throws Exception {
+ final LocalDateTime minutesAgo,
long retryInterval, Runnable generateTraffic) throws Exception {
+verifyPercentileMetrics(queryClient, metricName, id, minutesAgo,
LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1), retryInterval,
generateTraffic);
Review comment:
I get it.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at
OAP
URL: https://github.com/apache/skywalking/pull/4228#discussion_r379509831
##
File path:
test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsMatcher.java
##
@@ -64,15 +72,23 @@ public static void verifyMetrics(SimpleQueryClient
queryClient, String metricNam
}
public static void verifyPercentileMetrics(SimpleQueryClient queryClient,
String metricName, String id,
-final LocalDateTime minutesAgo, long retryInterval, Runnable
generateTraffic) throws Exception {
+ final LocalDateTime minutesAgo,
long retryInterval, Runnable generateTraffic) throws Exception {
+verifyPercentileMetrics(queryClient, metricName, id, minutesAgo,
LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1), retryInterval,
generateTraffic);
Review comment:
Convenient debug, set end time according to local TZ.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at
OAP
URL: https://github.com/apache/skywalking/pull/4228#discussion_r379435243
##
File path:
test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsMatcher.java
##
@@ -64,15 +72,23 @@ public static void verifyMetrics(SimpleQueryClient
queryClient, String metricNam
}
public static void verifyPercentileMetrics(SimpleQueryClient queryClient,
String metricName, String id,
-final LocalDateTime minutesAgo, long retryInterval, Runnable
generateTraffic) throws Exception {
+ final LocalDateTime minutesAgo,
long retryInterval, Runnable generateTraffic) throws Exception {
+verifyPercentileMetrics(queryClient, metricName, id, minutesAgo,
LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1), retryInterval,
generateTraffic);
Review comment:
Before that was the UTC TZ, I just overload `verifyMetrics`.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at OAP URL: https://github.com/apache/skywalking/pull/4228#discussion_r379404093 ## File path: oap-server/server-bootstrap/src/main/resources/browser_analysis.oal ## @@ -0,0 +1,49 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +*/ + +// browser app +browser_app_pv = from(BrowserAppPerf.count).sum(); +browser_app_error_sum = from(BrowserAppErrorTraffic.count).sum(); Review comment: done 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at OAP URL: https://github.com/apache/skywalking/pull/4228#discussion_r379404199 ## File path: docs/en/setup/README.md ## @@ -25,6 +25,12 @@ You can go to their project repositories for additional info about guides and re - [SkyAPM GO2Sky](https://github.com/SkyAPM/go2sky). See GO2Sky project document for more details. +## Browser agent + +- Activate the [browser-receiver](backend/backend-receivers.md#browser-receiver) following the document. + +- [Browser Js Client](https://github.com/apache/skywalking-client-js). See `skywalking-client-js` project document for more details. Review comment: done 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at OAP URL: https://github.com/apache/skywalking/pull/4228#discussion_r379404115 ## File path: dist-material/application.yml ## @@ -151,6 +151,17 @@ receiver-jvm: default: receiver-clr: default: +#receiver-browser: Review comment: done 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at OAP URL: https://github.com/apache/skywalking/pull/4228#discussion_r379404246 ## File path: docs/en/setup/README.md ## @@ -25,6 +25,12 @@ You can go to their project repositories for additional info about guides and re - [SkyAPM GO2Sky](https://github.com/SkyAPM/go2sky). See GO2Sky project document for more details. +## Browser agent + +- Activate the [browser-receiver](backend/backend-receivers.md#browser-receiver) following the document. Review comment: done 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at
OAP
URL: https://github.com/apache/skywalking/pull/4228#discussion_r379403998
##
File path:
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/BrowserErrorTrafficRecord.java
##
@@ -0,0 +1,129 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.oap.server.core.browser.manual;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.skywalking.apm.util.StringUtil;
+import org.apache.skywalking.oap.server.core.Const;
+import org.apache.skywalking.oap.server.core.analysis.Stream;
+import org.apache.skywalking.oap.server.core.analysis.record.Record;
+import
org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor;
+import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
+import org.apache.skywalking.oap.server.core.storage.StorageBuilder;
+import org.apache.skywalking.oap.server.core.storage.annotation.Column;
+import org.apache.skywalking.oap.server.library.util.CollectionUtils;
+
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+@Stream(name = BrowserErrorTrafficRecord.INDEX_NAME, scopeId =
DefaultScopeDefine.BROWSER_ERROR_TRAFFIC, builder =
BrowserErrorTrafficRecord.Builder.class, processor =
RecordStreamProcessor.class)
+public class BrowserErrorTrafficRecord extends Record {
Review comment:
done
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at
OAP
URL: https://github.com/apache/skywalking/pull/4228#discussion_r377471040
##
File path:
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppErrorLog.java
##
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.oap.server.core.browser.source;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.skywalking.oap.server.core.source.ScopeDeclaration;
+import org.apache.skywalking.oap.server.core.source.ScopeDefaultColumn;
+import org.apache.skywalking.oap.server.core.source.Source;
+
+import static
org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.BROWSER_APP_ERROR_LOG;
+import static
org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_CATALOG_NAME;
+
+/**
+ * @author zhangwei
+ */
+@ScopeDeclaration(id = BROWSER_APP_ERROR_LOG, name = "BrowserAppErrorLog",
catalog = SERVICE_CATALOG_NAME)
+@ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName
= "entity_id", isID = true, type = String.class)
+public class BrowserAppErrorLog extends Source {
+
+@Override
+public int scope() {
+return BROWSER_APP_ERROR_LOG;
+}
+
+@Override
+public String getEntityId() {
+return String.valueOf(id);
+}
+
+@Getter @Setter private int id;
+@Getter private final int count = 1;
Review comment:
Because the client calls the uncertainty of `onCompleted`, leave it as it is.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at OAP URL: https://github.com/apache/skywalking/pull/4228#discussion_r368352870 ## File path: oap-server/server-bootstrap/src/main/resources/official_analysis.oal ## @@ -102,3 +102,77 @@ envoy_parent_connections_used = from(EnvoyInstanceMetric.value).filter(metricNam // disable(top_n_database_statement); // disable(zipkin_span); // disable(jaeger_span); + + +// Browser metrics begin Review comment: > And activate the OAL by the receiver? Agree. ### Design 1. `official_analysis.oal` and `browser_analysis.oal` 1. `official_analysis.oal` activate by `mission-metric, istio-telemetry, service-mesh, receiver-trace, receiver-so11y, receiver-jvm, receiver-clr ` 1. `browser_analysis.oal` activate by `browser-receiver` 1. each file will only be activated once 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] arugal commented on a change in pull request #4228: Support Browser protocol at OAP
arugal commented on a change in pull request #4228: Support Browser protocol at
OAP
URL: https://github.com/apache/skywalking/pull/4228#discussion_r368214206
##
File path:
oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandler.java
##
@@ -82,6 +82,12 @@ public NotifyHandler(AlarmRulesWatcher alarmRulesWatcher) {
endpointMetaInAlarm.setName(textName);
metaInAlarm = endpointMetaInAlarm;
+} else if (DefaultScopeDefine.inServicePageCatalog(scope)) {
+// TODO handler service page path catalog
+return;
+} else if (DefaultScopeDefine.inServiceVersionCatalog(scope)) {
+// TODO handler service version page path catalog
Review comment:
Done.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
