Skip to content

Commit 70b16af

Browse files
committed
Review fixes for cassandra-3.0:javaagent
Automated code review of instrumentation/cassandra/cassandra-3.0/javaagent.
1 parent 0073314 commit 70b16af

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ muzzle {
1717
group.set("com.datastax.cassandra")
1818
module.set("cassandra-driver-core")
1919
versions.set("[3.0,4.0)")
20+
assertInverse.set(true)
2021
// While com.datastax.cassandra uses old versions of Guava, users may depends themselves on newer versions of Guava
2122
extraDependency("com.google.guava:guava:27.0-jre")
2223
}

instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/TracingSession.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ public ResultSetFuture executeAsync(String query) {
116116
ResultSetFuture future = session.executeAsync(query);
117117
addCallbackToEndSpan(future, context, request);
118118
return future;
119+
} catch (Throwable t) {
120+
instrumenter().end(context, request, null, t);
121+
throw t;
119122
}
120123
}
121124

@@ -127,6 +130,9 @@ public ResultSetFuture executeAsync(String query, Object... values) {
127130
ResultSetFuture future = session.executeAsync(query, values);
128131
addCallbackToEndSpan(future, context, request);
129132
return future;
133+
} catch (Throwable t) {
134+
instrumenter().end(context, request, null, t);
135+
throw t;
130136
}
131137
}
132138

@@ -138,6 +144,9 @@ public ResultSetFuture executeAsync(String query, Map<String, Object> values) {
138144
ResultSetFuture future = session.executeAsync(query, values);
139145
addCallbackToEndSpan(future, context, request);
140146
return future;
147+
} catch (Throwable t) {
148+
instrumenter().end(context, request, null, t);
149+
throw t;
141150
}
142151
}
143152

@@ -151,6 +160,9 @@ public ResultSetFuture executeAsync(Statement statement) {
151160
ResultSetFuture future = session.executeAsync(statement);
152161
addCallbackToEndSpan(future, context, request);
153162
return future;
163+
} catch (Throwable t) {
164+
instrumenter().end(context, request, null, t);
165+
throw t;
154166
}
155167
}
156168

0 commit comments

Comments
 (0)