diff --git a/CHANGELOG b/CHANGELOG index bca683466..facaf7647 100644 --- a/CHANGELOG +++ b/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: diff --git a/build.gradle b/build.gradle index 0fbfb6e38..959351f6c 100644 --- a/build.gradle +++ b/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") + diff --git a/gradle.lockfile b/gradle.lockfile deleted file mode 100644 index 0d1257603..000000000 --- a/gradle.lockfile +++ /dev/null @@ -1,277 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -aopalliance:aopalliance:1.0=annotationProcessor,errorprone,testAnnotationProcessor -ch.qos.logback:logback-classic:1.2.10=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.10=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.aayushatharva.brotli4j:brotli4j:1.6.0=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -com.auth0:java-jwt:3.18.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.datastax.cassandra:cassandra-driver-core:4.0.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.datastax.oss:java-driver-core:4.0.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.datastax.oss:java-driver-shaded-guava:25.1-jre=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.datastax.oss:native-protocol:1.4.4=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.13.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.13.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.13.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.13.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.fasterxml.woodstox:woodstox-core:5.0.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.fasterxml:aalto-xml:1.3.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,errorprone,testAnnotationProcessor -com.github.cliftonlabs:json-simple:2.1.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.2.13=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.2.13=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.2.13=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.jnr:jffi:1.2.17=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.9.9=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.1.9=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.0.49=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor -com.github.luben:zstd-jni:1.5.0-4=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.rzymek:opczip:1.2.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:3.1.12=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.tomakehurst:wiremock-standalone:2.27.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.github.virtuald:curvesapi:1.06=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.android:annotations:4.1.1.4=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.9.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor -com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor -com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor -com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,compileProtoPath,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.code.gson:gson:2.8.9=compileClasspath,testCompileClasspath -com.google.code.gson:gson:2.9.0=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.errorprone:error_prone_annotation:2.21.1=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.21.1=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_check_api:2.21.1=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_core:2.21.1=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_type_annotations:2.21.1=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:javac:9+181-r4173-1=errorproneJavac -com.google.guava:failureaccess:1.0.1=annotationProcessor,compileClasspath,compileProtoPath,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.guava:guava-parent:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor -com.google.guava:guava:31.1-android=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:1.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.21.7=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor -com.google.protobuf:protobuf-java:3.21.7=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.protobuf:protoc:3.12.0=protobufToolsLocator_protoc -com.linecorp.armeria:armeria-brave:1.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-grpc-protocol:1.14.0=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-grpc:1.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-jetty9:1.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-kafka:1.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-kotlin:1.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-logback:1.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-retrofit2:1.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-rxjava3:1.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-saml:1.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-thrift0.13:1.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-tomcat9:1.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-zookeeper3:1.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria:1.14.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:3.14.9=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.squareup.okio:okio:1.17.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.squareup.retrofit2:retrofit:2.9.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.typesafe:config:1.3.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.zaxxer:SparseBitSet:1.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -commons-beanutils:commons-beanutils:1.9.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -commons-codec:commons-codec:1.15=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -commons-collections:commons-collections:3.2.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -commons-io:commons-io:2.11.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -commons-lang:commons-lang:2.4=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -commons-logging:commons-logging:1.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.0.5=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor -io.github.java-diff-utils:java-diff-utils:4.0=annotationProcessor,errorprone,testAnnotationProcessor -io.grpc:grpc-api:1.53.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-context:1.53.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-core:1.53.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.53.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.53.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.53.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-services:1.53.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-stub:1.53.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:protoc-gen-grpc-java:1.36.1=protobufToolsLocator_grpc -io.lettuce:lettuce-core:6.2.2.RELEASE=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.micrometer:micrometer-core:1.8.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-buffer:4.1.85.Final=compileClasspath,testCompileClasspath -io.netty:netty-buffer:4.1.86.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-dns:4.1.73.Final=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-haproxy:4.1.73.Final=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.73.Final=compileClasspath,testCompileClasspath -io.netty:netty-codec-http2:4.1.86.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.73.Final=compileClasspath,testCompileClasspath -io.netty:netty-codec-http:4.1.86.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-socks:4.1.73.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec:4.1.85.Final=compileClasspath,testCompileClasspath -io.netty:netty-codec:4.1.86.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-common:4.1.85.Final=compileClasspath,testCompileClasspath -io.netty:netty-common:4.1.86.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-handler-proxy:4.1.73.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-handler:4.1.85.Final=compileClasspath,testCompileClasspath -io.netty:netty-handler:4.1.86.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-resolver-dns-classes-macos:4.1.73.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-resolver-dns-native-macos:4.1.73.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-resolver-dns:4.1.73.Final=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-resolver:4.1.85.Final=compileClasspath,testCompileClasspath -io.netty:netty-resolver:4.1.86.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.46.Final=compileProtoPath,runtimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.61.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.46.Final=compileProtoPath,runtimeClasspath -io.netty:netty-tcnative-classes:2.0.61.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.86.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-transport-native-epoll:4.1.63.Final=compileClasspath,testCompileClasspath -io.netty:netty-transport-native-epoll:4.1.73.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.85.Final=compileClasspath,testCompileClasspath -io.netty:netty-transport-native-unix-common:4.1.86.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-transport:4.1.85.Final=compileClasspath,testCompileClasspath -io.netty:netty-transport:4.1.86.Final=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.6.0-alpha=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.opentelemetry:opentelemetry-api-metrics:1.6.0-alpha=testCompileProtoPath,testRuntimeClasspath -io.opentelemetry:opentelemetry-api:1.6.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.opentelemetry:opentelemetry-context:1.6.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.opentelemetry:opentelemetry-extension-annotations:1.6.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.opentelemetry:opentelemetry-semconv:1.6.0-alpha=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.perfmark:perfmark-api:0.25.0=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.projectreactor:reactor-core:3.4.25=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.reactivex.rxjava3:rxjava:3.1.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.zipkin.brave:brave-instrumentation-http:5.13.7=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.zipkin.brave:brave:5.13.7=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.zipkin.reporter2:zipkin-reporter-brave:2.16.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.zipkin.reporter2:zipkin-reporter:2.16.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.zipkin.zipkin2:zipkin:2.23.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -javax.annotation:javax.annotation-api:1.3.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor -javax.servlet:javax.servlet-api:3.1.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -joda-time:joda-time:2.9=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -junit:junit:4.13.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -log4j:log4j:1.2.17=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.6=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -net.java.dev.jna:jna:5.8.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -net.shibboleth.utilities:java-support:7.5.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -net.sourceforge.jexcelapi:jxl:2.6.10=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.commons:commons-collections4:4.4=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.commons:commons-compress:1.23.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.commons:commons-jexl3:3.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.commons:commons-math3:3.6.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.curator:curator-client:5.2.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.curator:curator-framework:5.2.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.curator:curator-recipes:5.2.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.curator:curator-x-discovery:5.2.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.13=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.kafka:kafka-clients:3.1.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.17.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.poi:poi-ooxml-lite:5.2.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.poi:poi-ooxml:5.2.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.poi:poi:5.2.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.santuario:xmlsec:2.0.10=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.thrift:libthrift:0.13.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-core:9.0.56=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.tomcat:tomcat-annotations-api:9.0.56=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.velocity:velocity:1.7=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.xmlbeans:xmlbeans:5.0.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.yetus:audience-annotations:0.5.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.zookeeper:zookeeper-jute:3.6.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apache.zookeeper:zookeeper:3.6.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.bouncycastle:bcprov-jdk15on:1.59=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.checkerframework:checker-qual:3.12.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.checkerframework:checker-qual:3.33.0=annotationProcessor,errorprone,testAnnotationProcessor -org.codehaus.mojo:animal-sniffer-annotations:1.21=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.codehaus.woodstox:stax2-api:4.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.cryptacular:cryptacular:1.1.4=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.curioswitch.curiostack:protobuf-jackson:2.0.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.dhatim:fastexcel-reader:0.15.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.dhatim:fastexcel:0.15.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:9.4.46.v20220331=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:9.4.46.v20220331=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:9.4.46.v20220331=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:9.4.46.v20220331=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r=annotationProcessor,errorprone,testAnnotationProcessor -org.grpcmock:grpcmock-core:0.9.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.grpcmock:grpcmock-junit5:0.9.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.hamcrest:hamcrest-core:1.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.hdrhistogram:HdrHistogram:2.1.12=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.jacoco:org.jacoco.agent:0.8.7=jacocoAgent,jacocoAnt -org.jacoco:org.jacoco.ant:0.8.7=jacocoAnt -org.jacoco:org.jacoco.core:0.8.7=jacocoAnt -org.jacoco:org.jacoco.report:0.8.7=jacocoAnt -org.jetbrains.kotlin:kotlin-reflect:1.6.10=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.6.10=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.0=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.0=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.0=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.jetbrains:annotations:17.0.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.json:json:20220924=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.7.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.7.0=testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.7.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.7.0=testRuntimeClasspath -org.junit:junit-bom:5.7.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.jxls:jxls-jexcel:1.0.9=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.jxls:jxls:2.6.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.latencyutils:LatencyUtils:2.0.3=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.lz4:lz4-java:1.8.0=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.opensaml:opensaml-core:3.4.6=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.opensaml:opensaml-messaging-api:3.4.6=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.opensaml:opensaml-messaging-impl:3.4.6=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.opensaml:opensaml-profile-api:3.4.6=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.opensaml:opensaml-saml-api:3.4.6=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.opensaml:opensaml-saml-impl:3.4.6=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.opensaml:opensaml-security-api:3.4.6=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.opensaml:opensaml-security-impl:3.4.6=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.opensaml:opensaml-soap-api:3.4.6=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.opensaml:opensaml-soap-impl:3.4.6=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.opensaml:opensaml-storage-api:3.4.6=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.opensaml:opensaml-xmlsec-api:3.4.6=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.opensaml:opensaml-xmlsec-impl:3.4.6=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.ow2.asm:asm-analysis:5.0.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.1=jacocoAnt -org.ow2.asm:asm-commons:5.0.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.ow2.asm:asm-commons:9.1=jacocoAnt -org.ow2.asm:asm-tree:5.0.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.ow2.asm:asm-tree:9.1=jacocoAnt -org.ow2.asm:asm-util:5.0.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.ow2.asm:asm:5.0.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.ow2.asm:asm:9.1=jacocoAnt -org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotationProcessor -org.postgresql:postgresql:42.3.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.reactivestreams:reactive-streams:1.0.4=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.26=compileClasspath,testCompileClasspath -org.slf4j:jcl-over-slf4j:1.7.34=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.slf4j:log4j-over-slf4j:1.7.30=runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.36=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.testcontainers:testcontainers:1.17.5=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.xerial.snappy:snappy-java:1.1.8.4=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:apache-client:2.20.74=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:auth:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:dynamodb:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.20.74=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:regions:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.awssdk:utils:2.20.74=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -software.amazon.eventstream:eventstream:1.0.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -empty=protobuf,signatures,testProtobuf diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 05679dc3c..e411586a5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/src/main/java/cloud/filibuster/Main.java b/src/main/java/cloud/filibuster/Main.java new file mode 100644 index 000000000..c32f73d37 --- /dev/null +++ b/src/main/java/cloud/filibuster/Main.java @@ -0,0 +1,7 @@ +package cloud.filibuster; + +public class Main { + private Main() { + + } +} diff --git a/src/main/java/cloud/filibuster/instrumentation/instrumentors/FilibusterServerInstrumentor.java b/src/main/java/cloud/filibuster/instrumentation/instrumentors/FilibusterServerInstrumentor.java index 72120f2d4..ea5ce79cc 100644 --- a/src/main/java/cloud/filibuster/instrumentation/instrumentors/FilibusterServerInstrumentor.java +++ b/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 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 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!"); } diff --git a/src/main/java/cloud/filibuster/junit/server/FilibusterServerLifecycle.java b/src/main/java/cloud/filibuster/junit/server/FilibusterServerLifecycle.java index f8df312c8..edcfa6d0b 100644 --- a/src/main/java/cloud/filibuster/junit/server/FilibusterServerLifecycle.java +++ b/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); diff --git a/src/main/java/cloud/filibuster/junit/server/backends/FilibusterLocalServerBackend.java b/src/main/java/cloud/filibuster/junit/server/backends/FilibusterLocalServerBackend.java index 88bae63e8..a3046024f 100644 --- a/src/main/java/cloud/filibuster/junit/server/backends/FilibusterLocalServerBackend.java +++ b/src/main/java/cloud/filibuster/junit/server/backends/FilibusterLocalServerBackend.java @@ -19,24 +19,12 @@ 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; @@ -44,10 +32,6 @@ public synchronized boolean start(FilibusterConfiguration filibusterConfiguratio @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.) diff --git a/src/test/java/cloud/filibuster/functional/docker/JUnitFilibusterDockerBackendTestCorrectImage.java b/src/test/java/cloud/filibuster/functional/docker/JUnitFilibusterDockerBackendTestCorrectImage.java index 0cfb7605d..a79ac49d9 100644 --- a/src/test/java/cloud/filibuster/functional/docker/JUnitFilibusterDockerBackendTestCorrectImage.java +++ b/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 diff --git a/src/test/java/cloud/filibuster/functional/python/armeria/JUnitFilibusterTestWithFailFastException.java b/src/test/java/cloud/filibuster/functional/docker/armeria/JUnitFilibusterTestWithFailFastException.java similarity index 96% rename from src/test/java/cloud/filibuster/functional/python/armeria/JUnitFilibusterTestWithFailFastException.java rename to src/test/java/cloud/filibuster/functional/docker/armeria/JUnitFilibusterTestWithFailFastException.java index 47b60159e..45813f228 100644 --- a/src/test/java/cloud/filibuster/functional/python/armeria/JUnitFilibusterTestWithFailFastException.java +++ b/src/test/java/cloud/filibuster/functional/docker/armeria/JUnitFilibusterTestWithFailFastException.java @@ -1,5 +1,6 @@ -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; @@ -7,6 +8,7 @@ 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 { diff --git a/src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterExternalHttpTest.java b/src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterExternalHttpTest.java similarity index 93% rename from src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterExternalHttpTest.java rename to src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterExternalHttpTest.java index c590ea9ab..309c89c43 100644 --- a/src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterExternalHttpTest.java +++ b/src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterExternalHttpTest.java @@ -1,9 +1,10 @@ -package cloud.filibuster.functional.python.basic; +package cloud.filibuster.functional.docker.basic; import cloud.filibuster.integration.instrumentation.TestHelper; import cloud.filibuster.instrumentation.helpers.Networking; import cloud.filibuster.junit.TestWithFilibuster; 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 com.linecorp.armeria.client.WebClient; @@ -42,7 +43,7 @@ public class JUnitFilibusterExternalHttpTest extends JUnitBaseTest { */ @DisplayName("Test world route with Filibuster.") @ExtendWith(GitHubActionsSkipInvocationInterceptor.class) - @TestWithFilibuster(serverBackend=FilibusterLocalProcessServerBackend.class) + @TestWithFilibuster(serverBackend=FilibusterDockerServerBackend.class) @Order(1) public void testHelloAndExternalServiceWithFilibuster() { numberOfTestsExecuted++; @@ -81,6 +82,6 @@ public void testNumAssertions() { @Test @Order(3) public void testNumberOfTestsExecuted() { - assertEquals(5, numberOfTestsExecuted); + assertEquals(6, numberOfTestsExecuted); } } diff --git a/src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterFailingTest.java b/src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterFailingTest.java similarity index 94% rename from src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterFailingTest.java rename to src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterFailingTest.java index d84bfcfc0..6bc073543 100644 --- a/src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterFailingTest.java +++ b/src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterFailingTest.java @@ -1,4 +1,4 @@ -package cloud.filibuster.functional.python.basic; +package cloud.filibuster.functional.docker.basic; import cloud.filibuster.examples.Hello; import cloud.filibuster.examples.HelloServiceGrpc; @@ -6,6 +6,7 @@ import cloud.filibuster.instrumentation.helpers.Networking; import cloud.filibuster.junit.TestWithFilibuster; 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; @@ -43,7 +44,7 @@ public class JUnitFilibusterFailingTest extends JUnitBaseTest { */ @DisplayName("Test partial hello server grpc route with Filibuster. (MyHelloService, MyWorldService)") @ExtendWith(GitHubActionsSkipInvocationInterceptor.class) - @TestWithFilibuster(serverBackend=FilibusterLocalProcessServerBackend.class, expected=StatusRuntimeException.class) + @TestWithFilibuster(serverBackend= FilibusterDockerServerBackend.class, expected=StatusRuntimeException.class) @Order(1) public void testMyHelloAndMyWorldServiceWithFilibuster() throws InterruptedException { // Intentionally use a bad port. diff --git a/src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterHttpTest.java b/src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterHttpTest.java similarity index 93% rename from src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterHttpTest.java rename to src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterHttpTest.java index 16d413ffb..85a5026be 100644 --- a/src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterHttpTest.java +++ b/src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterHttpTest.java @@ -1,9 +1,10 @@ -package cloud.filibuster.functional.python.basic; +package cloud.filibuster.functional.docker.basic; import cloud.filibuster.integration.instrumentation.TestHelper; import cloud.filibuster.instrumentation.helpers.Networking; import cloud.filibuster.junit.TestWithFilibuster; 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 com.linecorp.armeria.client.WebClient; @@ -43,7 +44,7 @@ public class JUnitFilibusterHttpTest extends JUnitBaseTest { */ @DisplayName("Test world route with Filibuster.") @ExtendWith(GitHubActionsSkipInvocationInterceptor.class) - @TestWithFilibuster(serverBackend=FilibusterLocalProcessServerBackend.class) + @TestWithFilibuster(serverBackend=FilibusterDockerServerBackend.class) @Order(1) public void testHelloAndWorldServiceWithFilibuster() { numberOfTestsExecuted++; @@ -81,6 +82,6 @@ public void testNumAssertions() { @Test @Order(3) public void testNumberOfTestsExecuted() { - assertEquals(5, numberOfTestsExecuted); + assertEquals(6, numberOfTestsExecuted); } } diff --git a/src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterTest.java b/src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterTest.java similarity index 95% rename from src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterTest.java rename to src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterTest.java index 1f4d4cafe..cb4d5c29c 100644 --- a/src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterTest.java +++ b/src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterTest.java @@ -1,10 +1,11 @@ -package cloud.filibuster.functional.python.basic; +package cloud.filibuster.functional.docker.basic; import cloud.filibuster.examples.Hello; import cloud.filibuster.examples.HelloServiceGrpc; import cloud.filibuster.examples.WorldServiceGrpc; import cloud.filibuster.instrumentation.helpers.Networking; import cloud.filibuster.junit.TestWithFilibuster; +import cloud.filibuster.junit.server.backends.FilibusterDockerServerBackend; import cloud.filibuster.junit.server.backends.FilibusterLocalProcessServerBackend; import cloud.filibuster.functional.JUnitBaseTest; import io.grpc.ManagedChannel; @@ -39,7 +40,7 @@ public class JUnitFilibusterTest extends JUnitBaseTest { * @throws InterruptedException if teardown of gRPC channel fails. */ @DisplayName("Test partial hello server grpc route with Filibuster. (MyHelloService, MyWorldService)") - @TestWithFilibuster(serverBackend=FilibusterLocalProcessServerBackend.class) + @TestWithFilibuster(serverBackend=FilibusterDockerServerBackend.class) @Order(1) public void testMyHelloAndMyWorldServiceWithFilibuster() throws InterruptedException { ManagedChannel helloChannel = ManagedChannelBuilder diff --git a/src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterUnimplementedTest.java b/src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterUnimplementedTest.java similarity index 94% rename from src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterUnimplementedTest.java rename to src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterUnimplementedTest.java index c8236b817..75cb08368 100644 --- a/src/test/java/cloud/filibuster/functional/python/basic/JUnitFilibusterUnimplementedTest.java +++ b/src/test/java/cloud/filibuster/functional/docker/basic/JUnitFilibusterUnimplementedTest.java @@ -1,4 +1,4 @@ -package cloud.filibuster.functional.python.basic; +package cloud.filibuster.functional.docker.basic; import cloud.filibuster.examples.Hello.HelloRequest; import cloud.filibuster.examples.HelloServiceGrpc; @@ -6,6 +6,7 @@ import cloud.filibuster.instrumentation.helpers.Networking; import cloud.filibuster.junit.TestWithFilibuster; 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; @@ -34,7 +35,7 @@ public class JUnitFilibusterUnimplementedTest extends JUnitBaseTest { @DisplayName("Test partial hello server grpc route with Filibuster. (MyHelloService, MyWorldService)") @ExtendWith(GitHubActionsSkipInvocationInterceptor.class) - @TestWithFilibuster(serverBackend=FilibusterLocalProcessServerBackend.class) + @TestWithFilibuster(serverBackend= FilibusterDockerServerBackend.class) @Order(1) public void testMyHelloAndMyWorldServiceWithFilibuster() throws InterruptedException { ManagedChannel helloChannel = ManagedChannelBuilder diff --git a/src/test/java/cloud/filibuster/functional/python/custom/JUnitFilibusterTestWithCustomAnalysisFile.java b/src/test/java/cloud/filibuster/functional/docker/custom/JUnitFilibusterTestWithCustomAnalysisFile.java similarity index 96% rename from src/test/java/cloud/filibuster/functional/python/custom/JUnitFilibusterTestWithCustomAnalysisFile.java rename to src/test/java/cloud/filibuster/functional/docker/custom/JUnitFilibusterTestWithCustomAnalysisFile.java index 2ffd8a427..681b53d32 100644 --- a/src/test/java/cloud/filibuster/functional/python/custom/JUnitFilibusterTestWithCustomAnalysisFile.java +++ b/src/test/java/cloud/filibuster/functional/docker/custom/JUnitFilibusterTestWithCustomAnalysisFile.java @@ -1,4 +1,4 @@ -package cloud.filibuster.functional.python.custom; +package cloud.filibuster.functional.docker.custom; import cloud.filibuster.examples.Hello; import cloud.filibuster.examples.HelloServiceGrpc; @@ -7,6 +7,7 @@ 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; @@ -70,7 +71,7 @@ public class JUnitFilibusterTestWithCustomAnalysisFile extends JUnitBaseTest { * @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 { diff --git a/src/test/java/cloud/filibuster/functional/python/custom/JUnitFilibusterTestWithCustomAnalysisFileAndGrpcClient.java b/src/test/java/cloud/filibuster/functional/docker/custom/JUnitFilibusterTestWithCustomAnalysisFileAndGrpcClient.java similarity index 97% rename from src/test/java/cloud/filibuster/functional/python/custom/JUnitFilibusterTestWithCustomAnalysisFileAndGrpcClient.java rename to src/test/java/cloud/filibuster/functional/docker/custom/JUnitFilibusterTestWithCustomAnalysisFileAndGrpcClient.java index 95cc10227..f4eab8b46 100644 --- a/src/test/java/cloud/filibuster/functional/python/custom/JUnitFilibusterTestWithCustomAnalysisFileAndGrpcClient.java +++ b/src/test/java/cloud/filibuster/functional/docker/custom/JUnitFilibusterTestWithCustomAnalysisFileAndGrpcClient.java @@ -1,4 +1,4 @@ -package cloud.filibuster.functional.python.custom; +package cloud.filibuster.functional.docker.custom; import cloud.filibuster.examples.Hello; import cloud.filibuster.examples.HelloServiceGrpc; @@ -8,6 +8,7 @@ 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 com.linecorp.armeria.client.grpc.GrpcClientBuilder; @@ -81,7 +82,7 @@ protected void setupGrpcClientBuilder() { * @throws InterruptedException thrown when the gRPC channel fails to terminate. */ @DisplayName("Test partial hello server grpc route with Filibuster with instrumented test client. (MyHelloService, MyWorldService)") - @TestWithFilibuster(analysisFile=analysisFilePath, serverBackend=FilibusterLocalProcessServerBackend.class) + @TestWithFilibuster(analysisFile=analysisFilePath, serverBackend= FilibusterDockerServerBackend.class) @ExtendWith(GitHubActionsSkipInvocationInterceptor.class) @Order(1) public void testMyHelloAndMyWorldServiceWithFilibuster() throws InterruptedException { diff --git a/src/test/java/cloud/filibuster/functional/python/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFile.java b/src/test/java/cloud/filibuster/functional/docker/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFile.java similarity index 96% rename from src/test/java/cloud/filibuster/functional/python/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFile.java rename to src/test/java/cloud/filibuster/functional/docker/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFile.java index 878e2c69f..a57c74033 100644 --- a/src/test/java/cloud/filibuster/functional/python/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFile.java +++ b/src/test/java/cloud/filibuster/functional/docker/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFile.java @@ -1,4 +1,4 @@ -package cloud.filibuster.functional.python.exhaustive; +package cloud.filibuster.functional.docker.exhaustive; import cloud.filibuster.examples.Hello; import cloud.filibuster.examples.HelloServiceGrpc; @@ -7,6 +7,7 @@ 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; @@ -74,7 +75,7 @@ public class JUnitFilibusterTestWithExhaustiveAnalysisFile extends JUnitBaseTest @DisplayName("Test partial hello server grpc route with Filibuster. (MyHelloService, MyWorldService)") @ExtendWith(GitHubActionsSkipInvocationInterceptor.class) - @TestWithFilibuster(analysisFile=analysisFilePath, serverBackend=FilibusterLocalProcessServerBackend.class) + @TestWithFilibuster(analysisFile=analysisFilePath, serverBackend= FilibusterDockerServerBackend.class) @Order(1) public void testMyHelloAndMyWorldServiceWithFilibuster() throws InterruptedException { ManagedChannel helloChannel = ManagedChannelBuilder diff --git a/src/test/java/cloud/filibuster/functional/python/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFileByAnnotation.java b/src/test/java/cloud/filibuster/functional/docker/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFileByAnnotation.java similarity index 95% rename from src/test/java/cloud/filibuster/functional/python/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFileByAnnotation.java rename to src/test/java/cloud/filibuster/functional/docker/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFileByAnnotation.java index 46c2ecf9c..6e86edc0c 100644 --- a/src/test/java/cloud/filibuster/functional/python/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFileByAnnotation.java +++ b/src/test/java/cloud/filibuster/functional/docker/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFileByAnnotation.java @@ -1,4 +1,4 @@ -package cloud.filibuster.functional.python.exhaustive; +package cloud.filibuster.functional.docker.exhaustive; import cloud.filibuster.examples.Hello; import cloud.filibuster.examples.HelloServiceGrpc; @@ -6,6 +6,7 @@ import cloud.filibuster.junit.TestWithFilibuster; import cloud.filibuster.junit.configuration.examples.FilibusterGrpcExhaustiveAnalysisConfigurationFile; 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; @@ -55,7 +56,7 @@ public class JUnitFilibusterTestWithExhaustiveAnalysisFileByAnnotation extends J @DisplayName("Test partial hello server grpc route with Filibuster. (MyHelloService, MyWorldService)") @ExtendWith(GitHubActionsSkipInvocationInterceptor.class) - @TestWithFilibuster(analysisConfigurationFile=FilibusterGrpcExhaustiveAnalysisConfigurationFile.class, serverBackend=FilibusterLocalProcessServerBackend.class) + @TestWithFilibuster(analysisConfigurationFile=FilibusterGrpcExhaustiveAnalysisConfigurationFile.class, serverBackend= FilibusterDockerServerBackend.class) @Order(1) public void testMyHelloAndMyWorldServiceWithFilibuster() throws InterruptedException { ManagedChannel helloChannel = ManagedChannelBuilder diff --git a/src/test/java/cloud/filibuster/functional/python/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFileMaxIterationsNotEnough.java b/src/test/java/cloud/filibuster/functional/docker/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFileMaxIterationsNotEnough.java similarity index 96% rename from src/test/java/cloud/filibuster/functional/python/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFileMaxIterationsNotEnough.java rename to src/test/java/cloud/filibuster/functional/docker/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFileMaxIterationsNotEnough.java index de77c1819..d9d73c13c 100644 --- a/src/test/java/cloud/filibuster/functional/python/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFileMaxIterationsNotEnough.java +++ b/src/test/java/cloud/filibuster/functional/docker/exhaustive/JUnitFilibusterTestWithExhaustiveAnalysisFileMaxIterationsNotEnough.java @@ -1,4 +1,4 @@ -package cloud.filibuster.functional.python.exhaustive; +package cloud.filibuster.functional.docker.exhaustive; import cloud.filibuster.examples.Hello; import cloud.filibuster.examples.HelloServiceGrpc; @@ -7,6 +7,7 @@ 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; @@ -74,7 +75,7 @@ public class JUnitFilibusterTestWithExhaustiveAnalysisFileMaxIterationsNotEnough @DisplayName("Test partial hello server grpc route with Filibuster. (MyHelloService, MyWorldService)") @ExtendWith(GitHubActionsSkipInvocationInterceptor.class) - @TestWithFilibuster(analysisFile=analysisFilePath, maxIterations=3, serverBackend=FilibusterLocalProcessServerBackend.class) + @TestWithFilibuster(analysisFile=analysisFilePath, maxIterations=3, serverBackend= FilibusterDockerServerBackend.class) @Order(1) public void testMyHelloAndMyWorldServiceWithFilibuster() throws InterruptedException { ManagedChannel helloChannel = ManagedChannelBuilder diff --git a/src/test/java/cloud/filibuster/functional/python/extended/JUnitFilibusterTestWithBasicAnalysisFileByAnnotation.java b/src/test/java/cloud/filibuster/functional/docker/extended/JUnitFilibusterTestWithBasicAnalysisFileByAnnotation.java similarity index 94% rename from src/test/java/cloud/filibuster/functional/python/extended/JUnitFilibusterTestWithBasicAnalysisFileByAnnotation.java rename to src/test/java/cloud/filibuster/functional/docker/extended/JUnitFilibusterTestWithBasicAnalysisFileByAnnotation.java index 37c52ba09..16b3e37d4 100644 --- a/src/test/java/cloud/filibuster/functional/python/extended/JUnitFilibusterTestWithBasicAnalysisFileByAnnotation.java +++ b/src/test/java/cloud/filibuster/functional/docker/extended/JUnitFilibusterTestWithBasicAnalysisFileByAnnotation.java @@ -1,10 +1,11 @@ -package cloud.filibuster.functional.python.extended; +package cloud.filibuster.functional.docker.extended; 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.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; @@ -42,7 +43,7 @@ public class JUnitFilibusterTestWithBasicAnalysisFileByAnnotation extends JUnitB @DisplayName("Test partial hello server grpc route with Filibuster. (MyHelloService, MyWorldService)") @ExtendWith(GitHubActionsSkipInvocationInterceptor.class) - @TestWithFilibuster(serverBackend=FilibusterLocalProcessServerBackend.class) + @TestWithFilibuster(serverBackend= FilibusterDockerServerBackend.class) @Order(1) public void testMyHelloAndMyWorldServiceWithFilibuster() throws InterruptedException { ManagedChannel helloChannel = ManagedChannelBuilder diff --git a/src/test/java/cloud/filibuster/functional/python/extended/JUnitFilibusterTestWithNoBeforeEachOrAfterEach.java b/src/test/java/cloud/filibuster/functional/docker/extended/JUnitFilibusterTestWithNoBeforeEachOrAfterEach.java similarity index 96% rename from src/test/java/cloud/filibuster/functional/python/extended/JUnitFilibusterTestWithNoBeforeEachOrAfterEach.java rename to src/test/java/cloud/filibuster/functional/docker/extended/JUnitFilibusterTestWithNoBeforeEachOrAfterEach.java index d3ae5e7df..980368735 100644 --- a/src/test/java/cloud/filibuster/functional/python/extended/JUnitFilibusterTestWithNoBeforeEachOrAfterEach.java +++ b/src/test/java/cloud/filibuster/functional/docker/extended/JUnitFilibusterTestWithNoBeforeEachOrAfterEach.java @@ -1,4 +1,4 @@ -package cloud.filibuster.functional.python.extended; +package cloud.filibuster.functional.docker.extended; import cloud.filibuster.examples.Hello; import cloud.filibuster.examples.HelloServiceGrpc; @@ -9,6 +9,7 @@ import cloud.filibuster.instrumentation.libraries.grpc.FilibusterServerInterceptor; import cloud.filibuster.junit.TestWithFilibuster; import cloud.filibuster.junit.interceptors.GitHubActionsSkipInvocationInterceptor; +import cloud.filibuster.junit.server.backends.FilibusterDockerServerBackend; import cloud.filibuster.junit.server.backends.FilibusterLocalProcessServerBackend; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; @@ -48,7 +49,7 @@ public class JUnitFilibusterTestWithNoBeforeEachOrAfterEach { */ @DisplayName("Test partial hello server grpc route with Filibuster. (MyHelloService, MyWorldService)") @ExtendWith(GitHubActionsSkipInvocationInterceptor.class) - @TestWithFilibuster(serverBackend=FilibusterLocalProcessServerBackend.class) + @TestWithFilibuster(serverBackend= FilibusterDockerServerBackend.class) @Order(1) public void testMyHelloAndMyWorldServiceWithFilibuster() throws InterruptedException, IOException { MyHelloService.shouldReturnRuntimeExceptionWithCause = false; diff --git a/src/test/java/cloud/filibuster/functional/python/extended/JUnitFilibusterWorldExtendedHttpTest.java b/src/test/java/cloud/filibuster/functional/docker/extended/JUnitFilibusterWorldExtendedHttpTest.java similarity index 94% rename from src/test/java/cloud/filibuster/functional/python/extended/JUnitFilibusterWorldExtendedHttpTest.java rename to src/test/java/cloud/filibuster/functional/docker/extended/JUnitFilibusterWorldExtendedHttpTest.java index a6cb2a378..829314283 100644 --- a/src/test/java/cloud/filibuster/functional/python/extended/JUnitFilibusterWorldExtendedHttpTest.java +++ b/src/test/java/cloud/filibuster/functional/docker/extended/JUnitFilibusterWorldExtendedHttpTest.java @@ -1,10 +1,11 @@ -package cloud.filibuster.functional.python.extended; +package cloud.filibuster.functional.docker.extended; import cloud.filibuster.integration.instrumentation.TestHelper; import cloud.filibuster.instrumentation.helpers.Networking; import cloud.filibuster.junit.TestWithFilibuster; import cloud.filibuster.junit.configuration.examples.FilibusterWorldExtendedDefaultAnalysisConfigurationFile; 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 com.linecorp.armeria.client.WebClient; @@ -43,7 +44,7 @@ public class JUnitFilibusterWorldExtendedHttpTest extends JUnitBaseTest { * Inject faults between Hello and World using Filibuster and assert proper faults are injected. */ @DisplayName("Test world route with Filibuster.") - @TestWithFilibuster(analysisConfigurationFile=FilibusterWorldExtendedDefaultAnalysisConfigurationFile.class, serverBackend=FilibusterLocalProcessServerBackend.class) + @TestWithFilibuster(analysisConfigurationFile=FilibusterWorldExtendedDefaultAnalysisConfigurationFile.class, serverBackend= FilibusterDockerServerBackend.class) @ExtendWith(GitHubActionsSkipInvocationInterceptor.class) @Order(1) public void testHelloAndWorldServiceWithFilibuster() { diff --git a/src/test/java/cloud/filibuster/functional/python/macros/JUnitFilibusterTestExtendedMacroAssertion.java b/src/test/java/cloud/filibuster/functional/docker/macros/JUnitFilibusterTestExtendedMacroAssertion.java similarity index 96% rename from src/test/java/cloud/filibuster/functional/python/macros/JUnitFilibusterTestExtendedMacroAssertion.java rename to src/test/java/cloud/filibuster/functional/docker/macros/JUnitFilibusterTestExtendedMacroAssertion.java index 3b431ad82..27e8adb8c 100644 --- a/src/test/java/cloud/filibuster/functional/python/macros/JUnitFilibusterTestExtendedMacroAssertion.java +++ b/src/test/java/cloud/filibuster/functional/docker/macros/JUnitFilibusterTestExtendedMacroAssertion.java @@ -1,4 +1,4 @@ -package cloud.filibuster.functional.python.macros; +package cloud.filibuster.functional.docker.macros; import cloud.filibuster.examples.Hello; import cloud.filibuster.examples.HelloServiceGrpc; @@ -6,6 +6,7 @@ import cloud.filibuster.instrumentation.helpers.Networking; import cloud.filibuster.junit.TestWithFilibuster; 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; @@ -33,7 +34,7 @@ public class JUnitFilibusterTestExtendedMacroAssertion extends JUnitBaseTest { @DisplayName("Test partial hello server grpc route with Filibuster. (MyHelloService, MyWorldService)") @ExtendWith(GitHubActionsSkipInvocationInterceptor.class) - @TestWithFilibuster(serverBackend=FilibusterLocalProcessServerBackend.class) + @TestWithFilibuster(serverBackend= FilibusterDockerServerBackend.class) public void testMyHelloAndMyWorldServiceWithFilibusterWithMacro() throws Throwable { ManagedChannel helloChannel = ManagedChannelBuilder .forAddress(Networking.getHost("hello"), Networking.getPort("hello")) diff --git a/src/test/java/cloud/filibuster/functional/python/macros/JUnitFilibusterTestMacroAssertion.java b/src/test/java/cloud/filibuster/functional/docker/macros/JUnitFilibusterTestMacroAssertion.java similarity index 94% rename from src/test/java/cloud/filibuster/functional/python/macros/JUnitFilibusterTestMacroAssertion.java rename to src/test/java/cloud/filibuster/functional/docker/macros/JUnitFilibusterTestMacroAssertion.java index d3a7a5a6a..01e890993 100644 --- a/src/test/java/cloud/filibuster/functional/python/macros/JUnitFilibusterTestMacroAssertion.java +++ b/src/test/java/cloud/filibuster/functional/docker/macros/JUnitFilibusterTestMacroAssertion.java @@ -1,10 +1,11 @@ -package cloud.filibuster.functional.python.macros; +package cloud.filibuster.functional.docker.macros; 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.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; @@ -29,7 +30,7 @@ public class JUnitFilibusterTestMacroAssertion extends JUnitBaseTest { @DisplayName("Test partial hello server grpc route with Filibuster. (MyHelloService, MyWorldService)") @ExtendWith(GitHubActionsSkipInvocationInterceptor.class) - @TestWithFilibuster(serverBackend=FilibusterLocalProcessServerBackend.class) + @TestWithFilibuster(serverBackend= FilibusterDockerServerBackend.class) public void testMyHelloAndMyWorldServiceWithFilibusterWithMacro() throws Throwable { ManagedChannel helloChannel = ManagedChannelBuilder .forAddress(Networking.getHost("hello"), Networking.getPort("hello")) diff --git a/src/test/java/cloud/filibuster/functional/java/basic/WorldTest.java b/src/test/java/cloud/filibuster/functional/java/http/WorldTest.java similarity index 86% rename from src/test/java/cloud/filibuster/functional/java/basic/WorldTest.java rename to src/test/java/cloud/filibuster/functional/java/http/WorldTest.java index 8b777741b..eb2b8f085 100644 --- a/src/test/java/cloud/filibuster/functional/java/basic/WorldTest.java +++ b/src/test/java/cloud/filibuster/functional/java/http/WorldTest.java @@ -1,4 +1,4 @@ -package cloud.filibuster.functional.java.basic; +package cloud.filibuster.functional.java.http; import cloud.filibuster.examples.APIServiceGrpc; import cloud.filibuster.examples.Hello; @@ -74,7 +74,17 @@ public void testWorld() { Hello.HelloRequest request = Hello.HelloRequest.newBuilder().setName("Chris").build(); Hello.HelloReply reply = apiServiceBlockingStub.world(request); assertEquals("Hello!", reply.getMessage()); - assertFalse(wasFaultInjected()); + + // DEIs will either be nested or not, depending on thread scheduling: it will only work if all executions share the same scheduling and the server assigns DEIs on the same thread the outgoing request is issued on. + // Therefore, this test is flaky. + // In short, we may fail to inject a fault where we should have injected one. + // + // We may have tried to, but didn't due to thread scheduling. + // Therefore, we remove this check. + // + // Ideally, this would be fixed if the context storage was replaced with OTEL. + // + // assertFalse(wasFaultInjected()); } catch (StatusRuntimeException sre) { boolean expected = false; @@ -106,4 +116,6 @@ public void testWorld() { assertTrue(expected, "did not expect: " + sre); } } + + // See comment above as to why we do not have a count on expected faults to be injected. }