diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ProfileTaskQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ProfileTaskQueryService.java index f1ae37c7f325dd08cbc000843a318ca47153afc3..156e88f33fe05cef5634138c2d34906cdc1f6814 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ProfileTaskQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ProfileTaskQueryService.java @@ -162,7 +162,7 @@ public class ProfileTaskQueryService implements Service { final List tasks = getProfileTaskDAO().getTaskList(serviceId, endpointName, null, null, null); // query all and filter on task to match logs - List taskLogList = getProfileTaskLogQueryDAO().getTaskLogList(null); + List taskLogList = getProfileTaskLogQueryDAO().getTaskLogList(); if (taskLogList == null) { taskLogList = Collections.emptyList(); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileTaskLogQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileTaskLogQueryDAO.java index 064b8f9ed017ee32be5223a24317a8a142175394..d33dd46b850c5443af8d3ebd94329473aa2c639b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileTaskLogQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileTaskLogQueryDAO.java @@ -30,9 +30,7 @@ public interface IProfileTaskLogQueryDAO extends DAO { /** * search all task log list in appoint profile task id - * - * @param taskId profile task id, maybe null */ - List getTaskLogList(final String taskId) throws IOException; + List getTaskLogList() throws IOException; } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskLogEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskLogEsDAO.java index 52d7992210c6a6b9c2b3abd7256015d59f2b182d..9e484da2bc44919423cf5520abbd82d127d5b527 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskLogEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskLogEsDAO.java @@ -45,16 +45,12 @@ public class ProfileTaskLogEsDAO extends EsDAO implements IProfileTaskLogQueryDA } @Override - public List getTaskLogList(String taskId) throws IOException { + public List getTaskLogList() throws IOException { final SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); final BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); sourceBuilder.query(boolQueryBuilder); - if (taskId != null) { - boolQueryBuilder.must().add(QueryBuilders.termQuery(ProfileTaskLogRecord.TASK_ID, taskId)); - } - sourceBuilder.sort(ProfileTaskLogRecord.OPERATION_TIME, SortOrder.DESC); sourceBuilder.size(queryMaxSize); diff --git 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 index 06ff3f4ef901bdbbc92bd7abaafd98cb5b8e0339..9c4a02c369c7b0c3bb6f3de1ffc0cf60161492a0 100644 --- 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 @@ -25,7 +25,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import lombok.extern.slf4j.Slf4j; -import org.apache.skywalking.apm.util.StringUtil; 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; @@ -35,7 +34,6 @@ import org.influxdb.dto.QueryResult; import org.influxdb.querybuilder.SelectQueryImpl; import org.influxdb.querybuilder.WhereQueryImpl; -import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.eq; import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.select; @Slf4j @@ -49,7 +47,7 @@ public class ProfileTaskLogQuery implements IProfileTaskLogQueryDAO { } @Override - public List getTaskLogList(String taskId) throws IOException { + public List getTaskLogList() throws IOException { WhereQueryImpl query = select() .function("top", ProfileTaskLogRecord.OPERATION_TIME, fetchTaskLogMaxSize) .column("id") @@ -60,10 +58,6 @@ public class ProfileTaskLogQuery implements IProfileTaskLogQueryDAO { .from(client.getDatabase(), ProfileTaskLogRecord.INDEX_NAME) .where(); - if (StringUtil.isNotEmpty(taskId)) { - query.and(eq(ProfileTaskLogRecord.TASK_ID, taskId)); - } - QueryResult.Series series = client.queryForSingleSeries(query); if (log.isDebugEnabled()) { log.debug("SQL: {} result set: {}", query.getCommand(), series); diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskLogQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskLogQueryDAO.java index 7adbc4cea3a76c6f9609f78428e8fda500d2fc6f..7f4aad0c50e2f03862ddabf363f65b81132a302f 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskLogQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskLogQueryDAO.java @@ -41,15 +41,11 @@ public class H2ProfileTaskLogQueryDAO implements IProfileTaskLogQueryDAO { } @Override - public List getTaskLogList(String taskId) throws IOException { + public List getTaskLogList() throws IOException { final StringBuilder sql = new StringBuilder(); final ArrayList condition = new ArrayList<>(1); sql.append("select * from ").append(ProfileTaskLogRecord.INDEX_NAME).append(" where 1=1 "); - if (taskId != null) { - sql.append(" and ").append(ProfileTaskLogRecord.TASK_ID).append(" = ?"); - } - sql.append("ORDER BY ").append(ProfileTaskLogRecord.OPERATION_TIME).append(" DESC "); try (Connection connection = h2Client.getConnection()) { diff --git a/test/e2e/e2e-test/docker/Dockerfile.consumer b/test/e2e/e2e-test/docker/Dockerfile.consumer index ea67d40e6f9eb26dc95c7c3b47a332d678349241..b1802e1399794f981da1e5f6658db2ee560ab413 100644 --- a/test/e2e/e2e-test/docker/Dockerfile.consumer +++ b/test/e2e/e2e-test/docker/Dockerfile.consumer @@ -14,7 +14,7 @@ # limitations under the License. ARG SW_AGENT_JDK_VERSION=8 -ARG AGENT_JDK_BASE=adoptopenjdk/openjdk${SW_AGENT_JDK_VERSION}:alpine-slim +ARG AGENT_JDK_BASE=adoptopenjdk/openjdk${SW_AGENT_JDK_VERSION}:alpine FROM ${AGENT_JDK_BASE} diff --git a/test/e2e/e2e-test/docker/Dockerfile.provider b/test/e2e/e2e-test/docker/Dockerfile.provider index 042d88e045bcbd99bcd8cc3dce1b09b18b10b8c2..fdb1cd5371f4fc4bd435281910bb05d4866cd876 100644 --- a/test/e2e/e2e-test/docker/Dockerfile.provider +++ b/test/e2e/e2e-test/docker/Dockerfile.provider @@ -14,7 +14,7 @@ # limitations under the License. ARG SW_AGENT_JDK_VERSION=8 -ARG AGENT_JDK_BASE=adoptopenjdk/openjdk${SW_AGENT_JDK_VERSION}:alpine-slim +ARG AGENT_JDK_BASE=adoptopenjdk/openjdk${SW_AGENT_JDK_VERSION}:alpine FROM ${AGENT_JDK_BASE} diff --git a/test/e2e/e2e-test/docker/profile/Dockerfile.h2 b/test/e2e/e2e-test/docker/profile/Dockerfile.h2 index 02754e4e395916f2fb492b3a2dde5a0b551a94fa..b77f407a55ff34392a8c3502d3a6ccca9789bd90 100644 --- a/test/e2e/e2e-test/docker/profile/Dockerfile.h2 +++ b/test/e2e/e2e-test/docker/profile/Dockerfile.h2 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM adoptopenjdk/openjdk8:alpine-slim +FROM adoptopenjdk/openjdk8:alpine WORKDIR /h2