aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--api/src/main/java/io/opencensus/stats/NoopStats.java2
-rw-r--r--api/src/main/java/io/opencensus/stats/StatsRecorder.java4
-rw-r--r--api/src/test/java/io/opencensus/stats/NoopStatsTest.java7
-rw-r--r--api/src/test/java/io/opencensus/stats/StatsRecorderTest.java5
-rw-r--r--core_impl/src/main/java/io/opencensus/implcore/stats/StatsRecorderImpl.java2
-rw-r--r--core_impl/src/test/java/io/opencensus/implcore/stats/ViewManagerImplTest.java61
6 files changed, 48 insertions, 33 deletions
diff --git a/api/src/main/java/io/opencensus/stats/NoopStats.java b/api/src/main/java/io/opencensus/stats/NoopStats.java
index 1dee64a9..c6be7a47 100644
--- a/api/src/main/java/io/opencensus/stats/NoopStats.java
+++ b/api/src/main/java/io/opencensus/stats/NoopStats.java
@@ -110,7 +110,7 @@ final class NoopStats {
static final StatsRecorder INSTANCE = new NoopStatsRecorder();
@Override
- public StatsBuilder newStatsBuilder(TagContext tags) {
+ public StatsBuilder newStatsBuilderWithExplicitTagContext(TagContext tags) {
checkNotNull(tags, "tags");
return getNoopStatsBuilder();
}
diff --git a/api/src/main/java/io/opencensus/stats/StatsRecorder.java b/api/src/main/java/io/opencensus/stats/StatsRecorder.java
index a5f3f0db..98b3ad4e 100644
--- a/api/src/main/java/io/opencensus/stats/StatsRecorder.java
+++ b/api/src/main/java/io/opencensus/stats/StatsRecorder.java
@@ -30,7 +30,7 @@ public abstract class StatsRecorder {
*/
public final StatsBuilder newStatsBuilder() {
// Use the context key directly, to avoid depending on the tags implementation.
- return newStatsBuilder(ContextUtils.TAG_CONTEXT_KEY.get());
+ return newStatsBuilderWithExplicitTagContext(ContextUtils.TAG_CONTEXT_KEY.get());
}
/**
@@ -39,5 +39,5 @@ public abstract class StatsRecorder {
* @param tags the tags associated with the measurements.
* @return an object for recording multiple measures with a set of tags.
*/
- public abstract StatsBuilder newStatsBuilder(TagContext tags);
+ public abstract StatsBuilder newStatsBuilderWithExplicitTagContext(TagContext tags);
}
diff --git a/api/src/test/java/io/opencensus/stats/NoopStatsTest.java b/api/src/test/java/io/opencensus/stats/NoopStatsTest.java
index e05fba30..fa12bce6 100644
--- a/api/src/test/java/io/opencensus/stats/NoopStatsTest.java
+++ b/api/src/test/java/io/opencensus/stats/NoopStatsTest.java
@@ -86,7 +86,10 @@ public final class NoopStatsTest {
// exception.
@Test
public void noopStatsRecorder_Record() {
- NoopStats.getNoopStatsRecorder().newStatsBuilder(tagContext).put(MEASURE, 5).record();
+ NoopStats.getNoopStatsRecorder()
+ .newStatsBuilderWithExplicitTagContext(tagContext)
+ .put(MEASURE, 5)
+ .record();
}
// The NoopStatsRecorder should do nothing, so this test just checks that record doesn't throw an
@@ -100,6 +103,6 @@ public final class NoopStatsTest {
public void noopStatsRecorder_Record_DisallowNullTagContext() {
StatsRecorder noopStatsRecorder = NoopStats.getNoopStatsRecorder();
thrown.expect(NullPointerException.class);
- noopStatsRecorder.newStatsBuilder(null);
+ noopStatsRecorder.newStatsBuilderWithExplicitTagContext(null);
}
}
diff --git a/api/src/test/java/io/opencensus/stats/StatsRecorderTest.java b/api/src/test/java/io/opencensus/stats/StatsRecorderTest.java
index 77752431..a9edbda1 100644
--- a/api/src/test/java/io/opencensus/stats/StatsRecorderTest.java
+++ b/api/src/test/java/io/opencensus/stats/StatsRecorderTest.java
@@ -60,7 +60,8 @@ public final class StatsRecorderTest {
@Test
public void record_CurrentContextNotSet() {
statsRecorder.newStatsBuilder();
- verify(statsRecorder).newStatsBuilder(same(ContextUtils.TAG_CONTEXT_KEY.get()));
+ verify(statsRecorder)
+ .newStatsBuilderWithExplicitTagContext(same(ContextUtils.TAG_CONTEXT_KEY.get()));
}
@Test
@@ -68,7 +69,7 @@ public final class StatsRecorderTest {
Context orig = Context.current().withValue(ContextUtils.TAG_CONTEXT_KEY, tagContext).attach();
try {
statsRecorder.newStatsBuilder();
- verify(statsRecorder).newStatsBuilder(same(tagContext));
+ verify(statsRecorder).newStatsBuilderWithExplicitTagContext(same(tagContext));
} finally {
Context.current().detach(orig);
}
diff --git a/core_impl/src/main/java/io/opencensus/implcore/stats/StatsRecorderImpl.java b/core_impl/src/main/java/io/opencensus/implcore/stats/StatsRecorderImpl.java
index db67d122..5f72697c 100644
--- a/core_impl/src/main/java/io/opencensus/implcore/stats/StatsRecorderImpl.java
+++ b/core_impl/src/main/java/io/opencensus/implcore/stats/StatsRecorderImpl.java
@@ -31,7 +31,7 @@ public final class StatsRecorderImpl extends StatsRecorder {
}
@Override
- public StatsBuilderImpl newStatsBuilder(TagContext tags) {
+ public StatsBuilderImpl newStatsBuilderWithExplicitTagContext(TagContext tags) {
checkNotNull(tags, "tags");
return StatsBuilderImpl.create(statsManager, tags);
}
diff --git a/core_impl/src/test/java/io/opencensus/implcore/stats/ViewManagerImplTest.java b/core_impl/src/test/java/io/opencensus/implcore/stats/ViewManagerImplTest.java
index 9186c4bb..7c57686f 100644
--- a/core_impl/src/test/java/io/opencensus/implcore/stats/ViewManagerImplTest.java
+++ b/core_impl/src/test/java/io/opencensus/implcore/stats/ViewManagerImplTest.java
@@ -230,7 +230,8 @@ public class ViewManagerImplTest {
viewManager.registerView(view);
TagContext tags = tagger.emptyBuilder().put(KEY, VALUE).build();
for (double val : values) {
- addMeasureToBuilder(statsRecorder.newStatsBuilder(tags), measure, val).record();
+ addMeasureToBuilder(statsRecorder.newStatsBuilderWithExplicitTagContext(tags), measure, val)
+ .record();
}
clock.setTime(Timestamp.create(3, 4));
ViewData viewData = viewManager.getView(VIEW_NAME);
@@ -325,7 +326,10 @@ public class ViewManagerImplTest {
* 5th value should fall into the third bucket [35.0, 37.5).
*/
clock.setTime(Timestamp.fromMillis(startTimeMillis + i * MILLIS_PER_SECOND));
- addMeasureToBuilder(statsRecorder.newStatsBuilder(tags), measure, initialValues[i - 1])
+ addMeasureToBuilder(
+ statsRecorder.newStatsBuilderWithExplicitTagContext(tags),
+ measure,
+ initialValues[i - 1])
.record();
}
@@ -347,7 +351,8 @@ public class ViewManagerImplTest {
clock.setTime(Timestamp.fromMillis(startTimeMillis + 12 * MILLIS_PER_SECOND));
// 42s, add a new value value1, should fall into bucket [40.0, 42.5)
- addMeasureToBuilder(statsRecorder.newStatsBuilder(tags), measure, value6).record();
+ addMeasureToBuilder(statsRecorder.newStatsBuilderWithExplicitTagContext(tags), measure, value6)
+ .record();
clock.setTime(Timestamp.fromMillis(startTimeMillis + 17 * MILLIS_PER_SECOND));
// 47s, values in the first and second bucket should have expired, and 80% of values in the
@@ -359,7 +364,8 @@ public class ViewManagerImplTest {
clock.setTime(Timestamp.fromMillis(60 * MILLIS_PER_SECOND));
// 60s, all previous values should have expired, add another value value2
- addMeasureToBuilder(statsRecorder.newStatsBuilder(tags), measure, value7).record();
+ addMeasureToBuilder(statsRecorder.newStatsBuilderWithExplicitTagContext(tags), measure, value7)
+ .record();
StatsTestUtil.assertAggregationMapEquals(
viewManager.getView(VIEW_NAME).getAggregationMap(),
ImmutableMap.of(Arrays.asList(VALUE), expectedValues3),
@@ -376,7 +382,7 @@ public class ViewManagerImplTest {
clock.setTime(Timestamp.create(10, 0));
viewManager.registerView(view);
TagContext tags = tagger.emptyBuilder().put(KEY, VALUE).build();
- statsRecorder.newStatsBuilder(tags).put(MEASURE_DOUBLE, 0.1).record();
+ statsRecorder.newStatsBuilderWithExplicitTagContext(tags).put(MEASURE_DOUBLE, 0.1).record();
clock.setTime(Timestamp.create(11, 0));
ViewData viewData1 = viewManager.getView(VIEW_NAME);
assertThat(viewData1.getWindowData())
@@ -388,7 +394,7 @@ public class ViewManagerImplTest {
StatsTestUtil.createAggregationData(DISTRIBUTION, MEASURE_DOUBLE, 0.1)),
EPSILON);
- statsRecorder.newStatsBuilder(tags).put(MEASURE_DOUBLE, 0.2).record();
+ statsRecorder.newStatsBuilderWithExplicitTagContext(tags).put(MEASURE_DOUBLE, 0.2).record();
clock.setTime(Timestamp.create(12, 0));
ViewData viewData2 = viewManager.getView(VIEW_NAME);
@@ -409,15 +415,15 @@ public class ViewManagerImplTest {
viewManager.registerView(
createCumulativeView(VIEW_NAME, MEASURE_DOUBLE, DISTRIBUTION, Arrays.asList(KEY)));
statsRecorder
- .newStatsBuilder(tagger.emptyBuilder().put(KEY, VALUE).build())
+ .newStatsBuilderWithExplicitTagContext(tagger.emptyBuilder().put(KEY, VALUE).build())
.put(MEASURE_DOUBLE, 10.0)
.record();
statsRecorder
- .newStatsBuilder(tagger.emptyBuilder().put(KEY, VALUE_2).build())
+ .newStatsBuilderWithExplicitTagContext(tagger.emptyBuilder().put(KEY, VALUE_2).build())
.put(MEASURE_DOUBLE, 30.0)
.record();
statsRecorder
- .newStatsBuilder(tagger.emptyBuilder().put(KEY, VALUE_2).build())
+ .newStatsBuilderWithExplicitTagContext(tagger.emptyBuilder().put(KEY, VALUE_2).build())
.put(MEASURE_DOUBLE, 50.0)
.record();
ViewData viewData = viewManager.getView(VIEW_NAME);
@@ -445,18 +451,18 @@ public class ViewManagerImplTest {
// record for TagValue1 at 11s
clock.setTime(Timestamp.fromMillis(11 * MILLIS_PER_SECOND));
statsRecorder
- .newStatsBuilder(tagger.emptyBuilder().put(KEY, VALUE).build())
+ .newStatsBuilderWithExplicitTagContext(tagger.emptyBuilder().put(KEY, VALUE).build())
.put(MEASURE_DOUBLE, 10.0)
.record();
// record for TagValue2 at 15s
clock.setTime(Timestamp.fromMillis(15 * MILLIS_PER_SECOND));
statsRecorder
- .newStatsBuilder(tagger.emptyBuilder().put(KEY, VALUE_2).build())
+ .newStatsBuilderWithExplicitTagContext(tagger.emptyBuilder().put(KEY, VALUE_2).build())
.put(MEASURE_DOUBLE, 30.0)
.record();
statsRecorder
- .newStatsBuilder(tagger.emptyBuilder().put(KEY, VALUE_2).build())
+ .newStatsBuilderWithExplicitTagContext(tagger.emptyBuilder().put(KEY, VALUE_2).build())
.put(MEASURE_DOUBLE, 50.0)
.record();
@@ -493,7 +499,7 @@ public class ViewManagerImplTest {
@Test
public void allowRecordingWithoutRegisteringMatchingViewData() {
statsRecorder
- .newStatsBuilder(tagger.emptyBuilder().put(KEY, VALUE).build())
+ .newStatsBuilderWithExplicitTagContext(tagger.emptyBuilder().put(KEY, VALUE).build())
.put(MEASURE_DOUBLE, 10)
.record();
}
@@ -503,7 +509,10 @@ public class ViewManagerImplTest {
viewManager.registerView(
createCumulativeView(VIEW_NAME, MEASURE_DOUBLE, DISTRIBUTION, Arrays.asList(KEY)));
// DEFAULT doesn't have tags, but the view has tag key "KEY".
- statsRecorder.newStatsBuilder(tagger.empty()).put(MEASURE_DOUBLE, 10.0).record();
+ statsRecorder
+ .newStatsBuilderWithExplicitTagContext(tagger.empty())
+ .put(MEASURE_DOUBLE, 10.0)
+ .record();
ViewData viewData = viewManager.getView(VIEW_NAME);
assertAggregationMapEquals(
viewData.getAggregationMap(),
@@ -540,7 +549,8 @@ public class ViewManagerImplTest {
MEAN,
Arrays.asList(KEY)));
TagContext tags = tagger.emptyBuilder().put(KEY, VALUE).build();
- addMeasureToBuilder(statsRecorder.newStatsBuilder(tags), measure2, value).record();
+ addMeasureToBuilder(statsRecorder.newStatsBuilderWithExplicitTagContext(tags), measure2, value)
+ .record();
ViewData view = viewManager.getView(VIEW_NAME);
assertThat(view.getAggregationMap()).isEmpty();
}
@@ -550,11 +560,12 @@ public class ViewManagerImplTest {
viewManager.registerView(
createCumulativeView(VIEW_NAME, MEASURE_DOUBLE, DISTRIBUTION, Arrays.asList(KEY)));
statsRecorder
- .newStatsBuilder(tagger.emptyBuilder().put(TagKeyString.create("wrong key"), VALUE).build())
+ .newStatsBuilderWithExplicitTagContext(
+ tagger.emptyBuilder().put(TagKeyString.create("wrong key"), VALUE).build())
.put(MEASURE_DOUBLE, 10.0)
.record();
statsRecorder
- .newStatsBuilder(
+ .newStatsBuilderWithExplicitTagContext(
tagger.emptyBuilder().put(TagKeyString.create("another wrong key"), VALUE).build())
.put(MEASURE_DOUBLE, 50.0)
.record();
@@ -577,7 +588,7 @@ public class ViewManagerImplTest {
viewManager.registerView(
createCumulativeView(VIEW_NAME, MEASURE_DOUBLE, DISTRIBUTION, Arrays.asList(key1, key2)));
statsRecorder
- .newStatsBuilder(
+ .newStatsBuilderWithExplicitTagContext(
tagger
.emptyBuilder()
.put(key1, TagValueString.create("v1"))
@@ -586,7 +597,7 @@ public class ViewManagerImplTest {
.put(MEASURE_DOUBLE, 1.1)
.record();
statsRecorder
- .newStatsBuilder(
+ .newStatsBuilderWithExplicitTagContext(
tagger
.emptyBuilder()
.put(key1, TagValueString.create("v1"))
@@ -595,7 +606,7 @@ public class ViewManagerImplTest {
.put(MEASURE_DOUBLE, 2.2)
.record();
statsRecorder
- .newStatsBuilder(
+ .newStatsBuilderWithExplicitTagContext(
tagger
.emptyBuilder()
.put(key1, TagValueString.create("v2"))
@@ -604,7 +615,7 @@ public class ViewManagerImplTest {
.put(MEASURE_DOUBLE, 3.3)
.record();
statsRecorder
- .newStatsBuilder(
+ .newStatsBuilderWithExplicitTagContext(
tagger
.emptyBuilder()
.put(key1, TagValueString.create("v1"))
@@ -636,7 +647,7 @@ public class ViewManagerImplTest {
clock.setTime(Timestamp.create(2, 2));
viewManager.registerView(view2);
statsRecorder
- .newStatsBuilder(tagger.emptyBuilder().put(KEY, VALUE).build())
+ .newStatsBuilderWithExplicitTagContext(tagger.emptyBuilder().put(KEY, VALUE).build())
.put(MEASURE_DOUBLE, 5.0)
.record();
clock.setTime(Timestamp.create(3, 3));
@@ -690,7 +701,7 @@ public class ViewManagerImplTest {
clock.setTime(Timestamp.create(2, 0));
viewManager.registerView(view2);
TagContext tags = tagger.emptyBuilder().put(KEY, VALUE).build();
- StatsBuilder builder = statsRecorder.newStatsBuilder(tags);
+ StatsBuilder builder = statsRecorder.newStatsBuilderWithExplicitTagContext(tags);
addMeasureToBuilder(builder, measure1, value1);
addMeasureToBuilder(builder, measure2, value2);
builder.record();
@@ -724,7 +735,7 @@ public class ViewManagerImplTest {
createCumulativeView(VIEW_NAME, MEASURE_DOUBLE, noHistogram, Arrays.asList(KEY));
clock.setTime(Timestamp.create(1, 0));
viewManager.registerView(view);
- statsRecorder.newStatsBuilder(
+ statsRecorder.newStatsBuilderWithExplicitTagContext(
tagger.emptyBuilder().put(KEY, VALUE).build()).put(MEASURE_DOUBLE, 1.1).record();
clock.setTime(Timestamp.create(3, 0));
ViewData viewData = viewManager.getView(VIEW_NAME);
@@ -744,7 +755,7 @@ public class ViewManagerImplTest {
createCumulativeView(VIEW_NAME, MEASURE_DOUBLE, MEAN, Arrays.asList(KEY));
clock.setTime(Timestamp.create(1, 0));
viewManager.registerView(view);
- statsRecorder.newStatsBuilder(
+ statsRecorder.newStatsBuilderWithExplicitTagContext(
tagger.emptyBuilder().put(KEY, VALUE).build()).put(MEASURE_DOUBLE, 1.1).record();
clock.setTime(Timestamp.create(3, 0));
ViewData viewData = viewManager.getView(VIEW_NAME);
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-15 02:22:46 +0000