Remove baggage sdk package, move tests to API (#1865)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

all/build.gradle

@@ -22,7 +22,6 @@ def subprojects = [
         project(':opentelemetry-integration-tests'),
         project(':opentelemetry-integration-tests-tracecontext'),
         project(':opentelemetry-opentracing-shim'),
-        project(':opentelemetry-sdk-baggage'),
         project(':opentelemetry-sdk-common'),
         project(':opentelemetry-sdk-metrics'),
         project(':opentelemetry-sdk-tracing'),

api/src/test/java/io/opentelemetry/baggage/BaggageTestUtil.java

@@ -3,10 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.baggage;
+package io.opentelemetry.baggage;
 
-import io.opentelemetry.baggage.Baggage;
-import io.opentelemetry.baggage.Entry;
 import java.util.Arrays;
 import java.util.List;
 

api/src/test/java/io/opentelemetry/baggage/ImmutableBaggageTest.java

@@ -3,17 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.baggage;
+package io.opentelemetry.baggage;
 
-import static io.opentelemetry.sdk.baggage.BaggageTestUtil.listToBaggage;
+import static io.opentelemetry.baggage.BaggageTestUtil.listToBaggage;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.google.common.testing.EqualsTester;
-import io.opentelemetry.baggage.Baggage;
-import io.opentelemetry.baggage.BaggageUtils;
-import io.opentelemetry.baggage.Entry;
-import io.opentelemetry.baggage.EntryMetadata;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import org.junit.jupiter.api.Test;

api/src/test/java/io/opentelemetry/baggage/ScopedBaggageTest.java

@@ -3,14 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.baggage;
+package io.opentelemetry.baggage;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.baggage.Baggage;
-import io.opentelemetry.baggage.BaggageUtils;
-import io.opentelemetry.baggage.Entry;
-import io.opentelemetry.baggage.EntryMetadata;
 import io.opentelemetry.context.Scope;
 import org.junit.jupiter.api.Test;
 

sdk/all/build.gradle

@@ -13,7 +13,6 @@ ext.propertiesDir = "build/generated/properties/io/opentelemetry/sdk"
 dependencies {
     api project(':opentelemetry-api'),
             project(':opentelemetry-sdk-common'),
-            project(':opentelemetry-sdk-baggage'),
             project(':opentelemetry-sdk-metrics'),
             project(':opentelemetry-sdk-tracing')
 

sdk/baggage/build.gradle

@@ -1,50 +0,0 @@
-plugins {
-    id "java"
-    id "maven-publish"
-
-    id "ru.vyarus.animalsniffer"
-}
-
-description = 'OpenTelemetry SDK Baggage'
-ext.moduleName = "io.opentelemetry.sdk.baggage"
-ext.propertiesDir = "build/generated/properties/io/opentelemetry/sdk/baggage"
-
-dependencies {
-    api project(':opentelemetry-api'),
-            project(':opentelemetry-sdk-common')
-
-    implementation libraries.guava
-
-    annotationProcessor libraries.auto_value
-
-    testAnnotationProcessor libraries.auto_value
-    testCompileOnly libraries.auto_value_annotation
-
-    testImplementation project(':opentelemetry-testing-internal')
-    testImplementation libraries.junit_pioneer
-
-    signature "org.codehaus.mojo.signature:java18:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature"
-}
-
-sourceSets {
-    main {
-        output.dir("build/generated/properties", builtBy: 'generateVersionResource')
-    }
-}
-
-animalsniffer {
-    // Don't check sourceSets.jmh and sourceSets.test
-    sourceSets = [
-            sourceSets.main
-    ]
-}
-
-task generateVersionResource {
-    doLast {
-        def folder = file(propertiesDir)
-        folder.mkdirs()
-        def propertiesFile = new File(folder.getAbsolutePath(), "version.properties")
-        propertiesFile.write("sdk.version=${project.version}")
-    }
-}

sdk/baggage/src/test/java/io/opentelemetry/sdk/baggage/BaggageManagerSdkTest.java

@@ -1,68 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.sdk.baggage;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import io.opentelemetry.baggage.Baggage;
-import io.opentelemetry.baggage.BaggageUtils;
-import io.opentelemetry.context.Context;
-import io.opentelemetry.context.Scope;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-/** Unit tests for {@link Baggage} and {@link BaggageUtils}. TODO: move these where appropriate */
-class BaggageManagerSdkTest {
-
-  @Mock private Baggage baggage;
-
-  @BeforeEach
-  void setUp() {
-    MockitoAnnotations.initMocks(this);
-  }
-
-  @Test
-  void testGetCurrentContext_DefaultContext() {
-    assertThat(BaggageUtils.getCurrentBaggage()).isSameAs(Baggage.empty());
-  }
-
-  @Test
-  void testGetCurrentContext_ContextSetToNull() {
-    try (Scope ignored = Context.root().makeCurrent()) {
-      Baggage baggage = BaggageUtils.getCurrentBaggage();
-      assertThat(baggage).isNotNull();
-      assertThat(baggage.getEntries()).isEmpty();
-    }
-  }
-
-  @Test
-  void testWithBaggage() {
-    assertThat(BaggageUtils.getCurrentBaggage()).isSameAs(Baggage.empty());
-    try (Scope wtm = BaggageUtils.currentContextWith(baggage)) {
-      assertThat(BaggageUtils.getCurrentBaggage()).isSameAs(baggage);
-    }
-    assertThat(BaggageUtils.getCurrentBaggage()).isSameAs(Baggage.empty());
-  }
-
-  @Test
-  void testWithBaggageUsingWrap() {
-    Runnable runnable;
-    try (Scope wtm = BaggageUtils.currentContextWith(baggage)) {
-      assertThat(BaggageUtils.getCurrentBaggage()).isSameAs(baggage);
-      runnable =
-          Context.current()
-              .wrap(
-                  () -> {
-                    assertThat(BaggageUtils.getCurrentBaggage()).isSameAs(baggage);
-                  });
-    }
-    assertThat(BaggageUtils.getCurrentBaggage()).isSameAs(Baggage.empty());
-    // When we run the runnable we will have the Baggage in the current Context.
-    runnable.run();
-  }
-}

settings.gradle

@@ -38,7 +38,6 @@ include ":opentelemetry-all",
         ":opentelemetry-integration-tests-tracecontext",
         ":opentelemetry-opentracing-shim",
         ":opentelemetry-proto",
-        ":opentelemetry-sdk-baggage",
         ":opentelemetry-sdk-common",
         ":opentelemetry-sdk-metrics",
         ":opentelemetry-sdk-tracing",