Merge trace and metric incubator (open-telemetry#4705)

Author: jack-berg

README.md

@@ -8,21 +8,26 @@ plugins {
 
 // SDK modules that are still being developed.
 
-description = "OpenTelemetry SDK Tracing Incubator"
-otelJava.moduleName.set("io.opentelemetry.sdk.extension.trace.incubator")
+description = "OpenTelemetry SDK Incubator"
+otelJava.moduleName.set("io.opentelemetry.sdk.extension.incubator")
 
 dependencies {
-  api(project(":api:all"))
-  api(project(":sdk:trace"))
+  api(project(":sdk:all"))
 
   compileOnly(project(":sdk:trace-shaded-deps"))
 
-  implementation(project(":semconv"))
+  annotationProcessor("com.google.auto.value:auto-value")
+
+  // io.opentelemetry.sdk.extension.incubator.metric.viewconfig
+  implementation(project(":sdk-extensions:autoconfigure-spi"))
+  implementation("org.yaml:snakeyaml")
 
-  // zPages
+  // io.opentelemetry.sdk.extension.trace.zpages
+  implementation(project(":semconv"))
   compileOnly("com.sun.net.httpserver:http")
 
-  annotationProcessor("com.google.auto.value:auto-value")
   testImplementation(project(":sdk:testing"))
+  testImplementation(project(":sdk-extensions:autoconfigure"))
+
   testImplementation("com.google.guava:guava-testlib")
 }

sdk-extensions/metric-incubator/README.md sdk-extensions/incubator/README.md

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.viewconfig;
+package io.opentelemetry.sdk.extension.incubator.metric.viewconfig;
 
 import com.google.auto.value.AutoValue;
 import io.opentelemetry.sdk.metrics.InstrumentType;

sdk-extensions/tracing-incubator/build.gradle.kts sdk-extensions/incubator/build.gradle.kts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.viewconfig;
+package io.opentelemetry.sdk.extension.incubator.metric.viewconfig;
 
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;

sdk-extensions/metric-incubator/gradle.properties sdk-extensions/incubator/gradle.properties

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.viewconfig;
+package io.opentelemetry.sdk.extension.incubator.metric.viewconfig;
 
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;

sdk-extensions/tracing-incubator/img/traceconfigz.png sdk-extensions/incubator/img/traceconfigz.png

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.viewconfig;
+package io.opentelemetry.sdk.extension.incubator.metric.viewconfig;
 
 import com.google.auto.value.AutoValue;
 

sdk-extensions/tracing-incubator/img/tracez-details.png sdk-extensions/incubator/img/tracez-details.png

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.viewconfig;
+package io.opentelemetry.sdk.extension.incubator.metric.viewconfig;
 
 import com.google.auto.value.AutoValue;
 import java.util.List;

sdk-extensions/tracing-incubator/img/tracez-table.png sdk-extensions/incubator/img/tracez-table.png

@@ -0,0 +1 @@
+io.opentelemetry.sdk.extension.incubator.metric.viewconfig.ViewConfigCustomizer

sdk-extensions/tracing-incubator/src/jmh/java/io/opentelemetry/sdk/extension/incubator/trace/zpages/TracezDataAggregatorBenchmark.java sdk-extensions/incubator/src/jmh/java/io/opentelemetry/sdk/extension/incubator/trace/zpages/TracezDataAggregatorBenchmark.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.viewconfig;
+package io.opentelemetry.sdk.extension.incubator.metric.viewconfig;
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry;

sdk-extensions/tracing-incubator/src/jmh/java/io/opentelemetry/sdk/extension/incubator/trace/zpages/TracezSpanBucketsBenchmark.java sdk-extensions/incubator/src/jmh/java/io/opentelemetry/sdk/extension/incubator/trace/zpages/TracezSpanBucketsBenchmark.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.viewconfig;
+package io.opentelemetry.sdk.extension.incubator.metric.viewconfig;
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static org.assertj.core.api.Assertions.as;

sdk-extensions/metric-incubator/src/main/java/io/opentelemetry/sdk/viewconfig/SelectorSpecification.java sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/metric/viewconfig/SelectorSpecification.java

@@ -64,9 +64,8 @@ include(":sdk:trace-shaded-deps")
 include(":sdk-extensions:autoconfigure")
 include(":sdk-extensions:autoconfigure-spi")
 include(":sdk-extensions:aws")
-include(":sdk-extensions:metric-incubator")
 include(":sdk-extensions:resources")
-include(":sdk-extensions:tracing-incubator")
+include(":sdk-extensions:incubator")
 include(":sdk-extensions:jaeger-remote-sampler")
 include(":sdk-extensions:jfr-events")
 include(":testing-internal")