Update version to 5.0.0, bring modifications from 4.1.x to 5.x (#533)

* Update version to 5.0.0, bring modifications from 4.1.x to 5.x agent also

* Support Cassandra 5.0 Server.ConnectionTracker changes (#536)

* Update Changelog

---------

Co-authored-by: Erik Merkle <[email protected]>

Author: burmanm

CHANGELOG.md

@@ -9,6 +9,10 @@ Changelog for Management API, new PRs should update the `main / unreleased` sect
 * [BUGFIX]
 ```
 
+## unreleased
+
+* [FEATURE] [#535](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/535) Add Cassandra 5.0.0 to the build matrix
+
 ## v0.1.86
 
 * [ENHANCEMENT] [#539](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/539) Add the ability to run DSE 6.8 and 6.9 in readOnlyRootFilesystem mode

cassandra/Dockerfile-5.0.ubi8

@@ -1,6 +1,6 @@
 ARG UBI_MAJOR=8
 ARG UBI_BASETAG=latest
-ARG CASSANDRA_VERSION=5.0-beta1
+ARG CASSANDRA_VERSION=5.0.0
 FROM registry.access.redhat.com/ubi${UBI_MAJOR}/ubi-minimal:${UBI_BASETAG} AS builder
 
 ARG URL_PREFIX=https://dlcdn.apache.org/cassandra

management-api-agent-5.0.x/pom.xml

@@ -16,7 +16,7 @@
   <version>${revision}</version>
   <artifactId>datastax-mgmtapi-agent-5.0.x</artifactId>
   <properties>
-    <cassandra5.version>5.0-beta1</cassandra5.version>
+    <cassandra5.version>5.0.0</cassandra5.version>
     <netty.http.codec.version>4.1.96.Final</netty.http.codec.version>
   </properties>
   <dependencies>

management-api-agent-5.0.x/src/main/java/com/datastax/mgmtapi/shim/RpcStatement50x.java

@@ -10,6 +10,7 @@
 import org.apache.cassandra.cql3.QueryOptions;
 import org.apache.cassandra.service.ClientState;
 import org.apache.cassandra.service.QueryState;
+import org.apache.cassandra.transport.Dispatcher;
 import org.apache.cassandra.transport.messages.ResultMessage;
 
 public class RpcStatement50x implements RpcStatementShim {
@@ -28,7 +29,8 @@ public void authorize(ClientState clientState) {}
   public void validate(ClientState clientState) {}
 
   @Override
-  public ResultMessage execute(QueryState queryState, QueryOptions queryOptions, long l) {
+  public ResultMessage execute(
+      QueryState queryState, QueryOptions queryOptions, Dispatcher.RequestTime rt) {
     return new ResultMessage.Void();
   }
 

management-api-agent-5.0.x/src/main/java/org/apache/cassandra/transport/UnixSocketServer50x.java

@@ -83,7 +83,6 @@ protected void channelRead0(ChannelHandlerContext ctx, Message.Request request)
         throws Exception {
       final Message.Response response;
       final UnixSocketConnection connection;
-      long queryStartNanoTime = System.nanoTime();
 
       try {
         assert request.connection() instanceof UnixSocketConnection;
@@ -97,7 +96,8 @@ protected void channelRead0(ChannelHandlerContext ctx, Message.Request request)
         // logger.info("Executing {} {} {}", request, connection.getVersion(),
         // request.getStreamId());
 
-        Message.Response r = request.execute(qstate, queryStartNanoTime);
+        Message.Response r =
+            request.execute(qstate, Dispatcher.RequestTime.forImmediateExecution());
 
         // UnixSocket has no auth
         response = r instanceof AuthenticateMessage ? new ReadyMessage() : r;
@@ -286,7 +286,10 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> ou
             long approxStartTimeNanos = MonotonicClock.Global.approxTime.now();
             Message.Response response =
                 Dispatcher.processRequest(
-                    ctx.channel(), startup, Overload.NONE, approxStartTimeNanos);
+                    ctx.channel(),
+                    startup,
+                    Overload.NONE,
+                    Dispatcher.RequestTime.forImmediateExecution());
 
             if (response.type.equals(Message.Type.AUTHENTICATE))
               // bypass authentication

management-api-agent-common/src/main/java/com/datastax/mgmtapi/interceptors/CassandraDaemonInterceptor.java

@@ -15,8 +15,11 @@
 import io.netty.channel.epoll.Epoll;
 import io.netty.channel.epoll.EpollEventLoopGroup;
 import java.io.File;
+import java.lang.reflect.Constructor;
 import java.nio.file.Paths;
 import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BooleanSupplier;
 import net.bytebuddy.agent.builder.AgentBuilder.Transformer;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.implementation.MethodDelegation;
@@ -58,7 +61,7 @@ public static void intercept(@SuperCall Callable<Void> zuper) throws Exception {
       File unixSock = Paths.get(socketFileStr).toFile();
 
       final EventLoopGroup group = new EpollEventLoopGroup(8);
-      final Server.ConnectionTracker connectionTracker = new Server.ConnectionTracker();
+      final Server.ConnectionTracker connectionTracker = getTracker();
 
       IPCController controller =
           IPCController.newServer()
@@ -94,4 +97,29 @@ public static void intercept(@SuperCall Callable<Void> zuper) throws Exception {
       logger.warn("Problem starting DataStax Management API for Apache Cassandra", e);
     }
   }
+
+  private static Server.ConnectionTracker getTracker() throws Exception {
+    // ConnectionTracker constructor is private in 5.0, need to use reflection
+    for (Constructor ctor : Server.ConnectionTracker.class.getDeclaredConstructors()) {
+      // Try to get the 5.0 constructor that takes a BooleanSupplier
+      Class[] types = ctor.getParameterTypes();
+      if (types.length == 1 && types[0].equals(BooleanSupplier.class)) {
+        logger.info("BooleanSupplier constructor found!");
+        ctor.setAccessible(true);
+        Object[] args = new Object[1];
+        final AtomicBoolean isRunning = new AtomicBoolean(false);
+        final BooleanSupplier supplier = isRunning::get;
+        args[0] = supplier;
+        Object obj = ctor.newInstance(args);
+        return (Server.ConnectionTracker) obj;
+      } else if (types.length == 0) {
+        // try to get the no arg constructor from Cassandra < 5.0
+        logger.info("no-arg constructor found!");
+        ctor.setAccessible(true);
+        Object obj = ctor.newInstance();
+        return (Server.ConnectionTracker) obj;
+      }
+    }
+    throw new RuntimeException("No suitable Server.ConnectionTracker constructor found!!!");
+  }
 }