diff --git a/.circleci/config.yml b/.circleci/config.yml index 865fbeb161..9c8380d9fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -229,12 +229,12 @@ workflows: filters: tags: only: /.*/ - # - test_8: - # requires: - # - build - # filters: - # tags: - # only: /.*/ + - test_8: + requires: + - build + filters: + tags: + only: /.*/ - test_latest8: requires: - build diff --git a/agent-tooling/agent-tooling.gradle b/agent-tooling/agent-tooling.gradle index 726df39e01..10b3afebfe 100644 --- a/agent-tooling/agent-tooling.gradle +++ b/agent-tooling/agent-tooling.gradle @@ -3,7 +3,8 @@ apply from: "${rootDir}/gradle/java.gradle" minimumBranchCoverage = 0.6 minimumInstructionCoverage = 0.8 excludedClassesCoverage += [ - 'io.opentelemetry.auto.tooling.*' + 'io.opentelemetry.auto.tooling.*', + 'io.opentelemetry.auto.typed.*' ] configurations { diff --git a/gradle/java.gradle b/gradle/java.gradle index 9807ea5f02..d6ce6f2405 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -10,7 +10,7 @@ apply from: "$rootDir/gradle/spotbugs.gradle" def applyCodeCoverage = !( project.path.startsWith(":smoke-tests") || - project.path == ":java-agent" || + project.path == ":opentelemetry-auto" || project.path == ":load-generator" || project.path.startsWith(":benchmark") || project.path.startsWith(":instrumentation")) diff --git a/testing/src/main/groovy/io/opentelemetry/auto/test/InMemoryExporter.java b/testing/src/main/groovy/io/opentelemetry/auto/test/InMemoryExporter.java index 0f505821be..6994cfb155 100644 --- a/testing/src/main/groovy/io/opentelemetry/auto/test/InMemoryExporter.java +++ b/testing/src/main/groovy/io/opentelemetry/auto/test/InMemoryExporter.java @@ -89,7 +89,7 @@ public class InMemoryExporter implements SpanProcessor { if (!spanOrders.containsKey(span.getSpanId())) { // this happens on some tests where there are sporadic background traces, // e.g. Elasticsearch "RefreshAction" - log.debug("span ended that was started prior to ListWriter clear(): {}", span); + log.debug("span ended that was started prior to clear(): {}", span); return; } boolean found = false; diff --git a/testing/testing.gradle b/testing/testing.gradle index 76240c11ac..c6eb05b9e5 100644 --- a/testing/testing.gradle +++ b/testing/testing.gradle @@ -7,7 +7,7 @@ excludedClassesCoverage += [ 'io.opentelemetry.auto.test.base.*', 'io.opentelemetry.auto.test.log.*', 'io.opentelemetry.auto.test.AgentTestRunner', - 'io.opentelemetry.auto.test.ListWriter.*', + 'io.opentelemetry.auto.test.InMemoryExporter.*', 'io.opentelemetry.auto.test.utils.*', // Avoid applying jacoco instrumentation to classes instrumented by tested agent 'context.ContextTestInstrumentation**', diff --git a/utils/thread-utils/thread-utils.gradle b/utils/thread-utils/thread-utils.gradle index fd5a0b31c8..b0acd6b88e 100644 --- a/utils/thread-utils/thread-utils.gradle +++ b/utils/thread-utils/thread-utils.gradle @@ -2,7 +2,7 @@ apply from: "${rootDir}/gradle/java.gradle" // TODO: add more tests excludedClassesCoverage += [ - 'datadog.common.exec*' + 'io.opentelemetry.auto.common.exec.*' ] dependencies {