3.0.3

CHANGELOG

@@ -1,3 +1,9 @@
+3.0.3:
+    - (cmeiklejohn) Remove jacoco.
+    - (cmeiklejohn) Bump gradle.
+    - (cmeiklejohn) Remove support for Python backend, streamline Docker backend, switch Py tests to Docker.
+    - (cmeiklejohn) Address possibly flaky test.
+    - (cmeiklejohn) Bump armeria version.
 3.0.2:
     - (cmeiklejohn) Minor UX refactoring.
 3.0.1:

build.gradle

@@ -17,7 +17,6 @@ apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'eclipse'
 apply plugin: 'application'
-apply plugin: 'jacoco'
 apply plugin: 'com.diffplug.spotless'
 apply plugin: 'com.google.protobuf'
 
@@ -44,9 +43,8 @@ dependencies {
      'armeria-thrift0.13',
      'armeria-tomcat9',
      'armeria-zookeeper3'].each {
-        implementation "com.linecorp.armeria:${it}:1.14.0"
+        implementation "com.linecorp.armeria:${it}:1.22.1"
     }
-
     implementation "io.lettuce:lettuce-core:6.2.2.RELEASE"
     implementation 'org.postgresql:postgresql:42.3.3'
     implementation 'com.datastax.cassandra:cassandra-driver-core:4.0.0'
@@ -59,47 +57,31 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'org.grpcmock:grpcmock-junit5:0.9.3'
     implementation 'com.google.protobuf:protobuf-java-util:3.21.7'
-
-    // Pinned jetty for WireMock
     implementation 'org.eclipse.jetty:jetty-http:9.4.46.v20220331'
     implementation 'org.eclipse.jetty:jetty-io:9.4.46.v20220331'
     implementation 'org.eclipse.jetty:jetty-server:9.4.46.v20220331'
     implementation 'org.eclipse.jetty:jetty-util:9.4.46.v20220331'
-
-    // JUnit annotations
     implementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
-
-    // Test Containers
     implementation "org.testcontainers:testcontainers:1.17.5"
-
-    // Excel
     implementation "org.apache.poi:poi:5.2.0"
     implementation "org.apache.poi:poi-ooxml:5.2.0"
     implementation "org.jxls:jxls-jexcel:1.0.9"
     implementation "org.dhatim:fastexcel:0.15.3"
     implementation "org.dhatim:fastexcel-reader:0.15.3"
 
-    // Logging
     runtimeOnly 'ch.qos.logback:logback-classic:1.2.3'
     runtimeOnly 'org.slf4j:log4j-over-slf4j:1.7.30'
 
-    // Test dependencies are used for testing Filibuster.  Any jUnit, etc. have to be main dependencies
-    // with the assumption that Filibuster is only pulled in as a test dependency in the application that
-    // uses it.
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
-
     testImplementation 'io.opentelemetry:opentelemetry-api:1.6.0'
     testImplementation 'io.opentelemetry:opentelemetry-extension-annotations:1.6.0'
-
     testImplementation 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.6.0-alpha'
-
     testImplementation 'com.github.tomakehurst:wiremock-standalone:2.27.2'
     testImplementation 'io.netty:netty-tcnative-boringssl-static:2.0.61.Final'
 }
 
 test {
     useJUnitPlatform()
-    finalizedBy jacocoTestReport
     maxParallelForks = 1
     timeout = Duration.ofMinutes(60)
     minHeapSize = "128m" // initial heap size
@@ -114,10 +96,6 @@ test {
     }
 }
 
