fixed issues with metrics in tests

Author: chernser

.github/workflows/build.yml

@@ -249,7 +249,7 @@ jobs:
         run: mvn --also-make --batch-mode --no-transfer-progress -DskipTests install
       - name: Generate JWT
         env:
-          JWT_K_PEM: ${{ secrets.JWT_K_PEM }}
+          JWT_K_PEM: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_JWT_PRIVATE_KEY }}
         run: |
           npm install jsonwebtoken &&
           echo "CLIENT_JWT=$(node jwt-gen.js)" >> "$GITHUB_ENV"

client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java

@@ -89,7 +89,8 @@ protected Client.Builder newClient() {
                 .compressClientRequest(useClientCompression)
                 .useHttpCompression(useHttpCompression)
                 .setDefaultDatabase(ClickHouseServerForTest.getDatabase())
-                .serverSetting(ServerSettings.WAIT_ASYNC_INSERT, "1")
+                .serverSetting(ServerSettings.ASYNC_INSERT, "0")
+                .serverSetting(ServerSettings.WAIT_END_OF_QUERY, "1")
                 .useNewImplementation(System.getProperty("client.tests.useNewImplementation", "true").equals("true"));
     }
 
@@ -127,6 +128,10 @@ public void insertSimplePOJOs() throws Exception {
 
     @Test(groups = { "integration" }, enabled = true)
     public void insertPOJOWithJSON() throws Exception {
+        if (isCloud()) {
+            return; // not working because of Code: 452. DB::Exception: Setting allow_experimental_json_type should not be changed. (SETTING_CONSTRAINT_VIOLATION)
+            // but without this setting it doesn't let to create a table
+        }
         List<GenericRecord> serverVersion = client.queryAll("SELECT version()");
         if (ClickHouseVersion.of(serverVersion.get(0).getString(1)).check("(,24.8]")) {
             System.out.println("Test is skipped: feature is supported since 24.8");

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

@@ -1931,6 +1931,7 @@ protected Client.Builder newClient() {
                 .allowBinaryReaderToReuseBuffers(usePreallocatedBuffers)
                 .setDefaultDatabase(ClickHouseServerForTest.getDatabase())
                 .serverSetting(ServerSettings.WAIT_ASYNC_INSERT, "1")
+                .serverSetting(ServerSettings.ASYNC_INSERT, "0")
                 .useNewImplementation(System.getProperty("client.tests.useNewImplementation", "true").equals("true"));
     }
 

jdbc-v2/src/main/java/com/clickhouse/jdbc/ConnectionImpl.java

@@ -2,6 +2,7 @@
 
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.ClientConfigProperties;
+import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.client.api.query.QuerySettings;
 import com.clickhouse.data.ClickHouseDataType;
@@ -75,7 +76,9 @@ public ConnectionImpl(String url, Properties info) throws SQLException {
                 .setClientName(clientName)
                 .build();
         this.schema = client.getDefaultDatabase();
-        this.defaultQuerySettings = new QuerySettings();
+        this.defaultQuerySettings = new QuerySettings()
+                .serverSetting(ServerSettings.ASYNC_INSERT, "0")
+                .serverSetting(ServerSettings.WAIT_END_OF_QUERY, "1");
 
         this.metadata = new com.clickhouse.jdbc.metadata.DatabaseMetaData(this, false, url);
     }

jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java

@@ -1,5 +1,6 @@
 package com.clickhouse.jdbc;
 
+import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
 import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.client.api.metrics.OperationMetrics;
@@ -191,7 +192,7 @@ public int executeUpdate(String sql, QuerySettings settings) throws SQLException
         }
 
         QuerySettings mergedSettings = QuerySettings.merge(connection.getDefaultQuerySettings(), settings);
-        mergedSettings.serverSetting(ServerSettings.WAIT_END_OF_QUERY, "1");
+
         lastSql = parseJdbcEscapeSyntax(sql);
         int updateCount = 0;
         try (QueryResponse response = queryTimeout == 0 ? connection.client.query(lastSql, mergedSettings).get()

jdbc-v2/src/test/java/com/clickhouse/jdbc/JdbcIntegrationTest.java

@@ -34,7 +34,7 @@ public Connection getJdbcConnection(Properties properties) throws SQLException {
         Properties info = new Properties();
         info.setProperty("user", "default");
         info.setProperty("password", ClickHouseServerForTest.getPassword());
-        info.setProperty(ServerSettings.WAIT_ASYNC_INSERT, "1");
+
         if (properties != null) {
             info.putAll(properties);
         }