diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index c721cb0c..b6ee42e3 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -46,7 +46,7 @@ jobs: - name: End to End Integration Tests uses: ./.github/actions/run-tests with: - command: ./gradlew shadowJar test -DincludeTags="EndToEndTest" + command: ./gradlew test -DincludeTags="EndToEndTest" Upload-Test-Report: needs: diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer04openTelemetryTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer04openTelemetryTest.java index eb3d7029..e562cb12 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer04openTelemetryTest.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer04openTelemetryTest.java @@ -16,12 +16,12 @@ import org.apache.http.HttpStatus; import org.eclipse.edc.junit.annotations.EndToEndTest; -import org.junit.ClassRule; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.testcontainers.containers.DockerComposeContainer; import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import java.io.IOException; @@ -45,9 +45,9 @@ public class Transfer04openTelemetryTest { private final FileTransferSampleTestCommon testUtils = new FileTransferSampleTestCommon(SAMPLE_ASSET_FILE_PATH, DESTINATION_FILE_PATH); - @ClassRule - public static DockerComposeContainer environment = - new DockerComposeContainer(FileTransferSampleTestCommon.getFileFromRelativePath(SAMPLE_FOLDER + DOCKER_COMPOSE_YAML)) + @Container + public static DockerComposeContainer environment = + new DockerComposeContainer<>(FileTransferSampleTestCommon.getFileFromRelativePath(SAMPLE_FOLDER + DOCKER_COMPOSE_YAML)) .withLocalCompose(true) .waitingFor("consumer", Wait.forLogMessage(".*ready.*", 1)); diff --git a/transfer/transfer-04-open-telemetry/docker-compose.yaml b/transfer/transfer-04-open-telemetry/docker-compose.yaml index e5a99b6b..b3ad0fca 100644 --- a/transfer/transfer-04-open-telemetry/docker-compose.yaml +++ b/transfer/transfer-04-open-telemetry/docker-compose.yaml @@ -23,6 +23,9 @@ services: WEB_HTTP_MANAGEMENT_PATH: /management WEB_HTTP_PROTOCOL_PORT: 9292 WEB_HTTP_PROTOCOL_PATH: /protocol + WEB_HTTP_CONTROL_PORT: 9193 + WEB_HTTP_CONTROL_PATH: /control + EDC_CONTROL_ENDPOINT: http://consumer:9193/control EDC_DSP_CALLBACK_ADDRESS: http://consumer:9292/protocol EDC_PARTICIPANT_ID: consumer EDC_API_AUTH_KEY: password @@ -51,6 +54,9 @@ services: WEB_HTTP_MANAGEMENT_PATH: /management WEB_HTTP_PROTOCOL_PORT: 8282 WEB_HTTP_PROTOCOL_PATH: /protocol + WEB_HTTP_CONTROL_PORT: 8183 + WEB_HTTP_CONTROL_PATH: /control + EDC_CONTROL_ENDPOINT: http://provider:8183/control EDC_DSP_CALLBACK_ADDRESS: http://provider:8282/protocol EDC_PARTICIPANT_ID: provider EDC_SAMPLES_TRANSFER_01_ASSET_PATH: /resources/README.md diff --git a/transfer/transfer-04-open-telemetry/open-telemetry-provider/build.gradle.kts b/transfer/transfer-04-open-telemetry/open-telemetry-provider/build.gradle.kts index 29fc03bf..f6f67b14 100644 --- a/transfer/transfer-04-open-telemetry/open-telemetry-provider/build.gradle.kts +++ b/transfer/transfer-04-open-telemetry/open-telemetry-provider/build.gradle.kts @@ -25,6 +25,7 @@ plugins { dependencies { implementation(libs.edc.control.plane.api.client) + implementation(libs.edc.control.plane.api) implementation(libs.edc.control.plane.core) implementation(libs.edc.data.plane.selector.core) @@ -74,4 +75,4 @@ tasks.register("copyOpenTelemetryJar") { tasks.build { finalizedBy("copyOpenTelemetryJar") -} \ No newline at end of file +}