From f37b0c59e7f417dd1d2356783de1cc6ed611577e Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Sat, 22 Jan 2022 10:56:02 +0900 Subject: [PATCH] Migrate last test sets to test suites. (#4103) * Migrate last test sets to test suites. * Disable javadoc for tests project --- integration-tests/build.gradle.kts | 44 ----------------- integration-tests/otlp/build.gradle.kts | 47 +++++++++++++++++++ .../OtlpExporterIntegrationTest.java | 0 .../src/main}/resources/otel-config.yaml | 0 .../NoGrpcJavaOtlpIntegrationTest.java | 0 .../GrpcJavaOtlpIntegrationTest.java | 0 settings.gradle.kts | 2 +- 7 files changed, 48 insertions(+), 45 deletions(-) create mode 100644 integration-tests/otlp/build.gradle.kts rename integration-tests/{src/testOtlpCommon => otlp/src/main}/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java (100%) rename integration-tests/{src/testOtlpCommon => otlp/src/main}/resources/otel-config.yaml (100%) rename integration-tests/{src/testOtlpNoGrpcJava => otlp/src/test}/java/io/opentelemetry/integrationtest/NoGrpcJavaOtlpIntegrationTest.java (100%) rename integration-tests/{src/testOtlp => otlp/src/testGrpcJava}/java/io/opentelemetry/integrationtest/GrpcJavaOtlpIntegrationTest.java (100%) diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts index f1bde50d8f..90dae0aaf1 100644 --- a/integration-tests/build.gradle.kts +++ b/integration-tests/build.gradle.kts @@ -1,60 +1,16 @@ plugins { id("otel.java-conventions") - - id("org.unbroken-dome.test-sets") } description = "OpenTelemetry Integration Tests" otelJava.moduleName.set("io.opentelemetry.integration.tests") -testSets { - libraries { - create("testOtlpCommon") - } - - create("testOtlp") { - imports("testOtlpCommon") - } - - create("testOtlpNoGrpcJava") { - imports("testOtlpCommon") - } -} - dependencies { testImplementation(project(":sdk:all")) testImplementation(project(":sdk:testing")) testImplementation(project(":extensions:trace-propagators")) - testImplementation("com.google.protobuf:protobuf-java") testImplementation("com.linecorp.armeria:armeria-junit5") - testImplementation("com.fasterxml.jackson.core:jackson-databind") - testImplementation("com.squareup.okhttp3:okhttp") testImplementation("org.junit.jupiter:junit-jupiter-params") testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.slf4j:slf4j-simple") - - add("testOtlpCommonImplementation", project(":exporters:otlp:trace")) - add("testOtlpCommonImplementation", project(":exporters:otlp:metrics")) - add("testOtlpCommonImplementation", project(":exporters:otlp:logs")) - add("testOtlpCommonImplementation", project(":exporters:otlp-http:logs")) - add("testOtlpCommonImplementation", project(":exporters:otlp-http:metrics")) - add("testOtlpCommonImplementation", project(":exporters:otlp-http:trace")) - add("testOtlpCommonImplementation", project(":semconv")) - add("testOtlpCommonImplementation", "com.linecorp.armeria:armeria-grpc-protocol") - add("testOtlpCommonImplementation", "com.linecorp.armeria:armeria-junit5") - add("testOtlpCommonImplementation", "io.opentelemetry.proto:opentelemetry-proto") - add("testOtlpCommonImplementation", "org.assertj:assertj-core") - add("testOtlpCommonImplementation", "org.awaitility:awaitility") - add("testOtlpCommonImplementation", "org.junit.jupiter:junit-jupiter-params") - add("testOtlpCommonImplementation", "org.testcontainers:junit-jupiter") - - add("testOtlpRuntimeOnly", "io.grpc:grpc-netty-shaded") - add("testOtlpRuntimeOnly", "io.grpc:grpc-stub") -} - -tasks { - check { - dependsOn("testOtlp", "testOtlpNoGrpcJava") - } } diff --git a/integration-tests/otlp/build.gradle.kts b/integration-tests/otlp/build.gradle.kts new file mode 100644 index 0000000000..e834817ec3 --- /dev/null +++ b/integration-tests/otlp/build.gradle.kts @@ -0,0 +1,47 @@ +plugins { + id("otel.java-conventions") +} + +description = "OTLP Exporter Integration Tests" +otelJava.moduleName.set("io.opentelemetry.integration.tests.otlp") + +dependencies { + api("org.testcontainers:junit-jupiter") + + implementation(project(":exporters:otlp:trace")) + implementation(project(":exporters:otlp:metrics")) + implementation(project(":exporters:otlp:logs")) + implementation(project(":exporters:otlp-http:logs")) + implementation(project(":exporters:otlp-http:metrics")) + implementation(project(":exporters:otlp-http:trace")) + implementation(project(":semconv")) + + implementation("com.linecorp.armeria:armeria-grpc-protocol") + implementation("com.linecorp.armeria:armeria-junit5") + implementation("io.opentelemetry.proto:opentelemetry-proto") + implementation("org.assertj:assertj-core") + implementation("org.awaitility:awaitility") + implementation("org.junit.jupiter:junit-jupiter-params") +} + +testing { + suites { + val testGrpcJava by registering(JvmTestSuite::class) { + dependencies { + runtimeOnly("io.grpc:grpc-netty-shaded") + runtimeOnly("io.grpc:grpc-stub") + } + } + } +} + +tasks { + // Don't need javadoc. + javadoc { + isEnabled = false + } + + check { + dependsOn(testing.suites) + } +} diff --git a/integration-tests/src/testOtlpCommon/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java b/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java similarity index 100% rename from integration-tests/src/testOtlpCommon/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java rename to integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java diff --git a/integration-tests/src/testOtlpCommon/resources/otel-config.yaml b/integration-tests/otlp/src/main/resources/otel-config.yaml similarity index 100% rename from integration-tests/src/testOtlpCommon/resources/otel-config.yaml rename to integration-tests/otlp/src/main/resources/otel-config.yaml diff --git a/integration-tests/src/testOtlpNoGrpcJava/java/io/opentelemetry/integrationtest/NoGrpcJavaOtlpIntegrationTest.java b/integration-tests/otlp/src/test/java/io/opentelemetry/integrationtest/NoGrpcJavaOtlpIntegrationTest.java similarity index 100% rename from integration-tests/src/testOtlpNoGrpcJava/java/io/opentelemetry/integrationtest/NoGrpcJavaOtlpIntegrationTest.java rename to integration-tests/otlp/src/test/java/io/opentelemetry/integrationtest/NoGrpcJavaOtlpIntegrationTest.java diff --git a/integration-tests/src/testOtlp/java/io/opentelemetry/integrationtest/GrpcJavaOtlpIntegrationTest.java b/integration-tests/otlp/src/testGrpcJava/java/io/opentelemetry/integrationtest/GrpcJavaOtlpIntegrationTest.java similarity index 100% rename from integration-tests/src/testOtlp/java/io/opentelemetry/integrationtest/GrpcJavaOtlpIntegrationTest.java rename to integration-tests/otlp/src/testGrpcJava/java/io/opentelemetry/integrationtest/GrpcJavaOtlpIntegrationTest.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 4df4c978c3..d638836872 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,7 +7,6 @@ pluginManagement { id("io.github.gradle-nexus.publish-plugin") version "1.1.0" id("nebula.release") version "16.0.0" id("org.jetbrains.kotlin.jvm") version "1.6.10" - id("org.unbroken-dome.test-sets") version "4.0.0" } } @@ -53,6 +52,7 @@ include(":exporters:otlp-http:trace") include(":exporters:prometheus") include(":exporters:zipkin") include(":integration-tests") +include(":integration-tests:otlp") include(":integration-tests:tracecontext") include(":opencensus-shim") include(":opentracing-shim")