This is an automated email from the ASF dual-hosted git repository.
Amar3tto pushed a commit to branch icerbergio-benchmark
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/icerbergio-benchmark by this
push:
new 3764778ccc9 Refactoring
3764778ccc9 is described below
commit 3764778ccc9cd67b5e682e740759464f1a5e55cc
Author: Vitaly Terentyev <[email protected]>
AuthorDate: Tue Jul 7 16:46:11 2026 +0400
Refactoring
---
.../common/dataflow/DefaultPipelineLauncherTest.java | 1 -
.../it/common/{ => dataflow}/IOLoadTestBase.java | 5 +++--
.../it/common/{ => dataflow}/IOStressTestBase.java | 2 +-
.../beam/it/common/{ => dataflow}/LoadTestBase.java | 5 ++++-
.../beam/it/gcp/datagenerator/package-info.java | 20 --------------------
.../java/org/apache/beam/it/gcp/WordCountIT.java | 2 ++
.../apache/beam/it/gcp/bigquery/BigQueryIOLT.java | 2 +-
.../apache/beam/it/gcp/bigquery/BigQueryIOST.java | 2 +-
.../beam/it/gcp/bigquery/BigQueryStreamingLT.java | 2 +-
.../apache/beam/it/gcp/bigtable/BigTableIOLT.java | 2 +-
.../apache/beam/it/gcp/bigtable/BigTableIOST.java | 2 +-
.../beam/it/gcp/datagenerator/DataGenerator.java | 2 +-
.../org/apache/beam/it/gcp/pubsub/PubSubIOST.java | 2 +-
.../org/apache/beam/it/gcp/pubsub/PubsubIOLT.java | 2 +-
.../org/apache/beam/it/gcp/spanner/SpannerIOLT.java | 2 +-
.../org/apache/beam/it/gcp/spanner/SpannerIOST.java | 2 +-
.../apache/beam/it/gcp/storage/FileBasedIOLT.java | 2 +-
.../java/org/apache/beam/it/iceberg/IcebergIOLT.java | 2 +-
it/kafka/build.gradle | 3 +--
.../java/org/apache/beam/it/kafka/KafkaIOLT.java | 3 ++-
.../java/org/apache/beam/it/kafka/KafkaIOST.java | 3 ++-
21 files changed, 27 insertions(+), 41 deletions(-)
diff --git
a/it/common/src/test/java/org/apache/beam/it/common/dataflow/DefaultPipelineLauncherTest.java
b/it/common/src/test/java/org/apache/beam/it/common/dataflow/DefaultPipelineLauncherTest.java
index e9dc6a1a739..333549c621b 100644
---
a/it/common/src/test/java/org/apache/beam/it/common/dataflow/DefaultPipelineLauncherTest.java
+++
b/it/common/src/test/java/org/apache/beam/it/common/dataflow/DefaultPipelineLauncherTest.java
@@ -25,7 +25,6 @@ import java.io.IOException;
import java.time.Instant;
import
org.apache.beam.it.common.dataflow.DefaultPipelineLauncher.PipelineMetricsType;
import org.apache.beam.it.common.PipelineLauncher;
-import org.apache.beam.it.common.IOLoadTestBase;
import org.apache.beam.sdk.io.GenerateSequence;
import org.apache.beam.sdk.testing.TestPipeline;
import org.apache.beam.sdk.testutils.metrics.TimeMonitor;
diff --git
a/it/common/src/test/java/org/apache/beam/it/common/IOLoadTestBase.java
b/it/common/src/test/java/org/apache/beam/it/common/dataflow/IOLoadTestBase.java
similarity index 96%
rename from
it/common/src/test/java/org/apache/beam/it/common/IOLoadTestBase.java
rename to
it/common/src/test/java/org/apache/beam/it/common/dataflow/IOLoadTestBase.java
index 78ec2af36d7..8a1a94df1ae 100644
--- a/it/common/src/test/java/org/apache/beam/it/common/IOLoadTestBase.java
+++
b/it/common/src/test/java/org/apache/beam/it/common/dataflow/IOLoadTestBase.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beam.it.common;
+package org.apache.beam.it.common.dataflow;
import com.google.cloud.Timestamp;
import java.io.IOException;
@@ -24,7 +24,8 @@ import java.util.Collection;
import java.util.Map;
import java.util.UUID;
-import org.apache.beam.it.common.dataflow.DefaultPipelineLauncher;
+import org.apache.beam.it.common.PipelineLauncher;
+import org.apache.beam.it.common.TestProperties;
import
org.apache.beam.it.common.dataflow.DefaultPipelineLauncher.PipelineMetricsType;
import org.apache.beam.sdk.metrics.Counter;
import org.apache.beam.sdk.metrics.Metrics;
diff --git
a/it/common/src/test/java/org/apache/beam/it/common/IOStressTestBase.java
b/it/common/src/test/java/org/apache/beam/it/common/dataflow/IOStressTestBase.java
similarity index 99%
rename from
it/common/src/test/java/org/apache/beam/it/common/IOStressTestBase.java
rename to
it/common/src/test/java/org/apache/beam/it/common/dataflow/IOStressTestBase.java
index a15e98d65d8..e08eec031eb 100644
--- a/it/common/src/test/java/org/apache/beam/it/common/IOStressTestBase.java
+++
b/it/common/src/test/java/org/apache/beam/it/common/dataflow/IOStressTestBase.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beam.it.common;
+package org.apache.beam.it.common.dataflow;
import java.io.Serializable;
import java.time.Duration;
diff --git
a/it/common/src/test/java/org/apache/beam/it/common/LoadTestBase.java
b/it/common/src/test/java/org/apache/beam/it/common/dataflow/LoadTestBase.java
similarity index 99%
rename from it/common/src/test/java/org/apache/beam/it/common/LoadTestBase.java
rename to
it/common/src/test/java/org/apache/beam/it/common/dataflow/LoadTestBase.java
index bb0d2ab72bd..36071283506 100644
--- a/it/common/src/test/java/org/apache/beam/it/common/LoadTestBase.java
+++
b/it/common/src/test/java/org/apache/beam/it/common/dataflow/LoadTestBase.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.beam.it.common;
+package org.apache.beam.it.common.dataflow;
import static org.apache.beam.it.common.logging.LogStrings.formatForLogging;
import static
org.apache.beam.it.common.dataflow.AbstractPipelineLauncher.RUNNER_V2;
@@ -41,7 +41,10 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.regex.Pattern;
+import org.apache.beam.it.common.PipelineLauncher;
import org.apache.beam.it.common.PipelineLauncher.LaunchInfo;
+import org.apache.beam.it.common.PipelineOperator;
+import org.apache.beam.it.common.TestProperties;
import org.apache.beam.it.common.bigquery.BigQueryResourceManager;
import org.apache.beam.it.common.monitoring.MonitoringClient;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.MoreObjects;
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datagenerator/package-info.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datagenerator/package-info.java
deleted file mode 100644
index d563025ebeb..00000000000
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datagenerator/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** Data generator for load tests. */
-package org.apache.beam.it.gcp.datagenerator;
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/WordCountIT.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/WordCountIT.java
index b561c0c71fb..9719caa59f1 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/WordCountIT.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/WordCountIT.java
@@ -25,6 +25,8 @@ import java.io.IOException;
import java.time.Duration;
import java.util.Arrays;
import java.util.List;
+
+import org.apache.beam.it.common.dataflow.IOLoadTestBase;
import org.apache.beam.it.common.PipelineLauncher.LaunchConfig;
import org.apache.beam.it.common.PipelineLauncher.LaunchInfo;
import org.apache.beam.it.common.PipelineLauncher.Sdk;
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOLT.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOLT.java
index 9a4af4082e2..b734f93478e 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOLT.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOLT.java
@@ -45,7 +45,7 @@ import org.apache.beam.it.common.PipelineOperator;
import org.apache.beam.it.common.TestProperties;
import org.apache.beam.it.common.bigquery.BigQueryResourceManager;
import org.apache.beam.it.common.utils.ResourceManagerUtils;
-import org.apache.beam.it.common.IOLoadTestBase;
+import org.apache.beam.it.common.dataflow.IOLoadTestBase;
import org.apache.beam.sdk.io.Read;
import org.apache.beam.sdk.io.gcp.bigquery.AvroWriteRequest;
import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOST.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOST.java
index bbe4df61191..4c86eb139bf 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOST.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOST.java
@@ -43,7 +43,7 @@ import org.apache.beam.it.common.PipelineOperator;
import org.apache.beam.it.common.TestProperties;
import org.apache.beam.it.common.bigquery.BigQueryResourceManager;
import org.apache.beam.it.common.utils.ResourceManagerUtils;
-import org.apache.beam.it.common.IOStressTestBase;
+import org.apache.beam.it.common.dataflow.IOStressTestBase;
import
org.apache.beam.runners.dataflow.options.DataflowPipelineWorkerPoolOptions;
import org.apache.beam.sdk.io.Read;
import org.apache.beam.sdk.io.gcp.bigquery.AvroWriteRequest;
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryStreamingLT.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryStreamingLT.java
index 7bf759b42f9..75a7be50a50 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryStreamingLT.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryStreamingLT.java
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
import org.apache.beam.it.common.PipelineLauncher;
import org.apache.beam.it.common.PipelineOperator;
import org.apache.beam.it.common.TestProperties;
-import org.apache.beam.it.common.IOLoadTestBase;
+import org.apache.beam.it.common.dataflow.IOLoadTestBase;
import org.apache.beam.runners.dataflow.DataflowRunner;
import org.apache.beam.sdk.io.GenerateSequence;
import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigTableIOLT.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigTableIOLT.java
index aea26f2f0a4..03efb42dafb 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigTableIOLT.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigTableIOLT.java
@@ -35,7 +35,7 @@ import org.apache.beam.it.common.PipelineLauncher;
import org.apache.beam.it.common.PipelineOperator;
import org.apache.beam.it.common.TestProperties;
import org.apache.beam.it.common.utils.ResourceManagerUtils;
-import org.apache.beam.it.common.IOLoadTestBase;
+import org.apache.beam.it.common.dataflow.IOLoadTestBase;
import org.apache.beam.sdk.io.GenerateSequence;
import org.apache.beam.sdk.io.gcp.bigtable.BigtableIO;
import org.apache.beam.sdk.testing.TestPipeline;
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigTableIOST.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigTableIOST.java
index 85950772bce..5e70a0e2d58 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigTableIOST.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigTableIOST.java
@@ -38,7 +38,7 @@ import org.apache.beam.it.common.PipelineLauncher;
import org.apache.beam.it.common.PipelineOperator;
import org.apache.beam.it.common.TestProperties;
import org.apache.beam.it.common.utils.ResourceManagerUtils;
-import org.apache.beam.it.common.IOStressTestBase;
+import org.apache.beam.it.common.dataflow.IOStressTestBase;
import
org.apache.beam.runners.dataflow.options.DataflowPipelineWorkerPoolOptions;
import org.apache.beam.sdk.io.Read;
import org.apache.beam.sdk.io.gcp.bigtable.BigtableIO;
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datagenerator/DataGenerator.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/datagenerator/DataGenerator.java
similarity index 99%
rename from
it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datagenerator/DataGenerator.java
rename to
it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/datagenerator/DataGenerator.java
index 99016b5dd3a..0b838bddeb6 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datagenerator/DataGenerator.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/datagenerator/DataGenerator.java
@@ -17,7 +17,7 @@
*/
package org.apache.beam.it.gcp.datagenerator;
-import static org.apache.beam.it.gcp.LoadTestBase.createConfig;
+import static org.apache.beam.it.common.dataflow.LoadTestBase.createConfig;
import static
org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatPipeline;
import static
org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatResult;
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/pubsub/PubSubIOST.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/pubsub/PubSubIOST.java
index 74bd994055a..98092152ad2 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/pubsub/PubSubIOST.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/pubsub/PubSubIOST.java
@@ -38,7 +38,7 @@ import org.apache.beam.it.common.PipelineLauncher;
import org.apache.beam.it.common.PipelineOperator;
import org.apache.beam.it.common.TestProperties;
import org.apache.beam.it.common.utils.ResourceManagerUtils;
-import org.apache.beam.it.common.IOStressTestBase;
+import org.apache.beam.it.common.dataflow.IOStressTestBase;
import
org.apache.beam.runners.dataflow.options.DataflowPipelineWorkerPoolOptions;
import org.apache.beam.sdk.extensions.protobuf.Proto3SchemaMessages.Primitive;
import org.apache.beam.sdk.io.Read;
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/pubsub/PubsubIOLT.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/pubsub/PubsubIOLT.java
index a9c7b63e64c..360073ac0e9 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/pubsub/PubsubIOLT.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/pubsub/PubsubIOLT.java
@@ -38,7 +38,7 @@ import org.apache.beam.it.common.PipelineLauncher;
import org.apache.beam.it.common.PipelineOperator;
import org.apache.beam.it.common.TestProperties;
import org.apache.beam.it.common.utils.ResourceManagerUtils;
-import org.apache.beam.it.common.IOLoadTestBase;
+import org.apache.beam.it.common.dataflow.IOLoadTestBase;
import org.apache.beam.runners.direct.DirectOptions;
import org.apache.beam.sdk.extensions.protobuf.Proto3SchemaMessages.Primitive;
import org.apache.beam.sdk.io.Read;
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/spanner/SpannerIOLT.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/spanner/SpannerIOLT.java
index a29cf32eae1..99682746d2b 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/spanner/SpannerIOLT.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/spanner/SpannerIOLT.java
@@ -38,7 +38,7 @@ import org.apache.beam.it.common.PipelineLauncher;
import org.apache.beam.it.common.PipelineOperator;
import org.apache.beam.it.common.TestProperties;
import org.apache.beam.it.common.utils.ResourceManagerUtils;
-import org.apache.beam.it.common.IOLoadTestBase;
+import org.apache.beam.it.common.dataflow.IOLoadTestBase;
import org.apache.beam.sdk.io.GenerateSequence;
import org.apache.beam.sdk.io.gcp.spanner.SpannerIO;
import org.apache.beam.sdk.io.synthetic.SyntheticSourceOptions;
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/spanner/SpannerIOST.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/spanner/SpannerIOST.java
index 8ce34d06de8..01d8deef177 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/spanner/SpannerIOST.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/spanner/SpannerIOST.java
@@ -38,7 +38,7 @@ import org.apache.beam.it.common.PipelineLauncher;
import org.apache.beam.it.common.PipelineOperator;
import org.apache.beam.it.common.TestProperties;
import org.apache.beam.it.common.utils.ResourceManagerUtils;
-import org.apache.beam.it.common.IOStressTestBase;
+import org.apache.beam.it.common.dataflow.IOStressTestBase;
import
org.apache.beam.runners.dataflow.options.DataflowPipelineWorkerPoolOptions;
import org.apache.beam.sdk.io.Read;
import org.apache.beam.sdk.io.gcp.spanner.SpannerIO;
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/FileBasedIOLT.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/FileBasedIOLT.java
index febcfc01f3f..abec875981f 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/FileBasedIOLT.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/FileBasedIOLT.java
@@ -34,7 +34,7 @@ import org.apache.beam.it.common.PipelineLauncher;
import org.apache.beam.it.common.PipelineOperator;
import org.apache.beam.it.common.TestProperties;
import org.apache.beam.it.common.utils.ResourceManagerUtils;
-import org.apache.beam.it.common.IOLoadTestBase;
+import org.apache.beam.it.common.dataflow.IOLoadTestBase;
import org.apache.beam.sdk.io.Compression;
import org.apache.beam.sdk.io.Read;
import org.apache.beam.sdk.io.TextIO;
diff --git
a/it/iceberg/src/test/java/org/apache/beam/it/iceberg/IcebergIOLT.java
b/it/iceberg/src/test/java/org/apache/beam/it/iceberg/IcebergIOLT.java
index d2e342ccecb..3f486ec3f5d 100644
--- a/it/iceberg/src/test/java/org/apache/beam/it/iceberg/IcebergIOLT.java
+++ b/it/iceberg/src/test/java/org/apache/beam/it/iceberg/IcebergIOLT.java
@@ -1,6 +1,6 @@
package org.apache.beam.it.iceberg;
-import org.apache.beam.it.common.IOLoadTestBase;
+import org.apache.beam.it.common.dataflow.IOLoadTestBase;
public class IcebergIOLT extends IOLoadTestBase {
diff --git a/it/kafka/build.gradle b/it/kafka/build.gradle
index 0496c423beb..32ef0623fea 100644
--- a/it/kafka/build.gradle
+++ b/it/kafka/build.gradle
@@ -42,8 +42,7 @@ dependencies {
permitUsedUndeclared library.java.guava
testImplementation library.java.mockito_core
testRuntimeOnly library.java.slf4j_simple
- // TODO: Remove the below dependencies after KafkaIOLT has been moved to
the right directory.
- testImplementation project(path: ":it:google-cloud-platform")
+ testImplementation project(path: ":it:common", configuration:
"testRuntimeMigration")
testImplementation project(path: ":sdks:java:io:kafka")
testImplementation project(path: ":sdks:java:io:synthetic")
testImplementation project(path: ":runners:direct-java")
diff --git a/it/kafka/src/test/java/org/apache/beam/it/kafka/KafkaIOLT.java
b/it/kafka/src/test/java/org/apache/beam/it/kafka/KafkaIOLT.java
index c20699d61a5..4b0ecbfd343 100644
--- a/it/kafka/src/test/java/org/apache/beam/it/kafka/KafkaIOLT.java
+++ b/it/kafka/src/test/java/org/apache/beam/it/kafka/KafkaIOLT.java
@@ -27,11 +27,12 @@ import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.Map;
import java.util.UUID;
+import
org.apache.beam.it.common.dataflow.DefaultPipelineLauncher.PipelineMetricsType;
import org.apache.beam.it.common.PipelineLauncher;
import org.apache.beam.it.common.PipelineOperator;
import org.apache.beam.it.common.TestProperties;
import org.apache.beam.it.common.utils.ResourceManagerUtils;
-import org.apache.beam.it.gcp.IOLoadTestBase;
+import org.apache.beam.it.common.dataflow.IOLoadTestBase;
import org.apache.beam.runners.direct.DirectOptions;
import org.apache.beam.sdk.io.kafka.KafkaIO;
import org.apache.beam.sdk.io.synthetic.SyntheticOptions;
diff --git a/it/kafka/src/test/java/org/apache/beam/it/kafka/KafkaIOST.java
b/it/kafka/src/test/java/org/apache/beam/it/kafka/KafkaIOST.java
index bb1cb37a11b..cfc11127c34 100644
--- a/it/kafka/src/test/java/org/apache/beam/it/kafka/KafkaIOST.java
+++ b/it/kafka/src/test/java/org/apache/beam/it/kafka/KafkaIOST.java
@@ -31,10 +31,11 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
+import
org.apache.beam.it.common.dataflow.DefaultPipelineLauncher.PipelineMetricsType;
import org.apache.beam.it.common.PipelineLauncher;
import org.apache.beam.it.common.PipelineOperator;
import org.apache.beam.it.common.TestProperties;
-import org.apache.beam.it.gcp.IOStressTestBase;
+import org.apache.beam.it.common.dataflow.IOStressTestBase;
import
org.apache.beam.runners.dataflow.options.DataflowPipelineWorkerPoolOptions;
import org.apache.beam.sdk.io.Read;
import org.apache.beam.sdk.io.kafka.KafkaIO;
