Skip to content

[SNOW-3249917] JDBC removal Step 9c: Swap telemetry imports #1131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sfc-gh-ggeng merged 1 commit into from
Apr 2, 2026
Merged

[SNOW-3249917] JDBC removal Step 9c: Swap telemetry imports #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/snowflake/ingest/connection/telemetry/TelemetryClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import net.snowflake.client.core.SFSession;
import net.snowflake.client.jdbc.SnowflakeConnectionV1;
import net.snowflake.client.jdbc.SnowflakeSQLException;
import net.snowflake.client.jdbc.telemetryOOB.TelemetryThreadPool;
import net.snowflake.ingest.streaming.internal.fileTransferAgent.ObjectMapperFactory;
import net.snowflake.ingest.streaming.internal.fileTransferAgent.TelemetryThreadPool;
import net.snowflake.ingest.streaming.internal.fileTransferAgent.log.SFLogger;
import net.snowflake.ingest.streaming.internal.fileTransferAgent.log.SFLoggerFactory;
import net.snowflake.ingest.utils.Stopwatch;
Expand Down
21 changes: 10 additions & 11 deletions ...et/snowflake/ingest/streaming/internal/fileTransferAgent/SnowflakeSQLLoggedException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
* Source: https://github.com/snowflakedb/snowflake-jdbc/blob/v3.25.1/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLLoggedException.java
*
* Permitted differences: package, SFLogger/isNullOrEmpty/ErrorCode/SnowflakeSQLException use
* ingest versions. JDBC telemetry/session imports kept temporarily.
* ingest versions. OOB telemetry imports swapped to ingest replicated versions:
* ObjectMapperFactory/SqlState/TelemetryEvent/TelemetryService use ingest versions (same package).
* LoginInfoDTO.SF_JDBC_APP_ID/SnowflakeDriver.implementVersion → SnowflakeDriverConstants.
* IB telemetry imports (Telemetry/TelemetryField/TelemetryUtil) kept from JDBC — they interact
* with session.getTelemetryClient() which returns JDBC types.
* SFBaseSession/SFSession/SFException kept from JDBC temporarily (parameter types).
*/
package net.snowflake.ingest.streaming.internal.fileTransferAgent;

Expand All @@ -21,18 +26,12 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.minidev.json.JSONObject;
import net.snowflake.client.core.ObjectMapperFactory;
import net.snowflake.client.core.SFBaseSession;
import net.snowflake.client.core.SFException;
import net.snowflake.client.core.SFSession;
import net.snowflake.client.jdbc.SnowflakeDriver;
import net.snowflake.client.jdbc.internal.snowflake.common.core.LoginInfoDTO;
import net.snowflake.client.jdbc.internal.snowflake.common.core.SqlState;
import net.snowflake.client.jdbc.telemetry.Telemetry;
import net.snowflake.client.jdbc.telemetry.TelemetryField;
import net.snowflake.client.jdbc.telemetry.TelemetryUtil;
import net.snowflake.client.jdbc.telemetryOOB.TelemetryEvent;
import net.snowflake.client.jdbc.telemetryOOB.TelemetryService;
import net.snowflake.ingest.streaming.internal.fileTransferAgent.log.SFLogger;
import net.snowflake.ingest.streaming.internal.fileTransferAgent.log.SFLoggerFactory;

Expand Down Expand Up @@ -139,8 +138,8 @@ static String maskStacktrace(String stackTrace) {
static JSONObject createOOBValue(String queryId, String SQLState, int vendorCode) {
JSONObject oobValue = new JSONObject();
oobValue.put("type", TelemetryField.SQL_EXCEPTION.toString());
oobValue.put("DriverType", LoginInfoDTO.SF_JDBC_APP_ID);
oobValue.put("DriverVersion", SnowflakeDriver.implementVersion);
oobValue.put("DriverType", SnowflakeDriverConstants.SF_JDBC_APP_ID);
oobValue.put("DriverVersion", SnowflakeDriverConstants.implementVersion);
if (!isNullOrEmpty(queryId)) {
oobValue.put("QueryID", queryId);
}
Expand All @@ -164,8 +163,8 @@ static JSONObject createOOBValue(String queryId, String SQLState, int vendorCode
static ObjectNode createIBValue(String queryId, String SQLState, int vendorCode) {
ObjectNode ibValue = mapper.createObjectNode();
ibValue.put("type", TelemetryField.SQL_EXCEPTION.toString());
ibValue.put("DriverType", LoginInfoDTO.SF_JDBC_APP_ID);
ibValue.put("DriverVersion", SnowflakeDriver.implementVersion);
ibValue.put("DriverType", SnowflakeDriverConstants.SF_JDBC_APP_ID);
ibValue.put("DriverVersion", SnowflakeDriverConstants.implementVersion);
if (!isNullOrEmpty(queryId)) {
ibValue.put("QueryID", queryId);
}
Expand Down
Loading