diff --git a/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/KafkaConsumerServiceDelegator.java b/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/KafkaConsumerServiceDelegator.java index 757b3f4a956..68857d0181a 100644 --- a/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/KafkaConsumerServiceDelegator.java +++ b/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/KafkaConsumerServiceDelegator.java @@ -7,7 +7,7 @@ import com.linkedin.venice.pubsub.api.PubSubPosition; import com.linkedin.venice.pubsub.api.PubSubTopic; import com.linkedin.venice.pubsub.api.PubSubTopicPartition; -import com.linkedin.venice.stats.dimensions.VersionRole; +import com.linkedin.venice.server.VersionRole; import com.linkedin.venice.utils.concurrent.VeniceConcurrentHashMap; import java.util.ArrayList; import java.util.Collections; diff --git a/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/PartitionReplicaIngestionContext.java b/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/PartitionReplicaIngestionContext.java index 25c35210292..68ef044c5fe 100644 --- a/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/PartitionReplicaIngestionContext.java +++ b/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/PartitionReplicaIngestionContext.java @@ -2,7 +2,7 @@ import com.linkedin.venice.pubsub.api.PubSubTopic; import com.linkedin.venice.pubsub.api.PubSubTopicPartition; -import com.linkedin.venice.stats.dimensions.VersionRole; +import com.linkedin.venice.server.VersionRole; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/StoreIngestionTask.java b/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/StoreIngestionTask.java index 6a8f5498ead..cb43a41057f 100644 --- a/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/StoreIngestionTask.java +++ b/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/StoreIngestionTask.java @@ -118,7 +118,7 @@ import com.linkedin.venice.serializer.AvroGenericDeserializer; import com.linkedin.venice.serializer.FastSerializerDeserializerFactory; import com.linkedin.venice.serializer.RecordDeserializer; -import com.linkedin.venice.stats.dimensions.VersionRole; +import com.linkedin.venice.server.VersionRole; import com.linkedin.venice.storage.protocol.ChunkedValueManifest; import com.linkedin.venice.system.store.MetaStoreWriter; import com.linkedin.venice.utils.ByteUtils; diff --git a/clients/da-vinci-client/src/main/java/com/linkedin/davinci/stats/ingestion/heartbeat/HeartbeatOtelStats.java b/clients/da-vinci-client/src/main/java/com/linkedin/davinci/stats/ingestion/heartbeat/HeartbeatOtelStats.java index 37ce7461d19..92388fb3a76 100644 --- a/clients/da-vinci-client/src/main/java/com/linkedin/davinci/stats/ingestion/heartbeat/HeartbeatOtelStats.java +++ b/clients/da-vinci-client/src/main/java/com/linkedin/davinci/stats/ingestion/heartbeat/HeartbeatOtelStats.java @@ -6,12 +6,12 @@ import com.google.common.annotations.VisibleForTesting; import com.linkedin.davinci.stats.ServerMetricEntity; +import com.linkedin.venice.server.VersionRole; import com.linkedin.venice.stats.OpenTelemetryMetricsSetup; import com.linkedin.venice.stats.VeniceOpenTelemetryMetricsRepository; import com.linkedin.venice.stats.dimensions.ReplicaState; import com.linkedin.venice.stats.dimensions.ReplicaType; import com.linkedin.venice.stats.dimensions.VeniceMetricsDimensions; -import com.linkedin.venice.stats.dimensions.VersionRole; import com.linkedin.venice.stats.metrics.MetricEntity; import com.linkedin.venice.stats.metrics.MetricEntityStateThreeEnums; import com.linkedin.venice.utils.concurrent.VeniceConcurrentHashMap; diff --git a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/AggKafkaConsumerServiceTest.java b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/AggKafkaConsumerServiceTest.java index 295df67308f..25125092a6c 100644 --- a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/AggKafkaConsumerServiceTest.java +++ b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/AggKafkaConsumerServiceTest.java @@ -30,7 +30,7 @@ import com.linkedin.venice.pubsub.api.PubSubTopicPartition; import com.linkedin.venice.pubsub.manager.TopicManager; import com.linkedin.venice.pubsub.manager.TopicManagerContext.PubSubPropertiesSupplier; -import com.linkedin.venice.stats.dimensions.VersionRole; +import com.linkedin.venice.server.VersionRole; import com.linkedin.venice.utils.SystemTime; import com.linkedin.venice.utils.Time; import com.linkedin.venice.utils.Utils; diff --git a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/KafkaConsumerServiceDelegatorTest.java b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/KafkaConsumerServiceDelegatorTest.java index dff5d49ee75..c89383962c1 100644 --- a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/KafkaConsumerServiceDelegatorTest.java +++ b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/KafkaConsumerServiceDelegatorTest.java @@ -31,7 +31,7 @@ import com.linkedin.venice.pubsub.api.PubSubPosition; import com.linkedin.venice.pubsub.api.PubSubTopic; import com.linkedin.venice.pubsub.api.PubSubTopicPartition; -import com.linkedin.venice.stats.dimensions.VersionRole; +import com.linkedin.venice.server.VersionRole; import com.linkedin.venice.utils.SystemTime; import com.linkedin.venice.utils.Utils; import io.tehuti.metrics.MetricsRepository; diff --git a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/KafkaConsumerServiceTest.java b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/KafkaConsumerServiceTest.java index 3d0bdeb1294..7c4a1c6d1f7 100644 --- a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/KafkaConsumerServiceTest.java +++ b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/KafkaConsumerServiceTest.java @@ -34,7 +34,7 @@ import com.linkedin.venice.pubsub.api.PubSubMessageDeserializer; import com.linkedin.venice.pubsub.api.PubSubTopic; import com.linkedin.venice.pubsub.api.PubSubTopicPartition; -import com.linkedin.venice.stats.dimensions.VersionRole; +import com.linkedin.venice.server.VersionRole; import com.linkedin.venice.utils.RandomAccessDaemonThreadFactory; import com.linkedin.venice.utils.SystemTime; import com.linkedin.venice.utils.TestUtils; diff --git a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/StoreIngestionTaskTest.java b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/StoreIngestionTaskTest.java index e9a8e973d69..f3e9cda00ee 100644 --- a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/StoreIngestionTaskTest.java +++ b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/kafka/consumer/StoreIngestionTaskTest.java @@ -203,7 +203,7 @@ import com.linkedin.venice.serialization.avro.VeniceAvroKafkaSerializer; import com.linkedin.venice.serializer.FastSerializerDeserializerFactory; import com.linkedin.venice.serializer.RecordSerializer; -import com.linkedin.venice.stats.dimensions.VersionRole; +import com.linkedin.venice.server.VersionRole; import com.linkedin.venice.throttle.EventThrottler; import com.linkedin.venice.unit.matchers.ExceptionClassMatcher; import com.linkedin.venice.unit.matchers.NonEmptyStringMatcher; diff --git a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/stats/ingestion/heartbeat/HeartbeatOtelStatsTest.java b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/stats/ingestion/heartbeat/HeartbeatOtelStatsTest.java index e2b7ba5faf7..8900475e702 100644 --- a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/stats/ingestion/heartbeat/HeartbeatOtelStatsTest.java +++ b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/stats/ingestion/heartbeat/HeartbeatOtelStatsTest.java @@ -12,11 +12,11 @@ import static com.linkedin.venice.utils.OpenTelemetryDataTestUtils.validateExponentialHistogramPointData; import static org.testng.Assert.*; +import com.linkedin.venice.server.VersionRole; import com.linkedin.venice.stats.VeniceMetricsConfig; import com.linkedin.venice.stats.VeniceMetricsRepository; import com.linkedin.venice.stats.dimensions.ReplicaState; import com.linkedin.venice.stats.dimensions.ReplicaType; -import com.linkedin.venice.stats.dimensions.VersionRole; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.tehuti.metrics.MetricsRepository; diff --git a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/stats/ingestion/heartbeat/HeartbeatVersionedStatsTest.java b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/stats/ingestion/heartbeat/HeartbeatVersionedStatsTest.java index 01be2b54830..f3153328266 100644 --- a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/stats/ingestion/heartbeat/HeartbeatVersionedStatsTest.java +++ b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/stats/ingestion/heartbeat/HeartbeatVersionedStatsTest.java @@ -18,12 +18,12 @@ import com.linkedin.venice.meta.Version; import com.linkedin.venice.meta.VersionImpl; import com.linkedin.venice.meta.VersionStatus; +import com.linkedin.venice.server.VersionRole; import com.linkedin.venice.stats.StatsSupplier; import com.linkedin.venice.stats.VeniceMetricsConfig; import com.linkedin.venice.stats.VeniceMetricsRepository; import com.linkedin.venice.stats.dimensions.ReplicaState; import com.linkedin.venice.stats.dimensions.ReplicaType; -import com.linkedin.venice.stats.dimensions.VersionRole; import com.linkedin.venice.utils.DataProviderUtils; import com.linkedin.venice.utils.concurrent.VeniceConcurrentHashMap; import io.opentelemetry.api.common.Attributes; diff --git a/internal/venice-client-common/src/main/java/com/linkedin/venice/stats/dimensions/VersionRole.java b/internal/venice-client-common/src/main/java/com/linkedin/venice/server/VersionRole.java similarity index 78% rename from internal/venice-client-common/src/main/java/com/linkedin/venice/stats/dimensions/VersionRole.java rename to internal/venice-client-common/src/main/java/com/linkedin/venice/server/VersionRole.java index aeed972a517..7396471da0d 100644 --- a/internal/venice-client-common/src/main/java/com/linkedin/venice/stats/dimensions/VersionRole.java +++ b/internal/venice-client-common/src/main/java/com/linkedin/venice/server/VersionRole.java @@ -1,4 +1,8 @@ -package com.linkedin.venice.stats.dimensions; +package com.linkedin.venice.server; + +import com.linkedin.venice.stats.dimensions.VeniceDimensionInterface; +import com.linkedin.venice.stats.dimensions.VeniceMetricsDimensions; + /** * Role of a store's version: Backup/Current/Future. diff --git a/internal/venice-client-common/src/main/java/com/linkedin/venice/stats/dimensions/VeniceMetricsDimensions.java b/internal/venice-client-common/src/main/java/com/linkedin/venice/stats/dimensions/VeniceMetricsDimensions.java index 7a51cf3f068..8b07191f079 100644 --- a/internal/venice-client-common/src/main/java/com/linkedin/venice/stats/dimensions/VeniceMetricsDimensions.java +++ b/internal/venice-client-common/src/main/java/com/linkedin/venice/stats/dimensions/VeniceMetricsDimensions.java @@ -7,6 +7,7 @@ import static com.linkedin.venice.stats.VeniceOpenTelemetryMetricNamingFormat.validateMetricName; import com.google.common.annotations.VisibleForTesting; +import com.linkedin.venice.server.VersionRole; import com.linkedin.venice.stats.VeniceOpenTelemetryMetricNamingFormat; diff --git a/internal/venice-client-common/src/test/java/com/linkedin/venice/stats/dimensions/VersionRoleTest.java b/internal/venice-client-common/src/test/java/com/linkedin/venice/server/VersionRoleTest.java similarity index 78% rename from internal/venice-client-common/src/test/java/com/linkedin/venice/stats/dimensions/VersionRoleTest.java rename to internal/venice-client-common/src/test/java/com/linkedin/venice/server/VersionRoleTest.java index fd45312dab5..4b20902b7fe 100644 --- a/internal/venice-client-common/src/test/java/com/linkedin/venice/stats/dimensions/VersionRoleTest.java +++ b/internal/venice-client-common/src/test/java/com/linkedin/venice/server/VersionRoleTest.java @@ -1,5 +1,7 @@ -package com.linkedin.venice.stats.dimensions; +package com.linkedin.venice.server; +import com.linkedin.venice.stats.dimensions.VeniceDimensionInterfaceTest; +import com.linkedin.venice.stats.dimensions.VeniceMetricsDimensions; import com.linkedin.venice.utils.CollectionUtils; import java.util.Map; diff --git a/internal/venice-common/src/main/java/com/linkedin/venice/ConfigKeys.java b/internal/venice-common/src/main/java/com/linkedin/venice/ConfigKeys.java index 9338a34035f..f62059db681 100644 --- a/internal/venice-common/src/main/java/com/linkedin/venice/ConfigKeys.java +++ b/internal/venice-common/src/main/java/com/linkedin/venice/ConfigKeys.java @@ -3,7 +3,7 @@ import com.linkedin.venice.pubsub.PubSubConstants; import com.linkedin.venice.pubsub.adapter.kafka.consumer.ApacheKafkaConsumerConfig; import com.linkedin.venice.pubsub.adapter.kafka.producer.ApacheKafkaProducerConfig; -import com.linkedin.venice.stats.dimensions.VersionRole; +import com.linkedin.venice.server.VersionRole; public class ConfigKeys { diff --git a/internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/kafka/KafkaConsumptionTest.java b/internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/kafka/KafkaConsumptionTest.java index 5cfc81dc8c8..7894e415eac 100644 --- a/internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/kafka/KafkaConsumptionTest.java +++ b/internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/kafka/KafkaConsumptionTest.java @@ -41,8 +41,8 @@ import com.linkedin.venice.pubsub.api.PubSubTopic; import com.linkedin.venice.pubsub.api.PubSubTopicPartition; import com.linkedin.venice.pubsub.manager.TopicManager; +import com.linkedin.venice.server.VersionRole; import com.linkedin.venice.stats.TehutiUtils; -import com.linkedin.venice.stats.dimensions.VersionRole; import com.linkedin.venice.throttle.EventThrottler; import com.linkedin.venice.utils.DataProviderUtils; import com.linkedin.venice.utils.IntegrationTestPushUtils;