From 960f3dfffd2cfa8c39f1fd95d043cd18abd6476b Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Tue, 16 Apr 2019 13:57:32 +0200 Subject: [PATCH] core: Adjust CensusModules test cases for new grpc_{server,client}_method tag --- .../io/grpc/internal/CensusStatsModule.java | 3 ++ .../io/grpc/internal/CensusModulesTest.java | 40 ++++++++++++++----- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/io/grpc/internal/CensusStatsModule.java b/core/src/main/java/io/grpc/internal/CensusStatsModule.java index 1f26042184a9..2a7c56701822 100644 --- a/core/src/main/java/io/grpc/internal/CensusStatsModule.java +++ b/core/src/main/java/io/grpc/internal/CensusStatsModule.java @@ -42,12 +42,15 @@ import io.opencensus.stats.MeasureMap; import io.opencensus.stats.Stats; import io.opencensus.stats.StatsRecorder; +import io.opencensus.tags.InternalUtils; +import io.opencensus.tags.Tag; import io.opencensus.tags.TagContext; import io.opencensus.tags.TagValue; import io.opencensus.tags.Tagger; import io.opencensus.tags.Tags; import io.opencensus.tags.propagation.TagContextBinarySerializer; import io.opencensus.tags.propagation.TagContextSerializationException; +import java.util.Iterator; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; diff --git a/core/src/test/java/io/grpc/internal/CensusModulesTest.java b/core/src/test/java/io/grpc/internal/CensusModulesTest.java index 6774be012530..b4e9dcaffc14 100644 --- a/core/src/test/java/io/grpc/internal/CensusModulesTest.java +++ b/core/src/test/java/io/grpc/internal/CensusModulesTest.java @@ -297,14 +297,16 @@ public ClientCall interceptCall( StatsTestUtils.MetricsRecord record = statsRecorder.pollRecord(); assertNotNull(record); TagValue methodTagOld = record.tags.get(DeprecatedCensusConstants.RPC_METHOD); + TagValue methodTagNew = record.tags.get(RpcMeasureConstants.GRPC_CLIENT_METHOD); assertEquals(method.getFullMethodName(), methodTagOld.asString()); + assertEquals(method.getFullMethodName(), methodTagNew.asString()); if (nonDefaultContext) { TagValue extraTag = record.tags.get(StatsTestUtils.EXTRA_TAG); assertEquals("extra value", extraTag.asString()); - assertEquals(2, record.tags.size()); + assertEquals(3, record.tags.size()); } else { assertNull(record.tags.get(StatsTestUtils.EXTRA_TAG)); - assertEquals(1, record.tags.size()); + assertEquals(2, record.tags.size()); } if (nonDefaultContext) { @@ -391,7 +393,7 @@ private void subtestClientBasicStatsDefaultContext( StatsTestUtils.MetricsRecord record = statsRecorder.pollRecord(); assertNotNull(record); assertNoServerContent(record); - assertEquals(1, record.tags.size()); + assertEquals(2, record.tags.size()); TagValue methodTagOld = record.tags.get(DeprecatedCensusConstants.RPC_METHOD); assertEquals(method.getFullMethodName(), methodTagOld.asString()); assertEquals( @@ -571,9 +573,11 @@ public void clientStreamNeverCreatedStillRecordStats() { StatsTestUtils.MetricsRecord record = statsRecorder.pollRecord(); assertNotNull(record); assertNoServerContent(record); - assertEquals(1, record.tags.size()); + assertEquals(2, record.tags.size()); TagValue methodTagOld = record.tags.get(DeprecatedCensusConstants.RPC_METHOD); + TagValue methodTagNew = record.tags.get(RpcMeasureConstants.GRPC_CLIENT_METHOD); assertEquals(method.getFullMethodName(), methodTagOld.asString()); + assertEquals(method.getFullMethodName(), methodTagNew.asString()); assertEquals( 1, record.getMetricAsLongOrFail(DeprecatedCensusConstants.RPC_CLIENT_STARTED_COUNT)); @@ -583,7 +587,9 @@ record = statsRecorder.pollRecord(); assertNotNull(record); assertNoServerContent(record); methodTagOld = record.tags.get(DeprecatedCensusConstants.RPC_METHOD); + methodTagNew = record.tags.get(RpcMeasureConstants.GRPC_CLIENT_METHOD); assertEquals(method.getFullMethodName(), methodTagOld.asString()); + assertEquals(method.getFullMethodName(), methodTagNew.asString()); TagValue statusTagOld = record.tags.get(DeprecatedCensusConstants.RPC_STATUS); assertEquals(Status.Code.DEADLINE_EXCEEDED.toString(), statusTagOld.asString()); assertEquals( @@ -675,9 +681,11 @@ private void subtestStatsHeadersPropagateTags(boolean propagate, boolean recordS StatsTestUtils.MetricsRecord clientRecord = statsRecorder.pollRecord(); assertNotNull(clientRecord); assertNoServerContent(clientRecord); - assertEquals(2, clientRecord.tags.size()); + assertEquals(3, clientRecord.tags.size()); TagValue clientMethodTagOld = clientRecord.tags.get(DeprecatedCensusConstants.RPC_METHOD); + TagValue clientMethodTagNew = clientRecord.tags.get(RpcMeasureConstants.GRPC_CLIENT_METHOD); assertEquals(method.getFullMethodName(), clientMethodTagOld.asString()); + assertEquals(method.getFullMethodName(), clientMethodTagNew.asString()); TagValue clientPropagatedTag = clientRecord.tags.get(StatsTestUtils.EXTRA_TAG); assertEquals("extra-tag-value-897", clientPropagatedTag.asString()); } @@ -700,6 +708,9 @@ private void subtestStatsHeadersPropagateTags(boolean propagate, boolean recordS .put( DeprecatedCensusConstants.RPC_METHOD, TagValue.create(method.getFullMethodName())) + .put( + RpcMeasureConstants.GRPC_SERVER_METHOD, + TagValue.create(method.getFullMethodName())) .build(), TAG_CONTEXT_KEY.get(serverContext)); @@ -711,9 +722,11 @@ private void subtestStatsHeadersPropagateTags(boolean propagate, boolean recordS StatsTestUtils.MetricsRecord serverRecord = statsRecorder.pollRecord(); assertNotNull(serverRecord); assertNoClientContent(serverRecord); - assertEquals(2, serverRecord.tags.size()); + assertEquals(3, serverRecord.tags.size()); TagValue serverMethodTagOld = serverRecord.tags.get(DeprecatedCensusConstants.RPC_METHOD); + TagValue serverMethodTagNew = serverRecord.tags.get(RpcMeasureConstants.GRPC_SERVER_METHOD); assertEquals(method.getFullMethodName(), serverMethodTagOld.asString()); + assertEquals(method.getFullMethodName(), serverMethodTagNew.asString()); TagValue serverPropagatedTag = serverRecord.tags.get(StatsTestUtils.EXTRA_TAG); assertEquals("extra-tag-value-897", serverPropagatedTag.asString()); @@ -721,10 +734,12 @@ private void subtestStatsHeadersPropagateTags(boolean propagate, boolean recordS serverRecord = statsRecorder.pollRecord(); assertNotNull(serverRecord); assertNoClientContent(serverRecord); - serverMethodTagOld = serverRecord.tags.get(DeprecatedCensusConstants.RPC_METHOD); - assertEquals(method.getFullMethodName(), serverMethodTagOld.asString()); TagValue serverStatusTagOld = serverRecord.tags.get(DeprecatedCensusConstants.RPC_STATUS); + serverMethodTagOld = serverRecord.tags.get(DeprecatedCensusConstants.RPC_METHOD); + serverMethodTagNew = serverRecord.tags.get(RpcMeasureConstants.GRPC_SERVER_METHOD); assertEquals(Status.Code.OK.toString(), serverStatusTagOld.asString()); + assertEquals(method.getFullMethodName(), serverMethodTagOld.asString()); + assertEquals(method.getFullMethodName(), serverMethodTagNew.asString()); assertNull(serverRecord.getMetric(DeprecatedCensusConstants.RPC_SERVER_ERROR_COUNT)); serverPropagatedTag = serverRecord.tags.get(StatsTestUtils.EXTRA_TAG); assertEquals("extra-tag-value-897", serverPropagatedTag.asString()); @@ -740,7 +755,9 @@ private void subtestStatsHeadersPropagateTags(boolean propagate, boolean recordS assertNotNull(clientRecord); assertNoServerContent(clientRecord); TagValue clientMethodTagOld = clientRecord.tags.get(DeprecatedCensusConstants.RPC_METHOD); + TagValue clientMethodTagNew = clientRecord.tags.get(RpcMeasureConstants.GRPC_CLIENT_METHOD); assertEquals(method.getFullMethodName(), clientMethodTagOld.asString()); + assertEquals(method.getFullMethodName(), clientMethodTagNew.asString()); TagValue clientStatusTagOld = clientRecord.tags.get(DeprecatedCensusConstants.RPC_STATUS); assertEquals(Status.Code.OK.toString(), clientStatusTagOld.asString()); assertNull(clientRecord.getMetric(DeprecatedCensusConstants.RPC_CLIENT_ERROR_COUNT)); @@ -918,9 +935,11 @@ private void subtestServerBasicStatsNoHeaders( StatsTestUtils.MetricsRecord record = statsRecorder.pollRecord(); assertNotNull(record); assertNoClientContent(record); - assertEquals(1, record.tags.size()); + assertEquals(2, record.tags.size()); TagValue methodTagOld = record.tags.get(DeprecatedCensusConstants.RPC_METHOD); + TagValue methodTagNew = record.tags.get(RpcMeasureConstants.GRPC_SERVER_METHOD); assertEquals(method.getFullMethodName(), methodTagOld.asString()); + assertEquals(method.getFullMethodName(), methodTagNew.asString()); assertEquals( 1, record.getMetricAsLongOrFail(DeprecatedCensusConstants.RPC_SERVER_STARTED_COUNT)); @@ -936,6 +955,9 @@ private void subtestServerBasicStatsNoHeaders( .put( DeprecatedCensusConstants.RPC_METHOD, TagValue.create(method.getFullMethodName())) + .put( + RpcMeasureConstants.GRPC_SERVER_METHOD, + TagValue.create(method.getFullMethodName())) .build(), statsCtx);