You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/06/23 16:11:54 UTC
[shardingsphere-elasticjob-lite] branch master updated: Rename
TracingConfiguration and TracingListener (#830)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-lite.git
The following commit(s) were added to refs/heads/master by this push:
new 294f817 Rename TracingConfiguration and TracingListener (#830)
294f817 is described below
commit 294f81746250f403dce129baf20e30eb666be288
Author: Liang Zhang <te...@163.com>
AuthorDate: Wed Jun 24 00:11:46 2020 +0800
Rename TracingConfiguration and TracingListener (#830)
* Rename TracingConfiguration and TracingListener
* Remove Serializable from RDBTracingConfiguration
* rename useless getter for RDBTracingConfiguration
---
docs/content/02-guide/event-trace.md | 6 +++---
.../elasticjob/lite/api/JobScheduler.java | 4 ++--
.../common/AbstractJobBeanDefinitionParser.java | 4 ++--
.../elasticjob/lite/tracing/JobEventBus.java | 10 +++++-----
...onfiguration.java => TracingConfiguration.java} | 12 +++++------
...{JobEventListener.java => TracingListener.java} | 4 ++--
.../elasticjob/lite/tracing/JobEventBusTest.java | 18 ++++++++---------
.../lite/tracing/event/JobExecutionEventTest.java | 10 +++++-----
...guration.java => TestTracingConfiguration.java} | 10 +++++-----
...n.java => TestTracingFailureConfiguration.java} | 8 ++++----
...EventListener.java => TestTracingListener.java} | 4 ++--
.../src/test/resources/logback-test.xml | 2 +-
...iguration.java => RDBTracingConfiguration.java} | 21 ++++++++------------
...entRdbListener.java => RDBTracingListener.java} | 8 ++++----
...nTest.java => RDBTracingConfigurationTest.java} | 23 ++++++----------------
...stenerTest.java => RDBTracingListenerTest.java} | 20 +++++++++----------
.../JobEventRdbSearchTest.java | 4 ++--
.../elasticjob/lite/example/JavaMain.java | 18 ++++++++---------
.../lite/example/config/DataflowJobConfig.java | 6 +++---
.../lite/example/config/JobEventConfig.java | 8 ++++----
.../lite/example/config/SimpleJobConfig.java | 6 +++---
21 files changed, 95 insertions(+), 111 deletions(-)
diff --git a/docs/content/02-guide/event-trace.md b/docs/content/02-guide/event-trace.md
index 5c1f52a..276afac 100644
--- a/docs/content/02-guide/event-trace.md
+++ b/docs/content/02-guide/event-trace.md
@@ -11,18 +11,18 @@ Elastic-Job提供了事件追踪功能,可通过事件订阅的方式处理调
## 通过代码配置开启事件追踪
-Elastic-Job-Lite在配置中提供了JobEventConfiguration,目前支持数据库方式配置。
+Elastic-Job-Lite 在配置中提供了 TracingConfiguration,目前支持数据库方式配置。
```java
// 初始化数据源
DataSource dataSource = ...;
// 定义日志数据库事件溯源配置
- JobEventConfiguration jobEventRdbConfig = new JobEventRdbConfiguration(dataSource);
+ TracingConfiguration tracingConfig = new RDBTracingConfiguration(dataSource);
// 初始化注册中心
CoordinatorRegistryCenter regCenter = ...;
// 初始化作业配置
LiteJobConfiguration liteJobConfig = ...;
- new JobScheduler(regCenter, liteJobConfig, jobEventRdbConfig).init();
+ new JobScheduler(regCenter, liteJobConfig, tracingConfig).init();
```
具体配置方式请参见[开发指南](/01-start/dev-guide/).
diff --git a/elastic-job-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/api/JobScheduler.java b/elastic-job-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/api/JobScheduler.java
index fc8af5a..c2cf3dd 100644
--- a/elastic-job-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/api/JobScheduler.java
+++ b/elastic-job-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/api/JobScheduler.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.elasticjob.lite.api.listener.ElasticJobListener
import org.apache.shardingsphere.elasticjob.lite.api.script.ScriptJob;
import org.apache.shardingsphere.elasticjob.lite.config.LiteJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.tracing.JobEventBus;
-import org.apache.shardingsphere.elasticjob.lite.tracing.config.JobEventConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.config.TracingConfiguration;
import org.apache.shardingsphere.elasticjob.lite.exception.JobSystemException;
import org.apache.shardingsphere.elasticjob.lite.executor.JobFacade;
import org.apache.shardingsphere.elasticjob.lite.handler.sharding.JobInstance;
@@ -68,7 +68,7 @@ public final class JobScheduler {
this(regCenter, elasticJob, liteJobConfig, new JobEventBus(), elasticJobListeners);
}
- public JobScheduler(final CoordinatorRegistryCenter regCenter, final ElasticJob elasticJob, final LiteJobConfiguration liteJobConfig, final JobEventConfiguration jobEventConfig,
+ public JobScheduler(final CoordinatorRegistryCenter regCenter, final ElasticJob elasticJob, final LiteJobConfiguration liteJobConfig, final TracingConfiguration jobEventConfig,
final ElasticJobListener... elasticJobListeners) {
this(regCenter, elasticJob, liteJobConfig, new JobEventBus(jobEventConfig), elasticJobListeners);
}
diff --git a/elastic-job-lite-spring/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/job/parser/common/AbstractJobBeanDefinitionParser.java b/elastic-job-lite-spring/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/job/parser/common/AbstractJobBeanDefinitionParser.java
index 746c70e..4548631 100644
--- a/elastic-job-lite-spring/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/job/parser/common/AbstractJobBeanDefinitionParser.java
+++ b/elastic-job-lite-spring/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/job/parser/common/AbstractJobBeanDefinitionParser.java
@@ -22,7 +22,7 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.elasticjob.lite.api.JobScheduler;
import org.apache.shardingsphere.elasticjob.lite.config.JobCoreConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.LiteJobConfiguration;
-import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.config.JobEventRdbConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.config.RDBTracingConfiguration;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -94,7 +94,7 @@ public abstract class AbstractJobBeanDefinitionParser extends AbstractBeanDefini
if (Strings.isNullOrEmpty(eventTraceDataSourceName)) {
return null;
}
- BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition(JobEventRdbConfiguration.class);
+ BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition(RDBTracingConfiguration.class);
factory.addConstructorArgReference(eventTraceDataSourceName);
return factory.getBeanDefinition();
}
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/JobEventBus.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/JobEventBus.java
index 1432393..21c421f 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/JobEventBus.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/JobEventBus.java
@@ -23,7 +23,7 @@ import com.google.common.eventbus.EventBus;
import com.google.common.util.concurrent.MoreExecutors;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.apache.shardingsphere.elasticjob.lite.tracing.config.JobEventConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.config.TracingConfiguration;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobEvent;
import org.apache.shardingsphere.elasticjob.lite.tracing.exception.TracingConfigurationException;
@@ -38,7 +38,7 @@ import java.util.concurrent.TimeUnit;
@Slf4j
public final class JobEventBus {
- private final JobEventConfiguration jobEventConfig;
+ private final TracingConfiguration jobEventConfig;
private final ExecutorService executorService;
@@ -52,7 +52,7 @@ public final class JobEventBus {
eventBus = null;
}
- public JobEventBus(final JobEventConfiguration jobEventConfig) {
+ public JobEventBus(final TracingConfiguration jobEventConfig) {
this.jobEventConfig = jobEventConfig;
executorService = createExecutorService(Runtime.getRuntime().availableProcessors() * 2);
eventBus = new AsyncEventBus(executorService);
@@ -68,10 +68,10 @@ public final class JobEventBus {
private void register() {
try {
- eventBus.register(jobEventConfig.createJobEventListener());
+ eventBus.register(jobEventConfig.createTracingListener());
isRegistered = true;
} catch (final TracingConfigurationException ex) {
- log.error("Elastic job: create JobEventListener failure, error is: ", ex);
+ log.error("Elastic job: create tracing listener failure, error is: ", ex);
}
}
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/config/JobEventConfiguration.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/config/TracingConfiguration.java
similarity index 82%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/config/JobEventConfiguration.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/config/TracingConfiguration.java
index 002cb3b..1d1e102 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/config/JobEventConfiguration.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/config/TracingConfiguration.java
@@ -18,18 +18,18 @@
package org.apache.shardingsphere.elasticjob.lite.tracing.config;
import org.apache.shardingsphere.elasticjob.lite.tracing.exception.TracingConfigurationException;
-import org.apache.shardingsphere.elasticjob.lite.tracing.listener.JobEventListener;
+import org.apache.shardingsphere.elasticjob.lite.tracing.listener.TracingListener;
/**
- * Job event configuration.
+ * Tracing configuration.
*/
-public interface JobEventConfiguration {
+public interface TracingConfiguration {
/**
- * Create job event listener.
+ * Create tracing listener.
*
- * @return Job event listener
+ * @return tracing listener
* @throws TracingConfigurationException tracing configuration exception
*/
- JobEventListener createJobEventListener() throws TracingConfigurationException;
+ TracingListener createTracingListener() throws TracingConfigurationException;
}
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/listener/JobEventListener.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/listener/TracingListener.java
similarity index 96%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/listener/JobEventListener.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/listener/TracingListener.java
index d798929..90ecdec 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/listener/JobEventListener.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/listener/TracingListener.java
@@ -23,9 +23,9 @@ import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobExecutionEvent
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent;
/**
- * Job event listener.
+ * Tracing listener.
*/
-public interface JobEventListener {
+public interface TracingListener {
/**
* Listen job execution event.
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/JobEventBusTest.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/JobEventBusTest.java
index 45025aa..6a43c69 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/JobEventBusTest.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/JobEventBusTest.java
@@ -20,12 +20,11 @@ package org.apache.shardingsphere.elasticjob.lite.tracing;
import com.google.common.eventbus.EventBus;
import lombok.SneakyThrows;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobEvent;
-import org.apache.shardingsphere.elasticjob.lite.tracing.fixture.JobEventCaller;
-import org.apache.shardingsphere.elasticjob.lite.tracing.fixture.TestJobEventConfiguration;
-import org.apache.shardingsphere.elasticjob.lite.tracing.fixture.TestJobEventFailureConfiguration;
-import org.apache.shardingsphere.elasticjob.lite.tracing.fixture.TestJobEventListener;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobExecutionEvent;
-import org.hamcrest.CoreMatchers;
+import org.apache.shardingsphere.elasticjob.lite.tracing.fixture.JobEventCaller;
+import org.apache.shardingsphere.elasticjob.lite.tracing.fixture.TestTracingConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.fixture.TestTracingFailureConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.fixture.TestTracingListener;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
@@ -35,6 +34,7 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.lang.reflect.Field;
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.verify;
@@ -51,16 +51,16 @@ public final class JobEventBusTest {
@Test
public void assertRegisterFailure() {
- jobEventBus = new JobEventBus(new TestJobEventFailureConfiguration());
+ jobEventBus = new JobEventBus(new TestTracingFailureConfiguration());
assertIsRegistered(false);
}
@Test
public void assertPost() throws InterruptedException {
- jobEventBus = new JobEventBus(new TestJobEventConfiguration(jobEventCaller));
+ jobEventBus = new JobEventBus(new TestTracingConfiguration(jobEventCaller));
assertIsRegistered(true);
jobEventBus.post(new JobExecutionEvent("localhost", "127.0.0.1", "fake_task_id", "test_event_bus_job", JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER, 0));
- while (!TestJobEventListener.isExecutionEventCalled()) {
+ while (!TestTracingListener.isExecutionEventCalled()) {
Thread.sleep(100L);
}
verify(jobEventCaller).call();
@@ -81,6 +81,6 @@ public final class JobEventBusTest {
private void assertIsRegistered(final boolean actual) {
Field field = JobEventBus.class.getDeclaredField("isRegistered");
field.setAccessible(true);
- assertThat(field.get(jobEventBus), CoreMatchers.is(actual));
+ assertThat(field.get(jobEventBus), is(actual));
}
}
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/event/JobExecutionEventTest.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/event/JobExecutionEventTest.java
index 428eff0..6b410e5 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/event/JobExecutionEventTest.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/event/JobExecutionEventTest.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.elasticjob.lite.tracing.event;
-import org.hamcrest.CoreMatchers;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -31,9 +31,9 @@ public final class JobExecutionEventTest {
@Test
public void assertNewJobExecutionEvent() {
JobExecutionEvent actual = new JobExecutionEvent("localhost", "127.0.0.1", "fake_task_id", "test_job", JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER, 0);
- assertThat(actual.getJobName(), CoreMatchers.is("test_job"));
- assertThat(actual.getSource(), CoreMatchers.is(JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER));
- assertThat(actual.getShardingItem(), CoreMatchers.is(0));
+ assertThat(actual.getJobName(), is("test_job"));
+ assertThat(actual.getSource(), is(JobExecutionEvent.ExecutionSource.NORMAL_TRIGGER));
+ assertThat(actual.getShardingItem(), is(0));
assertNotNull(actual.getHostname());
assertNotNull(actual.getStartTime());
assertNull(actual.getCompleteTime());
@@ -55,6 +55,6 @@ public final class JobExecutionEventTest {
JobExecutionEvent failureEvent = startEvent.executionFailure("java.lang.RuntimeException: failure");
assertNotNull(failureEvent.getCompleteTime());
assertFalse(failureEvent.isSuccess());
- assertThat(failureEvent.getFailureCause(), CoreMatchers.is("java.lang.RuntimeException: failure"));
+ assertThat(failureEvent.getFailureCause(), is("java.lang.RuntimeException: failure"));
}
}
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestJobEventConfiguration.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestTracingConfiguration.java
similarity index 82%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestJobEventConfiguration.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestTracingConfiguration.java
index 5187df2..e848dfe 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestJobEventConfiguration.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestTracingConfiguration.java
@@ -18,16 +18,16 @@
package org.apache.shardingsphere.elasticjob.lite.tracing.fixture;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.elasticjob.lite.tracing.config.JobEventConfiguration;
-import org.apache.shardingsphere.elasticjob.lite.tracing.listener.JobEventListener;
+import org.apache.shardingsphere.elasticjob.lite.tracing.config.TracingConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.listener.TracingListener;
@RequiredArgsConstructor
-public final class TestJobEventConfiguration implements JobEventConfiguration {
+public final class TestTracingConfiguration implements TracingConfiguration {
private final JobEventCaller jobEventCaller;
@Override
- public JobEventListener createJobEventListener() {
- return new TestJobEventListener(jobEventCaller);
+ public TracingListener createTracingListener() {
+ return new TestTracingListener(jobEventCaller);
}
}
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestJobEventFailureConfiguration.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestTracingFailureConfiguration.java
similarity index 84%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestJobEventFailureConfiguration.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestTracingFailureConfiguration.java
index 72f7e57..fbe073f 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestJobEventFailureConfiguration.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestTracingFailureConfiguration.java
@@ -17,14 +17,14 @@
package org.apache.shardingsphere.elasticjob.lite.tracing.fixture;
-import org.apache.shardingsphere.elasticjob.lite.tracing.config.JobEventConfiguration;
-import org.apache.shardingsphere.elasticjob.lite.tracing.listener.JobEventListener;
+import org.apache.shardingsphere.elasticjob.lite.tracing.config.TracingConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.listener.TracingListener;
import org.apache.shardingsphere.elasticjob.lite.tracing.exception.TracingConfigurationException;
-public final class TestJobEventFailureConfiguration implements JobEventConfiguration {
+public final class TestTracingFailureConfiguration implements TracingConfiguration {
@Override
- public JobEventListener createJobEventListener() throws TracingConfigurationException {
+ public TracingListener createTracingListener() throws TracingConfigurationException {
throw new TracingConfigurationException(new RuntimeException("assert failure"));
}
}
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestJobEventListener.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestTracingListener.java
similarity index 95%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestJobEventListener.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestTracingListener.java
index a9ddc66..6ce9b9f 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestJobEventListener.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/fixture/TestTracingListener.java
@@ -19,12 +19,12 @@ package org.apache.shardingsphere.elasticjob.lite.tracing.fixture;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.elasticjob.lite.tracing.listener.JobEventListener;
+import org.apache.shardingsphere.elasticjob.lite.tracing.listener.TracingListener;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobExecutionEvent;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent;
@RequiredArgsConstructor
-public final class TestJobEventListener implements JobEventListener {
+public final class TestTracingListener implements TracingListener {
@Getter
private static volatile boolean executionEventCalled;
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/resources/logback-test.xml b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/resources/logback-test.xml
index 639f0ac..ca8e053 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/resources/logback-test.xml
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-api/src/test/resources/logback-test.xml
@@ -36,6 +36,6 @@
<appender-ref ref="STDOUT" />
</root>
- <logger name="org.apache.shardingsphere.elasticjob.lite.tracing.rdb.JobEventRdbConfiguration" level="OFF" />
+ <logger name="org.apache.shardingsphere.elasticjob.lite.tracing.rdb.config.RDBTracingConfiguration" level="OFF" />
<logger name="org.apache.shardingsphere.elasticjob.lite.tracing.JobEventBus" level="OFF" />
</configuration>
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/config/JobEventRdbConfiguration.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/config/RDBTracingConfiguration.java
similarity index 73%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/config/JobEventRdbConfiguration.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/config/RDBTracingConfiguration.java
index 61402c2..bc1d93c 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/config/JobEventRdbConfiguration.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/config/RDBTracingConfiguration.java
@@ -17,32 +17,27 @@
package org.apache.shardingsphere.elasticjob.lite.tracing.rdb.config;
-import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.elasticjob.lite.tracing.config.JobEventConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.config.TracingConfiguration;
import org.apache.shardingsphere.elasticjob.lite.tracing.exception.TracingConfigurationException;
-import org.apache.shardingsphere.elasticjob.lite.tracing.listener.JobEventListener;
-import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.listener.JobEventRdbListener;
+import org.apache.shardingsphere.elasticjob.lite.tracing.listener.TracingListener;
+import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.listener.RDBTracingListener;
import javax.sql.DataSource;
-import java.io.Serializable;
import java.sql.SQLException;
/**
- * Job event RDB configuration.
+ * RDB tracing configuration.
*/
@RequiredArgsConstructor
-@Getter
-public final class JobEventRdbConfiguration implements JobEventConfiguration, Serializable {
+public final class RDBTracingConfiguration implements TracingConfiguration {
- private static final long serialVersionUID = 3344410699286435226L;
-
- private final transient DataSource dataSource;
+ private final DataSource dataSource;
@Override
- public JobEventListener createJobEventListener() throws TracingConfigurationException {
+ public TracingListener createTracingListener() throws TracingConfigurationException {
try {
- return new JobEventRdbListener(dataSource);
+ return new RDBTracingListener(dataSource);
} catch (final SQLException ex) {
throw new TracingConfigurationException(ex);
}
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/JobEventRdbListener.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListener.java
similarity index 89%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/JobEventRdbListener.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListener.java
index 5017d10..d95be40 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/JobEventRdbListener.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/main/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListener.java
@@ -19,19 +19,19 @@ package org.apache.shardingsphere.elasticjob.lite.tracing.rdb.listener;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobExecutionEvent;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent;
-import org.apache.shardingsphere.elasticjob.lite.tracing.listener.JobEventListener;
+import org.apache.shardingsphere.elasticjob.lite.tracing.listener.TracingListener;
import javax.sql.DataSource;
import java.sql.SQLException;
/**
- * Job event RDB listener.
+ * RDB tracing listener.
*/
-public final class JobEventRdbListener implements JobEventListener {
+public final class RDBTracingListener implements TracingListener {
private final JobEventRdbStorage repository;
- public JobEventRdbListener(final DataSource dataSource) throws SQLException {
+ public RDBTracingListener(final DataSource dataSource) throws SQLException {
repository = new JobEventRdbStorage(dataSource);
}
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/config/JobEventRdbConfigurationTest.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/config/RDBTracingConfigurationTest.java
similarity index 62%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/config/JobEventRdbConfigurationTest.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/config/RDBTracingConfigurationTest.java
index 3086be2..0c2f990 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/config/JobEventRdbConfigurationTest.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/config/RDBTracingConfigurationTest.java
@@ -19,37 +19,26 @@ package org.apache.shardingsphere.elasticjob.lite.tracing.rdb.config;
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.shardingsphere.elasticjob.lite.tracing.exception.TracingConfigurationException;
-import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.listener.JobEventRdbListener;
-import org.hamcrest.CoreMatchers;
+import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.listener.RDBTracingListener;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertThat;
-public final class JobEventRdbConfigurationTest {
+public final class RDBTracingConfigurationTest {
@Test
- public void assertGetDataSource() {
+ public void assertCreateTracingListenerSuccess() throws TracingConfigurationException {
BasicDataSource dataSource = new BasicDataSource();
dataSource.setDriverClassName(org.h2.Driver.class.getName());
dataSource.setUrl("jdbc:h2:mem:job_event_storage");
dataSource.setUsername("sa");
dataSource.setPassword("");
- assertThat(new JobEventRdbConfiguration(dataSource).getDataSource(), CoreMatchers.is(dataSource));
- }
-
- @Test
- public void assertCreateJobEventListenerSuccess() throws TracingConfigurationException {
- BasicDataSource dataSource = new BasicDataSource();
- dataSource.setDriverClassName(org.h2.Driver.class.getName());
- dataSource.setUrl("jdbc:h2:mem:job_event_storage");
- dataSource.setUsername("sa");
- dataSource.setPassword("");
- assertThat(new JobEventRdbConfiguration(dataSource).createJobEventListener(), instanceOf(JobEventRdbListener.class));
+ assertThat(new RDBTracingConfiguration(dataSource).createTracingListener(), instanceOf(RDBTracingListener.class));
}
@Test(expected = TracingConfigurationException.class)
- public void assertCreateJobEventListenerFailure() throws TracingConfigurationException {
- new JobEventRdbConfiguration(new BasicDataSource()).createJobEventListener();
+ public void assertCreateTracingListenerFailure() throws TracingConfigurationException {
+ new RDBTracingConfiguration(new BasicDataSource()).createTracingListener();
}
}
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/JobEventRdbListenerTest.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListenerTest.java
similarity index 83%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/JobEventRdbListenerTest.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListenerTest.java
index 862ad5c..9d18a4f 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/JobEventRdbListenerTest.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/RDBTracingListenerTest.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEve
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent.Source;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent.State;
import org.apache.shardingsphere.elasticjob.lite.tracing.exception.TracingConfigurationException;
-import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.config.JobEventRdbConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.config.RDBTracingConfiguration;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,12 +40,12 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class JobEventRdbListenerTest {
+public final class RDBTracingListenerTest {
private static final String JOB_NAME = "test_rdb_event_listener";
@Mock
- private JobEventRdbConfiguration jobEventRdbConfiguration;
+ private RDBTracingConfiguration rdbTracingConfiguration;
@Mock
private JobEventRdbStorage repository;
@@ -59,17 +59,17 @@ public final class JobEventRdbListenerTest {
dataSource.setUrl("jdbc:h2:mem:job_event_storage");
dataSource.setUsername("sa");
dataSource.setPassword("");
- JobEventRdbListener jobEventRdbListener = new JobEventRdbListener(dataSource);
- setRepository(jobEventRdbListener);
- when(jobEventRdbConfiguration.createJobEventListener()).thenReturn(jobEventRdbListener);
- jobEventBus = new JobEventBus(jobEventRdbConfiguration);
+ RDBTracingListener tracingListener = new RDBTracingListener(dataSource);
+ setRepository(tracingListener);
+ when(rdbTracingConfiguration.createTracingListener()).thenReturn(tracingListener);
+ jobEventBus = new JobEventBus(rdbTracingConfiguration);
}
@SneakyThrows
- private void setRepository(final JobEventRdbListener jobEventRdbListener) {
- Field field = JobEventRdbListener.class.getDeclaredField("repository");
+ private void setRepository(final RDBTracingListener tracingListener) {
+ Field field = RDBTracingListener.class.getDeclaredField("repository");
field.setAccessible(true);
- field.set(jobEventRdbListener, repository);
+ field.set(tracingListener, repository);
}
@Test
diff --git a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/JobEventRdbSearchTest.java b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/JobEventRdbSearchTest.java
similarity index 98%
rename from elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/JobEventRdbSearchTest.java
rename to elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/JobEventRdbSearchTest.java
index b533b5b..81bfb2d 100644
--- a/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/listener/JobEventRdbSearchTest.java
+++ b/elastic-job-lite-tracing/elastic-job-lite-tracing-rdb/src/test/java/org/apache/shardingsphere/elasticjob/lite/tracing/rdb/search/JobEventRdbSearchTest.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.lite.tracing.rdb.listener;
+package org.apache.shardingsphere.elasticjob.lite.tracing.rdb.search;
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobExecutionEvent;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent.Source;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent.State;
-import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.search.JobEventRdbSearch;
+import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.listener.JobEventRdbStorage;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/examples/elastic-job-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/JavaMain.java b/examples/elastic-job-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/JavaMain.java
index c45d4ea..cb5985c 100644
--- a/examples/elastic-job-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/JavaMain.java
+++ b/examples/elastic-job-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/JavaMain.java
@@ -24,8 +24,8 @@ import org.apache.shardingsphere.elasticjob.lite.config.LiteJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.dataflow.DataflowJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.script.ScriptJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.simple.SimpleJobConfiguration;
-import org.apache.shardingsphere.elasticjob.lite.tracing.config.JobEventConfiguration;
-import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.config.JobEventRdbConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.config.TracingConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.config.RDBTracingConfiguration;
import org.apache.shardingsphere.elasticjob.lite.example.job.dataflow.JavaDataflowJob;
import org.apache.shardingsphere.elasticjob.lite.example.job.simple.JavaSimpleJob;
import org.apache.shardingsphere.elasticjob.lite.reg.base.CoordinatorRegistryCenter;
@@ -64,10 +64,10 @@ public final class JavaMain {
// CHECKSTYLE:ON
EmbedZookeeperServer.start(EMBED_ZOOKEEPER_PORT);
CoordinatorRegistryCenter regCenter = setUpRegistryCenter();
- JobEventConfiguration jobEventConfig = new JobEventRdbConfiguration(setUpEventTraceDataSource());
- setUpSimpleJob(regCenter, jobEventConfig);
- setUpDataflowJob(regCenter, jobEventConfig);
- setUpScriptJob(regCenter, jobEventConfig);
+ TracingConfiguration tracingConfig = new RDBTracingConfiguration(setUpEventTraceDataSource());
+ setUpSimpleJob(regCenter, tracingConfig);
+ setUpDataflowJob(regCenter, tracingConfig);
+ setUpScriptJob(regCenter, tracingConfig);
}
private static CoordinatorRegistryCenter setUpRegistryCenter() {
@@ -86,19 +86,19 @@ public final class JavaMain {
return result;
}
- private static void setUpSimpleJob(final CoordinatorRegistryCenter regCenter, final JobEventConfiguration jobEventConfig) {
+ private static void setUpSimpleJob(final CoordinatorRegistryCenter regCenter, final TracingConfiguration jobEventConfig) {
JobCoreConfiguration coreConfig = JobCoreConfiguration.newBuilder("javaSimpleJob", "0/5 * * * * ?", 3).shardingItemParameters("0=Beijing,1=Shanghai,2=Guangzhou").build();
SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(coreConfig);
new JobScheduler(regCenter, new JavaSimpleJob(), LiteJobConfiguration.newBuilder(simpleJobConfig).build(), jobEventConfig).init();
}
- private static void setUpDataflowJob(final CoordinatorRegistryCenter regCenter, final JobEventConfiguration jobEventConfig) {
+ private static void setUpDataflowJob(final CoordinatorRegistryCenter regCenter, final TracingConfiguration jobEventConfig) {
JobCoreConfiguration coreConfig = JobCoreConfiguration.newBuilder("javaDataflowElasticJob", "0/5 * * * * ?", 3).shardingItemParameters("0=Beijing,1=Shanghai,2=Guangzhou").build();
DataflowJobConfiguration dataflowJobConfig = new DataflowJobConfiguration(coreConfig, true);
new JobScheduler(regCenter, new JavaDataflowJob(), LiteJobConfiguration.newBuilder(dataflowJobConfig).build(), jobEventConfig).init();
}
- private static void setUpScriptJob(final CoordinatorRegistryCenter regCenter, final JobEventConfiguration jobEventConfig) throws IOException {
+ private static void setUpScriptJob(final CoordinatorRegistryCenter regCenter, final TracingConfiguration jobEventConfig) throws IOException {
JobCoreConfiguration coreConfig = JobCoreConfiguration.newBuilder("scriptElasticJob", "0/5 * * * * ?", 3).build();
ScriptJobConfiguration scriptJobConfig = new ScriptJobConfiguration(coreConfig, buildScriptCommandLine());
new JobScheduler(regCenter, null, LiteJobConfiguration.newBuilder(scriptJobConfig).build(), jobEventConfig).init();
diff --git a/examples/elastic-job-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/config/DataflowJobConfig.java b/examples/elastic-job-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/config/DataflowJobConfig.java
index ae8a5a6..dd3ef1a 100644
--- a/examples/elastic-job-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/config/DataflowJobConfig.java
+++ b/examples/elastic-job-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/config/DataflowJobConfig.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.elasticjob.lite.api.dataflow.DataflowJob;
import org.apache.shardingsphere.elasticjob.lite.config.JobCoreConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.LiteJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.dataflow.DataflowJobConfiguration;
-import org.apache.shardingsphere.elasticjob.lite.tracing.config.JobEventConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.config.TracingConfiguration;
import org.apache.shardingsphere.elasticjob.lite.example.job.dataflow.SpringDataflowJob;
import org.apache.shardingsphere.elasticjob.lite.reg.zookeeper.ZookeeperRegistryCenter;
import org.springframework.beans.factory.annotation.Value;
@@ -38,7 +38,7 @@ public class DataflowJobConfig {
private ZookeeperRegistryCenter regCenter;
@Resource
- private JobEventConfiguration jobEventConfiguration;
+ private TracingConfiguration tracingConfiguration;
@Bean
public DataflowJob dataflowJob() {
@@ -48,7 +48,7 @@ public class DataflowJobConfig {
@Bean(initMethod = "init")
public JobScheduler dataflowJobScheduler(final DataflowJob dataflowJob, @Value("${dataflowJob.cron}") final String cron, @Value("${dataflowJob.shardingTotalCount}") final int shardingTotalCount,
@Value("${dataflowJob.shardingItemParameters}") final String shardingItemParameters) {
- return new JobScheduler(regCenter, dataflowJob, getLiteJobConfiguration(dataflowJob.getClass(), cron, shardingTotalCount, shardingItemParameters), jobEventConfiguration);
+ return new JobScheduler(regCenter, dataflowJob, getLiteJobConfiguration(dataflowJob.getClass(), cron, shardingTotalCount, shardingItemParameters), tracingConfiguration);
}
private LiteJobConfiguration getLiteJobConfiguration(final Class<? extends DataflowJob> jobClass, final String cron, final int shardingTotalCount, final String shardingItemParameters) {
diff --git a/examples/elastic-job-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/config/JobEventConfig.java b/examples/elastic-job-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/config/JobEventConfig.java
index ffd99e9..6bc50f2 100644
--- a/examples/elastic-job-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/config/JobEventConfig.java
+++ b/examples/elastic-job-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/config/JobEventConfig.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.elasticjob.lite.example.config;
-import org.apache.shardingsphere.elasticjob.lite.tracing.config.JobEventConfiguration;
-import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.config.JobEventRdbConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.config.TracingConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.rdb.config.RDBTracingConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -32,7 +32,7 @@ public class JobEventConfig {
private DataSource dataSource;
@Bean
- public JobEventConfiguration jobEventConfiguration() {
- return new JobEventRdbConfiguration(dataSource);
+ public TracingConfiguration tracingConfiguration() {
+ return new RDBTracingConfiguration(dataSource);
}
}
diff --git a/examples/elastic-job-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/config/SimpleJobConfig.java b/examples/elastic-job-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/config/SimpleJobConfig.java
index c0efae9..8d0efb5 100644
--- a/examples/elastic-job-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/config/SimpleJobConfig.java
+++ b/examples/elastic-job-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/config/SimpleJobConfig.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.elasticjob.lite.api.simple.SimpleJob;
import org.apache.shardingsphere.elasticjob.lite.config.JobCoreConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.LiteJobConfiguration;
import org.apache.shardingsphere.elasticjob.lite.config.simple.SimpleJobConfiguration;
-import org.apache.shardingsphere.elasticjob.lite.tracing.config.JobEventConfiguration;
+import org.apache.shardingsphere.elasticjob.lite.tracing.config.TracingConfiguration;
import org.apache.shardingsphere.elasticjob.lite.example.job.simple.SpringSimpleJob;
import org.apache.shardingsphere.elasticjob.lite.reg.zookeeper.ZookeeperRegistryCenter;
import org.springframework.beans.factory.annotation.Value;
@@ -38,7 +38,7 @@ public class SimpleJobConfig {
private ZookeeperRegistryCenter regCenter;
@Resource
- private JobEventConfiguration jobEventConfiguration;
+ private TracingConfiguration tracingConfiguration;
@Bean
public SimpleJob simpleJob() {
@@ -48,7 +48,7 @@ public class SimpleJobConfig {
@Bean(initMethod = "init")
public JobScheduler simpleJobScheduler(final SimpleJob simpleJob, @Value("${simpleJob.cron}") final String cron, @Value("${simpleJob.shardingTotalCount}") final int shardingTotalCount,
@Value("${simpleJob.shardingItemParameters}") final String shardingItemParameters) {
- return new JobScheduler(regCenter, simpleJob, getLiteJobConfiguration(simpleJob.getClass(), cron, shardingTotalCount, shardingItemParameters), jobEventConfiguration);
+ return new JobScheduler(regCenter, simpleJob, getLiteJobConfiguration(simpleJob.getClass(), cron, shardingTotalCount, shardingItemParameters), tracingConfiguration);
}
private LiteJobConfiguration getLiteJobConfiguration(final Class<? extends SimpleJob> jobClass, final String cron, final int shardingTotalCount, final String shardingItemParameters) {