-jacocoTestReport {
-    dependsOn test
-}
-
 tasks.withType(JavaCompile) {
     options.compilerArgs += '-parameters'
     options.compilerArgs += '-Xlint:unchecked'
@@ -171,7 +149,7 @@ javadoc {
 
 group = "cloud.filibuster"
 archivesBaseName = "instrumentation"
-version = "3.0.2"
+version = "3.0.3"
 
 java {
     withJavadocJar()
@@ -341,3 +319,6 @@ task testWithFaultInjectionDocker(type: Test) {
         includeTestsMatching('cloud.filibuster.functional.docker.*')
     }
 }
+
+project.setProperty("mainClassName", "cloud.filibuster.instrumentation.Main")
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/cloud/filibuster/Main.java

@@ -0,0 +1,7 @@
+package cloud.filibuster;
+
+public class Main {
+    private Main() {
+
+    }
+}

src/main/java/cloud/filibuster/instrumentation/instrumentors/FilibusterServerInstrumentor.java

@@ -1,11 +1,13 @@
 package cloud.filibuster.instrumentation.instrumentors;
 
+import cloud.filibuster.exceptions.filibuster.FilibusterRuntimeException;
 import cloud.filibuster.instrumentation.datatypes.FilibusterExecutor;
 import cloud.filibuster.instrumentation.datatypes.VectorClock;
 import cloud.filibuster.instrumentation.helpers.Networking;
 import cloud.filibuster.instrumentation.helpers.Response;
 import cloud.filibuster.instrumentation.storage.ContextStorage;
 import cloud.filibuster.exceptions.filibuster.FilibusterServerBadResponseException;
+import cloud.filibuster.junit.server.core.FilibusterCore;
 import com.linecorp.armeria.client.WebClient;
 import com.linecorp.armeria.common.AggregatedHttpResponse;
 import com.linecorp.armeria.common.HttpHeaderNames;
@@ -24,6 +26,7 @@
 import static cloud.filibuster.instrumentation.helpers.Counterexample.canLoadCounterexample;
 import static cloud.filibuster.instrumentation.helpers.Counterexample.loadCounterexampleAsJsonObjectFromEnvironment;
 import static cloud.filibuster.instrumentation.helpers.Counterexample.loadTestExecutionFromCounterexample;
+import static cloud.filibuster.instrumentation.helpers.Property.getServerBackendCanInvokeDirectlyProperty;
 
 /**
  * Server instrumentor for Filibuster.
@@ -139,65 +142,75 @@ public void beforeInvocation() {
         logger.log(Level.INFO, "beforeInvocation [server]: about to make call.");
 
         if (getDistributedExecutionIndex() != null) {
-            JSONObject payload = new JSONObject();
-            payload.put("instrumentation_type", "request_received");
-            payload.put("generated_id", getGeneratedId());
-            payload.put("target_service_name", serviceName);
-            payload.put("execution_index", getDistributedExecutionIndex());
+            JSONObject requestReceivedPayload = new JSONObject();
+            requestReceivedPayload.put("instrumentation_type", "request_received");
+            requestReceivedPayload.put("generated_id", getGeneratedId());
+            requestReceivedPayload.put("target_service_name", serviceName);
+            requestReceivedPayload.put("execution_index", getDistributedExecutionIndex());
 
-            logger.log(Level.INFO, "payload: " + payload);
+            logger.log(Level.INFO, "requestReceivedPayload: " + requestReceivedPayload);
 
             if (shouldCommunicateWithServer && counterexampleNotProvided()) {
-                CompletableFuture<String> updateFuture = CompletableFuture.supplyAsync(() -> {
-                    String uri = "http://" + Networking.getFilibusterHost() + ":" + Networking.getFilibusterPort() + "/";
-                    logger.log(Level.INFO, "making call to filibuster server, update with body: " + payload);
-                    logger.log(Level.INFO, "URI: " + uri);
-                    WebClient webClient = FilibusterExecutor.getWebClient("http://" + Networking.getFilibusterHost() + ":" + Networking.getFilibusterPort() + "/");
-
-                    RequestHeaders postJson = RequestHeaders.of(
-                            HttpMethod.POST,
-                            "/filibuster/update",
-                            HttpHeaderNames.CONTENT_TYPE,
-                            "application/json",
-                            "X-Filibuster-Instrumentation",
-                            "true");
-                    AggregatedHttpResponse response = webClient.execute(postJson, payload.toString()).aggregate().join();
-
-                    ResponseHeaders headers = response.headers();
-                    String statusCode = headers.get(HttpHeaderNames.STATUS);
-
-                    if (statusCode == null) {
-                        FilibusterServerBadResponseException.logAndThrow("beforeInvocation, statusCode: null");
+                if (getServerBackendCanInvokeDirectlyProperty()) {
+                    if (FilibusterCore.hasCurrentInstance()) {
+                        FilibusterCore.getCurrentInstance().endInvocation(requestReceivedPayload, false);
+                    } else {
+                        throw new FilibusterRuntimeException("No current filibuster core instance, this could indicate a problem.");
                     }
-
-                    if (!Objects.equals(statusCode, "200")) {
-                        FilibusterServerBadResponseException.logAndThrow("beforeInvocation, statusCode: " + statusCode);
-                    }
-
-                    JSONObject jsonObject = Response.aggregatedHttpResponseToJsonObject(response);
-
-                    if (jsonObject.has("execution_index")) {
-                        distributedExecutionIndex = jsonObject.getString("execution_index");
-                        return distributedExecutionIndex;
+                } else {
+                    CompletableFuture<String> updateFuture = CompletableFuture.supplyAsync(() -> {
+                        String uri = "http://" + Networking.getFilibusterHost() + ":" + Networking.getFilibusterPort() + "/";
+                        logger.log(Level.INFO, "making call to filibuster server, update with body: " + requestReceivedPayload);
+                        logger.log(Level.INFO, "URI: " + uri);
+                        WebClient webClient = FilibusterExecutor.getWebClient("http://" + Networking.getFilibusterHost() + ":" + Networking.getFilibusterPort() + "/");
+
+                        RequestHeaders postJson = RequestHeaders.of(
+                                HttpMethod.POST,
+                                "/filibuster/update",
+                                HttpHeaderNames.CONTENT_TYPE,
+                                "application/json",
+                                "X-Filibuster-Instrumentation",
+                                "true",
+                                "X-Filibuster-Is-Update",
+                                String.valueOf(false));
+                        AggregatedHttpResponse response = webClient.execute(postJson, requestReceivedPayload.toString()).aggregate().join();
+
+                        ResponseHeaders headers = response.headers();
+                        String statusCode = headers.get(HttpHeaderNames.STATUS);
+
+                        if (statusCode == null) {
+                            FilibusterServerBadResponseException.logAndThrow("beforeInvocation, statusCode: null");
+                        }
+
+                        if (!Objects.equals(statusCode, "200")) {
+                            FilibusterServerBadResponseException.logAndThrow("beforeInvocation, statusCode: " + statusCode);
+                        }
+
+                        JSONObject jsonObject = Response.aggregatedHttpResponseToJsonObject(response);
+
+                        if (jsonObject.has("execution_index")) {
+                            distributedExecutionIndex = jsonObject.getString("execution_index");
+                            return distributedExecutionIndex;
+                        }
+
+                        return null;
+                    }, FilibusterExecutor.getExecutorService());
+
+                    try {
+                        String newDistributedExecutionIndex = updateFuture.get();
+
+                        if (newDistributedExecutionIndex != null) {
+                            logger.log(Level.INFO, "rewriting EI from: " + contextStorage.getDistributedExecutionIndex() + " to " + distributedExecutionIndex);
+                            contextStorage.setDistributedExecutionIndex(distributedExecutionIndex);
+                        }
+                    } catch (InterruptedException | ExecutionException e) {
+                        logger.log(Level.SEVERE, "cannot get information from Filibuster server: " + e);
                     }
 
-                    return null;
-                }, FilibusterExecutor.getExecutorService());
+                    logger.log(Level.INFO, "beforeInvocation [server]: finished.");
 
-                try {
-                    String newDistributedExecutionIndex = updateFuture.get();
-
-                    if (newDistributedExecutionIndex != null) {
-                        logger.log(Level.INFO, "rewriting EI from: " + contextStorage.getDistributedExecutionIndex() + " to " + distributedExecutionIndex);
-                        contextStorage.setDistributedExecutionIndex(distributedExecutionIndex);
-                    }
-                } catch (InterruptedException | ExecutionException e) {
-                    logger.log(Level.SEVERE, "cannot get information from Filibuster server: " + e);
+                    logger.log(Level.INFO, "call complete.");
                 }
-
-                logger.log(Level.INFO, "beforeInvocation [server]: finished.");
-
-                logger.log(Level.INFO, "call complete.");
             } else {
                 logger.log(Level.INFO, "skipping!");
             }

src/main/java/cloud/filibuster/junit/server/FilibusterServerLifecycle.java

@@ -1,9 +1,11 @@
 package cloud.filibuster.junit.server;
 
+import cloud.filibuster.exceptions.filibuster.FilibusterRuntimeException;
 import cloud.filibuster.instrumentation.datatypes.FilibusterExecutor;
 import cloud.filibuster.instrumentation.exceptions.FilibusterServerUnavailabilityException;
 import cloud.filibuster.instrumentation.helpers.Networking;
 import cloud.filibuster.junit.configuration.FilibusterConfiguration;
+import cloud.filibuster.junit.server.backends.FilibusterLocalServerBackend;
 import com.linecorp.armeria.client.WebClient;
 import org.jetbrains.annotations.Nullable;
 
@@ -49,6 +51,16 @@ public static synchronized WebClient startServer(FilibusterConfiguration filibus
         if (!started) {
             FilibusterServerBackend filibusterServerBackend = filibusterConfiguration.getServerBackend();
 
+            if (filibusterServerBackend instanceof FilibusterLocalServerBackend) {
+                try {
+                    filibusterServerBackend.start(filibusterConfiguration);
+                } catch (Throwable e) {
+                    throw new FilibusterRuntimeException("we should never hit here, since the local server should always start.");
+                }
+
+                return getNewWebClient();
+            }
+
             try {
                 filibusterServerBackend.start(filibusterConfiguration);
 

src/main/java/cloud/filibuster/junit/server/backends/FilibusterLocalServerBackend.java

@@ -19,35 +19,19 @@
 public class FilibusterLocalServerBackend implements FilibusterServerBackend {
     private static final Logger logger = Logger.getLogger(FilibusterLocalServerBackend.class.getName());
 
-    @Nullable
-    private static Server filibusterServer;
-
     @Override
     public synchronized boolean start(FilibusterConfiguration filibusterConfiguration) throws InterruptedException {
         // Even though the value of the new appears unused. It is necessary since this FilibusterCore
         // object can be accessed via FilibusterCore.getCurrentInstance
         new FilibusterCore(filibusterConfiguration);
 
-        if (filibusterServer == null) {
-            filibusterServer = FilibusterServer.serve();
-        }
-        if(filibusterServer == null)
-        {
-            throw new FilibusterServerNullException("The Filibuster Server should not be null at this point.");
-        }
-        filibusterServer.start();
-
         setServerBackendCanInvokeDirectlyProperty(true);
 
         return true;
     }
 
     @Override
     public synchronized boolean stop(FilibusterConfiguration filibusterConfiguration) {
-        if (filibusterServer != null) {
-            filibusterServer.stop();
-        }
-
         FilibusterCore.removeCurrentInstance();
 
         // Poke the GC once we dereference the FilibusterCore object (via FilibusterServer.)

src/test/java/cloud/filibuster/functional/docker/JUnitFilibusterDockerBackendTestCorrectImage.java

@@ -39,7 +39,7 @@ public class JUnitFilibusterDockerBackendTestCorrectImage extends JUnitBaseTest
      * @throws InterruptedException if teardown of gRPC channel fails.
      */
     @DisplayName("Test partial hello server grpc route with Filibuster. (MyHelloService, MyWorldService)")
-    @TestWithFilibuster(serverBackend = FilibusterDockerServerBackend.class)
+    @TestWithFilibuster(serverBackend=FilibusterDockerServerBackend.class)
     @Order(1)
     public void testMyHelloAndMyWorldServiceWithFilibuster() throws InterruptedException {
         ManagedChannel helloChannel = ManagedChannelBuilder

src/test/java/cloud/filibuster/functional/python/armeria/JUnitFilibusterTestWithFailFastException.java → src/test/java/cloud/filibuster/functional/docker/armeria/JUnitFilibusterTestWithFailFastException.java

@@ -1,12 +1,14 @@
-package cloud.filibuster.functional.python.armeria;
+package cloud.filibuster.functional.docker.armeria;
 
+import cloud.filibuster.RpcType;
 import cloud.filibuster.examples.Hello;
 import cloud.filibuster.examples.HelloServiceGrpc;
 import cloud.filibuster.instrumentation.helpers.Networking;
 import cloud.filibuster.junit.TestWithFilibuster;
 import cloud.filibuster.junit.configuration.FilibusterAnalysisConfiguration;
 import cloud.filibuster.junit.configuration.FilibusterCustomAnalysisConfigurationFile;
 import cloud.filibuster.junit.interceptors.GitHubActionsSkipInvocationInterceptor;
+import cloud.filibuster.junit.server.backends.FilibusterDockerServerBackend;
 import cloud.filibuster.junit.server.backends.FilibusterLocalProcessServerBackend;
 import cloud.filibuster.functional.JUnitBaseTest;
 import io.grpc.ManagedChannel;
@@ -41,6 +43,7 @@ public static void writeCustomAnalysisFile() {
         FilibusterAnalysisConfiguration filibusterAnalysisConfiguration = new FilibusterAnalysisConfiguration.Builder()
                 .name("java.grpc")
                 .pattern("(.*/.*)")
+                .rpcType(RpcType.GRPC)
 
                 // Base exceptions.
                 .exception("io.grpc.StatusRuntimeException", Map.of(
@@ -86,7 +89,7 @@ public static void writeCustomAnalysisFile() {
      * @throws InterruptedException thrown if the gRPC channel fails to terminate.
      */
     @DisplayName("Test partial hello server grpc route with Filibuster. (MyHelloService, MyWorldService)")
-    @TestWithFilibuster(analysisFile=analysisFilePath, serverBackend=FilibusterLocalProcessServerBackend.class)
+    @TestWithFilibuster(analysisFile=analysisFilePath, serverBackend=FilibusterDockerServerBackend.class)
     @ExtendWith(GitHubActionsSkipInvocationInterceptor.class)
     @Order(1)
     public void testMyHelloAndMyWorldServiceWithFilibuster() throws InterruptedException {