diff options
author | Kristen Kozak <sebright@google.com> | 2017-08-17 12:00:51 -0700 |
---|---|---|
committer | Kristen Kozak <sebright@google.com> | 2017-08-17 17:45:32 -0700 |
commit | 7edf0c605414a38f14d719747235d3993791136e (patch) | |
tree | 1d06ec611ce23971e60233e1f1769d12016ec76d /impl | |
parent | 59990408b1c2c43862a999f902bfef5661743cea (diff) | |
download | opencensus-java-7edf0c605414a38f14d719747235d3993791136e.tar.gz |
Use different package names in each artifact. (fixes #379)
This commit uses the following package name prefixes in each artifact, in order
to ensure that no package is split across artifacts:
opencensus-api: io.opencensus
opencensus-impl-core: io.opencensus.implcore
opencensus-impl: io.opencensus.impl
opencensus-impl-lite: io.opencensus.impllite
Diffstat (limited to 'impl')
6 files changed, 10 insertions, 9 deletions
diff --git a/impl/src/main/java/io/opencensus/impl/internal/DisruptorEventQueue.java b/impl/src/main/java/io/opencensus/impl/internal/DisruptorEventQueue.java index be2d422e..77479ea3 100644 --- a/impl/src/main/java/io/opencensus/impl/internal/DisruptorEventQueue.java +++ b/impl/src/main/java/io/opencensus/impl/internal/DisruptorEventQueue.java @@ -19,7 +19,7 @@ import com.lmax.disruptor.RingBuffer; import com.lmax.disruptor.SleepingWaitStrategy; import com.lmax.disruptor.dsl.Disruptor; import com.lmax.disruptor.dsl.ProducerType; -import io.opencensus.impl.internal.EventQueue; +import io.opencensus.implcore.internal.EventQueue; import java.util.concurrent.Executors; import javax.annotation.concurrent.ThreadSafe; diff --git a/impl/src/main/java/io/opencensus/impl/trace/TraceComponentImpl.java b/impl/src/main/java/io/opencensus/impl/trace/TraceComponentImpl.java index 8457adfc..7e1397eb 100644 --- a/impl/src/main/java/io/opencensus/impl/trace/TraceComponentImpl.java +++ b/impl/src/main/java/io/opencensus/impl/trace/TraceComponentImpl.java @@ -13,10 +13,10 @@ package io.opencensus.impl.trace; -import io.opencensus.impl.common.MillisClock; import io.opencensus.impl.internal.DisruptorEventQueue; -import io.opencensus.impl.trace.TraceComponentImplBase; import io.opencensus.impl.trace.internal.ThreadLocalRandomHandler; +import io.opencensus.implcore.common.MillisClock; +import io.opencensus.implcore.trace.TraceComponentImplBase; import io.opencensus.trace.TraceComponent; /** Java 7 and 8 implementation of the {@link TraceComponent}. */ diff --git a/impl/src/main/java/io/opencensus/impl/trace/internal/ThreadLocalRandomHandler.java b/impl/src/main/java/io/opencensus/impl/trace/internal/ThreadLocalRandomHandler.java index 6094167f..34acf8f7 100644 --- a/impl/src/main/java/io/opencensus/impl/trace/internal/ThreadLocalRandomHandler.java +++ b/impl/src/main/java/io/opencensus/impl/trace/internal/ThreadLocalRandomHandler.java @@ -13,7 +13,7 @@ package io.opencensus.impl.trace.internal; -import io.opencensus.impl.trace.internal.RandomHandler; +import io.opencensus.implcore.trace.internal.RandomHandler; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; import javax.annotation.concurrent.ThreadSafe; diff --git a/impl/src/main/java/io/opencensus/trace/TraceComponentImpl.java b/impl/src/main/java/io/opencensus/trace/TraceComponentImpl.java index 211e08d9..a4c79241 100644 --- a/impl/src/main/java/io/opencensus/trace/TraceComponentImpl.java +++ b/impl/src/main/java/io/opencensus/trace/TraceComponentImpl.java @@ -13,10 +13,10 @@ package io.opencensus.trace; -import io.opencensus.impl.common.MillisClock; import io.opencensus.impl.internal.DisruptorEventQueue; -import io.opencensus.impl.trace.TraceComponentImplBase; import io.opencensus.impl.trace.internal.ThreadLocalRandomHandler; +import io.opencensus.implcore.common.MillisClock; +import io.opencensus.implcore.trace.TraceComponentImplBase; /** Java 7 and 8 implementation of the {@link TraceComponent}. */ // TraceComponentImpl was moved to io.opencensus.impl.trace. This class exists for backwards diff --git a/impl/src/test/java/io/opencensus/impl/internal/DisruptorEventQueueTest.java b/impl/src/test/java/io/opencensus/impl/internal/DisruptorEventQueueTest.java index 2be9eecb..b95314f9 100644 --- a/impl/src/test/java/io/opencensus/impl/internal/DisruptorEventQueueTest.java +++ b/impl/src/test/java/io/opencensus/impl/internal/DisruptorEventQueueTest.java @@ -16,7 +16,7 @@ package io.opencensus.impl.internal; import static com.google.common.truth.Truth.assertThat; import io.opencensus.impl.internal.DisruptorEventQueue; -import io.opencensus.impl.internal.EventQueue; +import io.opencensus.implcore.internal.EventQueue; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/impl/src/test/java/io/opencensus/impl/trace/TracingTest.java b/impl/src/test/java/io/opencensus/impl/trace/TracingTest.java index 5c0ca65a..8bdb9433 100644 --- a/impl/src/test/java/io/opencensus/impl/trace/TracingTest.java +++ b/impl/src/test/java/io/opencensus/impl/trace/TracingTest.java @@ -15,8 +15,9 @@ package io.opencensus.impl.trace; import static com.google.common.truth.Truth.assertThat; -import io.opencensus.impl.common.MillisClock; -import io.opencensus.impl.trace.export.ExportComponentImpl; +import io.opencensus.implcore.common.MillisClock; +import io.opencensus.implcore.trace.TracerImpl; +import io.opencensus.implcore.trace.export.ExportComponentImpl; import io.opencensus.trace.TraceComponent; import io.opencensus.trace.Tracing; import io.opencensus.trace.propagation.PropagationComponent; |