Skip to content

Commit 636d393

Browse files
songy23songy23
committed
Work around deprecation warning.
1 parent 3f8b9bf commit 636d393

5 files changed

Lines changed: 31 additions & 20 deletions

File tree

‎core/src/main/java/io/grpc/internal/CensusStatsModule.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
* starts earlier than the ServerCall. Therefore, only one tracer is created per stream/call and
6666
* it's the tracer that reports the summary to Census.
6767
*/
68+
@SuppressWarnings("deprecation")
6869
public final class CensusStatsModule {
6970
private static final Logger logger = Logger.getLogger(CensusStatsModule.class.getName());
7071
private static final double NANOS_PER_MILLI = TimeUnit.MILLISECONDS.toNanos(1);

‎core/src/main/java/io/grpc/internal/CensusTracingModule.java‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import io.grpc.ServerStreamTracer;
3636
import io.grpc.StreamTracer;
3737
import io.opencensus.trace.EndSpanOptions;
38-
import io.opencensus.trace.NetworkEvent;
3938
import io.opencensus.trace.Span;
4039
import io.opencensus.trace.SpanContext;
4140
import io.opencensus.trace.Status;
@@ -58,6 +57,7 @@
5857
* starts earlier than the ServerCall. Therefore, only one tracer is created per stream/call and
5958
* it's the tracer that reports the summary to Census.
6059
*/
60+
@SuppressWarnings("deprecation")
6161
final class CensusTracingModule {
6262
private static final Logger logger = Logger.getLogger(CensusTracingModule.class.getName());
6363

@@ -211,9 +211,10 @@ private static EndSpanOptions createEndSpanOptions(
211211
}
212212

213213
private static void recordNetworkEvent(
214-
Span span, NetworkEvent.Type type,
214+
Span span, io.opencensus.trace.NetworkEvent.Type type,
215215
int seqNo, long optionalWireSize, long optionalUncompressedSize) {
216-
NetworkEvent.Builder eventBuilder = NetworkEvent.builder(type, seqNo);
216+
io.opencensus.trace.NetworkEvent.Builder eventBuilder =
217+
io.opencensus.trace.NetworkEvent.builder(type, seqNo);
217218
if (optionalUncompressedSize != -1) {
218219
eventBuilder.setUncompressedMessageSize(optionalUncompressedSize);
219220
}
@@ -281,14 +282,16 @@ private static final class ClientTracer extends ClientStreamTracer {
281282
public void outboundMessageSent(
282283
int seqNo, long optionalWireSize, long optionalUncompressedSize) {
283284
recordNetworkEvent(
284-
span, NetworkEvent.Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize);
285+
span, io.opencensus.trace.NetworkEvent.Type.SENT, seqNo, optionalWireSize,
286+
optionalUncompressedSize);
285287
}
286288

287289
@Override
288290
public void inboundMessageRead(
289291
int seqNo, long optionalWireSize, long optionalUncompressedSize) {
290292
recordNetworkEvent(
291-
span, NetworkEvent.Type.RECV, seqNo, optionalWireSize, optionalUncompressedSize);
293+
span, io.opencensus.trace.NetworkEvent.Type.RECV, seqNo, optionalWireSize,
294+
optionalUncompressedSize);
292295
}
293296
}
294297

@@ -347,14 +350,16 @@ public Context filterContext(Context context) {
347350
public void outboundMessageSent(
348351
int seqNo, long optionalWireSize, long optionalUncompressedSize) {
349352
recordNetworkEvent(
350-
span, NetworkEvent.Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize);
353+
span, io.opencensus.trace.NetworkEvent.Type.SENT, seqNo, optionalWireSize,
354+
optionalUncompressedSize);
351355
}
352356

353357
@Override
354358
public void inboundMessageRead(
355359
int seqNo, long optionalWireSize, long optionalUncompressedSize) {
356360
recordNetworkEvent(
357-
span, NetworkEvent.Type.RECV, seqNo, optionalWireSize, optionalUncompressedSize);
361+
span, io.opencensus.trace.NetworkEvent.Type.RECV, seqNo, optionalWireSize,
362+
optionalUncompressedSize);
358363
}
359364
}
360365

