Merge non-metrics API into API artifact. (#2369)

* Merge non-metrics API into API artifact.

* Revert kotlin newline

api/all/README.md

@@ -6,4 +6,10 @@
   implementations of the OpenTelemetry library.
 
 [javadoc-image]: https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-api.svg
-[javadoc-url]: https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-api
+[javadoc-url]: https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-api
+
+---
+#### Running micro-benchmarks
+From the root of the repo run `./gradlew clean :api:jmh` to run all the benchmarks
+or run `./gradlew clean :api:jmh -PjmhIncludeSingleClass=<ClassNameHere>`
+to run a specific benchmark class.

api/all/build.gradle

@@ -11,10 +11,7 @@ ext.moduleName = "io.opentelemetry.api"
 archivesBaseName = "opentelemetry-api"
 
 dependencies {
-    api project(':api:context'),
+    api project(':api:context')
-            project(':api:baggage'),
-            project(':api:common'),
-            project(':api:trace')
 
     annotationProcessor libraries.auto_value
 

api/all/src/test/java/io/opentelemetry/api/trace/propagation/W3CTraceContextPropagatorTest.java

@@ -23,7 +23,6 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import javax.annotation.Nullable;
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 /** Unit tests for {@link W3CTraceContextPropagator}. */
@@ -482,8 +481,8 @@ class W3CTraceContextPropagatorTest {
 
   @Test
   void headerNames() {
-    Assertions.assertThat(W3CTraceContextPropagator.TRACE_PARENT).isEqualTo("traceparent");
+    assertThat(W3CTraceContextPropagator.TRACE_PARENT).isEqualTo("traceparent");
-    Assertions.assertThat(W3CTraceContextPropagator.TRACE_STATE).isEqualTo("tracestate");
+    assertThat(W3CTraceContextPropagator.TRACE_STATE).isEqualTo("tracestate");
   }
 
   @Test

api/baggage/README.md

@@ -1,12 +0,0 @@
-# OpenTelemetry Baggage API
-
-[![Javadocs][javadoc-image]][javadoc-url]
-
-[javadoc-image]: https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-api-baggage.svg
-[javadoc-url]: https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-api-baggage
-
----
-#### Running micro-benchmarks
-From the root of the repo run `./gradlew clean :opentelemetry-api-baggage:jmh` to run all the benchmarks 
-or run `./gradlew clean :opentelemetry-api-baggage:jmh -PjmhIncludeSingleClass=<ClassNameHere>` 
-to run a specific benchmark class.

api/baggage/build.gradle

@@ -1,22 +0,0 @@
-plugins {
-    id "java-library"
-    id "maven-publish"
-
-    id "me.champeau.gradle.jmh"
-    id "ru.vyarus.animalsniffer"
-}
-
-description = 'OpenTelemetry API'
-ext.moduleName = "io.opentelemetry.api"
-
-dependencies {
-    api project(':api:context'),
-            project(':api:common')
-
-    annotationProcessor libraries.auto_value
-
-    signature libraries.android_signature
-
-    testImplementation libraries.jqf,
-            libraries.guava_testlib
-}

api/common/README.md

@@ -1,6 +0,0 @@
-# OpenTelemetry Common API
-
-[![Javadocs][javadoc-image]][javadoc-url]
-
-[javadoc-image]: https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-api-common.svg
-[javadoc-url]: https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-api-common

api/common/build.gradle

@@ -1,19 +0,0 @@
-plugins {
-    id "java-library"
-    id "maven-publish"
-
-    id "me.champeau.gradle.jmh"
-    id "ru.vyarus.animalsniffer"
-}
-
-description = 'OpenTelemetry API'
-ext.moduleName = "io.opentelemetry.api.common"
-
-dependencies {
-    annotationProcessor libraries.auto_value
-
-    signature libraries.android_signature
-
-    testImplementation libraries.jqf,
-            libraries.guava_testlib
-}

api/metrics/build.gradle

@@ -10,8 +10,7 @@ description = 'OpenTelemetry API'
 ext.moduleName = "io.opentelemetry.api.metrics"
 
 dependencies {
-    api project(':api:context'),
+    api project(':api:all')
-            project(':api:common')
 
     annotationProcessor libraries.auto_value
 

api/trace/README.md

@@ -1,15 +0,0 @@
-# OpenTelemetry Trace API
-
-[![Javadocs][javadoc-image]][javadoc-url]
-
-* The interfaces in this directory can be implemented to create alternative
-  implementations of the OpenTelemetry library.
-
-[javadoc-image]: https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-api-trace.svg
-[javadoc-url]: https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-api-trace
-
----
-#### Running micro-benchmarks
-From the root of the repo run `./gradlew clean :opentelemetry-api-trace:jmh` to run all the benchmarks 
-or run `./gradlew clean :opentelemetry-api-trace:jmh -PjmhIncludeSingleClass=<ClassNameHere>` 
-to run a specific benchmark class.

api/trace/build.gradle

@@ -1,22 +0,0 @@
-plugins {
-    id "java-library"
-    id "maven-publish"
-
-    id "me.champeau.gradle.jmh"
-    id "ru.vyarus.animalsniffer"
-}
-
-description = 'OpenTelemetry API'
-ext.moduleName = "io.opentelemetry.api.trace"
-
-dependencies {
-    api project(':api:context'),
-            project(':api:common')
-
-    annotationProcessor libraries.auto_value
-
-    signature libraries.android_signature
-
-    testImplementation libraries.jqf,
-            libraries.guava_testlib
-}

sdk/trace/build.gradle

@@ -11,7 +11,7 @@ ext.moduleName = "io.opentelemetry.sdk.trace"
 ext.propertiesDir = "build/generated/properties/io/opentelemetry/sdk/trace"
 
 dependencies {
-    api project(':api:trace'),
+    api project(':api:all'),
             project(':sdk:common')
 
     implementation project(':api:metrics')

settings.gradle

@@ -29,9 +29,6 @@ rootProject.name = "opentelemetry-java"
 include ":all",
         ":api:all",
         ":api:context",
-        ":api:baggage",
-        ":api:common",
-        ":api:trace",
         ":api:metrics",
         ":bom",
         ":extensions:annotations",