Merge pull request #652 from sebright/propagation-package

Move TagContext serialization classes into io.opencensus.tags.propagation.

Author: sebright2

core/src/main/java/io/opencensus/tags/NoopTags.java

@@ -24,6 +24,8 @@
 import io.opencensus.tags.TagValue.TagValueBoolean;
 import io.opencensus.tags.TagValue.TagValueLong;
 import io.opencensus.tags.TagValue.TagValueString;
+import io.opencensus.tags.propagation.TagContextBinarySerializer;
+import io.opencensus.tags.propagation.TagPropagationComponent;
 import java.util.Collections;
 import java.util.Iterator;
 import javax.annotation.concurrent.Immutable;

core/src/main/java/io/opencensus/tags/Tags.java

@@ -18,6 +18,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import io.opencensus.internal.Provider;
+import io.opencensus.tags.propagation.TagPropagationComponent;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

core/src/main/java/io/opencensus/tags/TagsComponent.java

@@ -16,6 +16,8 @@
 
 package io.opencensus.tags;
 
+import io.opencensus.tags.propagation.TagPropagationComponent;
+
 /**
  * Class that holds the implementation for {@link Tagger}.
  *

…sus/tags/TagContextBinarySerializer.java …pagation/TagContextBinarySerializer.javacore/src/main/java/io/opencensus/tags/TagContextBinarySerializer.java renamed to core/src/main/java/io/opencensus/tags/propagation/TagContextBinarySerializer.java core/src/main/java/io/opencensus/tags/TagContextBinarySerializer.java renamed to core/src/main/java/io/opencensus/tags/propagation/TagContextBinarySerializer.java

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package io.opencensus.tags;
+package io.opencensus.tags.propagation;
+
+import io.opencensus.tags.TagContext;
 
 /** Object for serializing and deserializing {@link TagContext}s with the binary format. */
 public abstract class TagContextBinarySerializer {

…ensus/tags/TagContextParseException.java …ropagation/TagContextParseException.javacore/src/main/java/io/opencensus/tags/TagContextParseException.java renamed to core/src/main/java/io/opencensus/tags/propagation/TagContextParseException.java core/src/main/java/io/opencensus/tags/TagContextParseException.java renamed to core/src/main/java/io/opencensus/tags/propagation/TagContextParseException.java

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package io.opencensus.tags;
+package io.opencensus.tags.propagation;
+
+import io.opencensus.tags.TagContext;
 
 /** Exception thrown when a {@link TagContext} cannot be parsed. */
 public final class TagContextParseException extends Exception {

…census/tags/TagPropagationComponent.java …propagation/TagPropagationComponent.javacore/src/main/java/io/opencensus/tags/TagPropagationComponent.java renamed to core/src/main/java/io/opencensus/tags/propagation/TagPropagationComponent.java core/src/main/java/io/opencensus/tags/TagPropagationComponent.java renamed to core/src/main/java/io/opencensus/tags/propagation/TagPropagationComponent.java

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package io.opencensus.tags;
+package io.opencensus.tags.propagation;
+
+import io.opencensus.tags.TagContext;
 
 /** Object containing all supported {@link TagContext} propagation formats. */
 // TODO(sebright): Add a link to the specification for the cross-language OpenCensus tag context

core/src/test/java/io/opencensus/tags/NoopTagsTest.java

@@ -23,6 +23,7 @@
 import io.opencensus.tags.Tag.TagString;
 import io.opencensus.tags.TagKey.TagKeyString;
 import io.opencensus.tags.TagValue.TagValueString;
+import io.opencensus.tags.propagation.TagContextParseException;
 import java.util.Arrays;
 import java.util.Iterator;
 import org.junit.Test;

…s/tags/TagContextParseExceptionTest.java …gation/TagContextParseExceptionTest.javacore/src/test/java/io/opencensus/tags/TagContextParseExceptionTest.java renamed to core/src/test/java/io/opencensus/tags/propagation/TagContextParseExceptionTest.java core/src/test/java/io/opencensus/tags/TagContextParseExceptionTest.java renamed to core/src/test/java/io/opencensus/tags/propagation/TagContextParseExceptionTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opencensus.tags;
+package io.opencensus.tags.propagation;
 
 import static com.google.common.truth.Truth.assertThat;
 

core_impl/src/main/java/io/opencensus/implcore/tags/TagContextImpl.java

@@ -46,7 +46,7 @@ public final class TagContextImpl extends TagContext {
   // The types of the TagKey and value must match for each entry.
   private final Map<TagKey, TagValue> tags;
 
-  TagContextImpl(Map<? extends TagKey, ? extends TagValue> tags) {
+  public TagContextImpl(Map<? extends TagKey, ? extends TagValue> tags) {
     this.tags = Collections.unmodifiableMap(new HashMap<TagKey, TagValue>(tags));
   }
 

core_impl/src/main/java/io/opencensus/implcore/tags/TagsComponentImplBase.java

@@ -16,9 +16,10 @@
 
 package io.opencensus.implcore.tags;
 
-import io.opencensus.tags.TagPropagationComponent;
+import io.opencensus.implcore.tags.propagation.TagPropagationComponentImpl;
 import io.opencensus.tags.Tagger;
 import io.opencensus.tags.TagsComponent;
+import io.opencensus.tags.propagation.TagPropagationComponent;
 
 /** Base implementation of {@link TagsComponent}. */
 public abstract class TagsComponentImplBase extends TagsComponent {