diff --git a/assembly/dependencies-profiling.xml b/assembly/dependencies-profiling.xml
deleted file mode 100644
index 14e35654e8756..0000000000000
--- a/assembly/dependencies-profiling.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  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.
--->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
-          http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>dependencies-profiling</id>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <fileSets>
-        <fileSet>
-            <directory>report</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-    </fileSets>
-</assembly>
diff --git a/bin/profiling.sh b/bin/profiling.sh
deleted file mode 100755
index 7dfe5f9a1fa7c..0000000000000
--- a/bin/profiling.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/bin/env bash
-if [ ! -z "${IGNITE_SCRIPT_STRICT_MODE:-}" ]
-then
-    set -o nounset
-    set -o errexit
-    set -o pipefail
-    set -o errtrace
-    set -o functrace
-fi
-
-#
-# 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.
-#
-
-#
-# The script is used to create a performance report from profiling files.
-# Usage: profiling.sh path_to_profiling_files
-# The path should contain profiling files collected from the cluster.
-# Profiling file name mask: node-${sys:nodeId}.prf
-# The report will be created at files path with new directory: path_to_profiling_files/report_yyyy-MM-dd_HH-mm-ss/
-#
-
-#
-# Import common functions.
-#
-if [ "${IGNITE_HOME:-}" = "" ];
-    then IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";
-    else IGNITE_HOME_TMP=${IGNITE_HOME};
-fi
-
-#
-# Set SCRIPTS_HOME - base path to scripts.
-#
-SCRIPTS_HOME="${IGNITE_HOME_TMP}/bin"
-
-source "${SCRIPTS_HOME}"/include/functions.sh
-
-#
-# Discover path to Java executable and check it's version.
-#
-checkJava
-
-#
-# Discover IGNITE_HOME environment variable.
-#
-setIgniteHome
-
-if [ "${DEFAULT_CONFIG:-}" == "" ]; then
-    DEFAULT_CONFIG=config/default-config.xml
-fi
-
-#
-# Set IGNITE_LIBS.
-#
-. "${SCRIPTS_HOME}"/include/setenv.sh
-. "${SCRIPTS_HOME}"/include/build-classpath.sh # Will be removed in the binary release.
-CP="${IGNITE_LIBS}:${IGNITE_HOME}/libs/optional/ignite-profiling/*"
-
-#
-# JVM options. See http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp for more details.
-#
-# ADD YOUR/CHANGE ADDITIONAL OPTIONS HERE
-#
-if [ -z "${JVM_OPTS:-}" ] ; then
-    if [[ `"$JAVA" -version 2>&1 | egrep "1\.[7]\."` ]]; then
-        JVM_OPTS="-Xms256m -Xmx8g"
-    else
-        JVM_OPTS="-Xms256m -Xmx8g"
-    fi
-fi
-
-#
-# Set main class to run script.
-#
-if [ "${MAIN_CLASS:-}" = "" ]; then
-    MAIN_CLASS=org.apache.ignite.internal.profiling.ProfilingFilesParser
-fi
-
-#
-# Garbage Collection options.
-#
-JVM_OPTS="\
-    -XX:+UseG1GC \
-     ${JVM_OPTS}"
-
-#
-# Final JVM_OPTS for Java 9+ compatibility
-#
-if [ $version -eq 8 ] ; then
-    JVM_OPTS="\
-        -XX:+AggressiveOpts \
-         ${JVM_OPTS}"
-
-elif [ $version -gt 8 ] && [ $version -lt 11 ]; then
-    JVM_OPTS="\
-        -XX:+AggressiveOpts \
-        --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \
-        --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
-        --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
-        --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED \
-        --add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
-        --illegal-access=permit \
-        --add-modules=java.xml.bind \
-        ${JVM_OPTS}"
-
-elif [ $version -ge 11 ] ; then
-    JVM_OPTS="\
-        --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \
-        --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
-        --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
-        --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED \
-        --add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
-        --illegal-access=permit \
-        ${JVM_OPTS}"
-fi
-
-"$JAVA" ${JVM_OPTS} -cp "${CP}" ${MAIN_CLASS} $@
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java
index 4306587cef14e..d62d081d9dc66 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java
@@ -52,15 +52,15 @@
 import org.apache.ignite.internal.processors.metric.impl.HitRateMetric;
 import org.apache.ignite.internal.processors.task.GridInternal;
 import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
-import org.apache.ignite.internal.profiling.LogFileProfiling;
+import org.apache.ignite.internal.profiling.FileProfiling;
 import org.apache.ignite.internal.util.StripedExecutor;
 import org.apache.ignite.internal.util.future.GridCompoundFuture;
+import org.apache.ignite.internal.util.typedef.CX1;
 import org.apache.ignite.internal.util.typedef.T2;
 import org.apache.ignite.internal.util.typedef.T4;
 import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteClosure;
 import org.apache.ignite.resources.IgniteInstanceResource;
 import org.apache.ignite.spi.metric.HistogramMetric;
 import org.apache.ignite.spi.metric.Metric;
@@ -242,7 +242,7 @@ public class GridMetricManager extends GridManagerAdapter<MetricExporterSpi> imp
     private final MemoryUsageMetrics nonHeap;
 
     /** Profiling. */
-    private final LogFileProfiling profiling;
+    private final FileProfiling profiling;
 
     /**
      * @param ctx Kernal context.
@@ -282,7 +282,7 @@ public GridMetricManager(GridKernalContext ctx) {
         pmeReg.histogram(PME_OPS_BLOCKED_DURATION_HISTOGRAM, pmeBounds,
             "Histogram of cache operations blocked PME durations in milliseconds.");
 
-        profiling = new LogFileProfiling(ctx);
+        profiling = new FileProfiling(ctx);
     }
 
     /** {@inheritDoc} */
@@ -791,7 +791,7 @@ public boolean profilingEnabled() {
     }
 
     /** @return Profiling. */
