Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
4be7a2ef
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
4be7a2ef
编写于
12月 05, 2022
作者:
wu-sheng
提交者:
GitHub
12月 05, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polish codes - provide default implementations for IConsumer. (#10087)
上级
d8fce128
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
14 addition
and
130 deletion
+14
-130
oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCMetricsExporter.java
...ap/server/exporter/provider/grpc/GRPCMetricsExporter.java
+0
-11
oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/kafka/log/KafkaLogExporter.java
.../server/exporter/provider/kafka/log/KafkaLogExporter.java
+0
-11
oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/kafka/trace/KafkaTraceExporter.java
...ver/exporter/provider/kafka/trace/KafkaTraceExporter.java
+0
-11
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
...p/server/core/analysis/worker/MetricsAggregateWorker.java
+4
-13
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsPersistentWorker.java
.../server/core/analysis/worker/MetricsPersistentWorker.java
+0
-10
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/TopNWorker.java
...kywalking/oap/server/core/analysis/worker/TopNWorker.java
+2
-12
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java
...lking/oap/server/core/remote/client/GRPCRemoteClient.java
+2
-11
oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/IConsumer.java
...ng/oap/server/library/datacarrier/consumer/IConsumer.java
+4
-3
oap-server/server-library/library-datacarrier-queue/src/test/java/org/apache/skywalking/oap/server/library/datacarrier/DataCarrierTest.java
...lking/oap/server/library/datacarrier/DataCarrierTest.java
+0
-14
oap-server/server-library/library-datacarrier-queue/src/test/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/ConsumerTest.java
...oap/server/library/datacarrier/consumer/ConsumerTest.java
+0
-11
oap-server/server-library/library-datacarrier-queue/src/test/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/SampleConsumer.java
...p/server/library/datacarrier/consumer/SampleConsumer.java
+0
-11
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCBatchDAO.java
...p/server/storage/plugin/jdbc/common/dao/JDBCBatchDAO.java
+2
-12
未找到文件。
oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCMetricsExporter.java
浏览文件 @
4be7a2ef
...
...
@@ -22,7 +22,6 @@ import io.grpc.ManagedChannel;
import
io.grpc.stub.StreamObserver
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Properties
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
java.util.concurrent.locks.ReentrantLock
;
...
...
@@ -131,11 +130,6 @@ public class GRPCMetricsExporter extends MetricFormatter implements MetricValues
}
}
@Override
public
void
init
(
final
Properties
properties
)
{
}
@Override
public
void
consume
(
List
<
ExportData
>
data
)
{
GRPCStreamStatus
status
=
new
GRPCStreamStatus
();
...
...
@@ -239,11 +233,6 @@ public class GRPCMetricsExporter extends MetricFormatter implements MetricValues
log
.
error
(
t
.
getMessage
(),
t
);
}
@Override
public
void
onExit
()
{
}
private
boolean
eventTypeMatch
(
ExportEvent
.
EventType
eventType
,
org
.
apache
.
skywalking
.
oap
.
server
.
exporter
.
grpc
.
EventType
subscriptionType
)
{
return
(
ExportEvent
.
EventType
.
INCREMENT
.
equals
(
eventType
)
&&
EventType
.
INCREMENT
.
equals
(
subscriptionType
))
...
...
oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/kafka/log/KafkaLogExporter.java
浏览文件 @
4be7a2ef
...
...
@@ -20,7 +20,6 @@ package org.apache.skywalking.oap.server.exporter.provider.kafka.log;
import
com.google.protobuf.InvalidProtocolBufferException
;
import
java.util.List
;
import
java.util.Properties
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.kafka.clients.producer.ProducerRecord
;
import
org.apache.kafka.common.utils.Bytes
;
...
...
@@ -94,11 +93,6 @@ public class KafkaLogExporter extends KafkaExportProducer implements LogExportSe
return
setting
.
isEnableKafkaLog
();
}
@Override
public
void
init
(
final
Properties
properties
)
{
}
@Override
public
void
consume
(
final
List
<
LogRecord
>
data
)
{
for
(
LogRecord
logRecord
:
data
)
{
...
...
@@ -131,11 +125,6 @@ public class KafkaLogExporter extends KafkaExportProducer implements LogExportSe
}
@Override
public
void
onExit
()
{
}
private
LogData
transLogData
(
LogRecord
logRecord
)
throws
InvalidProtocolBufferException
{
LogData
.
Builder
builder
=
LogData
.
newBuilder
();
LogDataBody
.
Builder
bodyBuilder
=
LogDataBody
.
newBuilder
();
...
...
oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/kafka/trace/KafkaTraceExporter.java
浏览文件 @
4be7a2ef
...
...
@@ -20,7 +20,6 @@ package org.apache.skywalking.oap.server.exporter.provider.kafka.trace;
import
com.google.protobuf.InvalidProtocolBufferException
;
import
java.util.List
;
import
java.util.Properties
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.kafka.clients.producer.ProducerRecord
;
import
org.apache.kafka.common.utils.Bytes
;
...
...
@@ -85,11 +84,6 @@ public class KafkaTraceExporter extends KafkaExportProducer implements TraceExpo
return
setting
.
isEnableKafkaTrace
();
}
@Override
public
void
init
(
final
Properties
properties
)
{
}
@Override
public
void
consume
(
final
List
<
SegmentRecord
>
data
)
{
for
(
SegmentRecord
segmentRecord
:
data
)
{
...
...
@@ -122,9 +116,4 @@ public class KafkaTraceExporter extends KafkaExportProducer implements TraceExpo
public
void
onError
(
final
List
<
SegmentRecord
>
data
,
final
Throwable
t
)
{
}
@Override
public
void
onExit
()
{
}
}
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
浏览文件 @
4be7a2ef
...
...
@@ -19,16 +19,15 @@
package
org.apache.skywalking.oap.server.core.analysis.worker
;
import
java.util.List
;
import
java.util.Properties
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.skywalking.oap.server.library.datacarrier.DataCarrier
;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.BulkConsumePool
;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.ConsumerPoolFactory
;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer
;
import
org.apache.skywalking.oap.server.core.UnexpectedException
;
import
org.apache.skywalking.oap.server.core.analysis.data.MergableBufferedData
;
import
org.apache.skywalking.oap.server.core.analysis.metrics.Metrics
;
import
org.apache.skywalking.oap.server.core.worker.AbstractWorker
;
import
org.apache.skywalking.oap.server.library.datacarrier.DataCarrier
;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.BulkConsumePool
;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.ConsumerPoolFactory
;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer
;
import
org.apache.skywalking.oap.server.library.module.ModuleDefineHolder
;
import
org.apache.skywalking.oap.server.telemetry.TelemetryModule
;
import
org.apache.skywalking.oap.server.telemetry.api.CounterMetrics
;
...
...
@@ -130,10 +129,6 @@ public class MetricsAggregateWorker extends AbstractWorker<Metrics> {
}
private
class
AggregatorConsumer
implements
IConsumer
<
Metrics
>
{
@Override
public
void
init
(
final
Properties
properties
)
{
}
@Override
public
void
consume
(
List
<
Metrics
>
data
)
{
MetricsAggregateWorker
.
this
.
onWork
(
data
);
...
...
@@ -144,10 +139,6 @@ public class MetricsAggregateWorker extends AbstractWorker<Metrics> {
log
.
error
(
t
.
getMessage
(),
t
);
}
@Override
public
void
onExit
()
{
}
@Override
public
void
nothingToConsume
()
{
flush
();
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsPersistentWorker.java
浏览文件 @
4be7a2ef
...
...
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Optional
;
import
java.util.Properties
;
import
java.util.stream.Collectors
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.skywalking.oap.server.core.CoreModule
;
...
...
@@ -401,11 +400,6 @@ public class MetricsPersistentWorker extends PersistenceWorker<Metrics> {
* ID is declared through {@link Object#hashCode()} and {@link Object#equals(Object)} as usual.
*/
private
class
PersistentConsumer
implements
IConsumer
<
Metrics
>
{
@Override
public
void
init
(
final
Properties
properties
)
{
}
@Override
public
void
consume
(
List
<
Metrics
>
data
)
{
MetricsPersistentWorker
.
this
.
onWork
(
data
);
...
...
@@ -415,9 +409,5 @@ public class MetricsPersistentWorker extends PersistenceWorker<Metrics> {
public
void
onError
(
List
<
Metrics
>
data
,
Throwable
t
)
{
log
.
error
(
t
.
getMessage
(),
t
);
}
@Override
public
void
onExit
()
{
}
}
}
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/TopNWorker.java
浏览文件 @
4be7a2ef
...
...
@@ -21,16 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.worker;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Properties
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.skywalking.oap.server.library.datacarrier.DataCarrier
;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer
;
import
org.apache.skywalking.oap.server.core.analysis.data.LimitedSizeBufferedData
;
import
org.apache.skywalking.oap.server.core.analysis.data.ReadWriteSafeCache
;
import
org.apache.skywalking.oap.server.core.analysis.topn.TopN
;
import
org.apache.skywalking.oap.server.core.storage.IRecordDAO
;
import
org.apache.skywalking.oap.server.core.storage.model.Model
;
import
org.apache.skywalking.oap.server.library.client.request.PrepareRequest
;
import
org.apache.skywalking.oap.server.library.datacarrier.DataCarrier
;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer
;
import
org.apache.skywalking.oap.server.library.module.ModuleDefineHolder
;
/**
...
...
@@ -97,10 +96,6 @@ public class TopNWorker extends PersistenceWorker<TopN> {
}
private
class
TopNConsumer
implements
IConsumer
<
TopN
>
{
@Override
public
void
init
(
final
Properties
properties
)
{
}
@Override
public
void
consume
(
List
<
TopN
>
data
)
{
TopNWorker
.
this
.
onWork
(
data
);
...
...
@@ -110,10 +105,5 @@ public class TopNWorker extends PersistenceWorker<TopN> {
public
void
onError
(
List
<
TopN
>
data
,
Throwable
t
)
{
log
.
error
(
t
.
getMessage
(),
t
);
}
@Override
public
void
onExit
()
{
}
}
}
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java
浏览文件 @
4be7a2ef
...
...
@@ -24,17 +24,16 @@ import io.grpc.stub.StreamObserver;
import
io.netty.handler.ssl.SslContext
;
import
java.util.List
;
import
java.util.Objects
;
import
java.util.Properties
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.skywalking.oap.server.library.datacarrier.DataCarrier
;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer
;
import
org.apache.skywalking.oap.server.core.remote.data.StreamData
;
import
org.apache.skywalking.oap.server.core.remote.grpc.proto.Empty
;
import
org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteMessage
;
import
org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteServiceGrpc
;
import
org.apache.skywalking.oap.server.library.client.grpc.GRPCClient
;
import
org.apache.skywalking.oap.server.library.datacarrier.DataCarrier
;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer
;
import
org.apache.skywalking.oap.server.library.module.ModuleDefineHolder
;
import
org.apache.skywalking.oap.server.telemetry.TelemetryModule
;
import
org.apache.skywalking.oap.server.telemetry.api.CounterMetrics
;
...
...
@@ -154,10 +153,6 @@ public class GRPCRemoteClient implements RemoteClient {
}
class
RemoteMessageConsumer
implements
IConsumer
<
RemoteMessage
>
{
@Override
public
void
init
(
final
Properties
properties
)
{
}
@Override
public
void
consume
(
List
<
RemoteMessage
>
remoteMessages
)
{
try
{
...
...
@@ -177,10 +172,6 @@ public class GRPCRemoteClient implements RemoteClient {
public
void
onError
(
List
<
RemoteMessage
>
remoteMessages
,
Throwable
t
)
{
log
.
error
(
t
.
getMessage
(),
t
);
}
@Override
public
void
onExit
()
{
}
}
/**
...
...
oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/IConsumer.java
浏览文件 @
4be7a2ef
...
...
@@ -22,19 +22,20 @@ import java.util.List;
import
java.util.Properties
;
public
interface
IConsumer
<
T
>
{
void
init
(
final
Properties
properties
);
default
void
init
(
final
Properties
properties
)
{
}
void
consume
(
List
<
T
>
data
);
void
onError
(
List
<
T
>
data
,
Throwable
t
);
void
onExit
();
default
void
onExit
()
{
}
/**
* Notify the implementation, if there is nothing fetched from the queue. This could be used as a timer to trigger
* reaction if the queue has no element.
*/
default
void
nothingToConsume
()
{
return
;
}
}
oap-server/server-library/library-datacarrier-queue/src/test/java/org/apache/skywalking/oap/server/library/datacarrier/DataCarrierTest.java
浏览文件 @
4be7a2ef
...
...
@@ -20,14 +20,12 @@ package org.apache.skywalking.oap.server.library.datacarrier;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Properties
;
import
org.apache.skywalking.oap.server.library.datacarrier.buffer.BufferStrategy
;
import
org.apache.skywalking.oap.server.library.datacarrier.buffer.Channels
;
import
org.apache.skywalking.oap.server.library.datacarrier.buffer.QueueBuffer
;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer
;
import
org.apache.skywalking.oap.server.library.datacarrier.partition.ProducerThreadPartitioner
;
import
org.apache.skywalking.oap.server.library.datacarrier.partition.SimpleRollingPartitioner
;
import
org.junit.Assert
;
import
org.junit.Test
;
import
org.powermock.api.support.membermodification.MemberModifier
;
...
...
@@ -119,13 +117,6 @@ public class DataCarrierTest {
e
.
printStackTrace
();
}
IConsumer
<
SampleData
>
consumer
=
new
IConsumer
<
SampleData
>()
{
int
i
=
0
;
@Override
public
void
init
(
final
Properties
properties
)
{
}
@Override
public
void
consume
(
List
<
SampleData
>
data
)
{
...
...
@@ -135,11 +126,6 @@ public class DataCarrierTest {
public
void
onError
(
List
<
SampleData
>
data
,
Throwable
t
)
{
}
@Override
public
void
onExit
()
{
}
};
carrier
.
consume
(
consumer
,
1
);
}).
start
();
...
...
oap-server/server-library/library-datacarrier-queue/src/test/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/ConsumerTest.java
浏览文件 @
4be7a2ef
...
...
@@ -21,7 +21,6 @@ package org.apache.skywalking.oap.server.library.datacarrier.consumer;
import
java.util.ArrayList
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Properties
;
import
java.util.concurrent.LinkedBlockingQueue
;
import
org.apache.skywalking.oap.server.library.datacarrier.DataCarrier
;
import
org.apache.skywalking.oap.server.library.datacarrier.SampleData
;
...
...
@@ -104,11 +103,6 @@ public class ConsumerTest {
public
boolean
onError
=
false
;
@Override
public
void
init
(
final
Properties
properties
)
{
}
@Override
public
void
consume
(
List
<
SampleData
>
data
)
{
if
(
onError
)
{
...
...
@@ -120,11 +114,6 @@ public class ConsumerTest {
public
void
onError
(
List
<
SampleData
>
data
,
Throwable
t
)
{
IS_OCCUR_ERROR
=
true
;
}
@Override
public
void
onExit
()
{
}
}
private
IConsumer
getConsumer
(
DataCarrier
<
SampleData
>
carrier
)
throws
IllegalAccessException
{
...
...
oap-server/server-library/library-datacarrier-queue/src/test/java/org/apache/skywalking/oap/server/library/datacarrier/consumer/SampleConsumer.java
浏览文件 @
4be7a2ef
...
...
@@ -19,17 +19,11 @@
package
org.apache.skywalking.oap.server.library.datacarrier.consumer
;
import
java.util.List
;
import
java.util.Properties
;
import
org.apache.skywalking.oap.server.library.datacarrier.SampleData
;
public
class
SampleConsumer
implements
IConsumer
<
SampleData
>
{
public
int
i
=
1
;
@Override
public
void
init
(
final
Properties
properties
)
{
}
@Override
public
void
consume
(
List
<
SampleData
>
data
)
{
for
(
SampleData
one
:
data
)
{
...
...
@@ -42,9 +36,4 @@ public class SampleConsumer implements IConsumer<SampleData> {
public
void
onError
(
List
<
SampleData
>
data
,
Throwable
t
)
{
}
@Override
public
void
onExit
()
{
}
}
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCBatchDAO.java
浏览文件 @
4be7a2ef
...
...
@@ -22,19 +22,18 @@ import java.sql.Connection;
import
java.sql.SQLException
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Properties
;
import
java.util.Map
;
import
java.util.concurrent.CompletableFuture
;
import
java.util.function.Function
;
import
java.util.stream.Collectors
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.skywalking.oap.server.library.datacarrier.DataCarrier
;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer
;
import
org.apache.skywalking.oap.server.core.storage.IBatchDAO
;
import
org.apache.skywalking.oap.server.library.client.jdbc.JDBCClientException
;
import
org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient
;
import
org.apache.skywalking.oap.server.library.client.request.InsertRequest
;
import
org.apache.skywalking.oap.server.library.client.request.PrepareRequest
;
import
org.apache.skywalking.oap.server.library.datacarrier.DataCarrier
;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer
;
import
org.apache.skywalking.oap.server.library.util.CollectionUtils
;
import
org.apache.skywalking.oap.server.storage.plugin.jdbc.BatchSQLExecutor
;
import
org.apache.skywalking.oap.server.storage.plugin.jdbc.SQLExecutor
;
...
...
@@ -110,11 +109,6 @@ public class JDBCBatchDAO implements IBatchDAO {
this
.
h2BatchDAO
=
h2BatchDAO
;
}
@Override
public
void
init
(
final
Properties
properties
)
{
}
@Override
public
void
consume
(
List
<
PrepareRequest
>
prepareRequests
)
{
h2BatchDAO
.
flush
(
prepareRequests
);
...
...
@@ -124,9 +118,5 @@ public class JDBCBatchDAO implements IBatchDAO {
public
void
onError
(
List
<
PrepareRequest
>
prepareRequests
,
Throwable
t
)
{
log
.
error
(
t
.
getMessage
(),
t
);
}
@Override
public
void
onExit
()
{
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录