Move MillisClock to core_impl. Cleanup formatting. (#325)

10 files changed, 18 insertions, 24 deletions

diff --git a/core/src/main/java/com/google/instrumentation/internal/MillisClock.java b/core_impl/src/main/java/com/google/instrumentation/common/MillisClock.java
index 035c6e82..a1be48ea 100644
--- a/core/src/main/java/com/google/instrumentation/internal/MillisClock.java
+++ b/core_impl/src/main/java/com/google/instrumentation/common/MillisClock.java
@@ -11,10 +11,8 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.internal;
+package com.google.instrumentation.common;
 
-import com.google.instrumentation.common.Clock;
-import com.google.instrumentation.common.Timestamp;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
diff --git a/core_impl/src/test/java/com/google/instrumentation/trace/SpanImplTest.java b/core_impl/src/test/java/com/google/instrumentation/trace/SpanImplTest.java
index 3f24c862..26742032 100644
--- a/core_impl/src/test/java/com/google/instrumentation/trace/SpanImplTest.java
+++ b/core_impl/src/test/java/com/google/instrumentation/trace/SpanImplTest.java
@@ -307,10 +307,10 @@ public class SpanImplTest {
     assertThat(spanData.getAttributes().getAttributeMap().size()).isEqualTo(maxNumberOfAttributes);
     for (int i = 0; i < maxNumberOfAttributes; i++) {
       assertThat(
-          spanData
-              .getAttributes()
-              .getAttributeMap()
-              .get("MyStringAttributeKey" + (i + maxNumberOfAttributes)))
+              spanData
+                  .getAttributes()
+                  .getAttributeMap()
+                  .get("MyStringAttributeKey" + (i + maxNumberOfAttributes)))
           .isEqualTo(AttributeValue.longAttributeValue(i + maxNumberOfAttributes));
     }
     for (int i = 0; i < maxNumberOfAttributes / 2; i++) {
@@ -325,19 +325,15 @@ public class SpanImplTest {
     // Test that we still have in the attributes map the latest maxNumberOfAttributes / 2 entries.
     for (int i = 0; i < maxNumberOfAttributes / 2; i++) {
       assertThat(
-          spanData
-              .getAttributes()
-              .getAttributeMap()
-              .get("MyStringAttributeKey" + (i + maxNumberOfAttributes * 3 / 2)))
+              spanData
+                  .getAttributes()
+                  .getAttributeMap()
+                  .get("MyStringAttributeKey" + (i + maxNumberOfAttributes * 3 / 2)))
           .isEqualTo(AttributeValue.longAttributeValue(i + maxNumberOfAttributes * 3 / 2));
     }
     // Test that we have the newest re-added initial entries.
     for (int i = 0; i < maxNumberOfAttributes / 2; i++) {
-      assertThat(
-          spanData
-              .getAttributes()
-              .getAttributeMap()
-              .get("MyStringAttributeKey" + i))
+      assertThat(spanData.getAttributes().getAttributeMap().get("MyStringAttributeKey" + i))
           .isEqualTo(AttributeValue.longAttributeValue(i));
     }
   }
diff --git a/core_impl/src/test/java/com/google/instrumentation/trace/TraceComponentImplBaseTest.java b/core_impl/src/test/java/com/google/instrumentation/trace/TraceComponentImplBaseTest.java
index d82c6d09..8f739d28 100644
--- a/core_impl/src/test/java/com/google/instrumentation/trace/TraceComponentImplBaseTest.java
+++ b/core_impl/src/test/java/com/google/instrumentation/trace/TraceComponentImplBaseTest.java
@@ -15,8 +15,8 @@ package com.google.instrumentation.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.instrumentation.common.MillisClock;
 import com.google.instrumentation.common.SimpleEventQueue;
-import com.google.instrumentation.internal.MillisClock;
 import com.google.instrumentation.trace.RandomHandler.SecureRandomHandler;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/core_impl/src/test/java/com/google/instrumentation/trace/TraceExporterImplTest.java b/core_impl/src/test/java/com/google/instrumentation/trace/TraceExporterImplTest.java
index 7a30d530..70b5cedf 100644
--- a/core_impl/src/test/java/com/google/instrumentation/trace/TraceExporterImplTest.java
+++ b/core_impl/src/test/java/com/google/instrumentation/trace/TraceExporterImplTest.java
@@ -17,8 +17,8 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.anyListOf;
 import static org.mockito.Mockito.doThrow;
 
+import com.google.instrumentation.common.MillisClock;
 import com.google.instrumentation.common.SimpleEventQueue;
-import com.google.instrumentation.internal.MillisClock;
 import com.google.instrumentation.trace.Span.Options;
 import com.google.instrumentation.trace.TraceConfig.TraceParams;
 import com.google.instrumentation.trace.TraceExporter.ServiceHandler;
diff --git a/core_impl_android/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java b/core_impl_android/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java
index fe3fb91f..998777bf 100644
--- a/core_impl_android/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java
+++ b/core_impl_android/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java
@@ -13,8 +13,8 @@
 
 package com.google.instrumentation.stats;
 
+import com.google.instrumentation.common.MillisClock;
 import com.google.instrumentation.common.SimpleEventQueue;
-import com.google.instrumentation.internal.MillisClock;
 
 /**
  * Android-compatible implementation of {@link StatsManager}.
diff --git a/core_impl_android/src/main/java/com/google/instrumentation/trace/TraceComponentImpl.java b/core_impl_android/src/main/java/com/google/instrumentation/trace/TraceComponentImpl.java
index cfa44e06..07125900 100644
--- a/core_impl_android/src/main/java/com/google/instrumentation/trace/TraceComponentImpl.java
+++ b/core_impl_android/src/main/java/com/google/instrumentation/trace/TraceComponentImpl.java
@@ -13,8 +13,8 @@
 
 package com.google.instrumentation.trace;
 
+import com.google.instrumentation.common.MillisClock;
 import com.google.instrumentation.common.SimpleEventQueue;
-import com.google.instrumentation.internal.MillisClock;
 import com.google.instrumentation.trace.RandomHandler.SecureRandomHandler;
 
 /** Android-compatible implementation of the {@link TraceComponent}. */
diff --git a/core_impl_android/src/test/java/com/google/instrumentation/trace/TraceComponentImplTest.java b/core_impl_android/src/test/java/com/google/instrumentation/trace/TraceComponentImplTest.java
index 66a2b6d5..a4f8b4f9 100644
--- a/core_impl_android/src/test/java/com/google/instrumentation/trace/TraceComponentImplTest.java
+++ b/core_impl_android/src/test/java/com/google/instrumentation/trace/TraceComponentImplTest.java
@@ -15,7 +15,7 @@ package com.google.instrumentation.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.internal.MillisClock;
+import com.google.instrumentation.common.MillisClock;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/core_impl_java/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java b/core_impl_java/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java
index 2f9ff4d6..1e0e8bda 100644
--- a/core_impl_java/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java
+++ b/core_impl_java/src/main/java/com/google/instrumentation/stats/StatsManagerImpl.java
@@ -14,7 +14,7 @@
 package com.google.instrumentation.stats;
 
 import com.google.instrumentation.common.DisruptorEventQueue;
-import com.google.instrumentation.internal.MillisClock;
+import com.google.instrumentation.common.MillisClock;
 
 /** Java 7 and 8 implementation of {@link StatsManager}. */
 public final class StatsManagerImpl extends StatsManagerImplBase {
diff --git a/core_impl_java/src/main/java/com/google/instrumentation/trace/TraceComponentImpl.java b/core_impl_java/src/main/java/com/google/instrumentation/trace/TraceComponentImpl.java
index 766bc7fb..3a2db7ca 100644
--- a/core_impl_java/src/main/java/com/google/instrumentation/trace/TraceComponentImpl.java
+++ b/core_impl_java/src/main/java/com/google/instrumentation/trace/TraceComponentImpl.java
@@ -14,7 +14,7 @@
 package com.google.instrumentation.trace;
 
 import com.google.instrumentation.common.DisruptorEventQueue;
-import com.google.instrumentation.internal.MillisClock;
+import com.google.instrumentation.common.MillisClock;
 
 /** Java 7 and 8 implementation of the {@link TraceComponent}. */
 public final class TraceComponentImpl extends TraceComponentImplBase {
diff --git a/core_impl_java/src/test/java/com/google/instrumentation/trace/TracingTest.java b/core_impl_java/src/test/java/com/google/instrumentation/trace/TracingTest.java
index dcff6973..ba550e73 100644
--- a/core_impl_java/src/test/java/com/google/instrumentation/trace/TracingTest.java
+++ b/core_impl_java/src/test/java/com/google/instrumentation/trace/TracingTest.java
@@ -15,7 +15,7 @@ package com.google.instrumentation.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.instrumentation.internal.MillisClock;
+import com.google.instrumentation.common.MillisClock;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;