This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 6efa15c23f Modify the format of timebucket in ExtractorSpec (#9988)
6efa15c23f is described below
commit 6efa15c23fbe895e05ca236bba8cd950be99c787
Author: yswdqz <[email protected]>
AuthorDate: Sat Nov 19 11:33:11 2022 +0800
Modify the format of timebucket in ExtractorSpec (#9988)
---
.../analyzer/dsl/spec/extractor/ExtractorSpec.java | 20 ++++++++++----------
.../cases/mysql/mysql-slowsql/fluent-bit-script.lua | 2 +-
.../postgres-exporter/fluent-bit-script.lua | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
index bcad590f0d..96c0d3fefc 100644
---
a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
+++
b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
@@ -23,10 +23,6 @@ import com.google.common.collect.ImmutableMap;
import groovy.lang.Closure;
import groovy.lang.DelegatesTo;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
import java.util.Collection;
import java.util.Map;
import java.util.Objects;
@@ -50,13 +46,17 @@ import
org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyBuilder;
import
org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.DatabaseSlowStatementBuilder;
import
org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.SampledTraceBuilder;
import org.apache.skywalking.oap.server.core.CoreModule;
+import org.apache.skywalking.oap.server.core.analysis.DownSampling;
import org.apache.skywalking.oap.server.core.analysis.Layer;
+import org.apache.skywalking.oap.server.core.analysis.TimeBucket;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterSystem;
import org.apache.skywalking.oap.server.core.analysis.record.Record;
import
org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor;
import org.apache.skywalking.oap.server.core.config.NamingControl;
import org.apache.skywalking.oap.server.core.source.DatabaseSlowStatement;
+
import org.apache.skywalking.oap.server.core.source.ISource;
+
import org.apache.skywalking.oap.server.core.source.ServiceMeta;
import org.apache.skywalking.oap.server.core.source.SourceReceiver;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
@@ -80,8 +80,6 @@ public class ExtractorSpec extends AbstractSpec {
private final SourceReceiver sourceReceiver;
- private static final DateTimeFormatter DTF =
DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
-
public ExtractorSpec(final ModuleManager moduleManager,
final LogAnalyzerModuleConfig moduleConfig) throws
ModuleStartException {
super(moduleManager, moduleConfig);
@@ -269,13 +267,12 @@ public class ExtractorSpec extends AbstractSpec {
DatabaseSlowStatementBuilder builder = new
DatabaseSlowStatementBuilder(namingControl);
builder.setLayer(Layer.nameOf(log.getLayer()));
- LocalDateTime localDateTime =
Instant.ofEpochSecond(log.getTimestamp()).atZone(ZoneId.systemDefault()).toLocalDateTime();
- String timeBucket = DTF.format(localDateTime);
- builder.setTimeBucket(Long.parseLong(timeBucket));
+ long timeBucket = TimeBucket.getTimeBucket(log.getTimestamp(),
DownSampling.Minute);
builder.setServiceName(log.getService());
ServiceMeta serviceMeta = new ServiceMeta();
- serviceMeta.setName(namingControl.formatServiceName(log.getService()));
+ String serviceName = namingControl.formatServiceName(log.getService());
+ serviceMeta.setName(serviceName);
serviceMeta.setLayer(builder.getLayer());
serviceMeta.setTimeBucket(builder.getTimeBucket());
BINDING.get().databaseSlowStatement(builder);
@@ -290,6 +287,9 @@ public class ExtractorSpec extends AbstractSpec {
return;
}
+ long timeBucketForDB = TimeBucket.getTimeBucket(log.getTimestamp(),
DownSampling.Second);
+ builder.setTimeBucket(timeBucketForDB);
+
String entityId = serviceMeta.getEntityId();
builder.prepare();
DatabaseSlowStatement databaseSlowStatement =
builder.toDatabaseSlowStatement();
diff --git a/test/e2e-v2/cases/mysql/mysql-slowsql/fluent-bit-script.lua
b/test/e2e-v2/cases/mysql/mysql-slowsql/fluent-bit-script.lua
index c01d3ad5ae..abf6cd7058 100644
--- a/test/e2e-v2/cases/mysql/mysql-slowsql/fluent-bit-script.lua
+++ b/test/e2e-v2/cases/mysql/mysql-slowsql/fluent-bit-script.lua
@@ -34,7 +34,7 @@ function rewrite_body(tag, timestamp, record)
h1 = string.sub(time,9,10)
min1 = string.sub(time,11,12)
s1 = string.sub(time,13,14)
- re1["time"] = os.time()
+ re1["time"] = os.time() * 1000
re1["layer"] = "MYSQL"
record["layer"] = "MYSQL"
diff --git
a/test/e2e-v2/cases/postgresql/postgres-exporter/fluent-bit-script.lua
b/test/e2e-v2/cases/postgresql/postgres-exporter/fluent-bit-script.lua
index 3c1ba54983..46d2326ebc 100644
--- a/test/e2e-v2/cases/postgresql/postgres-exporter/fluent-bit-script.lua
+++ b/test/e2e-v2/cases/postgresql/postgres-exporter/fluent-bit-script.lua
@@ -23,7 +23,7 @@ function rewrite_body(tag, timestamp, record)
arr = split(log,"\n")
re1 = {}
- re1["time"] = os.time()
+ re1["time"] = os.time() * 1000
re1["layer"] = "POSTGRESQL"
record["layer"] = "POSTGRESQL"
