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/04/19 12:16:31 UTC
[skywalking] branch metrics updated (20299eb -> 95f99a9)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch metrics
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 20299eb Fix trace query
add 21bb638 [Test] Remove all images after E2E tests and disable ES threshold (#4671)
add 28530cd Upgrade the InfluxDB storage-plugin to protocol V3 (#4641)
new 95f99a9 Merge commit '28530cd79d6d91443c0584fade1cbb79e137a8ed' into metrics
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:
.github/workflows/e2e.cluster.yaml | 2 +-
.github/workflows/e2e.profiling.yaml | 2 +-
.github/workflows/e2e.storages.yaml | 2 +-
.github/workflows/e2e.ttl.yaml | 2 +-
.github/workflows/plugins-test.1.yaml | 1 -
.github/workflows/plugins-test.3.yaml | 1 +
.../storage/plugin/influxdb/InfluxClient.java | 20 +-
...luxModelConstants.java => InfluxConstants.java} | 32 ++-
.../plugin/influxdb/InfluxStorageProvider.java | 48 ++--
...AddressAlias.java => InfluxTableInstaller.java} | 28 +-
.../storage/plugin/influxdb/TableMetaInfo.java | 68 ++++-
.../plugin/influxdb/base/InfluxInsertRequest.java | 14 +-
.../storage/plugin/influxdb/base/MetricsDAO.java | 44 ++--
.../plugin/influxdb/base/NoneStreamDAO.java | 21 +-
.../storage/plugin/influxdb/base/RecordDAO.java | 16 +-
.../plugin/influxdb/query/AggregationQuery.java | 22 +-
.../storage/plugin/influxdb/query/LogQuery.java | 16 +-
.../plugin/influxdb/query/MetadataQuery.java | 290 +++++++++++++++++++++
.../plugin/influxdb/query/MetricsQuery.java | 60 ++---
.../influxdb/query/NetworkAddressAliasDAO.java | 86 ++++++
.../plugin/influxdb/query/ProfileTaskLogQuery.java | 27 +-
.../plugin/influxdb/query/ProfileTaskQuery.java | 51 ++--
.../influxdb/query/ProfileThreadSnapshotQuery.java | 28 +-
.../plugin/influxdb/query/TopNRecordsQuery.java | 8 +-
.../plugin/influxdb/query/TopologyQuery.java | 150 ++++++-----
.../storage/plugin/influxdb/query/TraceQuery.java | 10 +-
.../skywalking/e2e/SkyWalkingAnnotations.java | 2 +-
.../docker/cluster/docker-compose.zk.es6.yml | 1 +
.../docker/cluster/docker-compose.zk.es7.yml | 1 +
.../e2e/e2e-test/docker/gateway/docker-compose.yml | 1 +
.../e2e-test/docker/profile/docker-compose.es6.yml | 1 +
.../e2e-test/docker/profile/docker-compose.es7.yml | 1 +
.../docker/profile/docker-compose.influxdb.yml | 4 -
.../e2e-test/docker/storage/docker-compose.es6.yml | 1 +
.../e2e-test/docker/storage/docker-compose.es7.yml | 1 +
.../e2e/e2e-test/docker/ttl/docker-compose.es6.yml | 1 +
.../e2e/e2e-test/docker/ttl/docker-compose.es7.yml | 1 +
test/plugin/run.sh | 5 +-
.../scenarios/mysql-scenario/support-version.list | 11 +-
.../scenarios/solrj-7.x-scenario/configuration.yml | 1 +
40 files changed, 805 insertions(+), 276 deletions(-)
rename oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/{InfluxModelConstants.java => InfluxConstants.java} (62%)
rename oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/{query/InfluxNetworkAddressAlias.java => InfluxTableInstaller.java} (52%)
create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetadataQuery.java
create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/NetworkAddressAliasDAO.java
[skywalking] 01/01: Merge commit
'28530cd79d6d91443c0584fade1cbb79e137a8ed' into metrics
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch metrics
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 95f99a93b10a710f577513935f8b9b2766fd03fb
Merge: 20299eb 28530cd
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Apr 19 20:15:42 2020 +0800
Merge commit '28530cd79d6d91443c0584fade1cbb79e137a8ed' into metrics
# Conflicts:
# oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AggregationQuery.java
# oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/InfluxMetadataQueryDAO.java
# oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetricsQuery.java
# oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopologyQuery.java
.github/workflows/e2e.cluster.yaml | 2 +-
.github/workflows/e2e.profiling.yaml | 2 +-
.github/workflows/e2e.storages.yaml | 2 +-
.github/workflows/e2e.ttl.yaml | 2 +-
.github/workflows/plugins-test.1.yaml | 1 -
.github/workflows/plugins-test.3.yaml | 1 +
.../storage/plugin/influxdb/InfluxClient.java | 20 +-
...luxModelConstants.java => InfluxConstants.java} | 32 ++-
.../plugin/influxdb/InfluxStorageProvider.java | 48 ++--
...AddressAlias.java => InfluxTableInstaller.java} | 28 +-
.../storage/plugin/influxdb/TableMetaInfo.java | 68 ++++-
.../plugin/influxdb/base/InfluxInsertRequest.java | 14 +-
.../storage/plugin/influxdb/base/MetricsDAO.java | 44 ++--
.../plugin/influxdb/base/NoneStreamDAO.java | 21 +-
.../storage/plugin/influxdb/base/RecordDAO.java | 16 +-
.../plugin/influxdb/query/AggregationQuery.java | 22 +-
.../storage/plugin/influxdb/query/LogQuery.java | 16 +-
.../plugin/influxdb/query/MetadataQuery.java | 290 +++++++++++++++++++++
.../plugin/influxdb/query/MetricsQuery.java | 60 ++---
.../influxdb/query/NetworkAddressAliasDAO.java | 86 ++++++
.../plugin/influxdb/query/ProfileTaskLogQuery.java | 27 +-
.../plugin/influxdb/query/ProfileTaskQuery.java | 51 ++--
.../influxdb/query/ProfileThreadSnapshotQuery.java | 28 +-
.../plugin/influxdb/query/TopNRecordsQuery.java | 8 +-
.../plugin/influxdb/query/TopologyQuery.java | 150 ++++++-----
.../storage/plugin/influxdb/query/TraceQuery.java | 10 +-
.../skywalking/e2e/SkyWalkingAnnotations.java | 2 +-
.../docker/cluster/docker-compose.zk.es6.yml | 1 +
.../docker/cluster/docker-compose.zk.es7.yml | 1 +
.../e2e/e2e-test/docker/gateway/docker-compose.yml | 1 +
.../e2e-test/docker/profile/docker-compose.es6.yml | 1 +
.../e2e-test/docker/profile/docker-compose.es7.yml | 1 +
.../docker/profile/docker-compose.influxdb.yml | 4 -
.../e2e-test/docker/storage/docker-compose.es6.yml | 1 +
.../e2e-test/docker/storage/docker-compose.es7.yml | 1 +
.../e2e/e2e-test/docker/ttl/docker-compose.es6.yml | 1 +
.../e2e/e2e-test/docker/ttl/docker-compose.es7.yml | 1 +
test/plugin/run.sh | 5 +-
.../scenarios/mysql-scenario/support-version.list | 11 +-
.../scenarios/solrj-7.x-scenario/configuration.yml | 1 +
40 files changed, 805 insertions(+), 276 deletions(-)
diff --cc oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java
index f724764,6b6019d..e47b7c3
--- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java
+++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java
@@@ -26,14 -26,15 +26,15 @@@ import lombok.extern.slf4j.Slf4j
import org.apache.skywalking.apm.util.StringUtil;
import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord;
-import org.apache.skywalking.oap.server.core.query.entity.ContentType;
-import org.apache.skywalking.oap.server.core.query.entity.Log;
-import org.apache.skywalking.oap.server.core.query.entity.LogState;
-import org.apache.skywalking.oap.server.core.query.entity.Logs;
-import org.apache.skywalking.oap.server.core.query.entity.Pagination;
+import org.apache.skywalking.oap.server.core.query.type.ContentType;
+import org.apache.skywalking.oap.server.core.query.type.Log;
+import org.apache.skywalking.oap.server.core.query.type.LogState;
+import org.apache.skywalking.oap.server.core.query.type.Logs;
+import org.apache.skywalking.oap.server.core.query.type.Pagination;
import org.apache.skywalking.oap.server.core.storage.query.ILogQueryDAO;
+ import org.apache.skywalking.oap.server.core.storage.type.StorageDataComplexObject;
import org.apache.skywalking.oap.server.storage.plugin.influxdb.InfluxClient;
- import org.apache.skywalking.oap.server.storage.plugin.influxdb.base.RecordDAO;
+ import org.apache.skywalking.oap.server.storage.plugin.influxdb.InfluxConstants;
import org.elasticsearch.common.Strings;
import org.influxdb.dto.Query;
import org.influxdb.dto.QueryResult;
diff --cc oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/ProfileTaskLogQuery.java
index 20013c9,59982d8..2fb972c
--- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/ProfileTaskLogQuery.java
+++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/ProfileTaskLogQuery.java
@@@ -22,14 -22,13 +22,13 @@@ import com.google.common.collect.Lists
import java.io.IOException;
import java.util.Collections;
import java.util.List;
- import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.oap.server.core.profile.ProfileTaskLogRecord;
-import org.apache.skywalking.oap.server.core.query.entity.ProfileTaskLog;
-import org.apache.skywalking.oap.server.core.query.entity.ProfileTaskLogOperationType;
+import org.apache.skywalking.oap.server.core.query.type.ProfileTaskLog;
+import org.apache.skywalking.oap.server.core.query.type.ProfileTaskLogOperationType;
import org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskLogQueryDAO;
import org.apache.skywalking.oap.server.storage.plugin.influxdb.InfluxClient;
+ import org.apache.skywalking.oap.server.storage.plugin.influxdb.InfluxConstants;
import org.influxdb.dto.QueryResult;
import org.influxdb.querybuilder.SelectQueryImpl;
import org.influxdb.querybuilder.WhereQueryImpl;
diff --cc oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/ProfileTaskQuery.java
index 91ee428,43099ef..701d705
--- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/ProfileTaskQuery.java
+++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/ProfileTaskQuery.java
@@@ -22,13 -22,13 +22,13 @@@ import com.google.common.collect.Lists
import java.io.IOException;
import java.util.List;
import java.util.Objects;
+ import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.apm.util.StringUtil;
import org.apache.skywalking.oap.server.core.profile.ProfileTaskRecord;
-import org.apache.skywalking.oap.server.core.query.entity.ProfileTask;
+import org.apache.skywalking.oap.server.core.query.type.ProfileTask;
import org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskQueryDAO;
import org.apache.skywalking.oap.server.storage.plugin.influxdb.InfluxClient;
- import org.apache.skywalking.oap.server.storage.plugin.influxdb.InfluxModelConstants;
- import org.apache.skywalking.oap.server.storage.plugin.influxdb.base.NoneStreamDAO;
+ import org.apache.skywalking.oap.server.storage.plugin.influxdb.InfluxConstants;
import org.influxdb.dto.QueryResult;
import org.influxdb.querybuilder.SelectQueryImpl;
import org.influxdb.querybuilder.WhereQueryImpl;
diff --cc oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopNRecordsQuery.java
index 79f3f7b,1dda92c..17f2390
--- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopNRecordsQuery.java
+++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopNRecordsQuery.java
@@@ -26,11 -26,11 +26,11 @@@ import java.util.List
import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.apm.util.StringUtil;
import org.apache.skywalking.oap.server.core.analysis.topn.TopN;
-import org.apache.skywalking.oap.server.core.query.entity.Order;
-import org.apache.skywalking.oap.server.core.query.entity.TopNRecord;
+import org.apache.skywalking.oap.server.core.query.enumeration.Order;
+import org.apache.skywalking.oap.server.core.query.type.TopNRecord;
import org.apache.skywalking.oap.server.core.storage.query.ITopNRecordsQueryDAO;
import org.apache.skywalking.oap.server.storage.plugin.influxdb.InfluxClient;
- import org.apache.skywalking.oap.server.storage.plugin.influxdb.base.RecordDAO;
+ import org.apache.skywalking.oap.server.storage.plugin.influxdb.InfluxConstants;
import org.influxdb.dto.QueryResult;
import org.influxdb.querybuilder.WhereQueryImpl;