Removes current thread-local operations from CensusContext

Author: Dino Oliva

BUILD

@@ -68,19 +68,6 @@ java_test(
     ],
 )
 
-java_test(
-    name = "CensusScopeTest",
-    srcs = ["core/javatests/com/google/census/CensusScopeTest.java"],
-    deps = [
-        ":census-core",
-        ":census-core_native",
-        "@guava//jar",
-        "@jsr305//jar",
-        "@junit//jar",
-        "@truth//jar",
-    ],
-)
-
 java_test(
     name = "MetricMapTest",
     srcs = ["core/javatests/com/google/census/MetricMapTest.java"],

core/java/com/google/census/CensusContext.java

@@ -48,17 +48,13 @@ public final CensusContext with(
 
   /**
    * Serializes the {@link CensusContext} into the on-the-wire representation.
-   *
-   * <p>The inverse of {@link CensusContextFactory#deserialize(ByteBuffer)} and should be based on
-   * the {@link CensusContext} protobuf representation.
+   * The inverse of {@link CensusContextFactory#deserialize()} and should be based on the
+   * {@link CensusContext} protobuf representation.
    *
    * @return serialized bytes.
    */
   public abstract ByteBuffer serialize();
 
-  /** Sets the current thread-local {@link CensusContext}. */
-  public abstract void setCurrent();
-
   /** Builder for {@link CensusContext}. */
   public abstract static class Builder {
     /**

core/java/com/google/census/CensusContextFactory.java

@@ -21,20 +21,16 @@
  */
 public abstract class CensusContextFactory {
   /**
-   * Creates a {@link CensusContext} from the given on-the-wire encoded representation.
-   *
-   * <p>Should be the inverse of {@link CensusContext#serialize()}. The serialized representation
-   * should be based on the {@link CensusContext} protobuf representation.
+   * Creates a {@link CensusContext} from the given on-the-wire encoded representation. Should be
+   * the inverse of {@link CensusContext#serialize()}. The serialized representation should be
+   * based on the {@link CensusContext} protobuf representation.
    *
    * @param buffer on-the-wire representation of a {@link CensusContext}
    * @return a {@link CensusContext} deserialized from {@code buffer}
    */
   @Nullable
   public abstract CensusContext deserialize(ByteBuffer buffer);
 
-  /** Returns the current thread-local {@link CensusContext}. */
-  public abstract CensusContext getCurrent();
-
   /** Returns the default {@link CensusContext}. */
   public abstract CensusContext getDefault();
 }

core/java/com/google/census/CensusScope.java

@@ -30,10 +30,4 @@ public void testDeserializeEmpty() {
     assertThat(Census.getCensusContextFactory().deserialize(ByteBuffer.wrap(new byte[0])))
         .isEqualTo(Census.getCensusContextFactory().getDefault());
   }
-
-  @Test
-  public void testGetCurrent() {
-    assertThat(Census.getCensusContextFactory().getCurrent())
-        .isEqualTo(Census.getCensusContextFactory().getDefault());
-  }
 }

core/javatests/com/google/census/CensusContextFactoryTest.java

@@ -16,9 +16,6 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.testing.EqualsTester;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -116,35 +113,6 @@ public void testSerialize() {
     testSerialization(DEFAULT.with(K_EMPTY, V_EMPTY));
   }
 
-  @Test
-  public void testSetCurrent() {
-    assertThat(DEFAULT).isEqualTo(Census.getCensusContextFactory().getCurrent());
-
-    CensusContext context = DEFAULT.with(K1, V1);
-    context.setCurrent();
-    assertThat(context).isEqualTo(Census.getCensusContextFactory().getCurrent());
-
-    DEFAULT.setCurrent();
-    assertThat(DEFAULT).isEqualTo(Census.getCensusContextFactory().getCurrent());
-  }
-
-  @Test
-  public void testMultipleThreadsWithContext() throws Exception {
-    CensusContext currentContext = Census.getCensusContextFactory().getCurrent();
-    CensusContext c1 = Census.getCensusContextFactory().getDefault().with(K1, V1);
-    CensusContext c2 = Census.getCensusContextFactory().getDefault().with(K2, V2);
-    ExecutorService executor = Executors.newFixedThreadPool(1);
-    // Attach c1 to the executor thread.
-    Future<?> future =
-        executor.submit(withContext(Census.getCensusContextFactory().getDefault(), c1));
-    future.get();
-    // Verify that the context for the current thread was not updated.
-    assertThat(Census.getCensusContextFactory().getCurrent()).isEqualTo(currentContext);
-    // Attach c2 to the executor thread.
-    future = executor.submit(withContext(c1, c2));
-    future.get();
-  }
-
   // Tests for Object overrides.
 
   @Test
@@ -173,15 +141,4 @@ private static void testSerialization(CensusContext expected) {
     CensusContext actual = Census.getCensusContextFactory().deserialize(expected.serialize());
     assertThat(actual).isEqualTo(expected);
   }
-
-  private static final Runnable withContext(final CensusContext prev, final CensusContext next) {
-    return new Runnable() {
-      @Override
-      public void run() {
-        assertThat(Census.getCensusContextFactory().getCurrent()).isEqualTo(prev);
-        next.setCurrent();
-        assertThat(Census.getCensusContextFactory().getCurrent()).isEqualTo(next);
-      }
-    };
-  }
 }

core/javatests/com/google/census/CensusContextTest.java

@@ -32,11 +32,6 @@ public CensusContextImpl deserialize(ByteBuffer buffer) {
     return CensusSerializer.deserialize(buffer);
   }
 
-  @Override
-  public CensusContext getCurrent() {
-    return CensusCurrentContext.get();
-  }
-
   @Override
   public CensusContext getDefault() {
     return DEFAULT;

core/javatests/com/google/census/CensusScopeTest.java

@@ -44,11 +44,6 @@ public ByteBuffer serialize() {
     return CensusSerializer.serialize(this);
   }
 
-  @Override
-  public void setCurrent() {
-    CensusCurrentContext.set(this);
-  }
-
   @Override
   public boolean equals(Object obj) {
     return (obj instanceof CensusContextImpl) && tags.equals(((CensusContextImpl) obj).tags);