From c723de5b058e88eebf6a63ae08bee62a26814540 Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Sun, 1 Nov 2020 00:47:07 +0900 Subject: [PATCH] Merge context_prop into context artifact. (#1928) --- all/build.gradle | 1 - api/build.gradle | 2 +- .../propagation/ContextPropagators.java | 0 .../DefaultContextPropagators.java | 0 .../propagation/TextMapPropagator.java | 0 .../context/propagation/package-info.java | 0 .../propagation/DefaultPropagatorsTest.java | 0 context_prop/README.md | 8 -------- context_prop/build.gradle | 19 ------------------- settings.gradle | 1 - 10 files changed, 1 insertion(+), 30 deletions(-) rename {context_prop => context}/src/main/java/io/opentelemetry/context/propagation/ContextPropagators.java (100%) rename {context_prop => context}/src/main/java/io/opentelemetry/context/propagation/DefaultContextPropagators.java (100%) rename {context_prop => context}/src/main/java/io/opentelemetry/context/propagation/TextMapPropagator.java (100%) rename {context_prop => context}/src/main/java/io/opentelemetry/context/propagation/package-info.java (100%) rename {context_prop => context}/src/test/java/io/opentelemetry/context/propagation/DefaultPropagatorsTest.java (100%) delete mode 100644 context_prop/README.md delete mode 100644 context_prop/build.gradle diff --git a/all/build.gradle b/all/build.gradle index f554c6a98a..14a4e605c0 100644 --- a/all/build.gradle +++ b/all/build.gradle @@ -8,7 +8,6 @@ ext.moduleName = "io.opentelemetry.all" def subprojects = [ project(':opentelemetry-api'), project(':opentelemetry-context'), - project(':opentelemetry-context-prop'), project(':opentelemetry-extension-runtime-metrics'), project(':opentelemetry-extension-trace-propagators'), project(':opentelemetry-extension-trace-utils'), diff --git a/api/build.gradle b/api/build.gradle index ad879ed345..18efea3208 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -10,7 +10,7 @@ description = 'OpenTelemetry API' ext.moduleName = "io.opentelemetry.api" dependencies { - api project(':opentelemetry-context-prop') + api project(':opentelemetry-context') annotationProcessor libraries.auto_value diff --git a/context_prop/src/main/java/io/opentelemetry/context/propagation/ContextPropagators.java b/context/src/main/java/io/opentelemetry/context/propagation/ContextPropagators.java similarity index 100% rename from context_prop/src/main/java/io/opentelemetry/context/propagation/ContextPropagators.java rename to context/src/main/java/io/opentelemetry/context/propagation/ContextPropagators.java diff --git a/context_prop/src/main/java/io/opentelemetry/context/propagation/DefaultContextPropagators.java b/context/src/main/java/io/opentelemetry/context/propagation/DefaultContextPropagators.java similarity index 100% rename from context_prop/src/main/java/io/opentelemetry/context/propagation/DefaultContextPropagators.java rename to context/src/main/java/io/opentelemetry/context/propagation/DefaultContextPropagators.java diff --git a/context_prop/src/main/java/io/opentelemetry/context/propagation/TextMapPropagator.java b/context/src/main/java/io/opentelemetry/context/propagation/TextMapPropagator.java similarity index 100% rename from context_prop/src/main/java/io/opentelemetry/context/propagation/TextMapPropagator.java rename to context/src/main/java/io/opentelemetry/context/propagation/TextMapPropagator.java diff --git a/context_prop/src/main/java/io/opentelemetry/context/propagation/package-info.java b/context/src/main/java/io/opentelemetry/context/propagation/package-info.java similarity index 100% rename from context_prop/src/main/java/io/opentelemetry/context/propagation/package-info.java rename to context/src/main/java/io/opentelemetry/context/propagation/package-info.java diff --git a/context_prop/src/test/java/io/opentelemetry/context/propagation/DefaultPropagatorsTest.java b/context/src/test/java/io/opentelemetry/context/propagation/DefaultPropagatorsTest.java similarity index 100% rename from context_prop/src/test/java/io/opentelemetry/context/propagation/DefaultPropagatorsTest.java rename to context/src/test/java/io/opentelemetry/context/propagation/DefaultPropagatorsTest.java diff --git a/context_prop/README.md b/context_prop/README.md deleted file mode 100644 index 7c801d851a..0000000000 --- a/context_prop/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# OpenTelemetry Context Propagation - -[![Javadocs][javadoc-image]][javadoc-url] - -* Java 8 compatible. - -[javadoc-image]: https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-context-prop.svg -[javadoc-url]: https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-context-prop \ No newline at end of file diff --git a/context_prop/build.gradle b/context_prop/build.gradle deleted file mode 100644 index 5979239c37..0000000000 --- a/context_prop/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - id "java" - id "maven-publish" - - id "ru.vyarus.animalsniffer" -} - -description = 'OpenTelemetry Context Propagation' -ext.moduleName = "io.opentelemetry.context.propagation" - -dependencies { - api project(':opentelemetry-context') - - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" -} - -javadoc { - exclude 'io/opentelemetry/internal/**' -} diff --git a/settings.gradle b/settings.gradle index b78f2c281c..54ad35ce18 100644 --- a/settings.gradle +++ b/settings.gradle @@ -24,7 +24,6 @@ rootProject.name = "opentelemetry-java" include ":opentelemetry-all", ":opentelemetry-api", ":opentelemetry-context", - ":opentelemetry-context-prop", ":opentelemetry-extension-auto-annotations", ":opentelemetry-extension-runtime-metrics", ":opentelemetry-extension-trace-propagators",