From fca0fdb8c4c4e7797ead986adf4e0a3ff09a04b9 Mon Sep 17 00:00:00 2001 From: Jiri Pechanec Date: Tue, 20 Aug 2024 13:20:49 +0200 Subject: [PATCH] DBZ-8035 Move activity classes to distinct package --- .../sqlserver/metrics/AbstractSqlServerPartitionMetrics.java | 2 +- .../sqlserver/metrics/SqlServerPartitionMetricsMXBean.java | 2 +- .../activity}/ActivityMonitoringMXBean.java | 2 +- .../activity}/ActivityMonitoringMeter.java | 2 +- .../metrics/DefaultStreamingChangeEventSourceMetrics.java | 2 +- .../metrics/StreamingChangeEventSourceMetricsMXBean.java | 2 +- .../activity}/ActivityMonitoringMeterTest.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename debezium-core/src/main/java/io/debezium/{transforms => metrics/activity}/ActivityMonitoringMXBean.java (93%) rename debezium-core/src/main/java/io/debezium/{transforms => metrics/activity}/ActivityMonitoringMeter.java (98%) rename debezium-core/src/test/java/io/debezium/{transforms => metrics/activity}/ActivityMonitoringMeterTest.java (98%) diff --git a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/metrics/AbstractSqlServerPartitionMetrics.java b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/metrics/AbstractSqlServerPartitionMetrics.java index d0927f231..5a630fcd3 100644 --- a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/metrics/AbstractSqlServerPartitionMetrics.java +++ b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/metrics/AbstractSqlServerPartitionMetrics.java @@ -12,12 +12,12 @@ import io.debezium.connector.common.CdcSourceTaskContext; import io.debezium.data.Envelope.Operation; import io.debezium.metrics.Metrics; +import io.debezium.metrics.activity.ActivityMonitoringMeter; import io.debezium.pipeline.ConnectorEvent; import io.debezium.pipeline.meters.CommonEventMeter; import io.debezium.pipeline.source.spi.EventMetadataProvider; import io.debezium.pipeline.spi.OffsetContext; import io.debezium.spi.schema.DataCollectionId; -import io.debezium.transforms.ActivityMonitoringMeter; /** * Base implementation of partition-scoped multi-partition SQL Server connector metrics. diff --git a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/metrics/SqlServerPartitionMetricsMXBean.java b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/metrics/SqlServerPartitionMetricsMXBean.java index e24836d35..a28c6078f 100644 --- a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/metrics/SqlServerPartitionMetricsMXBean.java +++ b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/metrics/SqlServerPartitionMetricsMXBean.java @@ -5,9 +5,9 @@ */ package io.debezium.connector.sqlserver.metrics; +import io.debezium.metrics.activity.ActivityMonitoringMXBean; import io.debezium.pipeline.metrics.traits.CommonEventMetricsMXBean; import io.debezium.pipeline.metrics.traits.SchemaMetricsMXBean; -import io.debezium.transforms.ActivityMonitoringMXBean; /** * Metrics scoped to a source partition that are common for both snapshot and streaming change event sources diff --git a/debezium-core/src/main/java/io/debezium/transforms/ActivityMonitoringMXBean.java b/debezium-core/src/main/java/io/debezium/metrics/activity/ActivityMonitoringMXBean.java similarity index 93% rename from debezium-core/src/main/java/io/debezium/transforms/ActivityMonitoringMXBean.java rename to debezium-core/src/main/java/io/debezium/metrics/activity/ActivityMonitoringMXBean.java index e1dd4b901..7db6a888a 100644 --- a/debezium-core/src/main/java/io/debezium/transforms/ActivityMonitoringMXBean.java +++ b/debezium-core/src/main/java/io/debezium/metrics/activity/ActivityMonitoringMXBean.java @@ -3,7 +3,7 @@ * * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 */ -package io.debezium.transforms; +package io.debezium.metrics.activity; import java.util.Map; diff --git a/debezium-core/src/main/java/io/debezium/transforms/ActivityMonitoringMeter.java b/debezium-core/src/main/java/io/debezium/metrics/activity/ActivityMonitoringMeter.java similarity index 98% rename from debezium-core/src/main/java/io/debezium/transforms/ActivityMonitoringMeter.java rename to debezium-core/src/main/java/io/debezium/metrics/activity/ActivityMonitoringMeter.java index e01a94fbc..b213aa665 100644 --- a/debezium-core/src/main/java/io/debezium/transforms/ActivityMonitoringMeter.java +++ b/debezium-core/src/main/java/io/debezium/metrics/activity/ActivityMonitoringMeter.java @@ -3,7 +3,7 @@ * * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 */ -package io.debezium.transforms; +package io.debezium.metrics.activity; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/debezium-core/src/main/java/io/debezium/pipeline/metrics/DefaultStreamingChangeEventSourceMetrics.java b/debezium-core/src/main/java/io/debezium/pipeline/metrics/DefaultStreamingChangeEventSourceMetrics.java index 5035a0987..fdde3d336 100644 --- a/debezium-core/src/main/java/io/debezium/pipeline/metrics/DefaultStreamingChangeEventSourceMetrics.java +++ b/debezium-core/src/main/java/io/debezium/pipeline/metrics/DefaultStreamingChangeEventSourceMetrics.java @@ -13,6 +13,7 @@ import io.debezium.connector.base.ChangeEventQueueMetrics; import io.debezium.connector.common.CdcSourceTaskContext; import io.debezium.data.Envelope.Operation; +import io.debezium.metrics.activity.ActivityMonitoringMeter; import io.debezium.pipeline.ConnectorEvent; import io.debezium.pipeline.meters.ConnectionMeter; import io.debezium.pipeline.meters.StreamingMeter; @@ -20,7 +21,6 @@ import io.debezium.pipeline.spi.OffsetContext; import io.debezium.pipeline.spi.Partition; import io.debezium.spi.schema.DataCollectionId; -import io.debezium.transforms.ActivityMonitoringMeter; /** * The default implementation of metrics related to the streaming phase of a connector. diff --git a/debezium-core/src/main/java/io/debezium/pipeline/metrics/StreamingChangeEventSourceMetricsMXBean.java b/debezium-core/src/main/java/io/debezium/pipeline/metrics/StreamingChangeEventSourceMetricsMXBean.java index bf9a9fb95..d5e8c3f44 100644 --- a/debezium-core/src/main/java/io/debezium/pipeline/metrics/StreamingChangeEventSourceMetricsMXBean.java +++ b/debezium-core/src/main/java/io/debezium/pipeline/metrics/StreamingChangeEventSourceMetricsMXBean.java @@ -5,9 +5,9 @@ */ package io.debezium.pipeline.metrics; +import io.debezium.metrics.activity.ActivityMonitoringMXBean; import io.debezium.pipeline.metrics.traits.ConnectionMetricsMXBean; import io.debezium.pipeline.metrics.traits.StreamingMetricsMXBean; -import io.debezium.transforms.ActivityMonitoringMXBean; /** * Metrics specific to streaming change event sources diff --git a/debezium-core/src/test/java/io/debezium/transforms/ActivityMonitoringMeterTest.java b/debezium-core/src/test/java/io/debezium/metrics/activity/ActivityMonitoringMeterTest.java similarity index 98% rename from debezium-core/src/test/java/io/debezium/transforms/ActivityMonitoringMeterTest.java rename to debezium-core/src/test/java/io/debezium/metrics/activity/ActivityMonitoringMeterTest.java index 3c6f1964f..8c1ab2ec7 100644 --- a/debezium-core/src/test/java/io/debezium/transforms/ActivityMonitoringMeterTest.java +++ b/debezium-core/src/test/java/io/debezium/metrics/activity/ActivityMonitoringMeterTest.java @@ -3,7 +3,7 @@ * * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 */ -package io.debezium.transforms; +package io.debezium.metrics.activity; import static org.assertj.core.api.Assertions.assertThat;