Skip to content

Commit e1a5541

Browse files
sfc-gh-ggengclaude
andauthored
[SNOW-3249917] JDBC removal Step 9c: Swap telemetry imports (#1131)
Mechanical import swaps only — no logic changes: SnowflakeSQLLoggedException (6 of 12 JDBC imports swapped): - ObjectMapperFactory → same package (already replicated) - SqlState → same package (already replicated) - TelemetryEvent → same package (replicated in Step 9b) - TelemetryService (OOB) → same package (replicated in Step 9b) - LoginInfoDTO.SF_JDBC_APP_ID → SnowflakeDriverConstants.SF_JDBC_APP_ID - SnowflakeDriver.implementVersion → SnowflakeDriverConstants.implementVersion Kept from JDBC: SFBaseSession, SFSession, SFException (parameter types), Telemetry, TelemetryField, TelemetryUtil (interact with session.getTelemetryClient()) TelemetryClient (1 of 5 JDBC imports swapped): - TelemetryThreadPool → ingest version (replicated in Step 9b) Kept from JDBC: HttpUtil, SFSession, SnowflakeConnectionV1, SnowflakeSQLException Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 5f3a88e commit e1a5541

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

src/main/java/net/snowflake/ingest/connection/telemetry/TelemetryClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import net.snowflake.client.core.SFSession;
1919
import net.snowflake.client.jdbc.SnowflakeConnectionV1;
2020
import net.snowflake.client.jdbc.SnowflakeSQLException;
21-
import net.snowflake.client.jdbc.telemetryOOB.TelemetryThreadPool;
2221
import net.snowflake.ingest.streaming.internal.fileTransferAgent.ObjectMapperFactory;
22+
import net.snowflake.ingest.streaming.internal.fileTransferAgent.TelemetryThreadPool;
2323
import net.snowflake.ingest.streaming.internal.fileTransferAgent.log.SFLogger;
2424
import net.snowflake.ingest.streaming.internal.fileTransferAgent.log.SFLoggerFactory;
2525
import net.snowflake.ingest.utils.Stopwatch;

src/main/java/net/snowflake/ingest/streaming/internal/fileTransferAgent/SnowflakeSQLLoggedException.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
* Source: https://github.com/snowflakedb/snowflake-jdbc/blob/v3.25.1/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLLoggedException.java
44
*
55
* Permitted differences: package, SFLogger/isNullOrEmpty/ErrorCode/SnowflakeSQLException use
6-
* ingest versions. JDBC telemetry/session imports kept temporarily.
6+
* ingest versions. OOB telemetry imports swapped to ingest replicated versions:
7+
* ObjectMapperFactory/SqlState/TelemetryEvent/TelemetryService use ingest versions (same package).
8+
* LoginInfoDTO.SF_JDBC_APP_ID/SnowflakeDriver.implementVersion → SnowflakeDriverConstants.
9+
* IB telemetry imports (Telemetry/TelemetryField/TelemetryUtil) kept from JDBC — they interact
10+
* with session.getTelemetryClient() which returns JDBC types.
11+
* SFBaseSession/SFSession/SFException kept from JDBC temporarily (parameter types).
712
*/
813
package net.snowflake.ingest.streaming.internal.fileTransferAgent;
914

@@ -21,18 +26,12 @@
2126
import java.util.regex.Matcher;
2227
import java.util.regex.Pattern;
2328
import net.minidev.json.JSONObject;
24-
import net.snowflake.client.core.ObjectMapperFactory;
2529
import net.snowflake.client.core.SFBaseSession;
2630
import net.snowflake.client.core.SFException;
2731
import net.snowflake.client.core.SFSession;
28-
import net.snowflake.client.jdbc.SnowflakeDriver;
29-
import net.snowflake.client.jdbc.internal.snowflake.common.core.LoginInfoDTO;
30-
import net.snowflake.client.jdbc.internal.snowflake.common.core.SqlState;
3132
import net.snowflake.client.jdbc.telemetry.Telemetry;
3233
import net.snowflake.client.jdbc.telemetry.TelemetryField;
3334
import net.snowflake.client.jdbc.telemetry.TelemetryUtil;
34-
import net.snowflake.client.jdbc.telemetryOOB.TelemetryEvent;
35-
import net.snowflake.client.jdbc.telemetryOOB.TelemetryService;
3635
import net.snowflake.ingest.streaming.internal.fileTransferAgent.log.SFLogger;
3736
import net.snowflake.ingest.streaming.internal.fileTransferAgent.log.SFLoggerFactory;
3837

@@ -139,8 +138,8 @@ static String maskStacktrace(String stackTrace) {
139138
static JSONObject createOOBValue(String queryId, String SQLState, int vendorCode) {
140139
JSONObject oobValue = new JSONObject();
141140
oobValue.put("type", TelemetryField.SQL_EXCEPTION.toString());
142-
oobValue.put("DriverType", LoginInfoDTO.SF_JDBC_APP_ID);
143-
oobValue.put("DriverVersion", SnowflakeDriver.implementVersion);
141+
oobValue.put("DriverType", SnowflakeDriverConstants.SF_JDBC_APP_ID);
142+
oobValue.put("DriverVersion", SnowflakeDriverConstants.implementVersion);
144143
if (!isNullOrEmpty(queryId)) {
145144
oobValue.put("QueryID", queryId);
146145
}
@@ -164,8 +163,8 @@ static JSONObject createOOBValue(String queryId, String SQLState, int vendorCode
164163
static ObjectNode createIBValue(String queryId, String SQLState, int vendorCode) {
165164
ObjectNode ibValue = mapper.createObjectNode();
166165
ibValue.put("type", TelemetryField.SQL_EXCEPTION.toString());
167-
ibValue.put("DriverType", LoginInfoDTO.SF_JDBC_APP_ID);
168-
ibValue.put("DriverVersion", SnowflakeDriver.implementVersion);
166+
ibValue.put("DriverType", SnowflakeDriverConstants.SF_JDBC_APP_ID);
167+
ibValue.put("DriverVersion", SnowflakeDriverConstants.implementVersion);
169168
if (!isNullOrEmpty(queryId)) {
170169
ibValue.put("QueryID", queryId);
171170
}

0 commit comments

Comments
 (0)