You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2022/05/31 13:23:35 UTC
[skywalking] branch mal/instance-properties updated (783ec8c1da -> 8aed3928b7)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch mal/instance-properties
in repository https://gitbox.apache.org/repos/asf/skywalking.git
discard 783ec8c1da Add instanceProperties to MAL
new 8aed3928b7 Add instanceProperties to MAL
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (783ec8c1da)
\
N -- N -- N refs/heads/mal/instance-properties (8aed3928b7)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../skywalking/oap/meter/analyzer/Analyzer.java | 4 +-
.../InstanceEntityDescription.java | 7 +++-
.../analyzer/dsl/ExpressionParsingContext.java | 3 --
.../oap/meter/analyzer/dsl/SampleFamily.java | 44 ++++++++--------------
.../oap/meter/analyzer/dsl/ScopeTest.java | 12 +++---
.../server/core/analysis/meter/MeterEntity.java | 5 ++-
.../main/resources/otel-oc-rules/k8s-instance.yaml | 13 ++++---
7 files changed, 40 insertions(+), 48 deletions(-)
copy dist-material/config-examples/log-mal.yaml => oap-server/server-starter/src/main/resources/otel-oc-rules/k8s-instance.yaml (72%)
[skywalking] 01/01: Add instanceProperties to MAL
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch mal/instance-properties
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 8aed3928b78f25fa27a16564f281948ee9e02a21
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue May 31 21:23:08 2022 +0800
Add instanceProperties to MAL
---
.../skywalking/oap/meter/analyzer/Analyzer.java | 14 ++++++--
.../InstanceEntityDescription.java | 7 +++-
.../oap/meter/analyzer/dsl/SampleFamily.java | 22 ++++++++++---
.../oap/meter/analyzer/dsl/ScopeTest.java | 12 +++----
.../analysis/manual/instance/InstanceTraffic.java | 2 +-
.../server/core/analysis/meter/MeterEntity.java | 5 ++-
.../main/resources/otel-oc-rules/k8s-instance.yaml | 38 ++++++++++++++++++++++
7 files changed, 83 insertions(+), 17 deletions(-)
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/Analyzer.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/Analyzer.java
index 89299687c2..05b01868cf 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/Analyzer.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/Analyzer.java
@@ -20,6 +20,7 @@ package org.apache.skywalking.oap.meter.analyzer;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
+import com.google.gson.JsonObject;
import io.vavr.Tuple;
import io.vavr.Tuple2;
import java.util.List;
@@ -87,8 +88,8 @@ public class Analyzer {
filter = new FilterExpression(filterExpression);
}
ExpressionParsingContext ctx = e.parse();
- Analyzer analyzer = new Analyzer(metricName, filter, e, meterSystem);
- analyzer.init(ctx);
+ Analyzer analyzer = new Analyzer(metricName, filter, e, meterSystem, ctx);
+ analyzer.init();
return analyzer;
}
@@ -102,6 +103,8 @@ public class Analyzer {
private final MeterSystem meterSystem;
+ private final ExpressionParsingContext ctx;
+
private MetricType metricType;
private int[] percentiles;
@@ -221,7 +224,7 @@ public class Analyzer {
private final String literal;
}
- private void init(final ExpressionParsingContext ctx) {
+ private void init() {
this.samples = ctx.getSamples();
if (ctx.isHistogram()) {
if (ctx.getPercentiles() != null && ctx.getPercentiles().length > 0) {
@@ -282,6 +285,11 @@ public class Analyzer {
instanceTraffic.setServiceId(entity.serviceId());
instanceTraffic.setTimeBucket(TimeBucket.getMinuteTimeBucket(System.currentTimeMillis()));
instanceTraffic.setLastPingTimestamp(TimeBucket.getMinuteTimeBucket(System.currentTimeMillis()));
+ if (entity.getInstanceProperties() != null && !entity.getInstanceProperties().isEmpty()) {
+ final JsonObject properties = new JsonObject();
+ entity.getInstanceProperties().forEach((k, v) -> properties.addProperty(k, v));
+ instanceTraffic.setProperties(properties);
+ }
MetricsStreamProcessor.getInstance().in(instanceTraffic);
}
if (!com.google.common.base.Strings.isNullOrEmpty(entity.getEndpointName())) {
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/InstanceEntityDescription.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/InstanceEntityDescription.java
index 97502e2d53..197c274935 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/InstanceEntityDescription.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/InstanceEntityDescription.java
@@ -19,6 +19,8 @@
package org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription;
import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import lombok.Getter;
@@ -26,6 +28,7 @@ import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.skywalking.oap.server.core.analysis.Layer;
import org.apache.skywalking.oap.server.core.analysis.meter.ScopeType;
+import groovy.lang.Closure;
@Getter
@RequiredArgsConstructor
@@ -35,7 +38,9 @@ public class InstanceEntityDescription implements EntityDescription {
private final List<String> serviceKeys;
private final List<String> instanceKeys;
private final Layer layer;
- private final String delimiter;
+ private final String serviceDelimiter;
+ private final String instanceDelimiter;
+ private final Closure<Map<String, String>> propertiesExtractor;
@Override
public List<String> getLabelKeys() {
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java
index 72757f3c8a..93f88cc6d1 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java
@@ -448,7 +448,9 @@ public class SampleFamily {
return createMeterSamples(new ServiceEntityDescription(labelKeys, layer, delimiter));
}
- public SampleFamily instance(List<String> serviceKeys, List<String> instanceKeys, Layer layer) {
+ public SampleFamily instance(List<String> serviceKeys, String serviceDelimiter,
+ List<String> instanceKeys, String instanceDelimiter,
+ Layer layer, Closure<Map<String, String>> propertiesExtractor) {
Preconditions.checkArgument(serviceKeys.size() > 0);
Preconditions.checkArgument(instanceKeys.size() > 0);
ExpressionParsingContext.get().ifPresent(ctx -> {
@@ -459,7 +461,12 @@ public class SampleFamily {
if (this == EMPTY) {
return EMPTY;
}
- return createMeterSamples(new InstanceEntityDescription(serviceKeys, instanceKeys, layer, Const.POINT));
+ return createMeterSamples(new InstanceEntityDescription(
+ serviceKeys, instanceKeys, layer, serviceDelimiter, instanceDelimiter, propertiesExtractor));
+ }
+
+ public SampleFamily instance(List<String> serviceKeys, List<String> instanceKeys, Layer layer) {
+ return instance(serviceKeys, Const.POINT, instanceKeys, Const.POINT, layer, null);
}
public SampleFamily endpoint(List<String> serviceKeys, List<String> endpointKeys, Layer layer) {
@@ -620,10 +627,15 @@ public class SampleFamily {
);
case SERVICE_INSTANCE:
InstanceEntityDescription instanceEntityDescription = (InstanceEntityDescription) entityDescription;
+ Map<String, String> properties = null;
+ if (instanceEntityDescription.getPropertiesExtractor() != null) {
+ properties = instanceEntityDescription.getPropertiesExtractor().call(samples.get(0).labels);
+ }
return MeterEntity.newServiceInstance(
- InternalOps.dim(samples, instanceEntityDescription.getServiceKeys(), instanceEntityDescription.getDelimiter()),
- InternalOps.dim(samples, instanceEntityDescription.getInstanceKeys(), instanceEntityDescription.getDelimiter()),
- instanceEntityDescription.getLayer()
+ InternalOps.dim(samples, instanceEntityDescription.getServiceKeys(), instanceEntityDescription.getServiceDelimiter()),
+ InternalOps.dim(samples, instanceEntityDescription.getInstanceKeys(), instanceEntityDescription.getInstanceDelimiter()),
+ instanceEntityDescription.getLayer(),
+ properties
);
case ENDPOINT:
EndpointEntityDescription endpointEntityDescription = (EndpointEntityDescription) entityDescription;
diff --git a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ScopeTest.java b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ScopeTest.java
index 85d957325c..0cd95c7ab4 100644
--- a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ScopeTest.java
+++ b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ScopeTest.java
@@ -413,15 +413,15 @@ public class ScopeTest {
new HashMap<MeterEntity, Sample[]>() {
{
put(
- MeterEntity.newServiceInstance("t1", "us", Layer.GENERAL),
+ MeterEntity.newServiceInstance("t1", "us", Layer.GENERAL, null),
new Sample[] {Sample.builder().labels(of()).value(150).name("http_success_request").build()}
);
put(
- MeterEntity.newServiceInstance("t3", "cn", Layer.GENERAL),
+ MeterEntity.newServiceInstance("t3", "cn", Layer.GENERAL, null),
new Sample[] {Sample.builder().labels(of()).value(54).name("http_success_request").build()}
);
put(
- MeterEntity.newServiceInstance("t1", "", Layer.GENERAL),
+ MeterEntity.newServiceInstance("t1", "", Layer.GENERAL, null),
new Sample[] {Sample.builder().labels(of()).value(50).name("http_success_request").build()}
);
}
@@ -457,7 +457,7 @@ public class ScopeTest {
new HashMap<MeterEntity, Sample[]>() {
{
put(
- MeterEntity.newServiceInstance("t1", "us", Layer.GENERAL),
+ MeterEntity.newServiceInstance("t1", "us", Layer.GENERAL, null),
new Sample[] {
Sample.builder()
.labels(of("instance", ""))
@@ -470,7 +470,7 @@ public class ScopeTest {
}
);
put(
- MeterEntity.newServiceInstance("t3", "cn", Layer.GENERAL),
+ MeterEntity.newServiceInstance("t3", "cn", Layer.GENERAL, null),
new Sample[] {
Sample.builder()
.labels(of("instance", ""))
@@ -483,7 +483,7 @@ public class ScopeTest {
}
);
put(
- MeterEntity.newServiceInstance("t1", "", Layer.GENERAL),
+ MeterEntity.newServiceInstance("t1", "", Layer.GENERAL, null),
new Sample[] {
Sample.builder()
.labels(of("instance", ""))
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/InstanceTraffic.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/InstanceTraffic.java
index b57a238632..27d59a5125 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/InstanceTraffic.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/InstanceTraffic.java
@@ -79,7 +79,7 @@ public class InstanceTraffic extends Metrics {
final InstanceTraffic instanceTraffic = (InstanceTraffic) metrics;
this.lastPingTimestamp = instanceTraffic.getLastPingTimestamp();
if (instanceTraffic.getProperties() != null && instanceTraffic.getProperties().size() > 0) {
- this.properties = instanceTraffic.getProperties();
+ instanceTraffic.getProperties().entrySet().forEach(it -> this.properties.add(it.getKey(), it.getValue()));
}
/**
* Keep the time bucket as the same time inserted.
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/MeterEntity.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/MeterEntity.java
index 52ffc2b4eb..2c8b8a15cc 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/MeterEntity.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/MeterEntity.java
@@ -21,6 +21,7 @@ package org.apache.skywalking.oap.server.core.analysis.meter;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
+import java.util.Map;
import org.apache.skywalking.oap.server.core.UnexpectedException;
import org.apache.skywalking.oap.server.core.analysis.IDManager;
import org.apache.skywalking.oap.server.core.analysis.Layer;
@@ -39,6 +40,7 @@ public class MeterEntity {
private ScopeType scopeType;
private String serviceName;
private String instanceName;
+ private Map<String, String> instanceProperties;
private String endpointName;
private String sourceServiceName;
private String destServiceName;
@@ -103,11 +105,12 @@ public class MeterEntity {
/**
* Create a service instance level meter entity.
*/
- public static MeterEntity newServiceInstance(String serviceName, String serviceInstance, Layer layer) {
+ public static MeterEntity newServiceInstance(String serviceName, String serviceInstance, Layer layer, Map<String, String> properties) {
final MeterEntity meterEntity = new MeterEntity();
meterEntity.scopeType = ScopeType.SERVICE_INSTANCE;
meterEntity.serviceName = NAMING_CONTROL.formatServiceName(serviceName);
meterEntity.instanceName = NAMING_CONTROL.formatInstanceName(serviceInstance);
+ meterEntity.instanceProperties = properties;
meterEntity.layer = layer;
return meterEntity;
}
diff --git a/oap-server/server-starter/src/main/resources/otel-oc-rules/k8s-instance.yaml b/oap-server/server-starter/src/main/resources/otel-oc-rules/k8s-instance.yaml
new file mode 100644
index 0000000000..fac7ca68d2
--- /dev/null
+++ b/oap-server/server-starter/src/main/resources/otel-oc-rules/k8s-instance.yaml
@@ -0,0 +1,38 @@
+# 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.
+
+# This will parse a textual representation of a duration. The formats
+# accepted are based on the ISO-8601 duration format {@code PnDTnHnMn.nS}
+# with days considered to be exactly 24 hours.
+# <p>
+# Examples:
+# <pre>
+# "PT20.345S" -- parses as "20.345 seconds"
+# "PT15M" -- parses as "15 minutes" (where a minute is 60 seconds)
+# "PT10H" -- parses as "10 hours" (where an hour is 3600 seconds)
+# "P2D" -- parses as "2 days" (where a day is 24 hours or 86400 seconds)
+# "P2DT3H4M" -- parses as "2 days, 3 hours and 4 minutes"
+# "P-6H3M" -- parses as "-6 hours and +3 minutes"
+# "-P6H3M" -- parses as "-6 hours and -3 minutes"
+# "-P-6H+3M" -- parses as "+6 hours and -3 minutes"
+# </pre>
+filter: "{ tags -> tags.job_name in [ 'kubernetes-cadvisor', 'kube-state-metrics' ] }" # The OpenTelemetry job name
+expSuffix: |-
+ service(['cluster' , 'service'], '::', Layer.K8S_SERVICE)
+ .instance(['cluster', 'service'], '::', ['pod'], '', Layer.K8S_SERVICE, { tags -> ['pod': tags.pod, 'namespace': tags.namespace] })
+metricPrefix: k8s_service_instance
+metricsRules:
+ - name: pod_instance_status
+ exp: kube_pod_status_phase.retagByK8sMeta('service' , K8sRetagType.Pod2Service , 'pod' , 'namespace').tagNotEqual('service' , '').sum(['cluster', 'namespace', 'service' , 'pod'])