Skip to content

Commit 0b1ce00

Browse files
authored
Merge pull request #51160 from gsmet/mysql-connector-j-9.5.0
Update MySQL Connector J to 9.5.0
2 parents 2071e95 + d1b482e commit 0b1ce00

File tree

2 files changed

+50
-1
lines changed

2 files changed

+50
-1
lines changed

bom/application/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
and the dependency jts-core needs to be updated in extensions/jdbc/jdbc-h2/runtime/pom.xml -->
123123
<postgresql-jdbc.version>42.7.8</postgresql-jdbc.version>
124124
<mariadb-jdbc.version>3.5.6</mariadb-jdbc.version>
125-
<mysql-jdbc.version>8.3.0</mysql-jdbc.version>
125+
<mysql-jdbc.version>9.5.0</mysql-jdbc.version>
126126
<mssql-jdbc.version>13.2.1.jre11</mssql-jdbc.version>
127127
<adal4j.version>1.6.7</adal4j.version>
128128
<oracle-jdbc.version>23.26.0.0.0</oracle-jdbc.version>

extensions/jdbc/jdbc-mysql/runtime/src/main/java/io/quarkus/jdbc/mysql/runtime/graal/com/mysql/cj/jdbc/MySQLJDBCSubstitutions.java

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
package io.quarkus.jdbc.mysql.runtime.graal.com.mysql.cj.jdbc;
22

33
import java.sql.SQLException;
4+
import java.util.function.BiConsumer;
5+
import java.util.function.BooleanSupplier;
46

7+
import com.mysql.cj.Messages;
58
import com.mysql.cj.exceptions.ExceptionFactory;
9+
import com.mysql.cj.telemetry.TelemetryHandler;
10+
import com.mysql.cj.telemetry.TelemetrySpan;
11+
import com.mysql.cj.telemetry.TelemetrySpanName;
612
import com.oracle.svm.core.annotate.Substitute;
713
import com.oracle.svm.core.annotate.TargetClass;
814

@@ -67,5 +73,48 @@ public static void registerJmx() throws SQLException {
6773

6874
}
6975

76+
@TargetClass(className = "com.mysql.cj.otel.OpenTelemetryHandler", onlyWith = OpenTelemetryUnavailable.class)
77+
final class OpenTelemetryHandler implements TelemetryHandler {
78+
79+
@Substitute
80+
public OpenTelemetryHandler() {
81+
throw ExceptionFactory.createException(Messages.getString("Connection.OtelApiNotFound"));
82+
}
83+
84+
@Override
85+
@Substitute
86+
public TelemetrySpan startSpan(TelemetrySpanName telemetrySpanName, Object... objects) {
87+
return null;
88+
}
89+
90+
@Override
91+
@Substitute
92+
public void addLinkTarget(TelemetrySpan span) {
93+
}
94+
95+
@Override
96+
@Substitute
97+
public void removeLinkTarget(TelemetrySpan span) {
98+
}
99+
100+
@Override
101+
@Substitute
102+
public void propagateContext(BiConsumer<String, String> traceparentConsumer) {
103+
}
104+
}
105+
106+
final class OpenTelemetryUnavailable implements BooleanSupplier {
107+
108+
@Override
109+
public boolean getAsBoolean() {
110+
try {
111+
Class.forName("io.opentelemetry.api.GlobalOpenTelemetry");
112+
return false;
113+
} catch (ClassNotFoundException e) {
114+
return true;
115+
}
116+
}
117+
}
118+
70119
class MySQLJDBCSubstitutions {
71120
}

0 commit comments

Comments
 (0)