sleep longer :(

Author: evanchooly

dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy

@@ -81,80 +81,79 @@ abstract class GrpcCodeOriginTest extends VersionedNamingTestBase {
     def error = new AtomicReference()
 
     BindableService greeter = new GreeterGrpc.GreeterImplBase() {
-        @Override
-        StreamObserver<Helloworld.Response> conversation(StreamObserver<Helloworld.Response> observer) {
-          return new StreamObserver<Helloworld.Response>() {
-              @Override
-              void onNext(Helloworld.Response value) {
-
-                serverReceived << value.message
-
-                (1..msgCount).each {
-                  if (TEST_TRACER.activeScope().isAsyncPropagating()) {
-                    observer.onNext(value)
-                  } else {
-                    observer.onError(new IllegalStateException("not async propagating!"))
-                  }
-                }
+      @Override
+      StreamObserver<Helloworld.Response> conversation(StreamObserver<Helloworld.Response> observer) {
+        return new StreamObserver<Helloworld.Response>() {
+          @Override
+          void onNext(Helloworld.Response value) {
+
+            serverReceived << value.message
+
+            (1..msgCount).each {
+              if (TEST_TRACER.activeScope().isAsyncPropagating()) {
+                observer.onNext(value)
+              } else {
+                observer.onError(new IllegalStateException("not async propagating!"))
               }
+            }
+          }
 
-              @Override
-              void onError(Throwable t) {
-                if (TEST_TRACER.activeScope().isAsyncPropagating()) {
-                  error.set(t)
-                  observer.onError(t)
-                } else {
-                  observer.onError(new IllegalStateException("not async propagating!"))
-                }
-              }
+          @Override
+          void onError(Throwable t) {
+            if (TEST_TRACER.activeScope().isAsyncPropagating()) {
+              error.set(t)
+              observer.onError(t)
+            } else {
+              observer.onError(new IllegalStateException("not async propagating!"))
+            }
+          }
 
-              @Override
-              void onCompleted() {
-                if (TEST_TRACER.activeScope().isAsyncPropagating()) {
-                  observer.onCompleted()
-                } else {
-                  observer.onError(new IllegalStateException("not async propagating!"))
-                }
-              }
+          @Override
+          void onCompleted() {
+            if (TEST_TRACER.activeScope().isAsyncPropagating()) {
+              observer.onCompleted()
+            } else {
+              observer.onError(new IllegalStateException("not async propagating!"))
             }
+          }
         }
       }
+    }
     Server server = InProcessServerBuilder.forName(getClass().name).addService(greeter)
-      .executor(directExecutor ? MoreExecutors.directExecutor() : Executors.newCachedThreadPool())
-      .build().start()
-
-    Thread.sleep(500) // wait for instrumentation
+    .executor(directExecutor ? MoreExecutors.directExecutor() : Executors.newCachedThreadPool())
+    .build().start()
 
+    Thread.sleep(1000)
     ManagedChannel channel = InProcessChannelBuilder.forName(getClass().name).build()
     GreeterGrpc.GreeterStub client = GreeterGrpc.newStub(channel).withWaitForReady()
 
     when:
     def streamObserver = client.conversation(new StreamObserver<Helloworld.Response>() {
-        @Override
-        void onNext(Helloworld.Response value) {
-          if (TEST_TRACER.activeScope().isAsyncPropagating()) {
-            clientReceived << value.message
-          } else {
-            error.set(new IllegalStateException("not async propagating!"))
-          }
+      @Override
+      void onNext(Helloworld.Response value) {
+        if (TEST_TRACER.activeScope().isAsyncPropagating()) {
+          clientReceived << value.message
+        } else {
+          error.set(new IllegalStateException("not async propagating!"))
         }
+      }
 
-        @Override
-        void onError(Throwable t) {
-          if (TEST_TRACER.activeScope().isAsyncPropagating()) {
-            error.set(t)
-          } else {
-            error.set(new IllegalStateException("not async propagating!"))
-          }
+      @Override
+      void onError(Throwable t) {
+        if (TEST_TRACER.activeScope().isAsyncPropagating()) {
+          error.set(t)
+        } else {
+          error.set(new IllegalStateException("not async propagating!"))
         }
+      }
 
-        @Override
-        void onCompleted() {
-          if (!TEST_TRACER.activeScope().isAsyncPropagating()) {
-            error.set(new IllegalStateException("not async propagating!"))
-          }
+      @Override
+      void onCompleted() {
+        if (!TEST_TRACER.activeScope().isAsyncPropagating()) {
+          error.set(new IllegalStateException("not async propagating!"))
         }
-      })
+      }
+    })
 
     clientRange.each {
       def message = Helloworld.Response.newBuilder().setMessage("call $it").build()
@@ -289,15 +288,14 @@ abstract class GrpcCodeOriginTest extends VersionedNamingTestBase {
     when(config.getDebuggerCodeOriginMaxUserFrames()).thenReturn(8)
 
     def probeStatusSink = mock(ProbeStatusSink.class)
-    def instr = ByteBuddyAgent.install()
 
     def sink = new DebuggerSink(config, probeStatusSink)
-    def configurationUpdater = new ConfigurationUpdater(instr, DebuggerTransformer::new, config, sink, new ClassesToRetransformFinder())
+    def configurationUpdater = new ConfigurationUpdater(INSTRUMENTATION, DebuggerTransformer::new, config, sink, new ClassesToRetransformFinder())
 
     def currentTransformer = new DebuggerTransformer(config, configuration, {
       ProbeDefinition definition, InstrumentationResult result ->
     }, sink)
-    instr.addTransformer(currentTransformer)
+    INSTRUMENTATION.addTransformer(currentTransformer)
 
     DebuggerContext.initProbeResolver(configurationUpdater)
     DebuggerContext.initClassFilter(new DenyListHelper(null))