Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

optimize TracingProperties #2438

Merged
merged 3 commits into from
Sep 29, 2024
Merged

optimize TracingProperties #2438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12b19da
optimize TracingProperties
Sep 24, 2024
bc3dc8b
optimize ElasticJobTracingConfiguration
Sep 24, 2024
c6b0a75
fix the code formatting issues
Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .../apache/shardingsphere/elasticjob/spring/boot/tracing/ElasticJobTracingConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
Expand Down Expand Up @@ -68,9 +67,11 @@ public DataSource tracingDataSource(final TracingProperties tracingProperties) {
* @return a bean of tracing configuration
*/
@Bean
@ConditionalOnBean(DataSource.class)
public TracingConfiguration<DataSource> tracingConfiguration(@Qualifier("dataSource") final DataSource dataSource,
public TracingConfiguration<DataSource> tracingConfiguration(@Qualifier("dataSource") @Nullable final DataSource dataSource,
@Qualifier("tracingDataSource") @Nullable final DataSource tracingDataSource) {
if (dataSource == null && tracingDataSource == null) {
throw new IllegalArgumentException("Neither dataSource nor tracingDataSource bean is required");
}
linghengqian marked this conversation as resolved.
Show resolved Hide resolved
return new TracingConfiguration<>("RDB", null == tracingDataSource ? dataSource : tracingDataSource);
}
}
Expand Down
2 changes: 2 additions & 0 deletions ...main/java/org/apache/shardingsphere/elasticjob/spring/boot/tracing/TracingProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import lombok.Setter;
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;

import java.util.HashSet;
import java.util.Set;
Expand All @@ -32,6 +33,7 @@ public class TracingProperties {

private String type;

@NestedConfigurationProperty
private DataSourceProperties dataSource;

private Set<String> includeJobNames = new HashSet<>();
Expand Down
Loading