diff --git a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/AccumuloQueryRunner.java b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/AccumuloQueryRunner.java index fc69975717da..ea4a3576c1d4 100644 --- a/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/AccumuloQueryRunner.java +++ b/plugin/trino-accumulo/src/test/java/io/trino/plugin/accumulo/AccumuloQueryRunner.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedSet; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.metadata.QualifiedObjectName; import io.trino.plugin.accumulo.conf.AccumuloConfig; @@ -142,7 +141,6 @@ public static Session createSession() public static void main(String[] args) throws Exception { - Logging.initialize(); DistributedQueryRunner queryRunner = createAccumuloQueryRunner(ImmutableMap.of("http-server.http.port", "8080")); Thread.sleep(10); Logger log = Logger.get(AccumuloQueryRunner.class); diff --git a/plugin/trino-bigquery/pom.xml b/plugin/trino-bigquery/pom.xml index 174aed526437..90536086efbe 100644 --- a/plugin/trino-bigquery/pom.xml +++ b/plugin/trino-bigquery/pom.xml @@ -79,11 +79,6 @@ log - - io.airlift - log-manager - - io.airlift units diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryQueryRunner.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryQueryRunner.java index 31c100619455..2ae01370a66d 100644 --- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryQueryRunner.java +++ b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BigQueryQueryRunner.java @@ -27,7 +27,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.plugin.tpch.TpchPlugin; import io.trino.testing.DistributedQueryRunner; @@ -181,7 +180,6 @@ private static BigQuery createBigQueryClient() public static void main(String[] args) throws Exception { - Logging.initialize(); DistributedQueryRunner queryRunner = createQueryRunner(ImmutableMap.of("http-server.http.port", "8080"), ImmutableMap.of()); Thread.sleep(10); Logger log = Logger.get(BigQueryQueryRunner.class); diff --git a/plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/BlackHoleQueryRunner.java b/plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/BlackHoleQueryRunner.java index be018bbb4d2d..71bc2ae22973 100644 --- a/plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/BlackHoleQueryRunner.java +++ b/plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/BlackHoleQueryRunner.java @@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.plugin.tpch.TpchPlugin; import io.trino.testing.DistributedQueryRunner; @@ -66,7 +65,6 @@ public static DistributedQueryRunner createQueryRunner(Map extra public static void main(String[] args) throws Exception { - Logging.initialize(); DistributedQueryRunner queryRunner = createQueryRunner(ImmutableMap.of("http-server.http.port", "8080")); Thread.sleep(10); Logger log = Logger.get(BlackHoleQueryRunner.class); diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/CassandraQueryRunner.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/CassandraQueryRunner.java index 36f051a6f2c5..fe2f1417f826 100644 --- a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/CassandraQueryRunner.java +++ b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/CassandraQueryRunner.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.plugin.tpch.TpchPlugin; import io.trino.testing.DistributedQueryRunner; @@ -78,8 +77,6 @@ public static Session createCassandraSession(String schema) public static void main(String[] args) throws Exception { - Logging.initialize(); - DistributedQueryRunner queryRunner = createCassandraQueryRunner( new CassandraServer(), ImmutableMap.of("http-server.http.port", "8080"), diff --git a/plugin/trino-clickhouse/pom.xml b/plugin/trino-clickhouse/pom.xml index 1fe64d9636e7..80f2e80a426d 100644 --- a/plugin/trino-clickhouse/pom.xml +++ b/plugin/trino-clickhouse/pom.xml @@ -38,11 +38,6 @@ log - - io.airlift - log-manager - - com.clickhouse clickhouse-jdbc diff --git a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/ClickHouseQueryRunner.java b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/ClickHouseQueryRunner.java index cc42e66ff6b5..99a5a40904da 100644 --- a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/ClickHouseQueryRunner.java +++ b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/ClickHouseQueryRunner.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.plugin.tpch.TpchPlugin; import io.trino.testing.DistributedQueryRunner; @@ -85,8 +84,6 @@ public static Session createSession() public static void main(String[] args) throws Exception { - Logging.initialize(); - DistributedQueryRunner queryRunner = createClickHouseQueryRunner( new TestingClickHouseServer(), ImmutableMap.of("http-server.http.port", "8080"), diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java index 6982aa88d0fa..345845cd9f79 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java @@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.metadata.QualifiedObjectName; import io.trino.plugin.deltalake.util.DockerizedMinioDataLake; @@ -281,7 +280,6 @@ public static class DefaultDeltaLakeQueryRunnerMain public static void main(String[] args) throws Exception { - Logging.initialize(); DistributedQueryRunner queryRunner = createDeltaLakeQueryRunner( ImmutableMap.of("http-server.http.port", "8080"), ImmutableMap.of("delta.enable-non-concurrent-writes", "true")); @@ -302,7 +300,6 @@ public static class S3DeltaLakeQueryRunnerMain public static void main(String[] args) throws Exception { - Logging.initialize(); String bucketName = "test-bucket"; DockerizedMinioDataLake dockerizedMinioDataLake = createDockerizedMinioDataLakeForDeltaLake(bucketName); diff --git a/plugin/trino-druid/pom.xml b/plugin/trino-druid/pom.xml index c941fefa3c69..65b2cbb49e57 100644 --- a/plugin/trino-druid/pom.xml +++ b/plugin/trino-druid/pom.xml @@ -28,11 +28,6 @@ log - - io.airlift - log-manager - - io.airlift units diff --git a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/DruidQueryRunner.java b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/DruidQueryRunner.java index 1df335d516bb..e41ce77350f4 100644 --- a/plugin/trino-druid/src/test/java/io/trino/plugin/druid/DruidQueryRunner.java +++ b/plugin/trino-druid/src/test/java/io/trino/plugin/druid/DruidQueryRunner.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.plugin.tpch.TpchPlugin; import io.trino.testing.DistributedQueryRunner; @@ -131,8 +130,6 @@ private static String convertToTSV(List data) public static void main(String[] args) throws Exception { - Logging.initialize(); - DistributedQueryRunner queryRunner = createDruidQueryRunnerTpch( new TestingDruidServer(), ImmutableMap.of("http-server.http.port", "8080"), diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchExternalQueryRunner.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchExternalQueryRunner.java index e16ee5f9fd77..beef029ed948 100644 --- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchExternalQueryRunner.java +++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchExternalQueryRunner.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.net.HostAndPort; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.testing.DistributedQueryRunner; import io.trino.tpch.TpchTable; @@ -36,8 +35,6 @@ public static void main(String[] args) // Please set hostname and port via VM options. e.g. "-Delasticsearch.host=localhost -Delasticsearch.port=9200" // To start Elasticsearch: // docker run -p 9200:9200 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:7.6.2 - Logging.initialize(); - DistributedQueryRunner queryRunner = createElasticsearchQueryRunner( HostAndPort.fromParts(HOSTNAME, PORT), TpchTable.getTables(), diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchQueryRunner.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchQueryRunner.java index b15f66e9859e..592a87ad734d 100644 --- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchQueryRunner.java +++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchQueryRunner.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.net.HostAndPort; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.metadata.QualifiedObjectName; import io.trino.plugin.jmx.JmxPlugin; @@ -128,8 +127,6 @@ public static Session createSession() public static void main(String[] args) throws Exception { - Logging.initialize(); - DistributedQueryRunner queryRunner = createElasticsearchQueryRunner( new ElasticsearchServer(ELASTICSEARCH_7_IMAGE, ImmutableMap.of()).getAddress(), TpchTable.getTables(), diff --git a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/GeoQueryRunner.java b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/GeoQueryRunner.java index 426778d1d8d2..0e2e8a61b5c2 100644 --- a/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/GeoQueryRunner.java +++ b/plugin/trino-geospatial/src/test/java/io/trino/plugin/geospatial/GeoQueryRunner.java @@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.testing.DistributedQueryRunner; import java.util.Map; @@ -39,7 +38,6 @@ private static DistributedQueryRunner createQueryRunner(Map extr public static void main(String[] args) throws Exception { - Logging.initialize(); DistributedQueryRunner queryRunner = createQueryRunner(ImmutableMap.of("http-server.http.port", "8080")); Logger log = Logger.get(GeoQueryRunner.class); log.info("======== SERVER STARTED ========"); diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java index 10f52814c330..80be705ac192 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.plugin.tpch.TpchPlugin; import io.trino.testing.DistributedQueryRunner; import io.trino.tpch.TpchTable; @@ -138,11 +137,10 @@ public DistributedQueryRunner build() public static void main(String[] args) throws Exception { - Logging.initialize(); DistributedQueryRunner queryRunner = null; try { queryRunner = IcebergQueryRunner.builder() - .setExtraProperties(Map.of("http-server.http.port", "8080")) + .setExtraProperties(ImmutableMap.of("http-server.http.port", "8080")) .setInitialTables(TpchTable.getTables()) .build(); } diff --git a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/MemoryQueryRunner.java b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/MemoryQueryRunner.java index 6a64edebe101..69c1b35274bc 100644 --- a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/MemoryQueryRunner.java +++ b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/MemoryQueryRunner.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.plugin.tpch.TpchPlugin; import io.trino.testing.DistributedQueryRunner; @@ -104,7 +103,6 @@ private static Session createSession() public static void main(String[] args) throws Exception { - Logging.initialize(); DistributedQueryRunner queryRunner = createMemoryQueryRunner( ImmutableMap.of("http-server.http.port", "8080"), TpchTable.getTables()); diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoQueryRunner.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoQueryRunner.java index 1f22b9217b70..49451e1a5880 100644 --- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoQueryRunner.java +++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoQueryRunner.java @@ -18,7 +18,6 @@ import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.plugin.tpch.TpchPlugin; import io.trino.testing.DistributedQueryRunner; @@ -87,7 +86,6 @@ public static MongoClient createMongoClient(MongoServer server) public static void main(String[] args) throws Exception { - Logging.initialize(); DistributedQueryRunner queryRunner = createMongoQueryRunner( new MongoServer(), ImmutableMap.of("http-server.http.port", "8080"), diff --git a/plugin/trino-mysql/pom.xml b/plugin/trino-mysql/pom.xml index e9791755c919..6f4be6019a3b 100644 --- a/plugin/trino-mysql/pom.xml +++ b/plugin/trino-mysql/pom.xml @@ -38,11 +38,6 @@ log - - io.airlift - log-manager - - io.airlift units diff --git a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/MySqlQueryRunner.java b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/MySqlQueryRunner.java index 614d7880d707..bedfe53a8d38 100644 --- a/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/MySqlQueryRunner.java +++ b/plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/MySqlQueryRunner.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.plugin.tpch.TpchPlugin; import io.trino.testing.DistributedQueryRunner; @@ -86,8 +85,6 @@ private static Session createSession() public static void main(String[] args) throws Exception { - Logging.initialize(); - DistributedQueryRunner queryRunner = createMySqlQueryRunner( new TestingMySqlServer(), ImmutableMap.of("http-server.http.port", "8080"), diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/OracleQueryRunner.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/OracleQueryRunner.java index c1dc36e6252f..e952dff6d663 100644 --- a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/OracleQueryRunner.java +++ b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/OracleQueryRunner.java @@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.plugin.tpch.TpchPlugin; import io.trino.testing.DistributedQueryRunner; @@ -84,8 +83,6 @@ public static Map connectionProperties(TestingOracleServer serve public static void main(String[] args) throws Exception { - Logging.initialize(); - TestingOracleServer server = new TestingOracleServer(); DistributedQueryRunner queryRunner = createOracleQueryRunner( server, diff --git a/plugin/trino-phoenix/src/test/java/io/trino/plugin/phoenix/PhoenixQueryRunner.java b/plugin/trino-phoenix/src/test/java/io/trino/plugin/phoenix/PhoenixQueryRunner.java index c1f11c220a99..250cc11ed49c 100644 --- a/plugin/trino-phoenix/src/test/java/io/trino/plugin/phoenix/PhoenixQueryRunner.java +++ b/plugin/trino-phoenix/src/test/java/io/trino/plugin/phoenix/PhoenixQueryRunner.java @@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.metadata.QualifiedObjectName; import io.trino.plugin.tpch.TpchPlugin; @@ -140,8 +139,6 @@ private static Session createSession() public static void main(String[] args) throws Exception { - Logging.initialize(); - DistributedQueryRunner queryRunner = createPhoenixQueryRunner( TestingPhoenixServer.getInstance(), ImmutableMap.of("http-server.http.port", "8080"), diff --git a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/PhoenixQueryRunner.java b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/PhoenixQueryRunner.java index e988eccf70cd..9dc5f96c8be5 100644 --- a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/PhoenixQueryRunner.java +++ b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/PhoenixQueryRunner.java @@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.metadata.QualifiedObjectName; import io.trino.plugin.tpch.TpchPlugin; @@ -140,8 +139,6 @@ private static Session createSession() public static void main(String[] args) throws Exception { - Logging.initialize(); - DistributedQueryRunner queryRunner = createPhoenixQueryRunner( TestingPhoenixServer.getInstance(), ImmutableMap.of("http-server.http.port", "8080"), diff --git a/plugin/trino-pinot/pom.xml b/plugin/trino-pinot/pom.xml index 324ba62e985b..1afaad2db6ea 100755 --- a/plugin/trino-pinot/pom.xml +++ b/plugin/trino-pinot/pom.xml @@ -83,11 +83,6 @@ log - - io.airlift - log-manager - - io.airlift testing diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/PinotQueryRunner.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/PinotQueryRunner.java index 683740323121..a1307618ce08 100755 --- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/PinotQueryRunner.java +++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/PinotQueryRunner.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableMap; import com.google.inject.Module; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.connector.CatalogName; import io.trino.metadata.SessionPropertyManager; @@ -65,7 +64,6 @@ public static Session createSession(String schema, PinotConfig config) public static void main(String[] args) throws Exception { - Logging.initialize(); TestingKafka kafka = TestingKafka.createWithSchemaRegistry(); kafka.start(); TestingPinotCluster pinot = new TestingPinotCluster(kafka.getNetwork(), false); diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/PostgreSqlQueryRunner.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/PostgreSqlQueryRunner.java index d74a1eca41f6..ba714ff68fc7 100644 --- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/PostgreSqlQueryRunner.java +++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/PostgreSqlQueryRunner.java @@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.plugin.jmx.JmxPlugin; import io.trino.plugin.tpch.TpchPlugin; @@ -83,8 +82,6 @@ public static Session createSession() public static void main(String[] args) throws Exception { - Logging.initialize(); - DistributedQueryRunner queryRunner = createPostgreSqlQueryRunner( new TestingPostgreSqlServer(), ImmutableMap.of("http-server.http.port", "8080"), diff --git a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/PrometheusQueryRunner.java b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/PrometheusQueryRunner.java index f5a22df13d03..2cfc059e225b 100644 --- a/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/PrometheusQueryRunner.java +++ b/plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/PrometheusQueryRunner.java @@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.airlift.units.Duration; import io.trino.Session; import io.trino.testing.DistributedQueryRunner; @@ -74,7 +73,6 @@ public static PrometheusClient createPrometheusClient(PrometheusServer server) public static void main(String[] args) throws Exception { - Logging.initialize(); DistributedQueryRunner queryRunner = createPrometheusQueryRunner(new PrometheusServer(), ImmutableMap.of("http-server.http.port", "8080")); Thread.sleep(10); Logger log = Logger.get(PrometheusQueryRunner.class); diff --git a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/RaptorQueryRunner.java b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/RaptorQueryRunner.java index 577b3baa6025..ffbcb406850d 100644 --- a/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/RaptorQueryRunner.java +++ b/plugin/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/RaptorQueryRunner.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.connector.CatalogName; import io.trino.metadata.QualifiedObjectName; @@ -160,7 +159,6 @@ public static Session createSession(String schema) public static void main(String[] args) throws Exception { - Logging.initialize(); Map properties = ImmutableMap.of("http-server.http.port", "8080"); DistributedQueryRunner queryRunner = createRaptorQueryRunner(properties, ImmutableList.of(), false, ImmutableMap.of()); Thread.sleep(10); diff --git a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/RedisQueryRunner.java b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/RedisQueryRunner.java index e5a5c168559a..f3e7857621b5 100644 --- a/plugin/trino-redis/src/test/java/io/trino/plugin/redis/RedisQueryRunner.java +++ b/plugin/trino-redis/src/test/java/io/trino/plugin/redis/RedisQueryRunner.java @@ -17,7 +17,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.json.JsonCodec; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.metadata.QualifiedObjectName; import io.trino.plugin.redis.util.CodecSupplier; @@ -135,8 +134,6 @@ public static Session createSession() public static void main(String[] args) throws Exception { - Logging.initialize(); - DistributedQueryRunner queryRunner = createRedisQueryRunner( new RedisServer(), ImmutableMap.of("http-server.http.port", "8080"), diff --git a/plugin/trino-singlestore/pom.xml b/plugin/trino-singlestore/pom.xml index d0878a23e7fe..a6bbe370421c 100644 --- a/plugin/trino-singlestore/pom.xml +++ b/plugin/trino-singlestore/pom.xml @@ -38,11 +38,6 @@ log - - io.airlift - log-manager - - io.airlift units diff --git a/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/SingleStoreQueryRunner.java b/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/SingleStoreQueryRunner.java index c69168c1ae7d..c34537c4b28a 100644 --- a/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/SingleStoreQueryRunner.java +++ b/plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/SingleStoreQueryRunner.java @@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.plugin.tpch.TpchPlugin; import io.trino.testing.DistributedQueryRunner; @@ -78,8 +77,6 @@ private static Session createSession() public static void main(String[] args) throws Exception { - Logging.initialize(); - // You need to set 'memsql.license' to VM options DistributedQueryRunner queryRunner = createSingleStoreQueryRunner( new TestingSingleStoreServer(), diff --git a/plugin/trino-sqlserver/pom.xml b/plugin/trino-sqlserver/pom.xml index d6d13712514b..7b3688efef95 100644 --- a/plugin/trino-sqlserver/pom.xml +++ b/plugin/trino-sqlserver/pom.xml @@ -48,11 +48,6 @@ log - - io.airlift - log-manager - - io.airlift units diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/SqlServerQueryRunner.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/SqlServerQueryRunner.java index 6cabb7664229..fbb6ab66ce3c 100644 --- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/SqlServerQueryRunner.java +++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/SqlServerQueryRunner.java @@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.plugin.tpch.TpchPlugin; import io.trino.spi.security.Identity; @@ -33,6 +32,8 @@ public final class SqlServerQueryRunner { + private static final Logger log = Logger.get(SqlServerQueryRunner.class); + private SqlServerQueryRunner() {} private static final String CATALOG = "sqlserver"; @@ -60,6 +61,7 @@ public static QueryRunner createSqlServerQueryRunner( queryRunner.installPlugin(new SqlServerPlugin()); queryRunner.createCatalog(CATALOG, "sqlserver", connectorProperties); + log.info("%s catalog properties: %s", CATALOG, connectorProperties); copyTpchTables(queryRunner, "tpch", TINY_SCHEMA_NAME, createSession(testingSqlServer.getUsername()), tables); @@ -83,8 +85,6 @@ private static Session createSession(String username) public static void main(String[] args) throws Exception { - Logging.initialize(); - TestingSqlServer testingSqlServer = new TestingSqlServer(); // SqlServer is using docker container so in case that shutdown hook is not called, developer can easily clean docker container on their own diff --git a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TpcdsQueryRunner.java b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TpcdsQueryRunner.java index 88354dd224c2..166ffcb538f0 100644 --- a/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TpcdsQueryRunner.java +++ b/plugin/trino-tpcds/src/test/java/io/trino/plugin/tpcds/TpcdsQueryRunner.java @@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap; import io.airlift.log.Logger; -import io.airlift.log.Logging; import io.trino.Session; import io.trino.testing.DistributedQueryRunner; @@ -67,7 +66,6 @@ public static DistributedQueryRunner createQueryRunner(Map extra public static void main(String[] args) throws Exception { - Logging.initialize(); DistributedQueryRunner queryRunner = createQueryRunner(ImmutableMap.of("http-server.http.port", "8080")); Thread.sleep(10); Logger log = Logger.get(TpcdsQueryRunner.class); diff --git a/testing/trino-testing/pom.xml b/testing/trino-testing/pom.xml index 08970fa90fad..bd1c87267cac 100644 --- a/testing/trino-testing/pom.xml +++ b/testing/trino-testing/pom.xml @@ -63,6 +63,11 @@ log + + io.airlift + log-manager + + io.airlift slice @@ -153,12 +158,6 @@ - - io.airlift - log-manager - runtime - - com.h2database h2 diff --git a/testing/trino-testing/src/main/java/io/trino/testing/DistributedQueryRunner.java b/testing/trino-testing/src/main/java/io/trino/testing/DistributedQueryRunner.java index 9db002a81a4b..2871e2fa0f97 100644 --- a/testing/trino-testing/src/main/java/io/trino/testing/DistributedQueryRunner.java +++ b/testing/trino-testing/src/main/java/io/trino/testing/DistributedQueryRunner.java @@ -19,6 +19,7 @@ import com.google.inject.Module; import io.airlift.discovery.server.testing.TestingDiscoveryServer; import io.airlift.log.Logger; +import io.airlift.log.Logging; import io.airlift.testing.Assertions; import io.airlift.units.Duration; import io.trino.Session; @@ -72,6 +73,8 @@ import static com.google.common.base.Throwables.throwIfUnchecked; import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.inject.util.Modules.EMPTY_MODULE; +import static io.airlift.log.Level.ERROR; +import static io.airlift.log.Level.WARN; import static io.airlift.testing.Closeables.closeAllSuppress; import static io.airlift.units.Duration.nanosSince; import static java.util.Objects.requireNonNull; @@ -119,6 +122,8 @@ private DistributedQueryRunner( checkArgument(nodeCount >= 2, "the nodeCount must be greater than or equal to two!"); } + setupLogging(); + try { long start = System.nanoTime(); discoveryServer = new TestingDiscoveryServer(environment); @@ -204,6 +209,14 @@ private DistributedQueryRunner( log.info("Added functions in %s", nanosSince(start).convertToMostSuccinctTimeUnit()); } + private static void setupLogging() + { + Logging logging = Logging.initialize(); + logging.setLevel("Bootstrap", WARN); + logging.setLevel("org.glassfish", ERROR); + logging.setLevel("org.eclipse.jetty.server", WARN); + } + private static TestingTrinoServer createTestingTrinoServer( URI discoveryUri, boolean coordinator,