From 3b74070f74a75e780828370126b713524eece13c Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Thu, 15 Jun 2017 11:29:30 -0700 Subject: Prepare the release of the opencensus library. (#357) --- .../io/opencensus/trace/TraceComponentImpl.java | 26 ++++++++++++ .../opencensus/trace/TraceComponentImplTest.java | 48 ++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 impl_lite/src/main/java/io/opencensus/trace/TraceComponentImpl.java create mode 100644 impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplTest.java (limited to 'impl_lite/src') diff --git a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImpl.java b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImpl.java new file mode 100644 index 00000000..ca806508 --- /dev/null +++ b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImpl.java @@ -0,0 +1,26 @@ +/* + * Copyright 2017, Google Inc. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opencensus.trace; + +import io.opencensus.common.MillisClock; +import io.opencensus.internal.SimpleEventQueue; +import io.opencensus.trace.internal.RandomHandler.SecureRandomHandler; + +/** Android-compatible implementation of the {@link TraceComponent}. */ +public final class TraceComponentImpl extends TraceComponentImplBase { + + public TraceComponentImpl() { + super(MillisClock.getInstance(), new SecureRandomHandler(), new SimpleEventQueue()); + } +} diff --git a/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplTest.java b/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplTest.java new file mode 100644 index 00000000..024e8692 --- /dev/null +++ b/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplTest.java @@ -0,0 +1,48 @@ +/* + * Copyright 2017, Google Inc. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opencensus.trace; + +import static com.google.common.truth.Truth.assertThat; + +import io.opencensus.common.MillisClock; +import io.opencensus.trace.export.ExportComponentImpl; +import io.opencensus.trace.propagation.PropagationComponentImpl; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Unit tests for {@link TraceComponentImpl}. */ +@RunWith(JUnit4.class) +public class TraceComponentImplTest { + @Test + public void implementationOfTracer() { + assertThat(Tracing.getTracer()).isInstanceOf(TracerImpl.class); + } + + @Test + public void implementationOfBinaryPropagationHandler() { + assertThat(Tracing.getPropagationComponent()) + .isInstanceOf(PropagationComponentImpl.class); + } + + @Test + public void implementationOfClock() { + assertThat(Tracing.getClock()).isInstanceOf(MillisClock.class); + } + + @Test + public void implementationOfTraceExporter() { + assertThat(Tracing.getTraceExporter()).isInstanceOf(ExportComponentImpl.class); + } +} -- cgit v1.2.3 From 5484bd0904ceb4950ed3ccd3b4c993ed2d4a8813 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Thu, 15 Jun 2017 17:09:30 -0700 Subject: Add support to load lite or full implementations. (#360) --- .../io/opencensus/trace/TraceComponentImpl.java | 26 ------------ .../opencensus/trace/TraceComponentImplLite.java | 26 ++++++++++++ .../trace/TraceComponentImplLiteTest.java | 48 ++++++++++++++++++++++ .../opencensus/trace/TraceComponentImplTest.java | 48 ---------------------- 4 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 impl_lite/src/main/java/io/opencensus/trace/TraceComponentImpl.java create mode 100644 impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java create mode 100644 impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplLiteTest.java delete mode 100644 impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplTest.java (limited to 'impl_lite/src') diff --git a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImpl.java b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImpl.java deleted file mode 100644 index ca806508..00000000 --- a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2017, Google Inc. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.opencensus.trace; - -import io.opencensus.common.MillisClock; -import io.opencensus.internal.SimpleEventQueue; -import io.opencensus.trace.internal.RandomHandler.SecureRandomHandler; - -/** Android-compatible implementation of the {@link TraceComponent}. */ -public final class TraceComponentImpl extends TraceComponentImplBase { - - public TraceComponentImpl() { - super(MillisClock.getInstance(), new SecureRandomHandler(), new SimpleEventQueue()); - } -} diff --git a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java new file mode 100644 index 00000000..c3d7100b --- /dev/null +++ b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java @@ -0,0 +1,26 @@ +/* + * Copyright 2017, Google Inc. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opencensus.trace; + +import io.opencensus.common.MillisClock; +import io.opencensus.internal.SimpleEventQueue; +import io.opencensus.trace.internal.RandomHandler.SecureRandomHandler; + +/** Android-compatible implementation of the {@link TraceComponent}. */ +public final class TraceComponentImplLite extends TraceComponentImplBase { + + public TraceComponentImplLite() { + super(MillisClock.getInstance(), new SecureRandomHandler(), new SimpleEventQueue()); + } +} diff --git a/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplLiteTest.java b/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplLiteTest.java new file mode 100644 index 00000000..65afe66b --- /dev/null +++ b/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplLiteTest.java @@ -0,0 +1,48 @@ +/* + * Copyright 2017, Google Inc. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opencensus.trace; + +import static com.google.common.truth.Truth.assertThat; + +import io.opencensus.common.MillisClock; +import io.opencensus.trace.export.ExportComponentImpl; +import io.opencensus.trace.propagation.PropagationComponentImpl; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Unit tests for {@link TraceComponentImplLite}. */ +@RunWith(JUnit4.class) +public class TraceComponentImplLiteTest { + @Test + public void implementationOfTracer() { + assertThat(Tracing.getTracer()).isInstanceOf(TracerImpl.class); + } + + @Test + public void implementationOfBinaryPropagationHandler() { + assertThat(Tracing.getPropagationComponent()) + .isInstanceOf(PropagationComponentImpl.class); + } + + @Test + public void implementationOfClock() { + assertThat(Tracing.getClock()).isInstanceOf(MillisClock.class); + } + + @Test + public void implementationOfTraceExporter() { + assertThat(Tracing.getTraceExporter()).isInstanceOf(ExportComponentImpl.class); + } +} diff --git a/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplTest.java b/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplTest.java deleted file mode 100644 index 024e8692..00000000 --- a/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2017, Google Inc. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.opencensus.trace; - -import static com.google.common.truth.Truth.assertThat; - -import io.opencensus.common.MillisClock; -import io.opencensus.trace.export.ExportComponentImpl; -import io.opencensus.trace.propagation.PropagationComponentImpl; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -/** Unit tests for {@link TraceComponentImpl}. */ -@RunWith(JUnit4.class) -public class TraceComponentImplTest { - @Test - public void implementationOfTracer() { - assertThat(Tracing.getTracer()).isInstanceOf(TracerImpl.class); - } - - @Test - public void implementationOfBinaryPropagationHandler() { - assertThat(Tracing.getPropagationComponent()) - .isInstanceOf(PropagationComponentImpl.class); - } - - @Test - public void implementationOfClock() { - assertThat(Tracing.getClock()).isInstanceOf(MillisClock.class); - } - - @Test - public void implementationOfTraceExporter() { - assertThat(Tracing.getTraceExporter()).isInstanceOf(ExportComponentImpl.class); - } -} -- cgit v1.2.3 From 831b9ce3122268c4f689700b851f1b6d73bcacfe Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Thu, 22 Jun 2017 00:24:00 -0700 Subject: Fix Tracing method name to get ExportComponent (#382) --- .../src/test/java/io/opencensus/trace/TraceComponentImplLiteTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'impl_lite/src') diff --git a/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplLiteTest.java b/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplLiteTest.java index 65afe66b..f06c3d40 100644 --- a/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplLiteTest.java +++ b/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplLiteTest.java @@ -43,6 +43,6 @@ public class TraceComponentImplLiteTest { @Test public void implementationOfTraceExporter() { - assertThat(Tracing.getTraceExporter()).isInstanceOf(ExportComponentImpl.class); + assertThat(Tracing.getExportComponent()).isInstanceOf(ExportComponentImpl.class); } } -- cgit v1.2.3 From 3b5ec6e482575bd6be1572c7ef65c7b7ab832320 Mon Sep 17 00:00:00 2001 From: Kristen Kozak Date: Tue, 15 Aug 2017 13:45:20 -0700 Subject: Move tracing implementation classes to io.opencensus.impl.trace. This is part of #379. The package name may still need to be changed again, but this commit includes all of the changes necessary to put the API and implementation in separate packages. Other changes in this commit: - Make TraceComponent's constructor public. - Leave deprecated copies of the TraceComponent subclasses in the io.opencensus.trace package so that they can be loaded by opencensus-api 0.5. - Move internal classes to io.opencensus.impl.internal. - Make TraceComponentImplBase and BinaryFormatImpl public. --- .../impl/trace/TraceComponentImplLite.java | 27 ++++++++++++ .../opencensus/trace/TraceComponentImplLite.java | 10 +++-- .../impl/trace/TraceComponentImplLiteTest.java | 49 ++++++++++++++++++++++ .../trace/TraceComponentImplLiteTest.java | 48 --------------------- 4 files changed, 83 insertions(+), 51 deletions(-) create mode 100644 impl_lite/src/main/java/io/opencensus/impl/trace/TraceComponentImplLite.java create mode 100644 impl_lite/src/test/java/io/opencensus/impl/trace/TraceComponentImplLiteTest.java delete mode 100644 impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplLiteTest.java (limited to 'impl_lite/src') diff --git a/impl_lite/src/main/java/io/opencensus/impl/trace/TraceComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/impl/trace/TraceComponentImplLite.java new file mode 100644 index 00000000..7b172279 --- /dev/null +++ b/impl_lite/src/main/java/io/opencensus/impl/trace/TraceComponentImplLite.java @@ -0,0 +1,27 @@ +/* + * Copyright 2017, Google Inc. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opencensus.impl.trace; + +import io.opencensus.impl.common.MillisClock; +import io.opencensus.impl.internal.SimpleEventQueue; +import io.opencensus.impl.trace.internal.RandomHandler.SecureRandomHandler; +import io.opencensus.trace.TraceComponent; + +/** Android-compatible implementation of the {@link TraceComponent}. */ +public final class TraceComponentImplLite extends TraceComponentImplBase { + + public TraceComponentImplLite() { + super(MillisClock.getInstance(), new SecureRandomHandler(), new SimpleEventQueue()); + } +} diff --git a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java index c3d7100b..38a49927 100644 --- a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java +++ b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java @@ -13,11 +13,15 @@ package io.opencensus.trace; -import io.opencensus.common.MillisClock; -import io.opencensus.internal.SimpleEventQueue; -import io.opencensus.trace.internal.RandomHandler.SecureRandomHandler; +import io.opencensus.impl.common.MillisClock; +import io.opencensus.impl.internal.SimpleEventQueue; +import io.opencensus.impl.trace.TraceComponentImplBase; +import io.opencensus.impl.trace.internal.RandomHandler.SecureRandomHandler; /** Android-compatible implementation of the {@link TraceComponent}. */ +// TraceComponentImplLite was moved to io.opencensus.impl.trace. This class exists for backwards +// compatibility, so that it can be loaded by opencensus-api O.5. +@Deprecated public final class TraceComponentImplLite extends TraceComponentImplBase { public TraceComponentImplLite() { diff --git a/impl_lite/src/test/java/io/opencensus/impl/trace/TraceComponentImplLiteTest.java b/impl_lite/src/test/java/io/opencensus/impl/trace/TraceComponentImplLiteTest.java new file mode 100644 index 00000000..c07e0683 --- /dev/null +++ b/impl_lite/src/test/java/io/opencensus/impl/trace/TraceComponentImplLiteTest.java @@ -0,0 +1,49 @@ +/* + * Copyright 2017, Google Inc. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +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.impl.trace.propagation.PropagationComponentImpl; +import io.opencensus.trace.Tracing; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Unit tests for {@link TraceComponentImplLite}. */ +@RunWith(JUnit4.class) +public class TraceComponentImplLiteTest { + @Test + public void implementationOfTracer() { + assertThat(Tracing.getTracer()).isInstanceOf(TracerImpl.class); + } + + @Test + public void implementationOfBinaryPropagationHandler() { + assertThat(Tracing.getPropagationComponent()) + .isInstanceOf(PropagationComponentImpl.class); + } + + @Test + public void implementationOfClock() { + assertThat(Tracing.getClock()).isInstanceOf(MillisClock.class); + } + + @Test + public void implementationOfTraceExporter() { + assertThat(Tracing.getExportComponent()).isInstanceOf(ExportComponentImpl.class); + } +} diff --git a/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplLiteTest.java b/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplLiteTest.java deleted file mode 100644 index f06c3d40..00000000 --- a/impl_lite/src/test/java/io/opencensus/trace/TraceComponentImplLiteTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2017, Google Inc. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.opencensus.trace; - -import static com.google.common.truth.Truth.assertThat; - -import io.opencensus.common.MillisClock; -import io.opencensus.trace.export.ExportComponentImpl; -import io.opencensus.trace.propagation.PropagationComponentImpl; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -/** Unit tests for {@link TraceComponentImplLite}. */ -@RunWith(JUnit4.class) -public class TraceComponentImplLiteTest { - @Test - public void implementationOfTracer() { - assertThat(Tracing.getTracer()).isInstanceOf(TracerImpl.class); - } - - @Test - public void implementationOfBinaryPropagationHandler() { - assertThat(Tracing.getPropagationComponent()) - .isInstanceOf(PropagationComponentImpl.class); - } - - @Test - public void implementationOfClock() { - assertThat(Tracing.getClock()).isInstanceOf(MillisClock.class); - } - - @Test - public void implementationOfTraceExporter() { - assertThat(Tracing.getExportComponent()).isInstanceOf(ExportComponentImpl.class); - } -} -- cgit v1.2.3 From 7edf0c605414a38f14d719747235d3993791136e Mon Sep 17 00:00:00 2001 From: Kristen Kozak Date: Thu, 17 Aug 2017 12:00:51 -0700 Subject: 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 --- .../impl/trace/TraceComponentImplLite.java | 27 ------------ .../impllite/trace/TraceComponentImplLite.java | 28 ++++++++++++ .../opencensus/trace/TraceComponentImplLite.java | 8 ++-- .../impl/trace/TraceComponentImplLiteTest.java | 49 --------------------- .../impllite/trace/TraceComponentImplLiteTest.java | 51 ++++++++++++++++++++++ 5 files changed, 83 insertions(+), 80 deletions(-) delete mode 100644 impl_lite/src/main/java/io/opencensus/impl/trace/TraceComponentImplLite.java create mode 100644 impl_lite/src/main/java/io/opencensus/impllite/trace/TraceComponentImplLite.java delete mode 100644 impl_lite/src/test/java/io/opencensus/impl/trace/TraceComponentImplLiteTest.java create mode 100644 impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java (limited to 'impl_lite/src') diff --git a/impl_lite/src/main/java/io/opencensus/impl/trace/TraceComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/impl/trace/TraceComponentImplLite.java deleted file mode 100644 index 7b172279..00000000 --- a/impl_lite/src/main/java/io/opencensus/impl/trace/TraceComponentImplLite.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2017, Google Inc. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.opencensus.impl.trace; - -import io.opencensus.impl.common.MillisClock; -import io.opencensus.impl.internal.SimpleEventQueue; -import io.opencensus.impl.trace.internal.RandomHandler.SecureRandomHandler; -import io.opencensus.trace.TraceComponent; - -/** Android-compatible implementation of the {@link TraceComponent}. */ -public final class TraceComponentImplLite extends TraceComponentImplBase { - - public TraceComponentImplLite() { - super(MillisClock.getInstance(), new SecureRandomHandler(), new SimpleEventQueue()); - } -} diff --git a/impl_lite/src/main/java/io/opencensus/impllite/trace/TraceComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/impllite/trace/TraceComponentImplLite.java new file mode 100644 index 00000000..b2947429 --- /dev/null +++ b/impl_lite/src/main/java/io/opencensus/impllite/trace/TraceComponentImplLite.java @@ -0,0 +1,28 @@ +/* + * Copyright 2017, Google Inc. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opencensus.impllite.trace; + +import io.opencensus.implcore.common.MillisClock; +import io.opencensus.implcore.internal.SimpleEventQueue; +import io.opencensus.implcore.trace.TraceComponentImplBase; +import io.opencensus.implcore.trace.internal.RandomHandler.SecureRandomHandler; +import io.opencensus.trace.TraceComponent; + +/** Android-compatible implementation of the {@link TraceComponent}. */ +public final class TraceComponentImplLite extends TraceComponentImplBase { + + public TraceComponentImplLite() { + super(MillisClock.getInstance(), new SecureRandomHandler(), new SimpleEventQueue()); + } +} diff --git a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java index 38a49927..0da3afb2 100644 --- a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java +++ b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java @@ -13,10 +13,10 @@ package io.opencensus.trace; -import io.opencensus.impl.common.MillisClock; -import io.opencensus.impl.internal.SimpleEventQueue; -import io.opencensus.impl.trace.TraceComponentImplBase; -import io.opencensus.impl.trace.internal.RandomHandler.SecureRandomHandler; +import io.opencensus.implcore.common.MillisClock; +import io.opencensus.implcore.internal.SimpleEventQueue; +import io.opencensus.implcore.trace.TraceComponentImplBase; +import io.opencensus.implcore.trace.internal.RandomHandler.SecureRandomHandler; /** Android-compatible implementation of the {@link TraceComponent}. */ // TraceComponentImplLite was moved to io.opencensus.impl.trace. This class exists for backwards diff --git a/impl_lite/src/test/java/io/opencensus/impl/trace/TraceComponentImplLiteTest.java b/impl_lite/src/test/java/io/opencensus/impl/trace/TraceComponentImplLiteTest.java deleted file mode 100644 index c07e0683..00000000 --- a/impl_lite/src/test/java/io/opencensus/impl/trace/TraceComponentImplLiteTest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2017, Google Inc. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -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.impl.trace.propagation.PropagationComponentImpl; -import io.opencensus.trace.Tracing; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -/** Unit tests for {@link TraceComponentImplLite}. */ -@RunWith(JUnit4.class) -public class TraceComponentImplLiteTest { - @Test - public void implementationOfTracer() { - assertThat(Tracing.getTracer()).isInstanceOf(TracerImpl.class); - } - - @Test - public void implementationOfBinaryPropagationHandler() { - assertThat(Tracing.getPropagationComponent()) - .isInstanceOf(PropagationComponentImpl.class); - } - - @Test - public void implementationOfClock() { - assertThat(Tracing.getClock()).isInstanceOf(MillisClock.class); - } - - @Test - public void implementationOfTraceExporter() { - assertThat(Tracing.getExportComponent()).isInstanceOf(ExportComponentImpl.class); - } -} diff --git a/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java b/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java new file mode 100644 index 00000000..e8369fe3 --- /dev/null +++ b/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java @@ -0,0 +1,51 @@ +/* + * Copyright 2017, Google Inc. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opencensus.impllite.trace; + +import static com.google.common.truth.Truth.assertThat; + +import io.opencensus.implcore.common.MillisClock; +import io.opencensus.implcore.trace.TracerImpl; +import io.opencensus.implcore.trace.export.ExportComponentImpl; +import io.opencensus.implcore.trace.propagation.PropagationComponentImpl; +import io.opencensus.impllite.trace.TraceComponentImplLite; +import io.opencensus.trace.Tracing; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Unit tests for {@link TraceComponentImplLite}. */ +@RunWith(JUnit4.class) +public class TraceComponentImplLiteTest { + @Test + public void implementationOfTracer() { + assertThat(Tracing.getTracer()).isInstanceOf(TracerImpl.class); + } + + @Test + public void implementationOfBinaryPropagationHandler() { + assertThat(Tracing.getPropagationComponent()) + .isInstanceOf(PropagationComponentImpl.class); + } + + @Test + public void implementationOfClock() { + assertThat(Tracing.getClock()).isInstanceOf(MillisClock.class); + } + + @Test + public void implementationOfTraceExporter() { + assertThat(Tracing.getExportComponent()).isInstanceOf(ExportComponentImpl.class); + } +} -- cgit v1.2.3 From d14ed2083ad82aa00ad4efaab49e8c57fd76d68f Mon Sep 17 00:00:00 2001 From: Kristen Kozak Date: Thu, 17 Aug 2017 14:03:18 -0700 Subject: Update TraceComponentImplLite package name in a comment. --- .../src/main/java/io/opencensus/trace/TraceComponentImplLite.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'impl_lite/src') diff --git a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java index 0da3afb2..f534c2a1 100644 --- a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java +++ b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java @@ -19,8 +19,8 @@ import io.opencensus.implcore.trace.TraceComponentImplBase; import io.opencensus.implcore.trace.internal.RandomHandler.SecureRandomHandler; /** Android-compatible implementation of the {@link TraceComponent}. */ -// TraceComponentImplLite was moved to io.opencensus.impl.trace. This class exists for backwards -// compatibility, so that it can be loaded by opencensus-api O.5. +// TraceComponentImplLite was moved to io.opencensus.impllite.trace. This class exists for backwards +// compatibility, so that it can be loaded by opencensus-api 0.5. @Deprecated public final class TraceComponentImplLite extends TraceComponentImplBase { -- cgit v1.2.3 From b2f48c5d608c154d75ae7616c660e053f6e5c5f7 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Wed, 23 Aug 2017 09:52:48 -0700 Subject: Change the licence to OpenCensus authors. (#539) --- .../java/io/opencensus/impllite/trace/TraceComponentImplLite.java | 5 ++++- .../src/main/java/io/opencensus/trace/TraceComponentImplLite.java | 5 ++++- .../io/opencensus/impllite/trace/TraceComponentImplLiteTest.java | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'impl_lite/src') diff --git a/impl_lite/src/main/java/io/opencensus/impllite/trace/TraceComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/impllite/trace/TraceComponentImplLite.java index b2947429..34ec53bb 100644 --- a/impl_lite/src/main/java/io/opencensus/impllite/trace/TraceComponentImplLite.java +++ b/impl_lite/src/main/java/io/opencensus/impllite/trace/TraceComponentImplLite.java @@ -1,9 +1,12 @@ /* - * Copyright 2017, Google Inc. + * Copyright 2017, OpenCensus Authors + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java index f534c2a1..feb6d45b 100644 --- a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java +++ b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java @@ -1,9 +1,12 @@ /* - * Copyright 2017, Google Inc. + * Copyright 2017, OpenCensus Authors + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java b/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java index e8369fe3..667a0c9c 100644 --- a/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java +++ b/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java @@ -1,9 +1,12 @@ /* - * Copyright 2017, Google Inc. + * Copyright 2017, OpenCensus Authors + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- cgit v1.2.3 From f2714546d47aab1e904fd1c42e147549964c7341 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Thu, 31 Aug 2017 09:52:56 -0700 Subject: Fix backwards compatibility between TraceComponentBaseImpl and TraceComponent. (#575) --- .../impllite/trace/TraceComponentImplLite.java | 38 ++++++++++++++++++++-- .../opencensus/trace/TraceComponentImplLite.java | 37 +++++++++++++++++++-- 2 files changed, 71 insertions(+), 4 deletions(-) (limited to 'impl_lite/src') diff --git a/impl_lite/src/main/java/io/opencensus/impllite/trace/TraceComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/impllite/trace/TraceComponentImplLite.java index 34ec53bb..8c067557 100644 --- a/impl_lite/src/main/java/io/opencensus/impllite/trace/TraceComponentImplLite.java +++ b/impl_lite/src/main/java/io/opencensus/impllite/trace/TraceComponentImplLite.java @@ -16,16 +16,50 @@ package io.opencensus.impllite.trace; +import io.opencensus.common.Clock; import io.opencensus.implcore.common.MillisClock; import io.opencensus.implcore.internal.SimpleEventQueue; import io.opencensus.implcore.trace.TraceComponentImplBase; import io.opencensus.implcore.trace.internal.RandomHandler.SecureRandomHandler; import io.opencensus.trace.TraceComponent; +import io.opencensus.trace.Tracer; +import io.opencensus.trace.config.TraceConfig; +import io.opencensus.trace.export.ExportComponent; +import io.opencensus.trace.propagation.PropagationComponent; /** Android-compatible implementation of the {@link TraceComponent}. */ -public final class TraceComponentImplLite extends TraceComponentImplBase { +public final class TraceComponentImplLite extends TraceComponent { + private final TraceComponentImplBase traceComponentImplBase; + /** Public constructor to be used with reflection loading. */ public TraceComponentImplLite() { - super(MillisClock.getInstance(), new SecureRandomHandler(), new SimpleEventQueue()); + traceComponentImplBase = + new TraceComponentImplBase( + MillisClock.getInstance(), new SecureRandomHandler(), new SimpleEventQueue()); + } + + @Override + public Tracer getTracer() { + return traceComponentImplBase.getTracer(); + } + + @Override + public PropagationComponent getPropagationComponent() { + return traceComponentImplBase.getPropagationComponent(); + } + + @Override + public Clock getClock() { + return traceComponentImplBase.getClock(); + } + + @Override + public ExportComponent getExportComponent() { + return traceComponentImplBase.getExportComponent(); + } + + @Override + public TraceConfig getTraceConfig() { + return traceComponentImplBase.getTraceConfig(); } } diff --git a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java index feb6d45b..5e80b93a 100644 --- a/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java +++ b/impl_lite/src/main/java/io/opencensus/trace/TraceComponentImplLite.java @@ -16,18 +16,51 @@ package io.opencensus.trace; +import io.opencensus.common.Clock; import io.opencensus.implcore.common.MillisClock; import io.opencensus.implcore.internal.SimpleEventQueue; import io.opencensus.implcore.trace.TraceComponentImplBase; import io.opencensus.implcore.trace.internal.RandomHandler.SecureRandomHandler; +import io.opencensus.trace.config.TraceConfig; +import io.opencensus.trace.export.ExportComponent; +import io.opencensus.trace.propagation.PropagationComponent; /** Android-compatible implementation of the {@link TraceComponent}. */ // TraceComponentImplLite was moved to io.opencensus.impllite.trace. This class exists for backwards // compatibility, so that it can be loaded by opencensus-api 0.5. @Deprecated -public final class TraceComponentImplLite extends TraceComponentImplBase { +public final class TraceComponentImplLite extends TraceComponent { + private final TraceComponentImplBase traceComponentImplBase; + /** Public constructor to be used with reflection loading. */ public TraceComponentImplLite() { - super(MillisClock.getInstance(), new SecureRandomHandler(), new SimpleEventQueue()); + traceComponentImplBase = + new TraceComponentImplBase( + MillisClock.getInstance(), new SecureRandomHandler(), new SimpleEventQueue()); + } + + @Override + public Tracer getTracer() { + return traceComponentImplBase.getTracer(); + } + + @Override + public PropagationComponent getPropagationComponent() { + return traceComponentImplBase.getPropagationComponent(); + } + + @Override + public Clock getClock() { + return traceComponentImplBase.getClock(); + } + + @Override + public ExportComponent getExportComponent() { + return traceComponentImplBase.getExportComponent(); + } + + @Override + public TraceConfig getTraceConfig() { + return traceComponentImplBase.getTraceConfig(); } } -- cgit v1.2.3 From 8d4372eaa0c1b002a0c25ff02a794cf72f0c05d9 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Sat, 2 Sep 2017 13:21:17 -0700 Subject: Add RedundantImport check and upgrade checkstyle to 8.0. (#579) --- .../java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java | 1 - 1 file changed, 1 deletion(-) (limited to 'impl_lite/src') diff --git a/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java b/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java index 667a0c9c..0cc953ae 100644 --- a/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java +++ b/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java @@ -22,7 +22,6 @@ import io.opencensus.implcore.common.MillisClock; import io.opencensus.implcore.trace.TracerImpl; import io.opencensus.implcore.trace.export.ExportComponentImpl; import io.opencensus.implcore.trace.propagation.PropagationComponentImpl; -import io.opencensus.impllite.trace.TraceComponentImplLite; import io.opencensus.trace.Tracing; import org.junit.Test; import org.junit.runner.RunWith; -- cgit v1.2.3 From 6cb4dd2cc949a2602783321da179cb11afb7fc7a Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Fri, 3 Nov 2017 09:25:12 +1100 Subject: Add gradle plugin for google java format. Enforce all files to be formatted. (#771) * Add gradle plugin for google java format. Enforce all files to be formatted. * Fix javadoc comments. * update to google-java-formatter 1.5 * Fix comments and run formatter only for java8. * Formatter works only on java8. --- .../java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'impl_lite/src') diff --git a/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java b/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java index 0cc953ae..c4a609a4 100644 --- a/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java +++ b/impl_lite/src/test/java/io/opencensus/impllite/trace/TraceComponentImplLiteTest.java @@ -37,8 +37,7 @@ public class TraceComponentImplLiteTest { @Test public void implementationOfBinaryPropagationHandler() { - assertThat(Tracing.getPropagationComponent()) - .isInstanceOf(PropagationComponentImpl.class); + assertThat(Tracing.getPropagationComponent()).isInstanceOf(PropagationComponentImpl.class); } @Test -- cgit v1.2.3 From 5923bdbee2ea12ad9c4fa962b5adf526d9fe839d Mon Sep 17 00:00:00 2001 From: Yang Song Date: Thu, 9 Nov 2017 13:59:08 -0800 Subject: Move implementation directories (#786) * Move directories: core_impl to impl_core, core_impl_java to impl, core_impl_android to impl_lite. --- .../impllite/stats/StatsComponentImplLite.java | 31 ++++++++++++++++ .../impllite/tags/TagsComponentImplLite.java | 23 ++++++++++++ .../io/opencensus/impllite/stats/StatsTest.java | 41 ++++++++++++++++++++++ .../java/io/opencensus/impllite/tags/TagsTest.java | 41 ++++++++++++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 impl_lite/src/main/java/io/opencensus/impllite/stats/StatsComponentImplLite.java create mode 100644 impl_lite/src/main/java/io/opencensus/impllite/tags/TagsComponentImplLite.java create mode 100644 impl_lite/src/test/java/io/opencensus/impllite/stats/StatsTest.java create mode 100644 impl_lite/src/test/java/io/opencensus/impllite/tags/TagsTest.java (limited to 'impl_lite/src') diff --git a/impl_lite/src/main/java/io/opencensus/impllite/stats/StatsComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/impllite/stats/StatsComponentImplLite.java new file mode 100644 index 00000000..a58a9d3e --- /dev/null +++ b/impl_lite/src/main/java/io/opencensus/impllite/stats/StatsComponentImplLite.java @@ -0,0 +1,31 @@ +/* + * Copyright 2017, OpenCensus Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opencensus.impllite.stats; + +import io.opencensus.implcore.common.MillisClock; +import io.opencensus.implcore.internal.SimpleEventQueue; +import io.opencensus.implcore.stats.StatsComponentImplBase; +import io.opencensus.stats.StatsComponent; + +/** Android-compatible implementation of {@link StatsComponent}. */ +public final class StatsComponentImplLite extends StatsComponentImplBase { + + public StatsComponentImplLite() { + // TODO(sebright): Use a more efficient queue implementation. + super(new SimpleEventQueue(), MillisClock.getInstance()); + } +} diff --git a/impl_lite/src/main/java/io/opencensus/impllite/tags/TagsComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/impllite/tags/TagsComponentImplLite.java new file mode 100644 index 00000000..dc0d900c --- /dev/null +++ b/impl_lite/src/main/java/io/opencensus/impllite/tags/TagsComponentImplLite.java @@ -0,0 +1,23 @@ +/* + * Copyright 2017, OpenCensus Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opencensus.impllite.tags; + +import io.opencensus.implcore.tags.TagsComponentImplBase; +import io.opencensus.tags.TagsComponent; + +/** Android-compatible implementation of {@link TagsComponent}. */ +public final class TagsComponentImplLite extends TagsComponentImplBase {} diff --git a/impl_lite/src/test/java/io/opencensus/impllite/stats/StatsTest.java b/impl_lite/src/test/java/io/opencensus/impllite/stats/StatsTest.java new file mode 100644 index 00000000..313f8916 --- /dev/null +++ b/impl_lite/src/test/java/io/opencensus/impllite/stats/StatsTest.java @@ -0,0 +1,41 @@ +/* + * Copyright 2016-17, OpenCensus Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opencensus.impllite.stats; + +import static com.google.common.truth.Truth.assertThat; + +import io.opencensus.implcore.stats.StatsRecorderImpl; +import io.opencensus.implcore.stats.ViewManagerImpl; +import io.opencensus.stats.Stats; +import io.opencensus.stats.StatsComponent; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Test for accessing the {@link StatsComponent} through the {@link Stats} class. */ +@RunWith(JUnit4.class) +public final class StatsTest { + @Test + public void getStatsRecorder() { + assertThat(Stats.getStatsRecorder()).isInstanceOf(StatsRecorderImpl.class); + } + + @Test + public void getViewManager() { + assertThat(Stats.getViewManager()).isInstanceOf(ViewManagerImpl.class); + } +} diff --git a/impl_lite/src/test/java/io/opencensus/impllite/tags/TagsTest.java b/impl_lite/src/test/java/io/opencensus/impllite/tags/TagsTest.java new file mode 100644 index 00000000..890cdb15 --- /dev/null +++ b/impl_lite/src/test/java/io/opencensus/impllite/tags/TagsTest.java @@ -0,0 +1,41 @@ +/* + * Copyright 2017, OpenCensus Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opencensus.impllite.tags; + +import static com.google.common.truth.Truth.assertThat; + +import io.opencensus.implcore.tags.TaggerImpl; +import io.opencensus.implcore.tags.propagation.TagPropagationComponentImpl; +import io.opencensus.tags.Tags; +import io.opencensus.tags.TagsComponent; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Test for accessing the {@link TagsComponent} through the {@link Tags} class. */ +@RunWith(JUnit4.class) +public final class TagsTest { + @Test + public void getTagger() { + assertThat(Tags.getTagger()).isInstanceOf(TaggerImpl.class); + } + + @Test + public void getTagContextSerializer() { + assertThat(Tags.getTagPropagationComponent()).isInstanceOf(TagPropagationComponentImpl.class); + } +} -- cgit v1.2.3 From 775816d699bd4f02788db5609a87386940e34aff Mon Sep 17 00:00:00 2001 From: Yang Song Date: Mon, 13 Aug 2018 11:36:27 -0700 Subject: Metrics: Implement ExportComponent, make ProducerManager abstract. (#1347) * Metrics: Implement ExportComponent, make ProducerManager abstract. * Metrics: Add impl and impllite. * Resolve two TODOs. * Fix import path, leave a TODO for getMetricRegistry. * Make NoopMetricProducerManager private. Add missing since tag. --- .../impllite/metrics/MetricsComponentImplLite.java | 23 ++++++++++++++ .../opencensus/impllite/metrics/MetricsTest.java | 36 ++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java create mode 100644 impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java (limited to 'impl_lite/src') diff --git a/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java new file mode 100644 index 00000000..e755088d --- /dev/null +++ b/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java @@ -0,0 +1,23 @@ +/* + * Copyright 2018, OpenCensus Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opencensus.impllite.metrics; + +import io.opencensus.implcore.metrics.MetricsComponentImplBase; +import io.opencensus.metrics.MetricsComponent; + +/** Android-compatible implementation of {@link MetricsComponent}. */ +public final class MetricsComponentImplLite extends MetricsComponentImplBase {} diff --git a/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java b/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java new file mode 100644 index 00000000..ab8889a9 --- /dev/null +++ b/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java @@ -0,0 +1,36 @@ +/* + * Copyright 2018, OpenCensus Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opencensus.impllite.metrics; + +import static com.google.common.truth.Truth.assertThat; + +import io.opencensus.implcore.metrics.export.ExportComponentImpl; +import io.opencensus.metrics.Metrics; +import io.opencensus.metrics.MetricsComponent; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Test for accessing the {@link MetricsComponent} through the {@link Metrics} class. */ +@RunWith(JUnit4.class) +public class MetricsTest { + + @Test + public void getExportComponent() { + assertThat(Metrics.getExportComponent()).isInstanceOf(ExportComponentImpl.class); + } +} -- cgit v1.2.3 From f50596ac77fd0c4eb209ffbc8769b5025a3aa090 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 14 Aug 2018 17:28:24 -0700 Subject: Add implementation for gauges. (#1365) * Add implementation for gauges. * Remove usage of internal class in implcore tests. --- .../io/opencensus/impllite/metrics/MetricsComponentImplLite.java | 8 +++++++- .../src/test/java/io/opencensus/impllite/metrics/MetricsTest.java | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'impl_lite/src') diff --git a/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java index e755088d..6161c12a 100644 --- a/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java +++ b/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java @@ -16,8 +16,14 @@ package io.opencensus.impllite.metrics; +import io.opencensus.implcore.common.MillisClock; import io.opencensus.implcore.metrics.MetricsComponentImplBase; import io.opencensus.metrics.MetricsComponent; /** Android-compatible implementation of {@link MetricsComponent}. */ -public final class MetricsComponentImplLite extends MetricsComponentImplBase {} +public final class MetricsComponentImplLite extends MetricsComponentImplBase { + + public MetricsComponentImplLite() { + super(MillisClock.getInstance()); + } +} diff --git a/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java b/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java index ab8889a9..7ee900a6 100644 --- a/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java +++ b/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java @@ -18,6 +18,7 @@ package io.opencensus.impllite.metrics; import static com.google.common.truth.Truth.assertThat; +import io.opencensus.implcore.metrics.MetricRegistryImpl; import io.opencensus.implcore.metrics.export.ExportComponentImpl; import io.opencensus.metrics.Metrics; import io.opencensus.metrics.MetricsComponent; @@ -33,4 +34,9 @@ public class MetricsTest { public void getExportComponent() { assertThat(Metrics.getExportComponent()).isInstanceOf(ExportComponentImpl.class); } + + @Test + public void getMetricRegistry() { + assertThat(Metrics.getMetricRegistry()).isInstanceOf(MetricRegistryImpl.class); + } } -- cgit v1.2.3 From d3fa0e5c60903f95c184d7c7bafae8fdd12156ad Mon Sep 17 00:00:00 2001 From: sebright Date: Wed, 12 Sep 2018 12:13:14 -0700 Subject: Temporarily move "metrics" package into impl_core/ for release. (#1426) The "metrics" package isn't ready to be released yet, so this commit moves it out of the API artifact. The package can still be accessed by the stats implementation in impl_core/. This commit can be reverted once the package is ready to be exposed. The moved package names also contain "temporary" so that there is no possibility of class name conflicts between different versions of opencensus-api and opencensus-impl-core. For example, io.opencensus.metrics.export is renamed to io.opencensus.implcore.temporary.metrics.export. --- .../java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java | 2 +- .../src/test/java/io/opencensus/impllite/metrics/MetricsTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'impl_lite/src') diff --git a/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java index 6161c12a..ccc9f345 100644 --- a/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java +++ b/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java @@ -18,7 +18,7 @@ package io.opencensus.impllite.metrics; import io.opencensus.implcore.common.MillisClock; import io.opencensus.implcore.metrics.MetricsComponentImplBase; -import io.opencensus.metrics.MetricsComponent; +import io.opencensus.implcore.temporary.metrics.MetricsComponent; /** Android-compatible implementation of {@link MetricsComponent}. */ public final class MetricsComponentImplLite extends MetricsComponentImplBase { diff --git a/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java b/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java index 7ee900a6..388cac8f 100644 --- a/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java +++ b/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java @@ -20,8 +20,8 @@ import static com.google.common.truth.Truth.assertThat; import io.opencensus.implcore.metrics.MetricRegistryImpl; import io.opencensus.implcore.metrics.export.ExportComponentImpl; -import io.opencensus.metrics.Metrics; -import io.opencensus.metrics.MetricsComponent; +import io.opencensus.implcore.temporary.metrics.Metrics; +import io.opencensus.implcore.temporary.metrics.MetricsComponent; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -- cgit v1.2.3 From 937d2296642d9bcdae23a2be469d1d0f367ae3de Mon Sep 17 00:00:00 2001 From: Yang Song Date: Fri, 14 Sep 2018 15:45:30 -0700 Subject: Revert "Temporarily move "metrics" package into impl_core/ for release. (#1426)" (#1432) This reverts commit d3fa0e5c60903f95c184d7c7bafae8fdd12156ad. --- .../java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java | 2 +- .../src/test/java/io/opencensus/impllite/metrics/MetricsTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'impl_lite/src') diff --git a/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java b/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java index ccc9f345..6161c12a 100644 --- a/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java +++ b/impl_lite/src/main/java/io/opencensus/impllite/metrics/MetricsComponentImplLite.java @@ -18,7 +18,7 @@ package io.opencensus.impllite.metrics; import io.opencensus.implcore.common.MillisClock; import io.opencensus.implcore.metrics.MetricsComponentImplBase; -import io.opencensus.implcore.temporary.metrics.MetricsComponent; +import io.opencensus.metrics.MetricsComponent; /** Android-compatible implementation of {@link MetricsComponent}. */ public final class MetricsComponentImplLite extends MetricsComponentImplBase { diff --git a/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java b/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java index 388cac8f..7ee900a6 100644 --- a/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java +++ b/impl_lite/src/test/java/io/opencensus/impllite/metrics/MetricsTest.java @@ -20,8 +20,8 @@ import static com.google.common.truth.Truth.assertThat; import io.opencensus.implcore.metrics.MetricRegistryImpl; import io.opencensus.implcore.metrics.export.ExportComponentImpl; -import io.opencensus.implcore.temporary.metrics.Metrics; -import io.opencensus.implcore.temporary.metrics.MetricsComponent; +import io.opencensus.metrics.Metrics; +import io.opencensus.metrics.MetricsComponent; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -- cgit v1.2.3