Skip to content
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

Changes server-side tracing from Cassandra 3.x to 4.x #48

Merged
merged 1 commit into from
Jan 8, 2024
Merged

Changes server-side tracing from Cassandra 3.x to 4.x #48

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 cassandra-tests/src/main/java/cassandra/CassandraContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

public class CassandraContainer extends GenericContainer<CassandraContainer> {
public CassandraContainer() {
super(parse("ghcr.io/openzipkin/zipkin-cassandra:2.23.7"));
super(parse("ghcr.io/openzipkin/zipkin-cassandra:2.27.0"));
waitStrategy = Wait.forHealthcheck();
addExposedPort(9042);
withStartupTimeout(Duration.ofMinutes(2));
Expand Down
27 changes: 17 additions & 10 deletions cassandra/src/main/java/brave/cassandra/Tracing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.util.Map;
import java.util.UUID;
import org.apache.cassandra.net.MessageIn;
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.tracing.TraceState;
import org.apache.cassandra.tracing.TraceStateImpl;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.TimeUUID;
import zipkin2.reporter.Call;
import zipkin2.reporter.CheckResult;
import zipkin2.reporter.brave.AsyncZipkinSpanHandler;
Expand All @@ -49,7 +50,7 @@
* <p>Alternatively, you can subclass this and fix configuration to your favorite mechanism.
*/
public class Tracing extends org.apache.cassandra.tracing.Tracing {
final InetAddress coordinator = FBUtilities.getLocalAddress();
final InetAddressAndPort coordinator = FBUtilities.getLocalAddressAndPort();
final TracingComponent component;

public Tracing(brave.Tracing tracing) { // subclassable to pin configuration
Expand Down Expand Up @@ -77,6 +78,8 @@ public Tracing() {

brave.Tracing tracing = brave.Tracing.newBuilder()
.localServiceName(System.getProperty("zipkin.service_name", "cassandra"))
.localIp(coordinator.getAddress().getHostAddress())
.localPort(coordinator.getPort())
.addSpanHandler(zipkinSpanHandler)
.build();
component = new TracingComponent.Explicit(tracing);
Expand All @@ -99,8 +102,11 @@ static void maybeFailFast(Throwable error) {
* payload. If that's possible, it re-uses the trace identifiers and starts a server span.
* Otherwise, a new trace is created.
*/
@Override protected UUID newSession(UUID sessionId, TraceType traceType,
Map<String, ByteBuffer> customPayload) {
@Override protected TimeUUID newSession(
TimeUUID sessionId,
TraceType traceType,
Map<String, ByteBuffer> customPayload
) {
// override instead of call from super as otherwise we cannot store a reference to the span
assert get() == null;

Expand All @@ -119,9 +125,10 @@ static void maybeFailFast(Throwable error) {
}

@Override
protected TraceState newTraceState(InetAddress inetAddress, UUID timeUUID, TraceType traceType) {
protected TraceState newTraceState(InetAddressAndPort coordinator, TimeUUID sessionId,
TraceType traceType) {
assert false : "we don't expect this to be ever reached as we override newSession";
return new TraceStateImpl(coordinator, timeUUID, traceType);
return new TraceStateImpl(coordinator, sessionId, traceType);
}

/** This extracts the RPC span encoded in the custom payload, or starts a new trace */
Expand Down Expand Up @@ -181,7 +188,7 @@ protected void parseRequest(
customizer.tag(CassandraTraceKeys.CASSANDRA_SESSION_ID, state.sessionId.toString());
}

@Override public TraceState initializeFromMessage(MessageIn<?> message) {
@Override public TraceState initializeFromMessage(Message.Header header) {
// not current tracing inter-node messages
return null;
}
Expand All @@ -193,8 +200,8 @@ protected void parseRequest(
static final class ZipkinTraceState extends TraceState {
final Span incoming;

ZipkinTraceState(InetAddress coordinator, UUID sessionId,
org.apache.cassandra.tracing.Tracing.TraceType traceType, Span incoming) {
ZipkinTraceState(InetAddressAndPort coordinator, TimeUUID sessionId,
TraceType traceType, Span incoming) {
super(coordinator, sessionId, traceType);
this.incoming = incoming;
}
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
<!-- Matches last zipkin test image (v2.23.7) -->
<version>3.11.9</version>
<!-- Matches last zipkin test image (v2.27.0) -->
<version>4.1.3</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down