Skip to content
This repository was archived by the owner on Dec 23, 2023. It is now read-only.

Commit d3fa0e5

Browse files
authored
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.
1 parent c0e0b22 commit d3fa0e5

File tree

52 files changed

+135
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+135
-132
lines changed

api/src/main/java/io/opencensus/common/ToDoubleFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.opencensus.common;
1818

1919
/**
20-
* Represents a function that produces a double-valued result. See {@link
20+
* Represents a function that produces a double-valued result. See {@code
2121
* io.opencensus.metrics.MetricRegistry} for an example of its use.
2222
*
2323
* <p>Note: This class is based on the java.util.ToDoubleFunction class added in Java 1.8. We cannot

api/src/main/java/io/opencensus/common/ToLongFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.opencensus.common;
1818

1919
/**
20-
* Represents a function that produces a long-valued result. See {@link
20+
* Represents a function that produces a long-valued result. See {@code
2121
* io.opencensus.metrics.MetricRegistry} for an example of its use.
2222
*
2323
* <p>Note: This class is based on the java.util.ToLongFunction class added in Java 1.8. We cannot

buildscripts/import-control.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ General guidelines on imports:
3838
<allow pkg="io.opencensus.internal"/>
3939
<allow pkg="io.opencensus.tags"/>
4040
</subpackage>
41-
<subpackage name="metrics">
41+
<subpackage name="implcore.temporary.metrics">
4242
<allow pkg="io.opencensus.internal"/>
4343
<allow pkg="io.opencensus.common"/>
44-
<allow pkg="io.opencensus.metrics"/>
44+
<allow pkg="io.opencensus.implcore.temporary.metrics"/>
4545
</subpackage>
4646
<subpackage name="stats">
4747
<allow pkg="io.opencensus.common"/>
@@ -182,7 +182,7 @@ General guidelines on imports:
182182
<allow pkg="com.google.common"/>
183183
<allow pkg="io.opencensus.common"/>
184184
<allow pkg="io.opencensus.implcore"/>
185-
<allow pkg="io.opencensus.metrics"/>
185+
<allow pkg="io.opencensus.implcore.temporary.metrics"/>
186186
<allow pkg="io.opencensus.stats"/>
187187
<allow pkg="io.opencensus.tags"/>
188188
<allow pkg="io.opencensus.trace"/>
@@ -192,7 +192,7 @@ General guidelines on imports:
192192
<allow pkg="io.opencensus.common"/>
193193
<allow pkg="io.opencensus.impl"/>
194194
<allow pkg="io.opencensus.implcore"/>
195-
<allow pkg="io.opencensus.metrics"/>
195+
<allow pkg="io.opencensus.implcore.temporary.metrics"/>
196196
<allow pkg="io.opencensus.stats"/>
197197
<allow pkg="io.opencensus.tags"/>
198198
<allow pkg="io.opencensus.trace"/>
@@ -201,7 +201,7 @@ General guidelines on imports:
201201
<allow pkg="io.opencensus.common"/>
202202
<allow pkg="io.opencensus.implcore"/>
203203
<allow pkg="io.opencensus.impllite"/>
204-
<allow pkg="io.opencensus.metrics"/>
204+
<allow pkg="io.opencensus.implcore.temporary.metrics"/>
205205
<allow pkg="io.opencensus.stats"/>
206206
<allow pkg="io.opencensus.tags"/>
207207
<allow pkg="io.opencensus.trace"/>

impl/src/main/java/io/opencensus/impl/metrics/MetricsComponentImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import io.opencensus.implcore.common.MillisClock;
2020
import io.opencensus.implcore.metrics.MetricsComponentImplBase;
21-
import io.opencensus.metrics.MetricsComponent;
21+
import io.opencensus.implcore.temporary.metrics.MetricsComponent;
2222

2323
/** Implementation of {@link MetricsComponent}. */
2424
public final class MetricsComponentImpl extends MetricsComponentImplBase {

impl/src/test/java/io/opencensus/impl/metrics/MetricsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import io.opencensus.implcore.metrics.MetricRegistryImpl;
2222
import io.opencensus.implcore.metrics.export.ExportComponentImpl;
23-
import io.opencensus.metrics.Metrics;
24-
import io.opencensus.metrics.MetricsComponent;
23+
import io.opencensus.implcore.temporary.metrics.Metrics;
24+
import io.opencensus.implcore.temporary.metrics.MetricsComponent;
2525
import org.junit.Test;
2626
import org.junit.runner.RunWith;
2727
import org.junit.runners.JUnit4;

impl_core/src/main/java/io/opencensus/implcore/metrics/Gauge.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import io.opencensus.common.Clock;
2222
import io.opencensus.common.ToDoubleFunction;
2323
import io.opencensus.common.ToLongFunction;
24-
import io.opencensus.metrics.LabelKey;
25-
import io.opencensus.metrics.LabelValue;
26-
import io.opencensus.metrics.Metric;
27-
import io.opencensus.metrics.MetricDescriptor;
28-
import io.opencensus.metrics.MetricDescriptor.Type;
29-
import io.opencensus.metrics.Point;
30-
import io.opencensus.metrics.TimeSeries;
31-
import io.opencensus.metrics.Value;
24+
import io.opencensus.implcore.temporary.metrics.LabelKey;
25+
import io.opencensus.implcore.temporary.metrics.LabelValue;
26+
import io.opencensus.implcore.temporary.metrics.Metric;
27+
import io.opencensus.implcore.temporary.metrics.MetricDescriptor;
28+
import io.opencensus.implcore.temporary.metrics.MetricDescriptor.Type;
29+
import io.opencensus.implcore.temporary.metrics.Point;
30+
import io.opencensus.implcore.temporary.metrics.TimeSeries;
31+
import io.opencensus.implcore.temporary.metrics.Value;
3232
import java.util.Collections;
3333
import java.util.List;
3434

impl_core/src/main/java/io/opencensus/implcore/metrics/MetricRegistryImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import io.opencensus.common.ToLongFunction;
2424
import io.opencensus.implcore.metrics.Gauge.DoubleGauge;
2525
import io.opencensus.implcore.metrics.Gauge.LongGauge;
26-
import io.opencensus.metrics.LabelKey;
27-
import io.opencensus.metrics.LabelValue;
28-
import io.opencensus.metrics.Metric;
29-
import io.opencensus.metrics.MetricRegistry;
26+
import io.opencensus.implcore.temporary.metrics.LabelKey;
27+
import io.opencensus.implcore.temporary.metrics.LabelValue;
28+
import io.opencensus.implcore.temporary.metrics.Metric;
29+
import io.opencensus.implcore.temporary.metrics.MetricRegistry;
3030
import java.util.ArrayList;
3131
import java.util.Collection;
3232
import java.util.Collections;

impl_core/src/main/java/io/opencensus/implcore/metrics/MetricsComponentImplBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import io.opencensus.common.Clock;
2020
import io.opencensus.implcore.metrics.export.ExportComponentImpl;
21-
import io.opencensus.metrics.MetricRegistry;
22-
import io.opencensus.metrics.MetricsComponent;
21+
import io.opencensus.implcore.temporary.metrics.MetricRegistry;
22+
import io.opencensus.implcore.temporary.metrics.MetricsComponent;
2323

2424
/** Implementation of {@link MetricsComponent}. */
2525
public class MetricsComponentImplBase extends MetricsComponent {

impl_core/src/main/java/io/opencensus/implcore/metrics/export/ExportComponentImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package io.opencensus.implcore.metrics.export;
1818

19-
import io.opencensus.metrics.export.ExportComponent;
20-
import io.opencensus.metrics.export.MetricProducerManager;
19+
import io.opencensus.implcore.temporary.metrics.export.ExportComponent;
20+
import io.opencensus.implcore.temporary.metrics.export.MetricProducerManager;
2121

2222
/** Implementation of {@link ExportComponent}. */
2323
public final class ExportComponentImpl extends ExportComponent {

impl_core/src/main/java/io/opencensus/implcore/metrics/export/MetricProducerManagerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package io.opencensus.implcore.metrics.export;
1818

1919
import com.google.common.base.Preconditions;
20-
import io.opencensus.metrics.MetricProducer;
21-
import io.opencensus.metrics.export.MetricProducerManager;
20+
import io.opencensus.implcore.temporary.metrics.MetricProducer;
21+
import io.opencensus.implcore.temporary.metrics.export.MetricProducerManager;
2222
import java.util.Collections;
2323
import java.util.LinkedHashSet;
2424
import java.util.Set;

0 commit comments

Comments
 (0)