From 915f71dff53a366514211d6007b1f62aef9a6680 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 24 Sep 2019 18:30:19 -0700 Subject: [PATCH 1/2] update google-auth-library to 0.17.2 --- dependencies.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index 0a000e652..8b8882c13 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -34,8 +34,8 @@ version.io_grpc=1.23.0 # 2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:1.15.0 maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:1.15.0 -maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:0.17.1 -maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:0.17.1 +maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:0.17.2 +maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:0.17.2 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.23.0 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.23.0 maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.23.0 From 93aa08194eb63100d153451360f9c37033e88da3 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 25 Sep 2019 08:42:45 -0700 Subject: [PATCH 2/2] fix use of deprecated method --- .../google/api/gax/tracing/OpencensusTracerFactoryTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gax/src/test/java/com/google/api/gax/tracing/OpencensusTracerFactoryTest.java b/gax/src/test/java/com/google/api/gax/tracing/OpencensusTracerFactoryTest.java index e491d5903..0299e3fae 100644 --- a/gax/src/test/java/com/google/api/gax/tracing/OpencensusTracerFactoryTest.java +++ b/gax/src/test/java/com/google/api/gax/tracing/OpencensusTracerFactoryTest.java @@ -92,8 +92,7 @@ public void testImplicitParentSpan() { new OpencensusTracerFactory(internalTracer, defaultSpanAttributes); Span parentSpan = mock(Span.class); - Context origContext = - Context.current().withValue(ContextUtils.CONTEXT_SPAN_KEY, parentSpan).attach(); + Context origContext = ContextUtils.withValue(Context.current(), parentSpan).attach(); try { factory.newTracer( @@ -130,8 +129,7 @@ public void testExplicitParentOverridesImplicit() { OpencensusTracer parentTracer = new OpencensusTracer(internalTracer, parentSpan, OperationType.Unary); - Context origContext = - Context.current().withValue(ContextUtils.CONTEXT_SPAN_KEY, parentSpan).attach(); + Context origContext = ContextUtils.withValue(Context.current(), parentSpan).attach(); try { factory.newTracer(parentTracer, SpanName.of("FakeClient", "FakeMethod"), OperationType.Unary);