-    public LogFileProfiling profiling() {
+    public FileProfiling profiling() {
         return profiling;
     }
 
@@ -926,7 +926,7 @@ public void update(MemoryUsage usage) {
 
     /** Job to start/stop profiling. */
     @GridInternal
-    private static class ProfilingJob implements IgniteClosure<T4<Boolean, Long, Integer, Integer>, Void> {
+    private static class ProfilingJob extends CX1<T4<Boolean, Long, Integer, Integer>, Void> {
         /** Serial version uid. */
         private static final long serialVersionUID = 0L;
 
@@ -935,11 +935,11 @@ private static class ProfilingJob implements IgniteClosure<T4<Boolean, Long, Int
         private transient IgniteEx ignite;
 
         /** @param t Tuple with settings. */
-        @Override public Void apply(T4<Boolean, Long, Integer, Integer> t) {
+        @Override public Void applyx(T4<Boolean, Long, Integer, Integer> t) throws IgniteCheckedException {
             if (t.get1())
                 ignite.context().metric().profiling().startProfiling(t.get2(), t.get3(), t.get4());
             else
-                ignite.context().metric().profiling().stopProfiling();
+                ignite.context().metric().profiling().stopProfiling().get();
 
             return null;
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/profiling/LogFileProfiling.java b/modules/core/src/main/java/org/apache/ignite/internal/profiling/FileProfiling.java
similarity index 97%
rename from modules/core/src/main/java/org/apache/ignite/internal/profiling/LogFileProfiling.java
rename to modules/core/src/main/java/org/apache/ignite/internal/profiling/FileProfiling.java
index 40d0f3df9db8b..24a7800d7906f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/profiling/LogFileProfiling.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/profiling/FileProfiling.java
@@ -54,17 +54,9 @@
  * <p>
  * Each node collects statistics to a profiling file placed under {@link #PROFILING_DIR}.
  * <p>
- * To build the performance report follow:
- * <ol>
- *     <li>Start profiling. See {@link #startProfiling(long, int, int)}</li>
- *     <li>Collect workload statistics.</li>
- *     <li>Stop profiling. See {@link #stopProfiling()}</li>
- *     <li>Collect profiling files from all nodes under an empty directory.</li>
- *     <li>Run script {@code ./bin/profiling.sh path_to_files} to build the performance report.</li>
- * </ol>
  * <b>Note:</b> Start profiling again will erase previous profiling files.
  */
-public class LogFileProfiling implements IgniteProfiling {
+public class FileProfiling implements IgniteProfiling {
     /** Default Maximum file size in bytes. Profiling will be stopped when the size exceeded. */
     public static final long DFLT_FILE_MAX_SIZE = 16 * 1024 * 1024 * 1024L;
 
@@ -93,7 +85,7 @@ public class LogFileProfiling implements IgniteProfiling {
     private final IgniteLogger log;
 
     /** @param ctx Kernal context. */
-    public LogFileProfiling(GridKernalContext ctx) {
+    public FileProfiling(GridKernalContext ctx) {
         log = ctx.log(getClass());
 
         this.ctx = ctx;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/profiling/FileProfilingWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/profiling/FileProfilingWalker.java
new file mode 100644
index 0000000000000..dccfc9cd88f01
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/profiling/FileProfilingWalker.java
@@ -0,0 +1,343 @@
+/*
+ * 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.ignite.internal.profiling;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.file.Path;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
+import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType;
+import org.apache.ignite.internal.profiling.IgniteProfiling.CacheOperationType;
+import org.apache.ignite.internal.util.GridIntList;
+import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.lang.IgniteUuid;
+
+import static java.nio.ByteBuffer.allocateDirect;
+import static java.nio.ByteOrder.nativeOrder;
+import static org.apache.ignite.internal.profiling.FileProfiling.readIgniteUuid;
+import static org.apache.ignite.internal.profiling.FileProfiling.readUuid;
+
+/** Walker over the profiling file. */
+public class FileProfilingWalker {
+    /** File read buffer size. */
+    private static final int READ_BUFFER_SIZE = 8 * 1024 * 1024;
+
+    /** IO factory. */
+    private static final RandomAccessFileIOFactory ioFactory = new RandomAccessFileIOFactory();
+
+    /**
+     * Walks over profiling file.
+     *
+     * @param file Profiling file.
+     * @param handlers Handlers.
+     */
+    public static void walkFile(Path file, IgniteProfiling... handlers) throws IOException {
+        ByteBuffer buf = allocateDirect(READ_BUFFER_SIZE).order(nativeOrder());
+
+        try (
+            FileIO io = ioFactory.create(file.toFile());
+            ProfilingDeserializer des = new ProfilingDeserializer(handlers)
+        ) {
+            buf.clear();
+
+            while (true) {
+                int read = io.read(buf);
+
+                buf.flip();
+
+                if (read <= 0)
+                    break;
+
+                while (true) {
+                    boolean deserialized = des.deserialize(buf);
+
+                    if (!deserialized)
+                        break;
+                }
+
+                buf.compact();
+            }
+        }
+        finally {
+            GridUnsafe.cleanDirectBuffer(buf);
+        }
+    }
+
+    /**
+     * Profiling operations deserializer.
+     */
+    private static class ProfilingDeserializer implements AutoCloseable {
+        /** Cached strings by id. */
+        private final ConcurrentHashMap<Short, String> stringById = new ConcurrentHashMap<>();
+
+        /** Handlers to process deserialized operation. */
+        private final IgniteProfiling[] handlers;
+
+        /** @param handlers Handlers to process deserialized operation. */
+        public ProfilingDeserializer(IgniteProfiling... handlers) {
+            this.handlers = handlers;
+        }
+
+        /**
+         * Tries to deserialize profiling operation from buffer.
+         *
+         * @param buf Buffer.
+         * @return {@code True} if operation parsed. {@code False} if not enough bytes.
+         */
+        public boolean deserialize(ByteBuffer buf) {
+            int pos = buf.position();
+
+            if (buf.remaining() < 1)
+                return false;
+
+            byte opTypeByte = buf.get();
+
+            FileProfiling.OperationType opType = FileProfiling.OperationType.fromOrdinal(opTypeByte);
+
+            switch (opType) {
+                case CACHE_OPERATION: {
+                    if (buf.remaining() < 1 + 4 + 8 + 8)
+                        break;
+
+                    CacheOperationType cacheOp = CacheOperationType.fromOrdinal(buf.get());
+                    int cacheId = buf.getInt();
+                    long startTime = buf.getLong();
+                    long duration = buf.getLong();
+
+                    for (IgniteProfiling handler : handlers)
+                        handler.cacheOperation(cacheOp, cacheId, startTime, duration);
+
+                    return true;
+                }
+
+                case TRANSACTION: {
+                    if (buf.remaining() < 4)
+                        break;
+
+                    int cacheIdsSize = buf.getInt();
+
+                    if (buf.remaining() < 4 * cacheIdsSize + 8 + 8 + 1)
+                        break;
+
+                    GridIntList cacheIds = new GridIntList(cacheIdsSize);
+
+                    for (int i = 0; i < cacheIdsSize; i++)
+                        cacheIds.add(buf.getInt());
+
+                    long startTime = buf.getLong();
+                    long duration = buf.getLong();
+                    boolean commit = buf.get() != 0;
+
+                    for (IgniteProfiling handler : handlers)
+                        handler.transaction(cacheIds, startTime, duration, commit);
+
+                    return true;
+                }
+
+                case QUERY: {
+                    if (buf.remaining() < 1 + 1 + 2 + 8 + 8 + 8 + 1)
+                        break;
+
+                    GridCacheQueryType queryType = GridCacheQueryType.fromOrdinal(buf.get());
+                    boolean needReadString = buf.get() != 0;
+                    short strId = buf.getShort();
+
+                    String str;
+
+                    if (needReadString) {
+                        int textLength = buf.getInt();
+
+                        if (buf.remaining() < textLength + 8 + 8 + 8 + 1)
+                            break;
+
+                        str = readString(buf, textLength);
+
+                        stringById.putIfAbsent(strId, str);
+                    }
+                    else
+                        str = stringById.get(strId);
+
+                    long id = buf.getLong();
+                    long startTime = buf.getLong();
+                    long duration = buf.getLong();
+                    boolean success = buf.get() != 0;
+
+                    // TODO Delay deserealization.
+                    if (str == null)
+                        return true;
+
+                    for (IgniteProfiling handler : handlers)
+                        handler.query(queryType, str, id, startTime, duration, success);
+
+                    return true;
+                }
+
+                case QUERY_READS: {
+                    if (buf.remaining() < 1 + 16 + 8 + 8 + 8)
+                        break;
+
+                    GridCacheQueryType queryType = GridCacheQueryType.fromOrdinal(buf.get());
+
+                    UUID uuid = readUuid(buf);
+                    long id = buf.getLong();
+                    long logicalReads = buf.getLong();
+                    long physicalReads = buf.getLong();
+
+                    for (IgniteProfiling handler : handlers)
+                        handler.queryReads(queryType, uuid, id, logicalReads, physicalReads);
+
+                    return true;
+                }
+
+                case TASK: {
+                    if (buf.remaining() < 24 + 1 + 2 + 8 + 8 + 4)
+                        break;
+
+                    IgniteUuid sesId = readIgniteUuid(buf);
+                    boolean needReadString = buf.get() != 0;
+                    short strId = buf.getShort();
+
+                    String taskName;
+
+                    if (needReadString) {
+                        int textLength = buf.getInt();
+
+                        if (buf.remaining() < textLength + 8 + 8 + 4)
+                            break;
+
+                        taskName = readString(buf, textLength);
+
+                        stringById.putIfAbsent(strId, taskName);
+                    }
+                    else
+                        taskName = stringById.get(strId);
+
+                    long startTime = buf.getLong();
+                    long duration = buf.getLong();
+                    int affPartId = buf.getInt();
+
+                    // TODO Delay deserealization.
+                    if (taskName == null)
+                        return true;
+
+                    for (IgniteProfiling handler : handlers)
+                        handler.task(sesId, taskName, startTime, duration, affPartId);
+
+                    return true;
+                }
+
+                case JOB: {
+                    if (buf.remaining() < 24 + 8 + 8 + 8 + 1)
+                        break;
+
+                    IgniteUuid sesId = readIgniteUuid(buf);
+                    long queuedTime = buf.getLong();
+                    long startTime = buf.getLong();
+                    long duration = buf.getLong();
+                    boolean timedOut = buf.get() != 0;
+
+                    for (IgniteProfiling handler : handlers)
+                        handler.job(sesId, queuedTime, startTime, duration, timedOut);
+
+                    return true;
+                }
+
+                case CACHE_START: {
+                    if (buf.remaining() < 4 + 8 + 4)
+                        break;
+
+                    int cacheId = buf.getInt();
+                    long startTime = buf.getLong();
+
+                    int cacheNameLength = buf.getInt();
+
+                    if (buf.remaining() < cacheNameLength + 4)
+                        break;
+
+                    String cacheName = readString(buf, cacheNameLength);
+
+                    int groupNameLength = buf.getInt();
+
+                    if (buf.remaining() < groupNameLength + 1)
+                        break;
+
+                    String groupName = readString(buf, groupNameLength);
+
+                    boolean userCache = buf.get() != 0;
+
+                    for (IgniteProfiling handler : handlers)
+                        handler.cacheStart(cacheId, startTime, cacheName, groupName, userCache);
+
+                    return true;
+                }
+
+                case PROFILING_START: {
+                    if (buf.remaining() < 20)
+                        break;
+
+                    UUID nodeId = readUuid(buf);
+
+                    int nameLen = buf.getInt();
+
+                    if (buf.remaining() < nameLen + 4)
+                        break;
+
+                    String instanceName = readString(buf, nameLen);
+
+                    int verLen = buf.getInt();
+
+                    if (buf.remaining() < verLen + 4)
+                        break;
+
+                    String ver = readString(buf, verLen);
+
+                    long startTime = buf.getLong();
+
+                    for (IgniteProfiling handler : handlers)
+                        handler.profilingStart(nodeId, instanceName, ver, startTime);
+
+                    return true;
+                }
+
+                default:
+                    throw new RuntimeException("Unknown operation type id [typeId=" + opTypeByte + ']');
+            }
+
+            buf.position(pos);
+
+            return false;
+        }
+
+        /** Reads string from byte buffer. */
+        private static String readString(ByteBuffer buf, int size) {
+            byte[] bytes = new byte[size];
+
+            buf.get(bytes);
+
+            return new String(bytes);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void close() {
+            stringById.clear();
+        }
+    }
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/profiling/IgniteProfilingMBean.java b/modules/core/src/main/java/org/apache/ignite/internal/profiling/IgniteProfilingMBean.java
index ddb4de5a5ee48..66e4fddcd53ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/profiling/IgniteProfilingMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/profiling/IgniteProfilingMBean.java
@@ -29,9 +29,9 @@ public interface IgniteProfilingMBean {
     /**
      * Start profiling in the cluster with default settings.
      *
-     * @see LogFileProfiling#DFLT_FILE_MAX_SIZE
-     * @see LogFileProfiling#DFLT_BUFFER_SIZE
-     * @see LogFileProfiling#DFLT_FLUSH_SIZE
+     * @see FileProfiling#DFLT_FILE_MAX_SIZE
+     * @see FileProfiling#DFLT_BUFFER_SIZE
+     * @see FileProfiling#DFLT_FLUSH_SIZE
      */
     @MXBeanDescription("Start profiling in the cluster.")
     public void startProfiling() throws IgniteCheckedException;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/profiling/IgniteProfilingMbeanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/profiling/IgniteProfilingMbeanImpl.java
index 1f48452926811..8edb14595e933 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/profiling/IgniteProfilingMbeanImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/profiling/IgniteProfilingMbeanImpl.java
@@ -21,9 +21,9 @@
 import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.util.typedef.internal.A;
 
-import static org.apache.ignite.internal.profiling.LogFileProfiling.DFLT_BUFFER_SIZE;
-import static org.apache.ignite.internal.profiling.LogFileProfiling.DFLT_FILE_MAX_SIZE;
-import static org.apache.ignite.internal.profiling.LogFileProfiling.DFLT_FLUSH_SIZE;
+import static org.apache.ignite.internal.profiling.FileProfiling.DFLT_BUFFER_SIZE;
+import static org.apache.ignite.internal.profiling.FileProfiling.DFLT_FILE_MAX_SIZE;
+import static org.apache.ignite.internal.profiling.FileProfiling.DFLT_FLUSH_SIZE;
 
 /**
  * {@link IgniteProfilingMBean} implementation.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/profiling/AbstractProfilingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/profiling/AbstractProfilingTest.java
new file mode 100644
index 0000000000000..ec85dc2121e68
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/profiling/AbstractProfilingTest.java
@@ -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.
+ */
+
+package org.apache.ignite.internal.profiling;
+
+import java.util.List;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.ListeningTestLogger;
+import org.apache.ignite.testframework.LogListener;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+import static org.apache.ignite.internal.profiling.FileProfiling.DFLT_BUFFER_SIZE;
+import static org.apache.ignite.internal.profiling.FileProfiling.DFLT_FILE_MAX_SIZE;
+import static org.apache.ignite.internal.profiling.FileProfiling.DFLT_FLUSH_SIZE;
+import static org.apache.ignite.internal.profiling.FileProfiling.PROFILING_DIR;
+import static org.apache.ignite.internal.profiling.FileProfiling.profilingFile;
+
+/**
+ * Ignite profiling abstract test.
+ */
+public class AbstractProfilingTest extends GridCommonAbstractTest {
+    /** {@inheritDoc} */
+    @Override protected void afterTestsStopped() throws Exception {
+        stopAllGrids();
+
+        U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), PROFILING_DIR, false));
+    }
+
+    /** Starts profiling. */
+    public static void startProfiling() throws Exception {
+        List<Ignite> grids = G.allGrids();
+
+        assertFalse(grids.isEmpty());
+
+        IgniteEx ignite = (IgniteEx)grids.get(0);
+
+        ignite.context().metric().startProfiling(DFLT_FILE_MAX_SIZE, DFLT_BUFFER_SIZE, DFLT_FLUSH_SIZE);
+    }
+
+    /** Stops profiling and checks listeners on all grids. */
+    public static void stopProfilingAndCheck(LogListener... lsnrs) throws Exception {
+        List<Ignite> grids = G.allGrids();
+
+        assertFalse(grids.isEmpty());
+
+        IgniteEx ignite = (IgniteEx)grids.get(0);
+
+        ignite.context().metric().stopProfiling().get();
+
+        for (Ignite grid : grids)
+            TestFileProfilingReader.readToLog(profilingFile(((IgniteEx)grid).context()).toPath(), grid.log());
+
+        for (LogListener lsnr : lsnrs)
+            assertTrue(lsnr.check());
+    }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/profiling/ProfilingMBeanSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/profiling/ProfilingMBeanSelfTest.java
index 8802948137a96..969443f82aacc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/profiling/ProfilingMBeanSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/profiling/ProfilingMBeanSelfTest.java
@@ -18,11 +18,14 @@
 package org.apache.ignite.internal.profiling;
 
 import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
 
+import static org.apache.ignite.internal.profiling.FileProfiling.PROFILING_DIR;
+
 /** Tests {@link IgniteProfilingMbeanImpl}. */
-public class ProfilingMBeanSelfTest extends GridCommonAbstractTest {
+public class ProfilingMBeanSelfTest extends AbstractProfilingTest {
     /** @throws Exception If failed. */
     @Test
     public void testStartStop() throws Exception {
diff --git a/modules/profiling/src/test/java/org/apache/ignite/internal/ProfilingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/profiling/ProfilingSelfTest.java
similarity index 63%
rename from modules/profiling/src/test/java/org/apache/ignite/internal/ProfilingSelfTest.java
rename to modules/core/src/test/java/org/apache/ignite/internal/profiling/ProfilingSelfTest.java
index 56226f7f1a91e..2065e33f4a781 100644
--- a/modules/profiling/src/test/java/org/apache/ignite/internal/ProfilingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/profiling/ProfilingSelfTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.internal;
+package org.apache.ignite.internal.profiling;
 
 import java.util.Collections;
 import java.util.concurrent.locks.Lock;
@@ -25,29 +25,24 @@
 import javax.cache.processor.MutableEntry;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.cache.CacheEntryProcessor;
-import org.apache.ignite.cache.query.ScanQuery;
-import org.apache.ignite.cache.query.SqlFieldsQuery;
 import org.apache.ignite.cluster.ClusterState;
-import org.apache.ignite.configuration.DataRegionConfiguration;
-import org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.profiling.IgniteProfiling.CacheOperationType;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.lang.IgniteRunnable;
 import org.apache.ignite.testframework.ListeningTestLogger;
 import org.apache.ignite.testframework.LogListener;
 import org.apache.ignite.testframework.junits.GridAbstractTest;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
 import org.junit.Test;
 
-import static org.apache.ignite.internal.profiling.LogFileProfiling.PROFILING_DIR;
+import static org.apache.ignite.testframework.LogListener.matches;
 
 /**
  * Tests profiling.
  */
 @SuppressWarnings({"LockAcquiredButNotSafelyReleased"})
-public class ProfilingSelfTest extends GridCommonAbstractTest {
+public class ProfilingSelfTest extends AbstractProfilingTest {
     /** Test entry processor. */
     private static final EntryProcessor<Object, Object, Object> ENTRY_PROC =
         new EntryProcessor<Object, Object, Object>() {
@@ -66,6 +61,9 @@ public class ProfilingSelfTest extends GridCommonAbstractTest {
         }
     };
 
+    /** Ignite. */
+    private static IgniteEx ignite;
+
     /** Log to register profiling operations. */
     private static ListeningTestLogger log;
 
@@ -73,13 +71,10 @@ public class ProfilingSelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        cfg.setDataStorageConfiguration(new DataStorageConfiguration()
-            .setDefaultDataRegionConfiguration(
-                new DataRegionConfiguration()
-                    .setPersistenceEnabled(true)));
-
         cfg.setCacheConfiguration(defaultCacheConfiguration());
 
+        cfg.setGridLogger(log);
+
         return cfg;
     }
 
@@ -87,27 +82,14 @@ public class ProfilingSelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         log = new ListeningTestLogger(GridAbstractTest.log);
 
-        cleanPersistenceDir();
+        ignite = startGrid(0);
 
-        startGrids(2);
+        ignite.cluster().state(ClusterState.ACTIVE);
 
-        grid(0).cluster().state(ClusterState.ACTIVE);
-
-        IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
+        IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
 
         for (int i = 0; i < 100; i++)
             cache.put(i, i);
-
-        new TestProfilingLogReader(grid(0), log).startRead();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids(true);
-
-        cleanPersistenceDir();
-
-        U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), PROFILING_DIR, false));
     }
 
     /** {@inheritDoc} */
@@ -115,73 +97,29 @@ public class ProfilingSelfTest extends GridCommonAbstractTest {
         log.clearListeners();
     }
 
-    /** @throws Exception If failed. */
-    @Test
-    public void testSqlFieldsQuery() throws Exception {
-        checkSqlFieldsQuery("CREATE TABLE TEST (ID INT PRIMARY KEY, VAL VARCHAR)");
-
-        checkSqlFieldsQuery("INSERT INTO TEST VALUES (?, ?)", 1, "1");
-        checkSqlFieldsQuery("INSERT INTO TEST VALUES (?, ?)", 2, "2");
-
-        checkSqlFieldsQuery("UPDATE TEST SET VAL='2' WHERE ID = ?", 1);
-
-        checkSqlFieldsQuery("SELECT * FROM TEST");
-
-        checkSqlFieldsQuery("DROP TABLE TEST");
-    }
-
-    /** */
-    private void checkSqlFieldsQuery(String sql, Object... args) throws Exception {
-        SqlFieldsQuery qry = new SqlFieldsQuery(sql)
-            .setArgs(args)
-            .setSchema("PUBLIC");
-
-        LogListener lsnr = LogListener.matches("query ").andMatches(sql).andMatches("type=SQL_FIELDS").build();
-
-        log.registerListener(lsnr);
-
-        grid(0).context().query().querySqlFields(qry, true).getAll();
-
-        assertTrue(lsnr.check(30_000));
-    }
-
-    /** @throws Exception If failed. */
-    @Test
-    public void testScanQuery() throws Exception {
-        LogListener lsnr = LogListener.matches("query ").andMatches("type=SCAN").build();
-
-        log.registerListener(lsnr);
-
-        grid(0).cache(DEFAULT_CACHE_NAME).query(new ScanQuery<>()).getAll();
-
-        assertTrue(lsnr.check(30_000));
-    }
-
     /** @throws Exception If failed. */
     @Test
     public void testCompute() throws Exception {
-        LogListener taskLsnr = LogListener.matches("task ").build();
-
-        LogListener jobLsnr = LogListener.matches("job ").build();
+        LogListener taskLsnr = matches("task ").build();
+        LogListener jobLsnr = matches("job ").build();
 
-        log.registerListener(jobLsnr);
         log.registerListener(taskLsnr);
+        log.registerListener(jobLsnr);
 
-        grid(0).compute().broadcast(new IgniteCallable<Object>() {
-            @Override public Object call() throws Exception {
-                U.sleep(10);
+        startProfiling();
 
-                return null;
+        ignite.compute().broadcast(new IgniteRunnable() {
+            @Override public void run() {
+                // No-op.
             }
         });
 
-        assertTrue(taskLsnr.check(30_000));
-        assertTrue(jobLsnr.check(30_000));
+        stopProfilingAndCheck(taskLsnr, jobLsnr);
     }
 
     /** @throws Exception If failed. */
     @Test
-    public void testCacheOps() throws Exception {
+    public void testCacheOperations() throws Exception {
         checkCacheOp(CacheOperationType.PUT, cache -> cache.put(1, 1));
         checkCacheOp(CacheOperationType.PUT, cache -> cache.putAsync(2, 2).get());
 
@@ -232,38 +170,36 @@ public void testCacheOps() throws Exception {
 
     /** */
     private void checkCacheOp(CacheOperationType op, Consumer<IgniteCache<Object, Object>> clo) throws Exception {
-        LogListener lsnr = LogListener.matches("cacheOperation ").andMatches("type=" + op).build();
+        LogListener lsnr = matches("cacheOperation ").andMatches("type=" + op).build();
 
         log.registerListener(lsnr);
 
-        clo.accept(grid(0).cache(DEFAULT_CACHE_NAME));
+        startProfiling();
 
-        assertTrue(lsnr.check(30_000));
+        clo.accept(ignite.cache(DEFAULT_CACHE_NAME));
 
-        log.clearListeners();
+        stopProfilingAndCheck(lsnr);
     }
 
     /** @throws Exception If failed. */
     @Test
-    public void testCommit() throws Exception {
+    public void testTransactions() throws Exception {
         checkTx(true);
-    }
 
-    /** @throws Exception If failed. */
-    @Test
-    public void testRollback() throws Exception {
         checkTx(false);
     }
 
     /** @param commit {@code True} if check transaction commit. */
     private void checkTx(boolean commit) throws Exception {
-        IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME);
+        IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
 
-        LogListener lsnr = LogListener.matches("transaction ").andMatches("commit=" + commit).build();
+        LogListener lsnr = matches("transaction ").andMatches("commit=" + commit).build();
 
         log.registerListener(lsnr);
 
-        try (Transaction tx = grid(0).transactions().txStart()) {
+        startProfiling();
+
+        try (Transaction tx = ignite.transactions().txStart()) {
             for (int i = 0; i < 10; i++)
                 cache.put(i, i * 2);
 
@@ -273,6 +209,6 @@ private void checkTx(boolean commit) throws Exception {
                 tx.rollback();
         }
 
-        assertTrue(lsnr.check(30_000));
+        stopProfilingAndCheck(lsnr);
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/profiling/TestFileProfilingReader.java b/modules/core/src/test/java/org/apache/ignite/internal/profiling/TestFileProfilingReader.java
new file mode 100644
index 0000000000000..8693e4261fc58
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/profiling/TestFileProfilingReader.java
@@ -0,0 +1,128 @@
+/*
+ * 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.ignite.internal.profiling;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.UUID;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType;
+import org.apache.ignite.internal.util.GridIntList;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Test profiling file reader.
+ */
+public class TestFileProfilingReader {
+    /**
+     * @param file Profiling file to read.
+     * @param log Log to write operations to.
+     */
+    public static void readToLog(Path file, IgniteLogger log) throws IOException {
+        FileProfilingWalker.walkFile(file, new LogMessageHandler(log));
+    }
+
+    /** The handler that writes handled operations to the log. */
+    private static class LogMessageHandler implements IgniteProfiling {
+        /** Log to write operations to. */
+        private final IgniteLogger log;
+
+        /** @param log Log to write operations to. */
+        private LogMessageHandler(IgniteLogger log) {
+            this.log = log;
+        }
+
+        /** {@inheritDoc} */
+        @Override public void cacheOperation(CacheOperationType type, int cacheId, long startTime, long duration) {
+            log("cacheOperation", "type", type, "cacheId", cacheId, "startTime", startTime,
+                "duration", duration);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void transaction(GridIntList cacheIds, long startTime, long duration, boolean commit) {
+            log("transaction", "cacheIds", cacheIds, "startTime", startTime, "duration", duration,
+                "commit", commit);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void query(GridCacheQueryType type, String text, long id, long startTime, long duration,
+            boolean success) {
+            log("query", "type", type, "text", text, "id", id, "startTime", startTime,
+                "duration", duration, "success", success);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void queryReads(GridCacheQueryType type, UUID queryNodeId, long id, long logicalReads,
+            long physicalReads) {
+            log("queryReads", "type", type, "queryNodeId", queryNodeId, "id", id,
+                "logicalReads", logicalReads, "physicalReads", physicalReads);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void task(IgniteUuid sesId, String taskName, long startTime, long duration, int affPartId) {
+            log("task", "sesId", sesId, "taskName", taskName, "startTime", startTime,
+                "duration", duration, "affPartId", affPartId);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void job(IgniteUuid sesId, long queuedTime, long startTime, long duration, boolean timedOut) {
+            log("job", "sesId", sesId, "queuedTime", queuedTime, "startTime", startTime,
+                "duration", duration, "timedOut", timedOut);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void cacheStart(int cacheId, long startTime, String cacheName, @Nullable String groupName,
+            boolean userCache) {
+            log("cacheStart", "startTime", startTime, "cacheName", cacheName, "groupName", groupName,
+                "userCache", userCache);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void profilingStart(UUID nodeId, String igniteInstanceName, String igniteVersion,
+            long startTime) {
+            log("profilingStart", "nodeId", nodeId, "igniteInstanceName", igniteInstanceName,
+                "igniteVersion", igniteVersion, "startTime", startTime);
+        }
+
+        /**
+         * Logs operations.
+         *
+         * @param category Profile category.
+         * @param tuples   Tuples to log (key, value).
+         */
+        private void log(String category, Object... tuples) {
+            assert tuples.length % 2 == 0;
+
+            StringBuilder sb = new StringBuilder();
+
+            sb.append(category).append(" [");
+
+            for (int i = 0; i < tuples.length; i += 2) {
+                sb.append(tuples[i]).append("=").append(tuples[i + 1]);
+
+                if (i < tuples.length - 2)
+                    sb.append(", ");
+            }
+
+            sb.append(']');
+
+            log.info(sb.toString());
+        }
+    }
+}
diff --git a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/package-info.java b/modules/core/src/test/java/org/apache/ignite/internal/profiling/package-info.java
similarity index 97%
rename from modules/profiling/src/main/java/org/apache/ignite/internal/profiling/package-info.java
rename to modules/core/src/test/java/org/apache/ignite/internal/profiling/package-info.java
index b46ea3f57dcad..f8730c20c265f 100644
--- a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/package-info.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/profiling/package-info.java
@@ -17,7 +17,7 @@
 
 /**
  * <!-- Package description. -->
- * Profiling files parser.
+ * Ignite profiling tests.
  */
 
 package org.apache.ignite.internal.profiling;
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index c0e78225d409e..42c25d90199bc 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@ -104,6 +104,8 @@
 import org.apache.ignite.internal.processors.odbc.OdbcEscapeSequenceSelfTest;
 import org.apache.ignite.internal.processors.odbc.SqlListenerUtilsTest;
 import org.apache.ignite.internal.product.GridProductVersionSelfTest;
+import org.apache.ignite.internal.profiling.ProfilingMBeanSelfTest;
+import org.apache.ignite.internal.profiling.ProfilingSelfTest;
 import org.apache.ignite.internal.util.GridCleanerTest;
 import org.apache.ignite.internal.util.collection.BitSetIntSetTest;
 import org.apache.ignite.internal.util.collection.ImmutableIntSetTest;
@@ -296,7 +298,10 @@
 
     ClusterActivationStartedEventTest.class,
 
-    IgniteThreadGroupNodeRestartTest.class
+    IgniteThreadGroupNodeRestartTest.class,
+
+    ProfilingSelfTest.class,
+    ProfilingMBeanSelfTest.class
 })
 public class IgniteBasicTestSuite {
 }
diff --git a/modules/profiling/src/test/java/org/apache/ignite/internal/ProfilingQueryReadsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/profiling/ProfilingQueryTest.java
similarity index 76%
rename from modules/profiling/src/test/java/org/apache/ignite/internal/ProfilingQueryReadsTest.java
rename to modules/indexing/src/test/java/org/apache/ignite/internal/profiling/ProfilingQueryTest.java
index 8b47f29189b55..74a7f341922a6 100644
--- a/modules/profiling/src/test/java/org/apache/ignite/internal/ProfilingQueryReadsTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/profiling/ProfilingQueryTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.internal;
+package org.apache.ignite.internal.profiling;
 
 import java.util.Collections;
 import org.apache.ignite.IgniteCache;
@@ -23,27 +23,21 @@
 import org.apache.ignite.cache.query.Query;
 import org.apache.ignite.cache.query.ScanQuery;
 import org.apache.ignite.cache.query.SqlFieldsQuery;
-import org.apache.ignite.cache.query.SqlQuery;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.DataRegionConfiguration;
 import org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.testframework.ListeningTestLogger;
 import org.apache.ignite.testframework.LogListener;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
 
 import static java.util.regex.Pattern.compile;
 import static org.apache.ignite.cluster.ClusterState.ACTIVE;
 import static org.apache.ignite.cluster.ClusterState.INACTIVE;
-import static org.apache.ignite.internal.profiling.LogFileProfiling.PROFILING_DIR;
-
-/** Tests profiling of query reads. */
-public class ProfilingQueryReadsTest extends GridCommonAbstractTest {
-    /** Log listen timeout. */
-    public static final long TIMEOUT = 30_000L;
 
+/** Tests query profiling. */
+public class ProfilingQueryTest extends AbstractProfilingTest {
     /** Cache entry count. */
     private static final int ENTRY_COUNT = 100;
 
@@ -107,19 +101,13 @@ public class ProfilingQueryReadsTest extends GridCommonAbstractTest {
 
         for (int i = 0; i < ENTRY_COUNT; i++)
             cache.put(i, i);
-
-        new TestProfilingLogReader(grid(0), log0).startRead();
-        new TestProfilingLogReader(grid(1), log1).startRead();
-        new TestProfilingLogReader(client, clientLog).startRead();
     }
 
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids(true);
+        super.afterTestsStopped();
 
         cleanPersistenceDir();
-
-        U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), PROFILING_DIR, false));
     }
 
     /** {@inheritDoc} */
@@ -134,47 +122,40 @@ public class ProfilingQueryReadsTest extends GridCommonAbstractTest {
     /** */
     @Test
     public void testSqlFieldsQuery() throws Exception {
-        SqlFieldsQuery qry = new SqlFieldsQuery("SELECT * FROM " + DEFAULT_CACHE_NAME)
+        String sql = "SELECT * FROM " + DEFAULT_CACHE_NAME;
+
+        SqlFieldsQuery qry = new SqlFieldsQuery(sql)
             .setSchema(DEFAULT_CACHE_NAME);
 
-        checkQuery(qry);
+        checkQuery(qry, sql);
     }
 
     /** */
     @Test
     public void testScanQuery() throws Exception {
-        checkQuery(new ScanQuery<>());
-    }
-
-    /** */
-    @Test
-    public void testSqlQuery() throws Exception {
-        SqlQuery<Integer, Integer> qry = new SqlQuery<>(Integer.class, "_key >= 0");
-
-        // Deprecated SQL query executes as SQL_FIELDS query.
-        checkQuery(qry);
+        checkQuery(new ScanQuery<>(), DEFAULT_CACHE_NAME);
     }
 
     /** Check query. */
-    private void checkQuery(Query<?> qry) throws Exception {
+    private void checkQuery(Query<?> qry, String text) throws Exception {
         client.cluster().state(INACTIVE);
         client.cluster().state(ACTIVE);
 
         LogListener lsnr0 = readsListener(true, true);
         LogListener lsnr1 = readsListener(true, true);
-        LogListener clientLsnr = LogListener.matches("query ").times(1).build();
+        LogListener clientLsnr = LogListener.matches("query ").andMatches("text=" + text).times(1).build();
 
         log0.registerListener(lsnr0);
         log1.registerListener(lsnr1);
         clientLog.registerListener(clientLsnr);
 
+        startProfiling();
+
         int size = cache.query(qry).getAll().size();
 
         assertEquals(ENTRY_COUNT, size);
 
-        assertTrue(lsnr0.check(TIMEOUT));
-        assertTrue(lsnr1.check(TIMEOUT));
-        assertTrue(clientLsnr.check(TIMEOUT));
+        stopProfilingAndCheck(lsnr0, lsnr1, clientLsnr);
 
         lsnr0 = readsListener(true, false);
         lsnr1 = readsListener(true, false);
@@ -183,13 +164,13 @@ private void checkQuery(Query<?> qry) throws Exception {
         log0.registerListener(lsnr0);
         log1.registerListener(lsnr1);
 
+        startProfiling();
+
         size = cache.query(qry).getAll().size();
 
         assertEquals(ENTRY_COUNT, size);
 
-        assertTrue(lsnr0.check(TIMEOUT));
-        assertTrue(lsnr1.check(TIMEOUT));
-        assertTrue(clientLsnr.check(TIMEOUT));
+        stopProfilingAndCheck(lsnr0, lsnr1, clientLsnr);
     }
 
     /** @return Log listener for given reads. */
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
index 6396926df327e..00c2bed7b2959 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
@@ -78,6 +78,7 @@
 import org.apache.ignite.internal.processors.query.h2.twostep.NoneOrSinglePartitionsQueryOptimizationsTest;
 import org.apache.ignite.internal.processors.query.h2.twostep.RetryCauseMessageSelfTest;
 import org.apache.ignite.internal.processors.query.h2.twostep.TableViewSubquerySelfTest;
+import org.apache.ignite.internal.profiling.ProfilingQueryTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java
index 6868196ba6a83..0de0d4873c179 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java
@@ -39,6 +39,7 @@
 import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedAtomicSelfTest;
 import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheContinuousQueryClientTest;
 import org.apache.ignite.internal.processors.query.MemLeakOnSqlWithClientReconnectTest;
+import org.apache.ignite.internal.profiling.ProfilingQueryTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
@@ -68,7 +69,8 @@
     StaticCacheDdlTest.class,
     StaticCacheDdlKeepStaticConfigurationTest.class,
     MemLeakOnSqlWithClientReconnectTest.class,
-    CacheContinuousQueryFilterDeploymentFailedTest.class
+    CacheContinuousQueryFilterDeploymentFailedTest.class,
+    ProfilingQueryTest.class
 })
 public class IgniteCacheQuerySelfTestSuite6 {
 }
diff --git a/modules/profiling/README.txt b/modules/profiling/README.txt
deleted file mode 100644
index 6133efcedb6a0..0000000000000
--- a/modules/profiling/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Apache Ignite Profiling Module
-------------------------------
-
-Apache Ignite Profiling module provides cluster profiling tool based on performance logging to profiling files.
-
-To collect statistics in runtime and to build the performance report follow:
-
- - Start profiling (use IgniteProfilingMBean JMX bean).
- - Collect workload statistics.
- - Stop profiling (use IgniteProfilingMBean JMX bean).
- - Collect profiling files from all nodes under an empty directory.
- - Run script ./bin/profiling.sh path_to_files to build the performance report.
diff --git a/modules/profiling/licenses/apache-2.0.txt b/modules/profiling/licenses/apache-2.0.txt
deleted file mode 100644
index d645695673349..0000000000000
--- a/modules/profiling/licenses/apache-2.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/modules/profiling/pom.xml b/modules/profiling/pom.xml
deleted file mode 100644
index 524e355629201..0000000000000
--- a/modules/profiling/pom.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  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.
--->
-
-<!--
-    POM file.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.ignite</groupId>
-        <artifactId>ignite-parent</artifactId>
-        <version>1</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-
-    <artifactId>ignite-profiling</artifactId>
-    <version>2.9.0-SNAPSHOT</version>
-    <url>http://ignite.apache.org</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-core</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-log4j</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-spring</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-log4j2</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.9.10</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.9.10</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>2.9.10</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.6</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4</version>
-                <executions>
-                    <execution>
-                        <!-- Create zip archive with UI resources. -->
-                        <id>dependencies-profiling</id>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <phase>prepare-package</phase>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>../../assembly/dependencies-profiling.xml</descriptor>
-                            </descriptors>
-                            <finalName>report</finalName>
-                            <attach>false</attach>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <!-- Includes zip archive with UI resources to module resources. -->
-                        <id>copy-resources</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${basedir}/target</directory>
-                                    <includes>
-                                        <include>report.zip</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/modules/profiling/report/css/dashboard.css b/modules/profiling/report/css/dashboard.css
deleted file mode 100644
index 32e1a31f38c4e..0000000000000
--- a/modules/profiling/report/css/dashboard.css
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * 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.
- */
-
-body {
-  font-size: .875rem;
-}
-
-.feather {
-  width: 16px;
-  height: 16px;
-  vertical-align: text-bottom;
-}
-
-.sidebar {
-  position: fixed;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 100; /* Behind the navbar */
-  padding: 48px 0 0; /* Height of navbar */
-  box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
-}
-
-.sidebar-sticky {
-  position: relative;
-  top: 0;
-  height: calc(100vh - 48px);
-  padding-top: .5rem;
-  overflow-x: hidden;
-  overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
-}
-
-@supports ((position: -webkit-sticky) or (position: sticky)) {
-  .sidebar-sticky {
-    position: -webkit-sticky;
-    position: sticky;
-  }
-}
-
-.sidebar .nav-link {
-  font-weight: 500;
-  color: #333;
-}
-
-.sidebar .nav-link .feather {
-  margin-right: 4px;
-  color: #999;
-}
-
-.sidebar .nav-link.active {
-  color: #007bff;
-}
-
-.sidebar .nav-link:hover .feather,
-.sidebar .nav-link.active .feather {
-  color: inherit;
-}
-
-.sidebar-heading {
-  font-size: .75rem;
-  text-transform: uppercase;
-}
-
-[role="main"] {
-  padding-top: 133px; /* Space for fixed navbar */
-}
-
-@media (min-width: 768px) {
-  [role="main"] {
-    padding-top: 48px; /* Space for fixed navbar */
-  }
-}
-
-.navbar-brand {
-  padding-top: .75rem;
-  padding-bottom: .75rem;
-  font-size: 1rem;
-  background-color: rgba(0, 0, 0, .25);
-  box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25);
-}
-
-.navbar .form-control {
-  padding: .75rem 1rem;
-  border-width: 0;
-  border-radius: 0;
-}
-
-.form-control-dark {
-  color: #fff;
-  background-color: rgba(255, 255, 255, .1);
-  border-color: rgba(255, 255, 255, .1);
-}
-
-.form-control-dark:focus {
-  border-color: transparent;
-  box-shadow: 0 0 0 3px rgba(255, 255, 255, .25);
-}
-
-.bd-placeholder-img {
-    font-size: 1.125rem;
-    text-anchor: middle;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-
-@media (min-width: 768px) {
-    .bd-placeholder-img-lg {
-      font-size: 3.5rem;
-    }
-}
diff --git a/modules/profiling/report/images/favicon.png b/modules/profiling/report/images/favicon.png
deleted file mode 100644
index 91154da9a59e0..0000000000000
Binary files a/modules/profiling/report/images/favicon.png and /dev/null differ
diff --git a/modules/profiling/report/index.html b/modules/profiling/report/index.html
deleted file mode 100644
index 1291bef6e16e3..0000000000000
--- a/modules/profiling/report/index.html
+++ /dev/null
@@ -1,188 +0,0 @@
-<!DOCTYPE html>
-<!--
- 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.
--->
-<html lang="en">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="theme-color" content="#563d7c">
-
-    <title>Ignite profiling report</title>
-
-    <!-- Bootstrap CSS. -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css"
-          integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk"
-          crossorigin="anonymous">
-
-    <!-- Bootstrap table. -->
-    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.16.0/dist/bootstrap-table.min.css">
-
-    <!-- Bootstrap select. -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/css/bootstrap-select.min.css">
-
-    <!-- Feather Icons. -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css"
-          integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/"
-          crossorigin="anonymous">
-
-    <!-- Favicons. -->
-    <link rel="icon" href="images/favicon.png" sizes="32x32" type="image/png">
-
-    <link href="css/dashboard.css" rel="stylesheet">
-</head>
-<body>
-<nav class="navbar navbar-dark fixed-top bg-dark flex-md-nowrap p-0 shadow">
-    <a class="navbar-brand col-sm-3 col-md-2 mr-0" href="#">Ignite profiling report</a>
-    <span id="reportTiming" class="navbar-text mr-3"></span>
-</nav>
-
-<div class="container-fluid">
-    <div class="row">
-        <nav class="col-md-2 d-none d-md-block bg-light sidebar">
-            <div class="sidebar-sticky">
-                <ul class="nav flex-column">
-                    <li class="nav-item">
-                        <a class="nav-link active" data-toggle="tab" href="#clusterInfoTab" role="tab"
-                           aria-selected="true">Cluster info</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" data-toggle="tab" href="#cacheOperationsTab" role="tab"
-                           aria-selected="false">Cache operations</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" data-toggle="tab" href="#txOperationsTab" role="tab"
-                           aria-selected="false">Transactions</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" data-toggle="tab" href="#sqlStatisticsTab" role="tab"
-                           aria-selected="false">SQL queries</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" data-toggle="tab" href="#scanStatisticsTab" role="tab"
-                           aria-selected="false">Scan queries</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" data-toggle="tab" href="#computeStatisticsTab" role="tab"
-                           aria-selected="false">Tasks and jobs</a>
-                    </li>
-                </ul>
-            </div>
-        </nav>
-
-        <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-4">
-            <div class="tab-content">
-                <div class="tab-pane fade show active" id="clusterInfoTab" role="tabpanel">
-                    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-                        <h1 class="h2">Cluster info</h1>
-                    </div>
-
-                    <h2 class="mt-4">Cluster nodes</h2>
-                    <table data-toggle="table" id="nodesTable"></table>
-                    <h2 class="mt-4">Started caches</h2>
-                    <table data-toggle="table" id="cachesTable"></table>
-                </div>
-                <div class="tab-pane fade" id="cacheOperationsTab" role="tabpanel">
-                    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-                        <h1 class="h2">Cache operations statistics</h1>
-                    </div>
-
-                    <select id="searchCaches" class="selectpicker" data-live-search="true"></select>
-                    <select id="searchNodes" class="selectpicker" data-live-search="true"></select>
-
-                    <div id="operationsCharts"></div>
-                </div>
-                <div class="tab-pane fade" id="txOperationsTab" role="tabpanel">
-                    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-                        <h1 class="h2">Transactions statistics</h1>
-                    </div>
-
-                    <select id="txSearchCaches" class="selectpicker" data-live-search="true"></select>
-                    <select id="txSearchNodes" class="selectpicker" data-live-search="true"></select>
-
-                    <div id="txCharts"></div>
-                </div>
-                <div class="tab-pane fade" id="sqlStatisticsTab" role="tabpanel">
-                    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-                        <h1 class="h2">SQL query statistics</h1>
-                    </div>
-                    <h2 class="mt-4">Overall statistics</h2>
-                    <table data-toggle="table" id="sqlStatisticsTable"></table>
-                    <h2 class="mt-4">Top of slowest queries</h2>
-                    <table data-toggle="table" id="topSlowSqlTable"></table>
-                </div>
-                <div class="tab-pane fade" id="scanStatisticsTab" role="tabpanel">
-                    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-                        <h1 class="h2">Scan query statistics</h1>
-                    </div>
-                    <h2 class="mt-4">Overall statistics</h2>
-                    <table data-toggle="table" id="scanStatisticsTable"></table>
-                    <h2 class="mt-4">Top of slowest queries</h2>
-                    <table data-toggle="table" id="topSlowScanTable"></table>
-                </div>
-                <div class="tab-pane fade" id="computeStatisticsTab" role="tabpanel">
-                    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-                        <h1 class="h2">Tasks and jobs statistics</h1>
-                    </div>
-                    <h2 class="mt-4">Overall statistics</h2>
-                    <table data-toggle="table" id="computeStatisticsTable"></table>
-                    <h2 class="mt-4">Top of slowest tasks</h2>
-                    <table data-toggle="table" id="topSlowComputeTable"></table>
-                </div>
-            </div>
-        </main>
-    </div>
-</div>
-
-<!-- Bootstrap JS, Popper.js, and jQuery. -->
-<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"
-        integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj"
-        crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
-        integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
-        crossorigin="anonymous"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js"
-        integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI"
-        crossorigin="anonymous"></script>
-
-<!-- Bootstrap table. -->
-<script src="https://unpkg.com/bootstrap-table@1.16.0/dist/bootstrap-table.min.js"></script>
-
-<!-- Moment JS. -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.26.0/moment-with-locales.min.js"></script>
-
-<!-- Feather Icons. -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/feather-icons/4.27.0/feather.min.js"></script>
-
-<!-- Chart JS. -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.min.js"></script>
-
-<!-- Bootstrap select. -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/bootstrap-select.min.js"></script>
-
-<!-- Report data. -->
-<script type="text/javascript" src="data/data.json.js"></script>
-
-<script type="text/javascript" src="js/utils.js"></script>
-<script type="text/javascript" src="js/clusterInfoTab.js"></script>
-<script type="text/javascript" src="js/operationsTab.js"></script>
-<script type="text/javascript" src="js/sqlTab.js"></script>
-<script type="text/javascript" src="js/scanTab.js"></script>
-<script type="text/javascript" src="js/txTab.js"></script>
-<script type="text/javascript" src="js/computeTab.js"></script>
-
-</body>
-</html>
diff --git a/modules/profiling/report/js/clusterInfoTab.js b/modules/profiling/report/js/clusterInfoTab.js
deleted file mode 100644
index 077355eb2d20e..0000000000000
--- a/modules/profiling/report/js/clusterInfoTab.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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.
- */
-
-$('#nodesTable').bootstrapTable({
-    pagination: true,
-    search: true,
-    columns: [{
-        field: 'name',
-        title: 'Node name',
-        sortable: true
-    }, {
-        field: 'verson',
-        title: 'Node verson',
-        sortable: true
-    }, {
-        field: 'nodeId',
-        title: 'Node ID',
-        sortable: true
-    }],
-    data: prepareNodesTableData(),
-    sortName: 'name',
-    sortOrder: 'desc'
-})
-
-function prepareNodesTableData() {
-    var data = [];
-
-    $.each(REPORT_DATA.clusterInfo.nodes, function (nodeId, node) {
-        data.push({
-            "nodeId": nodeId,
-            "name": node.name,
-            "verson": node.verson
-        });
-    });
-
-    return data;
-}
-
-$('#cachesTable').bootstrapTable({
-    pagination: true,
-    search: true,
-    columns: [{
-        field: 'cacheName',
-        title: 'Cache name',
-        sortable: true
-    }, {
-        field: 'groupName',
-        title: 'Group name',
-        sortable: true
-    }, {
-        field: 'startTime',
-        title: 'Start time',
-        sortable: true
-    }, {
-        field: 'userCache',
-        title: 'User cache',
-        sortable: true
-    }, {
-        field: 'cacheId',
-        title: 'Cache ID',
-        sortable: true
-    }],
-    data: prepareCachesTableData(),
-    sortName: 'cacheName',
-    sortOrder: 'desc'
-})
-
-function prepareCachesTableData() {
-    var data = [];
-
-    $.each(REPORT_DATA.clusterInfo.caches, function (cacheId, cache) {
-        data.push({
-            "cacheId": cacheId,
-            "startTime": new Date(cache.startTime),
-            "cacheName": cache.cacheName,
-            "groupName": cache.groupName,
-            "userCache": cache.userCache
-        });
-    });
-
-    return data;
-}
diff --git a/modules/profiling/report/js/computeTab.js b/modules/profiling/report/js/computeTab.js
deleted file mode 100644
index f188fbf2efb2d..0000000000000
--- a/modules/profiling/report/js/computeTab.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * 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.
- */
-
-/** Builds tasks statistics table. */
-$('#computeStatisticsTable').bootstrapTable({
-    pagination: true,
-    search: true,
-    columns: [{
-        field: 'taskName',
-        title: 'Task name',
-        sortable: true
-    }, {
-        field: 'count',
-        title: 'Executions',
-        sortable: true
-    }, {
-        field: 'duration',
-        title: 'Total duration, ms',
-        sortable: true
-    }, {
-        field: 'jobsCount',
-        title: 'Jobs count',
-        sortable: true
-    }, {
-        field: 'jobsTotalDuration',
-        title: 'Jobs total duration',
-        sortable: true
-    }],
-    data: prepareComputeTableData(),
-    sortName: 'duration',
-    sortOrder: 'desc'
-})
-
-/** Tasks statistics table data. */
-function prepareComputeTableData() {
-    var data = [];
-
-    $.each(REPORT_DATA.totalCompute, function (taskName, taskData) {
-        data.push({
-            "taskName": taskName,
-            "count": taskData["count"],
-            "duration": taskData["duration"],
-            "jobsCount": taskData["jobsCount"],
-            "jobsTotalDuration": taskData["jobsTotalDuration"]
-        });
-    });
-
-    return data;
-}
-
-/** Builds top slow task table. */
-$('#topSlowComputeTable').bootstrapTable({
-    pagination: true,
-    search: true,
-    columns: [{
-        field: 'taskName',
-        title: 'Task name',
-        sortable: true
-    }, {
-        field: 'duration',
-        title: 'Duration, ms',
-        sortable: true,
-        sortOrder: 'desc'
-    }, {
-        field: 'startTime',
-        title: 'Start time',
-        sortable: true
-    }, {
-        field: 'nodeId',
-        title: 'Originating node id',
-        sortable: true
-    }, {
-        field: 'jobsTotalDuration',
-        title: 'Jobs total duration',
-        sortable: true
-    }, {
-        field: 'affPartId',
-        title: 'Affinity partition id',
-        sortable: true
-    }],
-    data: prepareSlowTasksTableData(),
-    sortName: 'duration',
-    sortOrder: 'desc',
-    detailViewIcon: true,
-    detailViewByClick: true,
-    detailView: true,
-    onExpandRow: function (index, row, $detail) {
-        buildJobsSubTable($detail.html("<h5>Jobs</h5><table></table>").find('table'), row.index)
-    }
-})
-
-/** Top of slow tasks table data. */
-function prepareSlowTasksTableData() {
-    var data = [];
-
-    $.each(REPORT_DATA.topSlowCompute, function (k, sqlData) {
-        data.push({
-            taskName: sqlData["taskName"],
-            duration: sqlData["duration"],
-            startTime: new Date(sqlData["startTime"]),
-            nodeId: sqlData["nodeId"],
-            affPartId: sqlData["affPartId"],
-            jobsTotalDuration: sqlData["jobsTotalDuration"],
-            index: k
-        });
-    });
-
-    return data;
-}
-
-/** Builds jobs statistics subtable. */
-function buildJobsSubTable($el, index) {
-    var jobs = REPORT_DATA.topSlowCompute[index]["jobs"];
-
-    var data = [];
-
-    $.each(jobs, function (k, job) {
-        data.push({
-            queuedTime: job["queuedTime"],
-            duration: job["duration"],
-            startTime: new Date(job["startTime"]),
-            nodeId: job["nodeId"],
-            isTimedOut: job["isTimedOut"]
-        });
-    });
-
-    $el.bootstrapTable({
-        columns: [{
-            field: 'nodeId',
-            title: 'Node id',
-            sortable: true
-        }, {
-            field: 'queuedTime',
-            title: 'Queued time, ms',
-            sortable: true
-        }, {
-            field: 'duration',
-            title: 'Duration, ms',
-            sortable: true,
-            sortOrder: 'desc'
-        }, {
-            field: 'startTime',
-            title: 'Start time',
-            sortable: true
-        }, {
-            field: 'isTimedOut',
-            title: 'Timed out',
-            sortable: true
-        }],
-        data: data,
-        sortName: 'duration',
-        sortOrder: 'desc'
-    })
-}
diff --git a/modules/profiling/report/js/operationsTab.js b/modules/profiling/report/js/operationsTab.js
deleted file mode 100644
index 926be36893479..0000000000000
--- a/modules/profiling/report/js/operationsTab.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * 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.
- */
-
-const CACHE_OPERATIONS = ["GET", "PUT", "REMOVE", "GET_AND_PUT", "GET_AND_REMOVE",
-    "GET_ALL", "PUT_ALL", "REMOVE_ALL", "INVOKE", "INVOKE_ALL", "LOCK"];
-
-const CACHE_OPERATIONS_READABLE = ["get", "put", "remove", "getAndPut", "getAndRemove",
-    "getAll", "putAll", "removeAll","invoke", "invokeAll", "lock"];
-
-const CACHE_OPERATIONS_COLORS = {
-    GET: "#007bff",
-    PUT: "#4661EE",
-    REMOVE: "#EC5657",
-    GET_AND_PUT: "#c02332",
-    GET_AND_REMOVE: "#9d71e4",
-    GET_ALL: "#8357c7",
-    PUT_ALL: "#1BCDD1",
-    REMOVE_ALL: "#23BFAA",
-    INVOKE: "#F5A52A",
-    INVOKE_ALL: "#fd7e14",
-    LOCK: "#FAA586"
-};
-
-const searchCachesSelect = $('#searchCaches');
-const searchNodesSelect = $('#searchNodes');
-
-var opsCountPerType = {};
-
-function drawCacheCharts() {
-    $("#operationsCharts").empty();
-
-    $.each(CACHE_OPERATIONS, function (k, opName) {
-        opsCountPerType[opName] = 0;
-
-        var chartId = opName + "OperationChart";
-
-        $("#operationsCharts").append('<canvas class="my-4" ' + 'id="' + chartId + '" height="120"/>');
-
-        new Chart(document.getElementById(chartId), {
-            type: 'line',
-            data: {
-                datasets: prepareCacheDatasets(opName)
-            },
-            options: {
-                scales: {
-                    xAxes: [{
-                        type: 'time',
-                        time: {
-                            displayFormats: {
-                                'millisecond': 'HH:mm:ss',
-                                'second': 'HH:mm:ss',
-                                'minute': 'HH:mm:ss',
-                                'hour': 'HH:mm'
-                            }
-                        },
-                        scaleLabel: {
-                            display: true,
-                            labelString: 'Date'
-                        }
-                    }],
-                    yAxes: [{
-                        display: true,
-                        scaleLabel: {
-                            display: true,
-                            labelString: 'Count'
-                        },
-                        ticks: {
-                            suggestedMin: 0,
-                            suggestedMax: 10
-                        }
-                    }]
-                },
-                legend: {
-                    display: true
-                },
-                title: {
-                    display: true,
-                    text: "Count of [" + CACHE_OPERATIONS_READABLE[k] + "]",
-                    fontSize: 20
-                },
-                animation: false
-            }
-        })
-    });
-
-    drawCacheBar();
-}
-
-function prepareCacheDatasets(opName) {
-    var cacheId = searchCachesSelect.val();
-    var nodeId = searchNodesSelect.val();
-
-    var datasets = [];
-
-    var cacheOps = REPORT_DATA.cacheOps[nodeId] === undefined ? undefined : REPORT_DATA.cacheOps[nodeId][cacheId];
-
-    if (cacheOps === undefined)
-        return datasets;
-
-    var datasetData = [];
-
-    $.each(cacheOps[opName], function (k, arr) {
-        datasetData.push({t: parseInt(arr[0]), y: arr[1]})
-
-        opsCountPerType[opName] += arr[1];
-    });
-
-    sortByKeyAsc(datasetData, "t");
-
-    var dataset = {
-        data: datasetData,
-        label: "Count of " + opName,
-        lineTension: 0,
-        backgroundColor: 'transparent',
-        borderWidth: 2,
-        pointRadius: 1,
-        borderColor: CACHE_OPERATIONS_COLORS[opName],
-        pointBackgroundColor: CACHE_OPERATIONS_COLORS[opName],
-    };
-
-    datasets.push(dataset);
-
-    return datasets;
-}
-
-function drawCacheBar() {
-    $("#operationsCharts").prepend('<canvas class="my-4" id="operationBarChart" height="60"/>');
-
-    var data = [];
-    var colors = [];
-
-    $.each(CACHE_OPERATIONS, function (k, opName) {
-        data[k] = opsCountPerType[opName];
-        colors[k] = CACHE_OPERATIONS_COLORS[opName];
-    });
-
-    new Chart(document.getElementById("operationBarChart"), {
-        type: 'bar',
-        data: {
-            datasets: [{
-                data: data,
-                backgroundColor: colors,
-                label: 'Total count',
-            }],
-            labels: CACHE_OPERATIONS
-        },
-        options: {
-            scales: {
-                yAxes: [{
-                    display: true,
-                    scaleLabel: {
-                        display: true,
-                        labelString: 'Count'
-                    },
-                    ticks: {
-                        suggestedMin: 0,
-                        suggestedMax: 10
-                    }
-                }]
-            },
-            legend: {
-                display: false
-            },
-            title: {
-                display: true,
-                text: 'Distribution of count operations by type',
-                fontSize: 20
-            },
-            animation: false
-        }
-    });
-
-}
-
-buildSelectCaches(searchCachesSelect, drawCacheCharts);
-buildSelectNodes(searchNodesSelect, drawCacheCharts);
-
-drawCacheCharts()
diff --git a/modules/profiling/report/js/scanTab.js b/modules/profiling/report/js/scanTab.js
deleted file mode 100644
index ab9f310b2a27f..0000000000000
--- a/modules/profiling/report/js/scanTab.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.
- */
-
-$('#scanStatisticsTable').bootstrapTable({
-    pagination: true,
-    search: true,
-    columns: [{
-        field: 'cacheName',
-        title: 'Cache name',
-        sortable: true
-    }, {
-        field: 'count',
-        title: 'Executions',
-        sortable: true
-    }, {
-        field: 'duration',
-        title: 'Total duration, ms',
-        sortable: true
-    }, {
-        field: 'logicalReads',
-        title: 'Logical reads',
-        sortable: true
-    }, {
-        field: 'physicalReads',
-        title: 'Physical reads',
-        sortable: true
-    }, {
-        field: 'failures',
-        title: 'Failures count',
-        sortable: true
-    }],
-    data: prepareScanTableData(),
-    sortName: 'duration',
-    sortOrder: 'desc'
-})
-
-function prepareScanTableData() {
-    var data = [];
-
-    $.each(REPORT_DATA.scan, function (cacheName, sqlData) {
-        data.push({
-            "cacheName": cacheName,
-            "count": numberWithCommas(sqlData["count"]),
-            "duration": numberWithCommas(sqlData["duration"]),
-            "logicalReads": numberWithCommas(sqlData["logicalReads"]),
-            "physicalReads": numberWithCommas(sqlData["physicalReads"]),
-            "failures": numberWithCommas(sqlData["failures"])
-        });
-    });
-
-    return data;
-}
-
-$('#topSlowScanTable').bootstrapTable({
-    pagination: true,
-    search: true,
-    columns: [{
-        field: 'text',
-        title: 'Query text',
-        sortable: true
-    }, {
-        field: 'duration',
-        title: 'Duration, ms',
-        sortable: true,
-        sortOrder: 'desc'
-    }, {
-        field: 'startTime',
-        title: 'Start time',
-        sortable: true
-    }, {
-        field: 'nodeId',
-        title: 'Originating node id',
-        sortable: true
-    }, {
-        field: 'logicalReads',
-        title: 'Logical reads',
-        sortable: true
-    }, {
-        field: 'physicalReads',
-        title: 'Physical reads',
-        sortable: true
-    }, {
-        field: 'success',
-        title: 'Success',
-        sortable: true
-    }],
-    data: prepareSlowScanTableData(),
-    sortName: 'duration',
-    sortOrder: 'desc'
-})
-
-function prepareSlowScanTableData() {
-    var data = [];
-
-    $.each(REPORT_DATA.topSlowScan, function (key, sqlData) {
-        data.push({
-            text: sqlData["text"],
-            duration: numberWithCommas(sqlData["duration"]),
-            startTime: new Date(sqlData["startTime"]),
-            nodeId: sqlData["nodeId"],
-            logicalReads: numberWithCommas(sqlData["logicalReads"]),
-            physicalReads: numberWithCommas(sqlData["physicalReads"]),
-            success: sqlData["success"]
-        });
-    });
-
-    return data;
-}
diff --git a/modules/profiling/report/js/sqlTab.js b/modules/profiling/report/js/sqlTab.js
deleted file mode 100644
index 43cfc0fccd3ae..0000000000000
--- a/modules/profiling/report/js/sqlTab.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.
- */
-
-$('#sqlStatisticsTable').bootstrapTable({
-    pagination: true,
-    search: true,
-    columns: [{
-        field: 'text',
-        title: 'Query text',
-        sortable: true
-    }, {
-        field: 'count',
-        title: 'Executions',
-        sortable: true
-    }, {
-        field: 'duration',
-        title: 'Total duration, ms',
-        sortable: true
-    }, {
-        field: 'logicalReads',
-        title: 'Logical reads',
-        sortable: true
-    }, {
-        field: 'physicalReads',
-        title: 'Physical reads',
-        sortable: true
-    }, {
-        field: 'failures',
-        title: 'Failures count',
-        sortable: true
-    }],
-    data: prepareSqlTableData(),
-    sortName: 'duration',
-    sortOrder: 'desc'
-})
-
-function prepareSqlTableData() {
-    var data = [];
-
-    $.each(REPORT_DATA.sql, function (queryText, sqlData) {
-        data.push({
-            "text": queryText,
-            "count": sqlData["count"],
-            "duration": sqlData["duration"],
-            "logicalReads": sqlData["logicalReads"],
-            "physicalReads": sqlData["physicalReads"],
-            "failures": sqlData["failures"]
-        });
-    });
-
-    return data;
-}
-
-$('#topSlowSqlTable').bootstrapTable({
-    pagination: true,
-    search: true,
-    columns: [{
-        field: 'text',
-        title: 'Query text',
-        sortable: true
-    }, {
-        field: 'duration',
-        title: 'Duration, ms',
-        sortable: true,
-        sortOrder: 'desc'
-    }, {
-        field: 'startTime',
-        title: 'Start time',
-        sortable: true
-    }, {
-        field: 'nodeId',
-        title: 'Originating node id',
-        sortable: true
-    }, {
-        field: 'logicalReads',
-        title: 'Logical reads',
-        sortable: true
-    }, {
-        field: 'physicalReads',
-        title: 'Physical reads',
-        sortable: true
-    }, {
-        field: 'success',
-        title: 'Success',
-        sortable: true
-    }],
-    data: prepareSlowSqlTableData(),
-    sortName: 'duration',
-    sortOrder: 'desc'
-})
-
-function prepareSlowSqlTableData() {
-    var data = [];
-
-    $.each(REPORT_DATA.topSlowSql, function (key, sqlData) {
-        data.push({
-            text: sqlData["text"],
-            duration: sqlData["duration"],
-            startTime: new Date(sqlData["startTime"]),
-            nodeId: sqlData["nodeId"],
-            logicalReads: sqlData["logicalReads"],
-            physicalReads: sqlData["physicalReads"],
-            success: sqlData["success"]
-        });
-    });
-
-    return data;
-}
diff --git a/modules/profiling/report/js/txTab.js b/modules/profiling/report/js/txTab.js
deleted file mode 100644
index 0905efb33eab8..0000000000000
--- a/modules/profiling/report/js/txTab.js
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * 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.
- */
-
-const TX_OPERATIONS = ["commit", "rollback"];
-
-const TX_COLORS = {
-    commit: "#1BCDD1",
-    rollback: "#007bff"
-};
-
-const txSearchCachesSelect = $('#txSearchCaches');
-const txSearchNodesSelect = $('#txSearchNodes');
-const txCharts = $("#txCharts");
-
-function drawTxCharts() {
-    var cacheId = searchCachesSelect.val();
-    var nodeId = searchNodesSelect.val();
-
-    txCharts.empty();
-
-    $.each(TX_OPERATIONS, function (k, opName) {
-        var txChartId = opName + "TxChart";
-
-        txCharts.append('<canvas class="my-4" id="' + txChartId + '" height="120""></canvas>');
-
-        new Chart(document.getElementById(txChartId), {
-            type: 'line',
-            data: {
-                datasets: prepareTxDatasets(nodeId, cacheId, opName)
-            },
-            options: {
-                scales: {
-                    xAxes: [{
-                        type: 'time',
-                        time: {
-                            displayFormats: {
-                                'millisecond': 'HH:mm:ss',
-                                'second': 'HH:mm:ss',
-                                'minute': 'HH:mm:ss',
-                                'hour': 'HH:mm'
-                            }
-                        },
-                        scaleLabel: {
-                            display: true,
-                            labelString: 'Date'
-                        }
-                    }],
-                    yAxes: [{
-                        display: true,
-                        scaleLabel: {
-                            display: true,
-                            labelString: 'Count'
-                        },
-                        ticks: {
-                            suggestedMin: 0,
-                            suggestedMax: 10
-                        }
-                    }]
-                },
-                legend: {
-                    display: true
-                },
-                title: {
-                    display: true,
-                    text: "Count of [" + opName + "]",
-                    fontSize: 20
-                },
-                animation: false
-            }
-        })
-    });
-
-    txCharts.prepend('<canvas class="my-4" id="txHistogram" height="80""></canvas>');
-
-    new Chart(document.getElementById("txHistogram"), {
-        type: 'bar',
-        data: {
-            labels: buildTxHistogramBuckets(),
-            datasets: prepareTxHistogramDatasets(nodeId, cacheId)
-        },
-        options: {
-            scales: {
-                xAxes: [{
-                    gridLines: {
-                        offsetGridLines: true
-                    },
-                    scaleLabel: {
-                        display: true,
-                        labelString: 'Duration of transaction'
-                    }
-                }],
-                yAxes: [{
-                    display: true,
-                    scaleLabel: {
-                        display: true,
-                        labelString: 'Count of transactions'
-                    }
-                }]
-            },
-            legend: {
-                display: false
-            },
-            title: {
-                display: true,
-                text: "Histogram of transaction durations",
-                fontSize: 20
-            },
-            animation: false
-        }
-    });
-}
-
-function prepareTxHistogramDatasets(nodeId, cacheId) {
-    var datasets = [];
-
-    var datasetData = REPORT_DATA.txHistogram[nodeId] === undefined ? undefined : REPORT_DATA.txHistogram[nodeId][cacheId];
-
-    if (datasetData === undefined)
-        return datasets;
-
-    var dataset = {
-        label: 'Count of transactions',
-        data: datasetData,
-        backgroundColor: '#FAA586',
-    }
-
-    datasets.push(dataset);
-
-    return datasets;
-}
-
-function prepareTxDatasets(nodeId, cacheId, opName) {
-    var datasets = [];
-
-    var txData = REPORT_DATA.tx[nodeId] === undefined ? undefined : REPORT_DATA.tx[nodeId][cacheId];
-
-    if (txData === undefined)
-        return datasets;
-
-    var datasetData = [];
-
-    $.each(txData[opName], function (time, arr) {
-        datasetData.push({t: parseInt(arr[0]), y: arr[1]})
-    });
-
-    sortByKeyAsc(datasetData, "t");
-
-    var dataset = {
-        data: datasetData,
-        label: "Count of " + opName,
-        lineTension: 0,
-        backgroundColor: 'transparent',
-        borderWidth: 2,
-        pointRadius: 1,
-        borderColor: TX_COLORS[opName],
-        pointBackgroundColor: TX_COLORS[opName]
-    };
-
-    datasets.push(dataset);
-
-    return datasets;
-}
-
-function buildTxHistogramBuckets() {
-    var buckets = [];
-
-    var lastVal = 0;
-
-    $.each(REPORT_DATA.txHistogramBuckets, function (idx, value) {
-        buckets.push(lastVal + " to " + value + " ms");
-        lastVal = value;
-    });
-
-    buckets.push(lastVal + " ms or more");
-
-    return buckets;
-}
-
-buildSelectCaches(txSearchCachesSelect, drawTxCharts);
-buildSelectNodes(txSearchNodesSelect, drawTxCharts);
-
-drawTxCharts()
diff --git a/modules/profiling/report/js/utils.js b/modules/profiling/report/js/utils.js
deleted file mode 100644
index 151fe3d997b81..0000000000000
--- a/modules/profiling/report/js/utils.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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.
- */
-
-$("#reportTiming").html("Profiling started at " + moment(REPORT_DATA.clusterInfo.profilingStartTime).format());
-
-/** Plugin for Charts JS to print 'No data to display' if there is no data for chart. */
-Chart.plugins.register({
-    afterDraw: function (chart) {
-        if (chart.data.datasets.length === 0 || chart.data.datasets.every(val => val.data.length === 0)) {
-            // No data is present
-            var ctx = chart.chart.ctx;
-            var width = chart.chart.width;
-            var height = chart.chart.height
-
-            ctx.save();
-            ctx.textAlign = 'center';
-            ctx.textBaseline = 'middle';
-            ctx.font = "16px normal 'Helvetica Nueue'";
-            ctx.fillText('No data to display', width / 2, height / 2);
-            ctx.restore();
-        }
-    }
-});
-
-/** Sorts array. */
-function sortByKeyDesc(array, key) {
-    return array.sort(function (a, b) {
-        var x = a[key];
-        var y = b[key];
-
-        return ((x > y) ? -1 : ((x < y) ? 1 : 0));
-    });
-}
-
-/** Sorts array. */
-function sortByKeyAsc(array, key) {
-    return array.sort(function (a, b) {
-        var x = a[key];
-        var y = b[key];
-
-        return ((x < y) ? -1 : ((x > y) ? 1 : 0));
-    });
-}
-
-/** Number with commas as thousands separators. */
-function numberWithCommas(x) {
-    return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-}
-
-/** Builds bootstrap-select for caches. */
-function buildSelectCaches(el, onSelect) {
-    el.append('<option data-content="<b>All caches</b>" value="total"/>');
-
-    var caches = REPORT_DATA.clusterInfo.caches;
-
-    Object.keys(caches).forEach(cacheId => caches[cacheId].cacheId = cacheId);
-
-    caches = sortByKeyAsc(Object.values(caches), "cacheName");
-
-    if (caches.length === 0)
-        return;
-
-    $.each(caches, function (idx, cache) {
-        var system = '';
-
-        if (!cache.userCache)
-            system = "<span class='badge badge-warning align-middle ml-2'>System</span>";
-
-        el.append('<option data-content="' + cache.cacheName + system + '" value="' + cache.cacheId + '"/>');
-    });
-
-    el.on('changed.bs.select', onSelect);
-}
-
-/** Builds bootstrap-select for nodes. */
-function buildSelectNodes(el, onSelect) {
-    el.append('<option data-content="<b>All nodes</b>" value="total"/>');
-
-    var nodes = REPORT_DATA.clusterInfo.nodes;
-
-    $.each(nodes, (nodeId, node) => {
-        el.append('<option data-content="' + node.name + '" value="' + nodeId + '"/>');
-    });
-
-    el.on('changed.bs.select', onSelect);
-}
diff --git a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/ProfilingFilesParser.java b/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/ProfilingFilesParser.java
deleted file mode 100644
index 96682fc5733f5..0000000000000
--- a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/ProfilingFilesParser.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * 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.ignite.internal.profiling;
-
-import com.fasterxml.jackson.core.util.MinimalPrettyPrinter;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
-import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory;
-import org.apache.ignite.internal.profiling.handlers.CacheOperationsHandler;
-import org.apache.ignite.internal.profiling.handlers.ClusterInfoHandler;
-import org.apache.ignite.internal.profiling.handlers.ComputeHandler;
-import org.apache.ignite.internal.profiling.handlers.IgniteProfilingHandler;
-import org.apache.ignite.internal.profiling.handlers.QueryHandler;
-import org.apache.ignite.internal.profiling.handlers.TransactionsHandler;
-import org.apache.ignite.internal.profiling.util.ProfilingDeserializer;
-import org.apache.ignite.internal.util.typedef.internal.A;
-import org.apache.ignite.internal.util.typedef.internal.U;
-
-import static java.nio.ByteBuffer.allocateDirect;
-import static java.nio.ByteOrder.nativeOrder;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.regex.Pattern.compile;
-import static org.apache.ignite.internal.profiling.util.Utils.MAPPER;
-import static org.apache.ignite.internal.util.IgniteUtils.sizeInMegabytes;
-
-/**
- * Profiling files parser. Creates JSONs for UI interface. Builds the report.
- */
-public class ProfilingFilesParser {
-    /** Profiling file name pattern. */
-    private static final Pattern PROFILING_FILE_PATTERN = compile(".*node-(.+).prf$");
-
-    /** Maven-generated archive of UI report resources. */
-    private static final String REPORT_RESOURCE_NAME = "report.zip";
-
-    /** File read buffer size. */
-    private static final int READ_BUFFER_SIZE = 8 * 1024 * 1024;
-
-    /** File read buffer. */
-    private static final ByteBuffer readBuf = allocateDirect(READ_BUFFER_SIZE).order(nativeOrder());
-
-    /** IO factory. */
-    private static final RandomAccessFileIOFactory ioFactory = new RandomAccessFileIOFactory();
-
-    /** Node id of current parsed file. */
-    private static UUID curNodeId;
-
-    /**
-     * @param args Only one argument: profiling files directory to parse or '-h' to get usage help.
-     */
-    public static void main(String[] args) throws Exception {
-        long startTime = System.currentTimeMillis();
-
-        String filesDir = parseArguments(args);
-
-        HashMap<UUID, File> files = findFiles(filesDir);
-
-        if (files.isEmpty())
-            throw new Exception("Unable to find profiling files.");
-
-        String resDir = createResultDir(filesDir);
-
-        parseFiles(files, resDir);
-
-        copyReportSources(resDir);
-
-        System.out.println(U.nl() + "Profiling files parsed successfully [totalTime=" +
-            MILLISECONDS.toSeconds(System.currentTimeMillis() - startTime) + " s]" + U.nl() + U.nl() +
-            "Report created [dir=" + resDir + "]" + U.nl() +
-            "Open '" + resDir + "/index.html' in browser to see the report.");
-    }
-
-    /**
-     * Parses arguments and print help or extracts files directory from arguments and checks it existing.
-     *
-     * @param args Arguments to parse.
-     * @return Profiling files directory.
-     */
-    private static String parseArguments(String[] args) {
-        if (args.length == 0 || "--help".equalsIgnoreCase(args[0]) || "-h".equalsIgnoreCase(args[0])) {
-            System.out.println(
-                "The script is used to create a performance report from profiling files." + U.nl() + U.nl() +
-                    "Usage: profiling.sh path_to_profiling_files" + U.nl() + U.nl() +
-                    "The path should contain profiling files collected from the cluster." + U.nl() +
-                    "Profiling file name mask: node-${sys:nodeId}.prf" + U.nl() +
-                    "The report will be created at files path with new directory: " +
-                    "path_to_profiling_files/report_yyyy-MM-dd_HH-mm-ss/" + U.nl() +
-                    "Open 'report_yyyy-MM-dd_HH-mm-ss/index.html' in browser to see the report.");
-
-            System.exit(0);
-        }
-
-        A.ensure(args.length <= 1, "Too much arguments [args=" + Arrays.toString(args) + ']');
-
-        String filesDir = args[0];
-
-        File dir = new File(filesDir);
-
-        A.ensure(dir.exists(), "Profiling files directory does not exists.");
-        A.ensure(dir.isDirectory(), "Profiling files directory is not a directory.");
-
-        return filesDir;
-    }
-
-    /**
-     * Finds profiling files to parse.
-     *
-     * @param filesPath Profiling files directory.
-     * @return Map of found files: nodeId -> profiling file path.
-     */
-    private static HashMap<UUID, File> findFiles(String filesPath) throws IOException {
-        HashMap<UUID, File> res = new HashMap<>();
-
-        File filesDir = new File(filesPath);
-
-        DirectoryStream<Path> files = Files.newDirectoryStream(filesDir.toPath());
-
-        for (Path file : files) {
-            Matcher matcher = PROFILING_FILE_PATTERN.matcher(file.toString());
-
-            if (!matcher.matches())
-                continue;
-
-            UUID nodeId = UUID.fromString(matcher.group(1));
-
-            res.put(nodeId, file.toFile());
-
-            System.out.println("Found file to parse [path=" + file.toAbsolutePath() + ", nodeId=" + nodeId + ']');
-        }
-
-        return res;
-    }
-
-    /**
-     * @param filesDir Parent directory of report results.
-     * @return Created result directory.
-     */
-    private static String createResultDir(String filesDir) throws IOException {
-        String postfix = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss").format(new Date());
-
-        String dir = Files.createDirectory(new File(filesDir + "/report_" + postfix).toPath())
-            .toAbsolutePath().toString();
-
-        // Data directory.
-        Files.createDirectory(new File(dir + "/data").toPath());
-
-        System.out.println("Result directory created [dir=" + dir + ']');
-
-        return dir;
-    }
-
-    /**
-     * Parses profiling files.
-     *
-     * @param files Profiling files.
-     * @param resDir Results directory.
-     */
-    private static void parseFiles(HashMap<UUID, File> files, String resDir) throws Exception {
-        IgniteProfilingHandler[] handlers = new IgniteProfilingHandler[] {
-            new QueryHandler(),
-            new CacheOperationsHandler(),
-            new TransactionsHandler(),
-            new ComputeHandler(),
-            new ClusterInfoHandler()
-        };
-
-        int currFileNum = 1;
-
-        for (Map.Entry<UUID, File> entry : files.entrySet()) {
-            UUID nodeId = entry.getKey();
-            File currFile = entry.getValue();
-
-            String progressMsg = "[" + currFileNum + '/' + files.size() + " files]";
-
-            curNodeId = nodeId;
-
-            parseFile(handlers, nodeId, currFile, progressMsg);
-
-            curNodeId = null;
-
-            currFileNum++;
-        }
-
-        ObjectNode dataJson = MAPPER.createObjectNode();
-
-        for (IgniteProfilingHandler handler : handlers)
-            handler.results().forEach(dataJson::set);
-
-        writeJsonToFile(resDir + "/data/data.json", dataJson);
-
-        jsonToJsVar(resDir + "/data/data.json", "REPORT_DATA");
-    }
-
-    /**
-     * Parses node's profiling file.
-     *
-     * @param handlers Parsers.
-     * @param nodeId Node id.
-     * @param file File to parse.
-     * @param msg Progress message to log.
-     */
-    private static void parseFile(IgniteProfilingHandler[] handlers, UUID nodeId, File file, String msg)
-        throws Exception {
-        System.out.println("Starting parse profiling file [file=" + file.getAbsolutePath() +
-            ", size=" + FileUtils.byteCountToDisplaySize(file.length()) + ", nodeId=" + nodeId + ']');
-
-        int infoFrequency = 1_000_000;
-        long ts = System.currentTimeMillis();
-        long parsed = 0;
-        long parsedBytes = 0;
-
-        try (
-            FileIO io = ioFactory.create(file);
-            ProfilingDeserializer des = new ProfilingDeserializer(handlers)
-        ) {
-            readBuf.clear();
-
-            while (true) {
-                int read = io.read(readBuf);
-
-                readBuf.flip();
-
-                if (read <= 0)
-                    break;
-
-                parsedBytes += read;
-
-                while (true) {
-                    boolean deserialized = des.deserialize(readBuf);
-
-                    if (!deserialized)
-                        break;
-
-                    if (++parsed % infoFrequency == 0) {
-                        long speed = infoFrequency / (System.currentTimeMillis() - ts) * 1000;
-
-                        Runtime runtime = Runtime.getRuntime();
-
-                        long memoryUsage = (runtime.totalMemory() - runtime.freeMemory()) * 100 / runtime.maxMemory();
-
-                        System.out.println(msg +
-                            " progress: " + parsedBytes * 100 / file.length() + " %," +
-                            " speed: " + speed + " ops/sec," +
-                            " memory usage: " + memoryUsage + "% of " + sizeInMegabytes(runtime.totalMemory()) + " MB");
-
-                        ts = System.currentTimeMillis();
-                    }
-                }
-
-                readBuf.compact();
-            }
-        }
-
-        System.out.println("File parsed successfully [nodeId=" + nodeId + ']');
-    }
-
-    /** @return Node id of current parsed file. */
-    public static UUID currentNodeId() {
-        return curNodeId;
-    }
-
-    /**
-     * Writes JSON to file.
-     *
-     * @param fileName File name path.
-     * @param json JSON to write.
-     */
-    public static void writeJsonToFile(String fileName, JsonNode json) throws IOException {
-        ObjectWriter writer = new ObjectMapper().writer(new MinimalPrettyPrinter());
-
-        File file = new File(fileName);
-
-        writer.writeValue(file, json);
-
-        System.out.println("Json writed to file [file=" + file.getAbsolutePath() + ']');
-    }
-
-    /**
-     * Make JSON as JS variable (CORS blocks external json files).
-     *
-     * @param fileName The JSON file path.
-     * @param varName The variable name for the JSON object.
-     */
-    public static void jsonToJsVar(String fileName, String varName) throws IOException {
-        File jsonFile = new File(fileName);
-        File jsFile = new File(fileName + ".js");
-
-        try (BufferedWriter fileWriter = new BufferedWriter(new FileWriter(jsFile))) {
-            fileWriter.write("var " + varName + " = ");
-
-            try (BufferedReader reader = new BufferedReader(new FileReader(jsonFile))) {
-                String line;
-
-                while ((line = reader.readLine()) != null) {
-                    fileWriter.write(line);
-                    fileWriter.newLine();
-                }
-            }
-        }
-
-        jsonFile.delete();
-
-        System.out.println("Json converted to js [file=" + jsonFile.getAbsolutePath() + ".js]");
-    }
-
-    /**
-     * Unzip and copies UI files to result directory.
-     *
-     * @param resDir Directory to copy sources to.
-     */
-    private static void copyReportSources(String resDir) throws Exception {
-        try (InputStream in = ProfilingFilesParser.class.getClassLoader().getResourceAsStream(REPORT_RESOURCE_NAME)) {
-            if (in == null) {
-                U.delete(new File(resDir));
-
-                throw new RuntimeException("Run from IDE require custom maven assembly (try to package " +
-                    "'ignite-profiling' module). The report sources will not be copied to the result directory.");
-            }
-
-            try (ZipInputStream zip = new ZipInputStream(in)) {
-                ZipEntry entry;
-
-                while ((entry = zip.getNextEntry()) != null) {
-                    File entryDestination = new File(resDir, entry.getName());
-
-                    if (entry.isDirectory())
-                        entryDestination.mkdirs();
-                    else {
-                        entryDestination.getParentFile().mkdirs();
-
-                        try (OutputStream out = new FileOutputStream(entryDestination)) {
-                            IOUtils.copy(zip, out);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/CacheOperationsHandler.java b/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/CacheOperationsHandler.java
deleted file mode 100644
index 258a95d96623d..0000000000000
--- a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/CacheOperationsHandler.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * 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.ignite.internal.profiling.handlers;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import org.apache.ignite.internal.util.typedef.internal.U;
-
-import static org.apache.ignite.internal.profiling.ProfilingFilesParser.currentNodeId;
-import static org.apache.ignite.internal.profiling.util.Utils.MAPPER;
-import static org.apache.ignite.internal.profiling.util.Utils.createArrayIfAbsent;
-import static org.apache.ignite.internal.profiling.util.Utils.createObjectIfAbsent;
-
-/**
- * Builds JSON with aggregated cache operations statistics.
- *
- * Example:
- * <pre>
- * {
- *    $nodeId : {
- *       $cacheId : {
- *          $opType : [ [ $startTime, $count] ]
- *       }
- *    }
- * }
- * </pre>
- */
-public class CacheOperationsHandler implements IgniteProfilingHandler {
-    /** Field name of aggregated by caches/nodes values. */
-    private static final String TOTAL = "total";
-
-    /** Cache operations statistics: nodeId->cacheId->opType->aggregatedResults. */
-    private final Map<UUID, Map<Integer, Map<String, Map<Long, Integer>>>> res = new HashMap<>();
-
-    /** {@inheritDoc} */
-    @Override public void cacheOperation(CacheOperationType type, int cacheId, long startTime, long duration) {
-        // nodeId=null means aggregate by all nodes.
-        UUID[] nodesId = new UUID[] {null, currentNodeId()};
-
-        // cacheId=0 means aggregate by all caches.
-        int[] cacheIds = new int[] {0, cacheId};
-
-        // Aggregate by seconds.
-        long aggrTime = startTime / 1000 * 1000;
-
-        for (UUID nodeId : nodesId) {
-            for (int cache : cacheIds) {
-                res.computeIfAbsent(nodeId, k -> new HashMap<>())
-                    .computeIfAbsent(cache, k -> new HashMap<>())
-                    .computeIfAbsent(type.name(), k -> new HashMap<>())
-                    .compute(aggrTime, (time, count) -> count == null ? 1 : count + 1);
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public Map<String, JsonNode> results() {
-        ObjectNode jsonRes = MAPPER.createObjectNode();
-
-        res.forEach((nodeId, cachesMap) -> {
-            ObjectNode node = createObjectIfAbsent(nodeId == null ? TOTAL : String.valueOf(nodeId), jsonRes);
-
-            cachesMap.forEach((cacheId, opsMap) -> {
-                ObjectNode cache = createObjectIfAbsent(cacheId == 0 ? TOTAL : String.valueOf(cacheId), node);
-
-                opsMap.forEach((opType, timingMap) -> {
-                    ArrayNode op = createArrayIfAbsent(opType, cache);
-
-                    timingMap.forEach((time, count) -> {
-                        ArrayNode arr = MAPPER.createArrayNode();
-
-                        arr.add(time);
-                        arr.add(count);
-
-                        op.add(arr);
-                    });
-                });
-            });
-        });
-
-        return U.map("cacheOps", jsonRes);
-    }
-}
diff --git a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/ClusterInfoHandler.java b/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/ClusterInfoHandler.java
deleted file mode 100644
index 26856a5f275d2..0000000000000
--- a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/ClusterInfoHandler.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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.ignite.internal.profiling.handlers;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.util.Map;
-import java.util.UUID;
-import org.apache.ignite.internal.util.typedef.internal.U;
-
-import static org.apache.ignite.internal.profiling.util.Utils.MAPPER;
-
-/**
- * Builds JSON with nodes and started caches information.
- *
- * Example:
- * <pre>
- * {
- *      "profilingStartTime" : $startTime,
- *      "nodes" : {
-*           $nodeId : {
- *              "name": $name,
- *              "verson": $verson,
- *              "startTime" : $startTime
- *          }
- *      }
- *      "caches": {
- *          $cacheId : {
- *              "startTime" : $startTime,
- *              "cacheName" : $cacheName,
- *              "groupName" : $groupName,
- *              "userCache" : $userCacheFlag
- *          }
- *      }
- * }
- * </pre>
- */
-public class ClusterInfoHandler implements IgniteProfilingHandler {
-    /** Result JSON. */
-    private final ObjectNode res = MAPPER.createObjectNode();
-
-    /** Nodes JSON object. */
-    private final ObjectNode nodes = MAPPER.createObjectNode();
-
-    /** Caches JSON object. */
-    private final ObjectNode caches = MAPPER.createObjectNode();
-
-    /** */
-    public ClusterInfoHandler() {
-        res.put("profilingStartTime", Long.MAX_VALUE);
-        res.set("nodes", nodes);
-        res.set("caches", caches);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void profilingStart(UUID nodeId, String igniteInstanceName, String igniteVersion, long startTime) {
-        res.put("profilingStartTime", Math.min(startTime, res.get("profilingStartTime").longValue()));
-
-        ObjectNode node = MAPPER.createObjectNode();
-
-        node.put("name", igniteInstanceName);
-        node.put("verson", igniteVersion);
-        node.put("startTime", startTime);
-
-        nodes.set(nodeId.toString(), node);
-    }
-
-    @Override public void cacheStart(int cacheId, long startTime, String cacheName, String groupName,
-        boolean userCache) {
-        ObjectNode node = MAPPER.createObjectNode();
-
-        node.put("startTime", startTime);
-        node.put("cacheName", cacheName);
-        node.put("groupName", groupName);
-        node.put("userCache", userCache);
-
-        caches.set(String.valueOf(cacheId), node);
-    }
-
-    /** {@inheritDoc} */
-    @Override public Map<String, JsonNode> results() {
-        return U.map("clusterInfo", res);
-    }
-}
diff --git a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/ComputeHandler.java b/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/ComputeHandler.java
deleted file mode 100644
index cc6081b2bce4a..0000000000000
--- a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/ComputeHandler.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * 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.ignite.internal.profiling.handlers;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import org.apache.ignite.internal.profiling.util.OrderedFixedSizeStructure;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteUuid;
-
-import static org.apache.ignite.internal.profiling.ProfilingFilesParser.currentNodeId;
-import static org.apache.ignite.internal.profiling.util.Utils.MAPPER;
-
-/**
- * Builds JSON with aggregated tasks and jobs statistics.
- *
- * Example:
- * <pre>
- * {
- *      $taskName : {
- *          "count" : $executionsCount,
- *          "duration" : $duration,
- *          "jobsCount" : $jobsCount,
- *          "jobsTotalDuration" : $jobsTotalDuration
- *      }
- * }
- * </pre>
- * Example of slowest tasks:
- * <pre>
- * [
- *  {
- *      "taskName" : $taskName,
- *      "startTime" : $startTime,
- *      "duration" : $duration,
- *      "affPartId" : $affPartId,
- *      "nodeId" : $nodeId,
- *      "jobsTotalDuration" : $jobsTotalDuration,
- *      "jobs" : [ {
- *          "queuedTime" : $queuedTime,
- *          "startTime" : $startTime,
- *          "duration" : $duration,
- *          "isTimedOut" : $isTimedOut,
- *          "nodeId" : "$nodeId"
- *      } ]
- *  }
- * ]
- * </pre>
- */
-public class ComputeHandler implements IgniteProfilingHandler {
-    /** Aggregated tasks: taskName -> aggregatedInfo. */
-    private final Map<String, AggregatedTaskInfo> taskRes = new HashMap<>();
-
-    /** Jobs: sesId -> jobs. */
-    private final Map<IgniteUuid, List<Job>> jobs = new HashMap<>();
-
-    /** Top of slow tasks: duration -> task. */
-    private final OrderedFixedSizeStructure<Long, Task> topSlowTask = new OrderedFixedSizeStructure<>();
-
-    /** {@inheritDoc} */
-    @Override public void task(IgniteUuid sesId, String taskName, long startTime, long duration, int affPartId) {
-        Task task = new Task(currentNodeId(), sesId, taskName, startTime, duration, affPartId);
-
-        topSlowTask.put(duration, task);
-
-        AggregatedTaskInfo info = taskRes.computeIfAbsent(taskName, k -> new AggregatedTaskInfo());
-
-        info.mergeTask(sesId, duration);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void job(IgniteUuid sesId, long queuedTime, long startTime, long duration, boolean timedOut) {
-        Job job = new Job(currentNodeId(), queuedTime, startTime, duration, timedOut);
-
-        jobs.computeIfAbsent(sesId, uuid -> new LinkedList<>()).add(job);
-    }
-
-    /** {@inheritDoc} */
-    @Override public Map<String, JsonNode> results() {
-        ObjectNode taskJson = MAPPER.createObjectNode();
-
-        taskRes.forEach((taskName, info) -> {
-            info.ids.forEach(uuid -> {
-                List<Job> jobs = this.jobs.get(uuid);
-
-                if (jobs == null)
-                    return;
-
-                jobs.forEach(job -> {
-                    info.jobsCnt += 1;
-                    info.jobsDuration += job.duration;
-                });
-            });
-
-            ObjectNode task = MAPPER.createObjectNode();
-
-            task.put("count", info.count);
-            task.put("duration", info.totalDuration);
-            task.put("jobsCount", info.jobsCnt);
-            task.put("jobsTotalDuration", info.jobsDuration);
-
-            taskJson.set(taskName, task);
-        });
-
-        ArrayNode topSlowJson = MAPPER.createArrayNode();
-
-        topSlowTask.values().forEach(task -> {
-            ObjectNode node = MAPPER.createObjectNode();
-
-            long jobsTotalDuration = 0;
-
-            ArrayNode jobsJson = MAPPER.createArrayNode();
-
-            for (Job job : jobs.get(task.sesId)) {
-                ObjectNode jobJson = MAPPER.createObjectNode();
-
-                jobJson.put("queuedTime", job.queuedTime);
-                jobJson.put("startTime", job.startTime);
-                jobJson.put("duration", job.duration);
-                jobJson.put("isTimedOut", job.isTimedOut);
-                jobJson.put("nodeId", String.valueOf(job.nodeId));
-
-                jobsJson.add(jobJson);
-
-                jobsTotalDuration += job.duration;
-            }
-
-            node.put("taskName", task.taskName);
-            node.put("startTime", task.startTime);
-            node.put("duration", task.duration);
-            node.put("affPartId", task.affPartId);
-            node.put("nodeId", String.valueOf(task.nodeId));
-            node.put("jobsTotalDuration", jobsTotalDuration);
-
-            node.set("jobs", jobsJson);
-
-            topSlowJson.add(node);
-        });
-
-        return U.map("totalCompute", taskJson, "topSlowCompute", topSlowJson);
-    }
-
-    /** */
-    private static class AggregatedTaskInfo {
-        /** Executions. */
-        long count;
-
-        /** Duration. */
-        long totalDuration;
-
-        /** Jobs count. */
-        long jobsCnt;
-
-        /** Jobs total duration. */
-        long jobsDuration;
-
-        /** Jobs ids. */
-        final Set<IgniteUuid> ids = new HashSet<>();
-
-        /** */
-        public void mergeTask(IgniteUuid sesId, long duration) {
-            count += 1;
-            totalDuration += duration;
-
-            ids.add(sesId);
-        }
-    }
-
-    /** Task. */
-    public class Task {
-        /** Node id. */
-        private final UUID nodeId;
-
-        /** Session id. */
-        private final IgniteUuid sesId;
-
-        /** Task name. */
-        private final String taskName;
-
-        /** Start time. */
-        private final long startTime;
-
-        /** Duration. */
-        private final long duration;
-
-        /** Affinity partition id. */
-        private final int affPartId;
-
-        /**
-         * @param id Node id.
-         * @param sesId Session id.
-         * @param taskName Task name.
-         * @param startTime Start time.
-         * @param duration Duration.
-         * @param affPartId Affinity partition id.
-         */
-        public Task(UUID id, IgniteUuid sesId, String taskName, long startTime, long duration, int affPartId) {
-            nodeId = id;
-            this.sesId = sesId;
-            this.taskName = taskName;
-            this.startTime = startTime;
-            this.duration = duration;
-            this.affPartId = affPartId;
-        }
-    }
-
-    /** Job. */
-    public class Job {
-        /** Node id. */
-        private final UUID nodeId;
-
-        /** Time job spent on waiting queue. */
-        private final long queuedTime;
-
-        /** Start time. */
-        private final long startTime;
-
-        /** Job execution time. */
-        private final long duration;
-
-        /** {@code True} if job is timed out. */
-        private final boolean isTimedOut;
-
-        /**
-         * @param nodeId Node id.
-         * @param queuedTime Time job spent on waiting queue.
-         * @param startTime Start time.
-         * @param duration Job execution time.
-         * @param isTimedOut {@code True} if job is timed out.
-         */
-        public Job(UUID nodeId, long queuedTime, long startTime, long duration, boolean isTimedOut) {
-            this.nodeId = nodeId;
-            this.queuedTime = queuedTime;
-            this.startTime = startTime;
-            this.duration = duration;
-            this.isTimedOut = isTimedOut;
-        }
-    }
-}
diff --git a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/IgniteProfilingHandler.java b/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/IgniteProfilingHandler.java
deleted file mode 100644
index ce0ca099ab143..0000000000000
--- a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/IgniteProfilingHandler.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.ignite.internal.profiling.handlers;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import java.util.Map;
-import java.util.UUID;
-import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType;
-import org.apache.ignite.internal.profiling.IgniteProfiling;
-import org.apache.ignite.internal.util.GridIntList;
-import org.apache.ignite.lang.IgniteUuid;
-
-/**
- * The interface represents profiling operations handler to build JSON for UI views.
- */
-public interface IgniteProfilingHandler extends IgniteProfiling {
-    /**
-     * Map of named JSON results.
-     *
-     * @return Result map.
-     */
-    Map<String, JsonNode> results();
-
-    /** {@inheritDoc} */
-    @Override default void cacheOperation(CacheOperationType type, int cacheId, long startTime, long duration) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override default void transaction(GridIntList cacheIds, long startTime, long duration, boolean commit) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override default void query(GridCacheQueryType type, String text, long id, long startTime, long duration,
-        boolean success) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override default void queryReads(GridCacheQueryType type, UUID queryNodeId, long id, long logicalReads,
-        long physicalReads) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override default void task(IgniteUuid sesId, String taskName, long startTime, long duration, int affPartId) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override default void job(IgniteUuid sesId, long queuedTime, long startTime, long duration, boolean timedOut) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override default void cacheStart(int cacheId, long startTime, String cacheName, String groupName,
-        boolean userCache) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override default void profilingStart(UUID nodeId, String igniteInstanceName, String igniteVersion,
-        long startTime) {
-        // No-op.
-    }
-}
diff --git a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/QueryHandler.java b/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/QueryHandler.java
deleted file mode 100644
index f79d043e3d24b..0000000000000
--- a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/QueryHandler.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * 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.ignite.internal.profiling.handlers;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType;
-import org.apache.ignite.internal.profiling.util.OrderedFixedSizeStructure;
-import org.apache.ignite.internal.util.typedef.F;
-
-import static org.apache.ignite.internal.profiling.ProfilingFilesParser.currentNodeId;
-import static org.apache.ignite.internal.profiling.util.Utils.MAPPER;
-
-/**
- * Builds JSON with aggregated query statistics.
- *
- * Example:
- * <pre>
- * {
- *      $textOrCacheName : {
- *          "count" : $executionsCount,
- *          "duration" : $duration,
- *          "logicalReads" : $logicalReads,
- *          "physicalReads" : $physicalReads,
- *          "failures" : $failures
- *      }
- * }
- * </pre>
- * Example of slowest queries:
- * <pre>
- * [
- *  {
- *      "text" : $textOrCacheName,
- *      "startTime" : $startTime,
- *      "duration" : $duration,
- *      "nodeId" : $nodeId,
- *      "logicalReads" : $logicalReads,
- *      "physicalReads" : $physicalReads,
- *      "success" : $success
- *  }
- * ]
- * </pre>
- */
-public class QueryHandler implements IgniteProfilingHandler {
-    /**  Queries results: queryType -> queryText -> aggregatedInfo. */
-    private final Map<GridCacheQueryType, Map<String, AggregatedQueryInfo>> aggrQuery =
-        new EnumMap<>(GridCacheQueryType.class);
-
-    /** Parsed reads: queryType -> queryNodeId -> queryId -> reads. */
-    private final Map<GridCacheQueryType, Map<UUID, Map<Long, long[]>>> readsById =
-        new EnumMap<>(GridCacheQueryType.class);
-
-    /** Structure to store top of slow SQL queries: queryType -> duration -> query. */
-    private final Map<GridCacheQueryType, OrderedFixedSizeStructure<Long, Query>> topSlow =
-        new EnumMap<>(GridCacheQueryType.class);
-
-    /** {@inheritDoc} */
-    @Override public void query(GridCacheQueryType type, String text, long id, long startTime,
-        long duration, boolean success) {
-        UUID queryNodeId = currentNodeId();
-
-        Query query = new Query(type, text, queryNodeId, id, startTime, duration, success);
-
-        OrderedFixedSizeStructure<Long, Query> tree = topSlow.computeIfAbsent(type,
-            t -> new OrderedFixedSizeStructure<>());
-
-        tree.put(duration, query);
-
-        AggregatedQueryInfo info = aggrQuery.computeIfAbsent(type, t -> new HashMap<>())
-            .computeIfAbsent(text, k -> new AggregatedQueryInfo());
-
-        info.merge(queryNodeId, id, duration, success);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void queryReads(GridCacheQueryType type, UUID queryNodeId, long id, long logicalReads,
-        long physicalReads) {
-
-        Map<Long, long[]> ids = readsById.computeIfAbsent(type, t -> new HashMap<>())
-            .computeIfAbsent(queryNodeId, k -> new HashMap<>());
-
-        long[] readsArr = ids.computeIfAbsent(id, k -> new long[] {0, 0});
-
-        readsArr[0] += logicalReads;
-        readsArr[1] += physicalReads;
-    }
-
-    /** {@inheritDoc} */
-    @Override public Map<String, JsonNode> results() {
-        ObjectNode sqlRes = MAPPER.createObjectNode();
-        ObjectNode scanRes = MAPPER.createObjectNode();
-
-        buildResult(GridCacheQueryType.SQL_FIELDS, sqlRes);
-        buildResult(GridCacheQueryType.SCAN, scanRes);
-
-        ArrayNode topSlowSql = MAPPER.createArrayNode();
-        ArrayNode topSlowScan = MAPPER.createArrayNode();
-
-        buildTopSlowResult(GridCacheQueryType.SQL_FIELDS, topSlowSql);
-        buildTopSlowResult(GridCacheQueryType.SCAN, topSlowScan);
-
-        return F.asMap("sql", sqlRes, "scan", scanRes, "topSlowSql", topSlowSql, "topSlowScan", topSlowScan);
-    }
-
-    /** Builds JSON. */
-    private void buildResult(GridCacheQueryType type, ObjectNode jsonRes) {
-        if (!aggrQuery.containsKey(type))
-            return;
-
-        Map<String, AggregatedQueryInfo> res = aggrQuery.get(type);
-
-        res.forEach((text, info) -> {
-            info.ids.forEach((uuid, ids) -> {
-                if (!readsById.containsKey(type) || !readsById.get(type).containsKey(uuid))
-                    return;
-
-                Map<Long, long[]> reads = readsById.get(type).get(uuid);
-
-                ids.forEach(id -> {
-                    long[] readsArr = reads.get(id);
-
-                    if (readsArr == null)
-                        return;
-
-                    info.logicalReads += readsArr[0];
-                    info.physicalReads += readsArr[1];
-                });
-            });
-
-            ObjectNode sql = (ObjectNode)jsonRes.get(text);
-
-            if (sql == null) {
-                sql = MAPPER.createObjectNode();
-
-                sql.put("count", info.count);
-                sql.put("duration", TimeUnit.NANOSECONDS.toMillis(info.totalDuration));
-                sql.put("logicalReads", info.logicalReads);
-                sql.put("physicalReads", info.physicalReads);
-                sql.put("failures", info.failures);
-
-                jsonRes.set(text, sql);
-            }
-        });
-    }
-
-    /** Builds JSON. */
-    private void buildTopSlowResult(GridCacheQueryType type, ArrayNode jsonRes) {
-        if (!topSlow.containsKey(type))
-            return;
-
-        OrderedFixedSizeStructure<Long, Query> tree = topSlow.get(type);
-
-        tree.values().forEach(query -> {
-            ObjectNode json = MAPPER.createObjectNode();
-
-            json.put("text", query.text);
-            json.put("startTime", query.startTime);
-            json.put("duration", TimeUnit.NANOSECONDS.toMillis(query.duration));
-            json.put("nodeId", String.valueOf(query.queryNodeId));
-            json.put("success", query.success);
-            json.put("logicalReads", 0);
-            json.put("physicalReads", 0);
-
-            jsonRes.add(json);
-
-            if (!readsById.containsKey(type) || !readsById.get(type).containsKey(query.queryNodeId))
-                return;
-
-            long[] readsArr = readsById.get(type).get(query.queryNodeId).get(query.id);
-
-            if (readsArr == null)
-                return;
-
-            json.put("logicalReads", readsArr[0]);
-            json.put("physicalReads", readsArr[1]);
-        });
-    }
-
-    /** Aggregated query info. */
-    private static class AggregatedQueryInfo {
-        /** Executions count. */
-        int count;
-
-        /** Total duration. */
-        long totalDuration;
-
-        /** Number of logical reads. */
-        long logicalReads;
-
-        /** Number of physical reads. */
-        long physicalReads;
-
-        /** Failures count. */
-        int failures;
-
-        /** Query ids. Parsed from global query id: NodeId -> queryIds */
-        final Map<UUID, Set<Long>> ids = new HashMap<>();
-
-        /** */
-        public void addReads(long logicalReads, long physicalReads) {
-            this.logicalReads += logicalReads;
-            this.physicalReads += physicalReads;
-        }
-
-        /** */
-        public void merge(UUID queryNodeId, long id, long duration, boolean success) {
-            count += 1;
-            totalDuration += duration;
-
-            if (!success)
-                failures += 1;
-
-            ids.computeIfAbsent(queryNodeId, k -> new HashSet<>())
-                .add(id);
-        }
-    }
-
-    /** Query. */
-    public class Query {
-        /** Cache query type. */
-        final GridCacheQueryType type;
-
-        /** Query text in case of SQL query. Cache name in case of SCAN query. */
-        final String text;
-
-        /** Originating node id (as part of global query id). */
-        final UUID queryNodeId;
-
-        /** Query id. */
-        final long id;
-
-        /** Start time. */
-        final long startTime;
-
-        /** Duration. */
-        final long duration;
-
-        /** Success flag. */
-        final boolean success;
-
-        /**
-         * @param type Cache query type.
-         * @param text Query text in case of SQL query. Cache name in case of SCAN query.
-         * @param queryNodeId Originating node id.
-         * @param id Query id.
-         * @param startTime Start time.
-         * @param duration Duration.
-         * @param success Success flag.
-         */
-        public Query(GridCacheQueryType type, String text, UUID queryNodeId, long id, long startTime, long duration,
-            boolean success) {
-            this.type = type;
-            this.text = text;
-            this.queryNodeId = queryNodeId;
-            this.id = id;
-            this.startTime = startTime;
-            this.duration = duration;
-            this.success = success;
-        }
-    }
-}
diff --git a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/TransactionsHandler.java b/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/TransactionsHandler.java
deleted file mode 100644
index 9dc67231c3735..0000000000000
--- a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/handlers/TransactionsHandler.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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.ignite.internal.profiling.handlers;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import org.apache.ignite.internal.processors.metric.impl.HistogramMetricImpl;
-import org.apache.ignite.internal.util.GridIntIterator;
-import org.apache.ignite.internal.util.GridIntList;
-import org.apache.ignite.internal.util.typedef.internal.U;
-
-import static org.apache.ignite.internal.profiling.ProfilingFilesParser.currentNodeId;
-import static org.apache.ignite.internal.profiling.util.Utils.MAPPER;
-import static org.apache.ignite.internal.profiling.util.Utils.createArrayIfAbsent;
-import static org.apache.ignite.internal.profiling.util.Utils.createObjectIfAbsent;
-
-/**
- * Builds JSON with aggregated transaction statistics and durations histogram.
- *
- * Example:
- * <pre>
- * {
- *    $nodeId : {
- *       $cacheId : {
- *          $txState : [ [ $startTime, $count] ]
- *       }
- *    }
- * }
- * </pre>
- */
-public class TransactionsHandler implements IgniteProfilingHandler {
-    /** Field name of aggregated by caches/nodes values. */
-    private static final String TOTAL = "total";
-
-    /** Transaction durations histogram buckets in milliseconds. */
-    public static final long[] HISTOGRAM_BUCKETS = new long[] {1, 10, 100, 250, 1000};
-
-    /** Aggregated results: nodeId -> cacheId -> txState -> aggregatedResults. */
-    private final Map<UUID, Map<Integer, Map<TransactionState, Map<Long, Integer>>>> res = new HashMap<>();
-
-    /** Transaction durations histogram data: nodeId -> cacheId -> histogram. */
-    private final Map<UUID, Map<Integer, HistogramMetricImpl>> histogram = new HashMap<>();
-
-    /** {@inheritDoc} */
-    @Override public void transaction(GridIntList cacheIds, long startTime, long duration, boolean commit) {
-        ArrayList<Integer> cacheIdsArr = new ArrayList<>(cacheIds.size() + 1);
-
-        // cacheId=0 means aggregate by all caches.
-        cacheIdsArr.add(0);
-
-        GridIntIterator iter = cacheIds.iterator();
-
-        while (iter.hasNext())
-            cacheIdsArr.add(iter.next());
-
-        // nodeId=null means aggregate by all nodes.
-        UUID[] nodesId = new UUID[] {null, currentNodeId()};
-
-        long aggrTime = startTime / 1000 * 1000;
-
-        for (UUID nodeId : nodesId) {
-            for (Integer cacheId : cacheIdsArr) {
-                res.computeIfAbsent(nodeId, s -> new HashMap<>())
-                    .computeIfAbsent(cacheId, s -> new EnumMap<>(TransactionState.class))
-                    .computeIfAbsent(commit ? TransactionState.COMMIT : TransactionState.ROLLBACK, s -> new HashMap<>())
-                    .compute(aggrTime, (time, count) -> count == null ? 1 : count + 1);
-
-                histogram.computeIfAbsent(nodeId, s -> new HashMap<>())
-                    .computeIfAbsent(cacheId, s -> new HistogramMetricImpl("", null, HISTOGRAM_BUCKETS))
-                    .value(U.nanosToMillis(duration));
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public Map<String, JsonNode> results() {
-        ObjectNode jsonRes = resultsToJson();
-        ObjectNode histogram = histogramToJson();
-
-        ArrayNode buckets = MAPPER.createArrayNode();
-
-        Arrays.stream(HISTOGRAM_BUCKETS).forEach(buckets::add);
-
-        return U.map("tx", jsonRes, "txHistogram", histogram, "txHistogramBuckets", buckets);
-    }
-
-    /** Builds JSON. */
-    private ObjectNode resultsToJson() {
-        ObjectNode json = MAPPER.createObjectNode();
-
-        res.forEach((nodeId, cachesMap) -> {
-            ObjectNode nodesInfo = createObjectIfAbsent(nodeId == null ? TOTAL : String.valueOf(nodeId), json);
-
-            cachesMap.forEach((cacheId, opsMap) -> {
-                ObjectNode cachesInfo = createObjectIfAbsent(cacheId == 0 ? TOTAL : String.valueOf(cacheId), nodesInfo);
-
-                opsMap.forEach((opType, timingMap) -> {
-                    ArrayNode op = createArrayIfAbsent(opType.name().toLowerCase(), cachesInfo);
-
-                    timingMap.forEach((time, count) -> {
-                        ArrayNode arr = MAPPER.createArrayNode();
-
-                        arr.add(time);
-                        arr.add(count);
-
-                        op.add(arr);
-                    });
-                });
-            });
-        });
-
-        return json;
-    }
-
-    /** Builds JSON. */
-    private ObjectNode histogramToJson() {
-        ObjectNode json = MAPPER.createObjectNode();
-
-        histogram.forEach((nodeId, map) -> {
-            ObjectNode nodesInfo = createObjectIfAbsent(nodeId == null ? TOTAL : String.valueOf(nodeId), json);
-
-            map.forEach((cacheId, metric) -> {
-                ArrayNode values = createArrayIfAbsent(cacheId == 0 ? TOTAL : String.valueOf(cacheId), nodesInfo);
-
-                Arrays.stream(metric.value()).forEach(values::add);
-            });
-        });
-
-        return json;
-    }
-
-    /** */
-    private enum TransactionState {
-        /** */
-        COMMIT,
-
-        /** */
-        ROLLBACK
-    }
-}
diff --git a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/util/OrderedFixedSizeStructure.java b/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/util/OrderedFixedSizeStructure.java
deleted file mode 100644
index b5b1969778e65..0000000000000
--- a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/util/OrderedFixedSizeStructure.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.ignite.internal.profiling.util;
-
-import java.util.Collection;
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-/**
- * Data structure for keeping the top N elements in DESC sort order.
- *
- * @param <K> Key.
- * @param <V> Value.
- */
-public class OrderedFixedSizeStructure<K extends Comparable<? super K>, V> {
-    /** Default capacity. */
-    private static final int DEFAULT_SIZE = 30;
-
-    /** Capacity. */
-    private final int capacity;
-
-    /** Map to store elements. */
-    private final NavigableMap<K, V> map = new TreeMap<>();
-
-    /** */
-    public OrderedFixedSizeStructure() {
-        this(DEFAULT_SIZE);
-    }
-
-    /**
-     * @param capacity The capacity.
-     */
-    public OrderedFixedSizeStructure(int capacity) {
-        this.capacity = capacity;
-    }
-
-    /**
-     * @param key Key.
-     * @param value Value.
-     */
-    public void put(K key, V value) {
-        if (map.size() < capacity) {
-            map.put(key, value);
-
-            return;
-        }
-
-        if (map.firstKey().compareTo(key) < 0) {
-            map.pollFirstEntry();
-
-            map.put(key, value);
-        }
-    }
-
-    /** @return Values. */
-    public Collection<V> values() {
-        return map.values();
-    }
-}
diff --git a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/util/ProfilingDeserializer.java b/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/util/ProfilingDeserializer.java
deleted file mode 100644
index 18d74221fa6a5..0000000000000
--- a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/util/ProfilingDeserializer.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * 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.ignite.internal.profiling.util;
-
-import java.nio.ByteBuffer;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType;
-import org.apache.ignite.internal.profiling.IgniteProfiling;
-import org.apache.ignite.internal.profiling.IgniteProfiling.CacheOperationType;
-import org.apache.ignite.internal.profiling.LogFileProfiling;
-import org.apache.ignite.internal.profiling.LogFileProfiling.OperationType;
-import org.apache.ignite.internal.util.GridIntList;
-import org.apache.ignite.lang.IgniteUuid;
-
-import static org.apache.ignite.internal.profiling.LogFileProfiling.readIgniteUuid;
-import static org.apache.ignite.internal.profiling.LogFileProfiling.readUuid;
-
-/**
- * Profiling operations deserializer.
- *
- * @see LogFileProfiling
- */
-public class ProfilingDeserializer implements AutoCloseable {
-    /** Cached strings by id. */
-    private final ConcurrentHashMap<Short, String> stringById = new ConcurrentHashMap<>();
-
-    /** Handlers to process deserialized operation. */
-    private final IgniteProfiling[] handlers;
-
-    /** @param handlers Handlers to process deserialized operation. */
-    public ProfilingDeserializer(IgniteProfiling... handlers) {
-        this.handlers = handlers;
-    }
-
-    /**
-     * Tries to deserialize profiling operation from buffer.
-     *
-     * @param buf Buffer.
-     * @return {@code True} if operation parsed. {@code False} if not enough bytes.
-     */
-    public boolean deserialize(ByteBuffer buf) {
-        int pos = buf.position();
-
-        if (buf.remaining() < 1)
-            return false;
-
-        byte opTypeByte = buf.get();
-
-        OperationType opType = OperationType.fromOrdinal(opTypeByte);
-
-        switch (opType) {
-            case CACHE_OPERATION: {
-                if (buf.remaining() < 1 + 4 + 8 + 8)
-                    break;
-
-                CacheOperationType cacheOp = CacheOperationType.fromOrdinal(buf.get());
-                int cacheId = buf.getInt();
-                long startTime = buf.getLong();
-                long duration = buf.getLong();
-
-                for (IgniteProfiling handler : handlers)
-                    handler.cacheOperation(cacheOp, cacheId, startTime, duration);
-
-                return true;
-            }
-
-            case TRANSACTION: {
-                if (buf.remaining() < 4)
-                    break;
-
-                int cacheIdsSize = buf.getInt();
-
-                if (buf.remaining() < 4 * cacheIdsSize + 8 + 8 + 1)
-                    break;
-
-                GridIntList cacheIds = new GridIntList(cacheIdsSize);
-
-                for (int i = 0; i < cacheIdsSize; i++)
-                    cacheIds.add(buf.getInt());
-
-                long startTime = buf.getLong();
-                long duration = buf.getLong();
-                boolean commit = buf.get() != 0;
-
-                for (IgniteProfiling handler : handlers)
-                    handler.transaction(cacheIds, startTime, duration, commit);
-
-                return true;
-            }
-
-            case QUERY: {
-                if (buf.remaining() < 1 + 1 + 2 + 8 + 8 + 8 + 1)
-                    break;
-
-                GridCacheQueryType queryType = GridCacheQueryType.fromOrdinal(buf.get());
-                boolean needReadString = buf.get() != 0;
-                short strId = buf.getShort();
-
-                String str;
-
-                if (needReadString) {
-                    int textLength = buf.getInt();
-
-                    if (buf.remaining() < textLength + 8 + 8 + 8 + 1)
-                        break;
-
-                    str = readString(buf, textLength);
-
-                    stringById.putIfAbsent(strId, str);
-                }
-                else
-                    str = stringById.get(strId);
-
-                long id = buf.getLong();
-                long startTime = buf.getLong();
-                long duration = buf.getLong();
-                boolean success = buf.get() != 0;
-
-                // TODO Delay deserealization.
-                if (str == null)
-                    return true;
-
-                for (IgniteProfiling handler : handlers)
-                    handler.query(queryType, str, id, startTime, duration, success);
-
-                return true;
-            }
-
-            case QUERY_READS: {
-                if (buf.remaining() < 1 + 16 + 8 + 8 + 8)
-                    break;
-
-                GridCacheQueryType queryType = GridCacheQueryType.fromOrdinal(buf.get());
-
-                UUID uuid = readUuid(buf);
-                long id = buf.getLong();
-                long logicalReads = buf.getLong();
-                long physicalReads = buf.getLong();
-
-                for (IgniteProfiling handler : handlers)
-                    handler.queryReads(queryType, uuid, id, logicalReads, physicalReads);
-
-                return true;
-            }
-
-            case TASK: {
-                if (buf.remaining() < 24 + 1 + 2 + 8 + 8 + 4)
-                    break;
-
-                IgniteUuid sesId = readIgniteUuid(buf);
-                boolean needReadString = buf.get() != 0;
-                short strId = buf.getShort();
-
-                String taskName;
-
-                if (needReadString) {
-                    int textLength = buf.getInt();
-
-                    if (buf.remaining() < textLength + 8 + 8 + 4)
-                        break;
-
-                    taskName = readString(buf, textLength);
-
-                    stringById.putIfAbsent(strId, taskName);
-                }
-                else
-                    taskName = stringById.get(strId);
-
-                long startTime = buf.getLong();
-                long duration = buf.getLong();
-                int affPartId = buf.getInt();
-
-                // TODO Delay deserealization.
-                if (taskName == null)
-                    return true;
-
-                for (IgniteProfiling handler : handlers)
-                    handler.task(sesId, taskName, startTime, duration, affPartId);
-
-                return true;
-            }
-
-            case JOB: {
-                if (buf.remaining() < 24 + 8 + 8 + 8 + 1)
-                    break;
-
-                IgniteUuid sesId = readIgniteUuid(buf);
-                long queuedTime = buf.getLong();
-                long startTime = buf.getLong();
-                long duration = buf.getLong();
-                boolean timedOut = buf.get() != 0;
-
-                for (IgniteProfiling handler : handlers)
-                    handler.job(sesId, queuedTime, startTime, duration, timedOut);
-
-                return true;
-            }
-
-            case CACHE_START: {
-                if (buf.remaining() < 4 + 8 + 4)
-                    break;
-
-                int cacheId = buf.getInt();
-                long startTime = buf.getLong();
-
-                int cacheNameLength = buf.getInt();
-
-                if (buf.remaining() < cacheNameLength + 4)
-                    break;
-
-                String cacheName = readString(buf, cacheNameLength);
-
-                int groupNameLength = buf.getInt();
-
-                if (buf.remaining() < groupNameLength + 1)
-                    break;
-
-                String groupName = readString(buf, groupNameLength);
-
-                boolean userCache = buf.get() != 0;
-
-                for (IgniteProfiling handler : handlers)
-                    handler.cacheStart(cacheId, startTime, cacheName, groupName, userCache);
-
-                return true;
-            }
-
-            case PROFILING_START: {
-                if (buf.remaining() < 20)
-                    break;
-
-                UUID nodeId = readUuid(buf);
-
-                int nameLen = buf.getInt();
-
-                if (buf.remaining() < nameLen + 4)
-                    break;
-
-                String instanceName = readString(buf, nameLen);
-
-                int verLen = buf.getInt();
-
-                if (buf.remaining() < verLen + 4)
-                    break;
-
-                String ver = readString(buf, verLen);
-
-                long startTime = buf.getLong();
-
-                for (IgniteProfiling handler : handlers)
-                    handler.profilingStart(nodeId, instanceName, ver, startTime);
-
-                return true;
-            }
-
-            default:
-                throw new RuntimeException("Unknown operation type id [typeId=" + opTypeByte + ']');
-        }
-
-        buf.position(pos);
-
-        return false;
-    }
-
-    /** Reads string from byte buffer. */
-    private static String readString(ByteBuffer buf, int size) {
-        byte[] bytes = new byte[size];
-
-        buf.get(bytes);
-
-        return new String(bytes);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void close() {
-        stringById.clear();
-    }
-}
diff --git a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/util/Utils.java b/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/util/Utils.java
deleted file mode 100644
index cf2259e84f524..0000000000000
--- a/modules/profiling/src/main/java/org/apache/ignite/internal/profiling/util/Utils.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.ignite.internal.profiling.util;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-/** */
-public class Utils {
-    /** Json mapper. */
-    public static final ObjectMapper MAPPER = new ObjectMapper();
-
-    /** Creates empty object for given value if absent. */
-    public static ObjectNode createObjectIfAbsent(String val, ObjectNode json) {
-        ObjectNode node = (ObjectNode)json.get(val);
-
-        if (node == null) {
-            node = MAPPER.createObjectNode();
-
-            json.set(val, node);
-        }
-
-        return node;
-    }
-
-    /** Creates empty array for given value if absent. */
-    public static ArrayNode createArrayIfAbsent(String val, ObjectNode json) {
-        ArrayNode node = (ArrayNode)json.get(val);
-
-        if (node == null) {
-            node = MAPPER.createArrayNode();
-
-            json.set(val, node);
-        }
-
-        return node;
-    }
-}
diff --git a/modules/profiling/src/test/java/org/apache/ignite/internal/TestProfilingLogReader.java b/modules/profiling/src/test/java/org/apache/ignite/internal/TestProfilingLogReader.java
deleted file mode 100644
index f804cb6b885fc..0000000000000
--- a/modules/profiling/src/test/java/org/apache/ignite/internal/TestProfilingLogReader.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * 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.ignite.internal;
-
-import java.nio.ByteBuffer;
-import java.util.UUID;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
-import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory;
-import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType;
-import org.apache.ignite.internal.profiling.IgniteProfiling;
-import org.apache.ignite.internal.profiling.util.ProfilingDeserializer;
-import org.apache.ignite.internal.util.GridIntList;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.testframework.GridTestUtils;
-import org.jetbrains.annotations.Nullable;
-
-import static java.nio.ByteBuffer.allocateDirect;
-import static java.nio.ByteOrder.nativeOrder;
-import static org.apache.ignite.internal.profiling.LogFileProfiling.DFLT_BUFFER_SIZE;
-import static org.apache.ignite.internal.profiling.LogFileProfiling.DFLT_FILE_MAX_SIZE;
-import static org.apache.ignite.internal.profiling.LogFileProfiling.profilingFile;
-
-/**
- * Test profiling file reader.
- */
-public class TestProfilingLogReader implements IgniteProfiling {
-    /** IO factory. */
-    private static final RandomAccessFileIOFactory ioFactory = new RandomAccessFileIOFactory();
-
-    /** File read buffer size. */
-    private static final int READ_BUFFER_SIZE = 512 * 1024;
-
-    /** File read buffer. */
-    private final ByteBuffer readBuf = allocateDirect(READ_BUFFER_SIZE).order(nativeOrder());
-
-    /** Log to write operations to. */
-    private final IgniteEx ignite;
-
-    /** Log to write operations to. */
-    private final IgniteLogger log;
-
-    /**
-     * @param ignite Ignite instance.
-     * @param log Log to write operations to.
-     */
-    TestProfilingLogReader(IgniteEx ignite, IgniteLogger log) {
-        this.ignite = ignite;
-        this.log = log;
-    }
-
-    /** Starts read profiling file to the configured log until node stoped. */
-    public void startRead() throws IgniteCheckedException {
-        ignite.context().metric().startProfiling(DFLT_FILE_MAX_SIZE, DFLT_BUFFER_SIZE, 0);
-
-        GridTestUtils.runAsync(() -> {
-            try (
-                FileIO io = ioFactory.create(profilingFile(ignite.context()));
-                ProfilingDeserializer des = new ProfilingDeserializer(this)
-            ) {
-                while (!ignite.context().isStopping()) {
-                    int read = io.read(readBuf);
-
-                    readBuf.flip();
-
-                    if (read < 0) {
-                        U.sleep(100);
-
-                        continue;
-                    }
-
-                    for (;;) {
-                        boolean deserialized = des.deserialize(readBuf);
-
-                        if (!deserialized)
-                            break;
-                    }
-
-                    readBuf.compact();
-                }
-            }
-
-            return null;
-        }, "profiling-file-reader-" + ignite.name());
-    }
-
-    /** {@inheritDoc} */
-    @Override public void cacheOperation(CacheOperationType type, int cacheId, long startTime, long duration) {
-        log("cacheOperation", "type", type, "cacheId", cacheId, "startTime", startTime,
-            "duration", duration);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void transaction(GridIntList cacheIds, long startTime, long duration, boolean commit) {
-        log("transaction", "cacheIds", cacheIds, "startTime", startTime, "duration", duration,
-            "commit", commit);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void query(GridCacheQueryType type, String text, long id, long startTime, long duration,
-        boolean success) {
-        log("query", "type", type, "text", text, "id", id, "startTime", startTime,
-            "duration", duration, "success", success);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void queryReads(GridCacheQueryType type, UUID queryNodeId, long id, long logicalReads,
-        long physicalReads) {
-        log("queryReads", "type", type, "queryNodeId", queryNodeId, "id", id,
-            "logicalReads", logicalReads, "physicalReads", physicalReads);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void task(IgniteUuid sesId, String taskName, long startTime, long duration, int affPartId) {
-        log("task", "sesId", sesId, "taskName", taskName, "startTime", startTime,
-            "duration", duration, "affPartId", affPartId);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void job(IgniteUuid sesId, long queuedTime, long startTime, long duration, boolean timedOut) {
-        log("job", "sesId", sesId, "queuedTime", queuedTime, "startTime", startTime,
-            "duration", duration, "timedOut", timedOut);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void cacheStart(int cacheId, long startTime, String cacheName, @Nullable String groupName,
-        boolean userCache) {
-        log("cacheStart", "startTime", startTime, "cacheName", cacheName, "groupName", groupName,
-            "userCache", userCache);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void profilingStart(UUID nodeId, String igniteInstanceName, String igniteVersion, long startTime) {
-        log("profilingStart", "nodeId", nodeId, "igniteInstanceName", igniteInstanceName,
-            "igniteVersion", igniteVersion, "startTime", startTime);
-    }
-
-    /**
-     * Logs operations.
-     *
-     * @param category Profile category.
-     * @param tuples Tuples to log (key, value).
-     */
-    private void log(String category, Object... tuples) {
-        assert tuples.length % 2 == 0;
-
-        StringBuilder sb = new StringBuilder();
-
-        sb.append(category).append(" [");
-
-        for (int i = 0; i < tuples.length; i += 2) {
-            sb.append(tuples[i]).append("=").append(tuples[i + 1]);
-
-            if (i < tuples.length - 2)
-                sb.append(", ");
-        }
-
-        sb.append(']');
-
-        log.info(sb.toString());
-    }
-}
diff --git a/modules/profiling/src/test/java/org/apache/ignite/internal/package-info.java b/modules/profiling/src/test/java/org/apache/ignite/internal/package-info.java
deleted file mode 100644
index c67c2577aa6dc..0000000000000
--- a/modules/profiling/src/test/java/org/apache/ignite/internal/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 description. -->
- * Profiling tests.
- */
-
-package org.apache.ignite.internal;
diff --git a/pom.xml b/pom.xml
index b2f7e9efd1d2d..ede52d1321b16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,6 @@
         <module>modules/ml/xgboost-model-parser</module>
         <module>modules/ml/h2o-model-parser</module>
         <module>modules/opencensus</module>
-        <module>modules/profiling</module>
     </modules>
 
     <profiles>