You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by pe...@apache.org on 2018/12/01 14:57:32 UTC
[incubator-skywalking] branch master updated: Support service
instance metric. (#1988)
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 44a85a4 Support service instance metric. (#1988)
44a85a4 is described below
commit 44a85a4f5ae357e6faee15919b8ad8c1dc153985
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Sat Dec 1 22:57:28 2018 +0800
Support service instance metric. (#1988)
---
.../serviceinstance/ServiceInstanceDispatcher.java | 11 ++
.../ServiceInstanceSlaIndicator.java | 177 +++++++++++++++++++++
.../src/main/resources/official_analysis.oal | 1 +
3 files changed, 189 insertions(+)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceDispatcher.java
index 91b32f5..00d8ab8 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceDispatcher.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceDispatcher.java
@@ -30,10 +30,21 @@ import org.apache.skywalking.oap.server.core.source.*;
public class ServiceInstanceDispatcher implements SourceDispatcher<ServiceInstance> {
@Override public void dispatch(ServiceInstance source) {
+ doServiceInstanceSla(source);
doServiceInstanceRespTime(source);
doServiceInstanceCpm(source);
}
+ private void doServiceInstanceSla(ServiceInstance source) {
+ ServiceInstanceSlaIndicator indicator = new ServiceInstanceSlaIndicator();
+
+
+ indicator.setTimeBucket(source.getTimeBucket());
+ indicator.setEntityId(source.getEntityId());
+ indicator.setServiceId(source.getServiceId());
+ indicator.combine(new org.apache.skywalking.oap.server.core.analysis.indicator.expression.EqualMatch(), source.isStatus(), true);
+ IndicatorProcess.INSTANCE.in(indicator);
+ }
private void doServiceInstanceRespTime(ServiceInstance source) {
ServiceInstanceRespTimeIndicator indicator = new ServiceInstanceRespTimeIndicator();
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceSlaIndicator.java
new file mode 100644
index 0000000..4f0e6f9
--- /dev/null
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceSlaIndicator.java
@@ -0,0 +1,177 @@
+/*
+ * 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.generated.serviceinstance;
+
+import java.util.*;
+import lombok.*;
+import org.apache.skywalking.oap.server.core.Const;
+import org.apache.skywalking.oap.server.core.alarm.AlarmMeta;
+import org.apache.skywalking.oap.server.core.alarm.AlarmSupported;
+import org.apache.skywalking.oap.server.core.analysis.indicator.*;
+import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType;
+import org.apache.skywalking.oap.server.core.remote.annotation.StreamData;
+import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
+import org.apache.skywalking.oap.server.core.storage.annotation.*;
+import org.apache.skywalking.oap.server.core.storage.StorageBuilder;
+import org.apache.skywalking.oap.server.core.source.Scope;
+
+/**
+ * This class is auto generated. Please don't change this class manually.
+ *
+ * @author Observability Analysis Language code generator
+ */
+@IndicatorType
+@StreamData
+@StorageEntity(name = "service_instance_sla", builder = ServiceInstanceSlaIndicator.Builder.class, source = Scope.ServiceInstance)
+public class ServiceInstanceSlaIndicator extends PercentIndicator implements AlarmSupported {
+
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId;
+ @Setter @Getter @Column(columnName = "service_id") private int serviceId;
+
+ @Override public String id() {
+ String splitJointId = String.valueOf(getTimeBucket());
+ splitJointId += Const.ID_SPLIT + entityId;
+ return splitJointId;
+ }
+
+ @Override public int hashCode() {
+ int result = 17;
+ result = 31 * result + entityId.hashCode();
+ result = 31 * result + (int)getTimeBucket();
+ return result;
+ }
+
+ @Override public int remoteHashCode() {
+ int result = 17;
+ result = 31 * result + entityId.hashCode();
+ return result;
+ }
+
+ @Override public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+
+ ServiceInstanceSlaIndicator indicator = (ServiceInstanceSlaIndicator)obj;
+ if (!entityId.equals(indicator.entityId))
+ return false;
+
+ if (getTimeBucket() != indicator.getTimeBucket())
+ return false;
+
+ return true;
+ }
+
+ @Override public RemoteData.Builder serialize() {
+ RemoteData.Builder remoteBuilder = RemoteData.newBuilder();
+ remoteBuilder.addDataStrings(getEntityId());
+
+ remoteBuilder.addDataLongs(getTotal());
+ remoteBuilder.addDataLongs(getMatch());
+ remoteBuilder.addDataLongs(getTimeBucket());
+
+
+ remoteBuilder.addDataIntegers(getServiceId());
+ remoteBuilder.addDataIntegers(getPercentage());
+
+ return remoteBuilder;
+ }
+
+ @Override public void deserialize(RemoteData remoteData) {
+ setEntityId(remoteData.getDataStrings(0));
+
+ setTotal(remoteData.getDataLongs(0));
+ setMatch(remoteData.getDataLongs(1));
+ setTimeBucket(remoteData.getDataLongs(2));
+
+
+ setServiceId(remoteData.getDataIntegers(0));
+ setPercentage(remoteData.getDataIntegers(1));
+
+
+ }
+
+ @Override public AlarmMeta getAlarmMeta() {
+ return new AlarmMeta("service_instance_sla", Scope.ServiceInstance, entityId);
+ }
+
+ @Override
+ public Indicator toHour() {
+ ServiceInstanceSlaIndicator indicator = new ServiceInstanceSlaIndicator();
+ indicator.setEntityId(this.getEntityId());
+ indicator.setServiceId(this.getServiceId());
+ indicator.setTotal(this.getTotal());
+ indicator.setPercentage(this.getPercentage());
+ indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInHour());
+ return indicator;
+ }
+
+ @Override
+ public Indicator toDay() {
+ ServiceInstanceSlaIndicator indicator = new ServiceInstanceSlaIndicator();
+ indicator.setEntityId(this.getEntityId());
+ indicator.setServiceId(this.getServiceId());
+ indicator.setTotal(this.getTotal());
+ indicator.setPercentage(this.getPercentage());
+ indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInDay());
+ return indicator;
+ }
+
+ @Override
+ public Indicator toMonth() {
+ ServiceInstanceSlaIndicator indicator = new ServiceInstanceSlaIndicator();
+ indicator.setEntityId(this.getEntityId());
+ indicator.setServiceId(this.getServiceId());
+ indicator.setTotal(this.getTotal());
+ indicator.setPercentage(this.getPercentage());
+ indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInMonth());
+ return indicator;
+ }
+
+ public static class Builder implements StorageBuilder<ServiceInstanceSlaIndicator> {
+
+ @Override public Map<String, Object> data2Map(ServiceInstanceSlaIndicator storageData) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("entity_id", storageData.getEntityId());
+ map.put("service_id", storageData.getServiceId());
+ map.put("total", storageData.getTotal());
+ map.put("percentage", storageData.getPercentage());
+ map.put("match", storageData.getMatch());
+ map.put("time_bucket", storageData.getTimeBucket());
+ return map;
+ }
+
+ @Override public ServiceInstanceSlaIndicator map2Data(Map<String, Object> dbMap) {
+ ServiceInstanceSlaIndicator indicator = new ServiceInstanceSlaIndicator();
+ indicator.setEntityId((String)dbMap.get("entity_id"));
+ indicator.setServiceId(((Number)dbMap.get("service_id")).intValue());
+ indicator.setTotal(((Number)dbMap.get("total")).longValue());
+ indicator.setPercentage(((Number)dbMap.get("percentage")).intValue());
+ indicator.setMatch(((Number)dbMap.get("match")).longValue());
+ indicator.setTimeBucket(((Number)dbMap.get("time_bucket")).longValue());
+ return indicator;
+ }
+ }
+}
diff --git a/oap-server/server-core/src/main/resources/official_analysis.oal b/oap-server/server-core/src/main/resources/official_analysis.oal
index be86d50..c38865b 100644
--- a/oap-server/server-core/src/main/resources/official_analysis.oal
+++ b/oap-server/server-core/src/main/resources/official_analysis.oal
@@ -43,6 +43,7 @@ service_relation_client_resp_time = from(ServiceRelation.latency).filter(detectP
service_relation_server_resp_time = from(ServiceRelation.latency).filter(detectPoint == DetectPoint.SERVER).longAvg();
// Service Instance Scope metric
+service_instance_sla = from(ServiceInstance.*).percent(status == true);
service_instance_resp_time= from(ServiceInstance.latency).longAvg();
service_instance_cpm = from(ServiceInstance.*).cpm();