‎core/src/test/java/io/grpc/internal/CensusModulesTest.java‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@
7272
import io.opencensus.tags.TagValue;
7373
import io.opencensus.tags.Tags;
7474
import io.opencensus.trace.EndSpanOptions;
75-
import io.opencensus.trace.NetworkEvent;
76-
import io.opencensus.trace.NetworkEvent.Type;
7775
import io.opencensus.trace.Span;
7876
import io.opencensus.trace.SpanBuilder;
7977
import io.opencensus.trace.SpanContext;
@@ -102,6 +100,7 @@
102100
* Test for {@link CensusStatsModule} and {@link CensusTracingModule}.
103101
*/
104102
@RunWith(JUnit4.class)
103+
@SuppressWarnings("deprecation")
105104
public class CensusModulesTest {
106105
private static final CallOptions.Key<String> CUSTOM_OPTION =
107106
CallOptions.Key.createWithDefault("option1", "default");
@@ -174,7 +173,7 @@ public String parse(InputStream stream) {
174173
@Captor
175174
private ArgumentCaptor<Status> statusCaptor;
176175
@Captor
177-
private ArgumentCaptor<NetworkEvent> networkEventCaptor;
176+
private ArgumentCaptor<io.opencensus.trace.NetworkEvent> networkEventCaptor;
178177

179178
private CensusStatsModule censusStats;
180179
private CensusTracingModule censusTracing;
@@ -475,13 +474,16 @@ public void clientBasicTracingDefaultSpan() {
475474

476475
InOrder inOrder = inOrder(spyClientSpan);
477476
inOrder.verify(spyClientSpan, times(3)).addNetworkEvent(networkEventCaptor.capture());
478-
List<NetworkEvent> events = networkEventCaptor.getAllValues();
477+
List<io.opencensus.trace.NetworkEvent> events = networkEventCaptor.getAllValues();
479478
assertEquals(
480-
NetworkEvent.builder(Type.SENT, 0).setCompressedMessageSize(882).build(), events.get(0));
479+
io.opencensus.trace.NetworkEvent.builder(io.opencensus.trace.NetworkEvent.Type.SENT, 0)
480+
.setCompressedMessageSize(882).build(), events.get(0));
481481
assertEquals(
482-
NetworkEvent.builder(Type.SENT, 1).setUncompressedMessageSize(27).build(), events.get(1));
482+
io.opencensus.trace.NetworkEvent.builder(io.opencensus.trace.NetworkEvent.Type.SENT, 1)
483+
.setUncompressedMessageSize(27).build(), events.get(1));
483484
assertEquals(
484-
NetworkEvent.builder(Type.RECV, 0)
485+
io.opencensus.trace.NetworkEvent.builder(io.opencensus.trace.NetworkEvent.Type.RECV, 0)
486+
.setCompressedMessageSize(255)
485487
.setCompressedMessageSize(255)
486488
.setUncompressedMessageSize(90)
487489
.build(),
@@ -956,13 +958,15 @@ public void serverBasicTracingNoHeaders() {
956958

957959
InOrder inOrder = inOrder(spyServerSpan);
958960
inOrder.verify(spyServerSpan, times(3)).addNetworkEvent(networkEventCaptor.capture());
959-
List<NetworkEvent> events = networkEventCaptor.getAllValues();
961+
List<io.opencensus.trace.NetworkEvent> events = networkEventCaptor.getAllValues();
960962
assertEquals(
961-
NetworkEvent.builder(Type.SENT, 0).setCompressedMessageSize(882).build(), events.get(0));
963+
io.opencensus.trace.NetworkEvent.builder(io.opencensus.trace.NetworkEvent.Type.SENT, 0)
964+
.setCompressedMessageSize(882).build(), events.get(0));
962965
assertEquals(
963-
NetworkEvent.builder(Type.SENT, 1).setUncompressedMessageSize(27).build(), events.get(1));
966+
io.opencensus.trace.NetworkEvent.builder(io.opencensus.trace.NetworkEvent.Type.SENT, 1)
967+
.setUncompressedMessageSize(27).build(), events.get(1));
964968
assertEquals(
965-
NetworkEvent.builder(Type.RECV, 0)
969+
io.opencensus.trace.NetworkEvent.builder(io.opencensus.trace.NetworkEvent.Type.RECV, 0)
966970
.setCompressedMessageSize(255)
967971
.setUncompressedMessageSize(90)
968972
.build(),

‎interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
*
141141
* <p> New tests should avoid using Mockito to support running on AppEngine.</p>
142142
*/
143+
@SuppressWarnings("deprecation")
143144
public abstract class AbstractInteropTest {
144145

145146
@Rule public final Timeout globalTimeout = Timeout.seconds(30);

‎testing/src/main/java/io/grpc/internal/testing/StatsTestUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import io.opencensus.trace.AttributeValue;
4141
import io.opencensus.trace.EndSpanOptions;
4242
import io.opencensus.trace.Link;
43-
import io.opencensus.trace.NetworkEvent;
4443
import io.opencensus.trace.Sampler;
4544
import io.opencensus.trace.Span;
4645
import io.opencensus.trace.SpanBuilder;
@@ -58,6 +57,7 @@
5857
import java.util.concurrent.TimeUnit;
5958
import javax.annotation.Nullable;
6059

60+
@SuppressWarnings("deprecation")
6161
public class StatsTestUtils {
6262
private StatsTestUtils() {
6363
}
@@ -347,7 +347,7 @@ public void addAnnotation(String description, Map<String, AttributeValue> attrib
347347
public void addAnnotation(Annotation annotation) {}
348348

349349
@Override
350-
public void addNetworkEvent(NetworkEvent networkEvent) {}
350+
public void addNetworkEvent(io.opencensus.trace.NetworkEvent networkEvent) {}
351351

352352
@Override
353353
public void addLink(Link link) {}

0 commit comments

Comments
 (0)