Skip to content

Set metricsFactory to NullMetricsFactory if metrics level is NONE #243

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

Merged
merged 8 commits into from
Apr 8, 2024
Merged

Set metricsFactory to NullMetricsFactory if metrics level is NONE #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f4e1fc6
GH-241: Support changing metrics-level for KclMessageDrivenChannelAda…
Mar 15, 2024
a78fc6c
Add test that metricsLevel is set correctly
Mar 15, 2024
4403ad0
Modify test body and add author
Mar 15, 2024
88b2484
Fix import order
Mar 15, 2024
b38b146
Add reference to instance variable
Mar 15, 2024
29ada0c
Merge branch 'spring-projects:main' into main
Min3953 Apr 8, 2024
1ef7db0
Set metricsFactory to NullMetricsFactory if metrics level is NONE
Apr 8, 2024
a354f74
Fix import order
Apr 8, 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
4 changes: 4 additions & 0 deletions ...a/org/springframework/integration/aws/inbound/kinesis/KclMessageDrivenChannelAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import software.amazon.kinesis.lifecycle.events.ShutdownRequestedInput;
import software.amazon.kinesis.metrics.MetricsConfig;
import software.amazon.kinesis.metrics.MetricsLevel;
import software.amazon.kinesis.metrics.NullMetricsFactory;
import software.amazon.kinesis.processor.FormerStreamsLeasesDeletionStrategy;
import software.amazon.kinesis.processor.MultiStreamTracker;
import software.amazon.kinesis.processor.RecordProcessorCheckpointer;
Expand Down Expand Up @@ -338,6 +339,9 @@ protected void doStart() {

MetricsConfig metricsConfig = this.config.metricsConfig();
metricsConfig.metricsLevel(this.metricsLevel);
if (MetricsLevel.NONE.equals(this.metricsLevel)) {
metricsConfig.metricsFactory(new NullMetricsFactory());
}

this.scheduler =
new Scheduler(
Expand Down
16 changes: 14 additions & 2 deletions ...java/org/springframework/integration/aws/kinesis/KclMessageDrivenChannelAdapterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
import software.amazon.awssdk.services.kinesis.model.Consumer;
import software.amazon.kinesis.common.InitialPositionInStream;
import software.amazon.kinesis.common.InitialPositionInStreamExtended;
import software.amazon.kinesis.metrics.MetricsFactory;
import software.amazon.kinesis.metrics.MetricsLevel;
import software.amazon.kinesis.metrics.NullMetricsFactory;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
Expand Down Expand Up @@ -123,15 +125,25 @@ void kclChannelAdapterReceivesRecords() {
}

@Test
public void metricsLevelOfMetricsFactoryShouldBeSetToMetricsLevelOfAdapter() {
public void metricsLevelOfMetricsConfigShouldBeSetToMetricsLevelOfAdapter() {
MetricsLevel metricsLevel = TestUtils.getPropertyValue(
this.kclMessageDrivenChannelAdapter,
"scheduler.metricsFactory.metricsLevel",
"scheduler.metricsConfig.metricsLevel",
MetricsLevel.class
);
assertThat(metricsLevel).isEqualTo(MetricsLevel.NONE);
}

@Test
public void metricsFactoryOfSchedulerShouldBeSetNullMetricsFactoryIfMetricsLevelIsNone() {
MetricsFactory metricsFactory = TestUtils.getPropertyValue(
this.kclMessageDrivenChannelAdapter,
"scheduler.metricsFactory",
MetricsFactory.class
);
assertThat(metricsFactory).isInstanceOf(NullMetricsFactory.class);
}

@Configuration
@EnableIntegration
public static class TestConfiguration {
Expand Down