Cleanup grpc object creation

pambrose · May 10, 2020 · a31307d · a31307d
1 parent e55f2b8
commit a31307d
Show file tree

Hide file tree

Showing 5 changed files with 202 additions and 115 deletions.
diff --git a/build.gradle b/build.gradle
@@ -73,12 +73,12 @@ dependencies {
 
 /*
 sourceSets {
-  main.java.srcDirs = ['src/main/java']
-  main.kotlin.srcDirs = ['src/main/kotlin']
-  test.java.srcDirs = ['src/test/java']
-  test.kotlin.srcDirs = ['src/test/kotlin']
-  main.resources.srcDirs = ['src/main/resources']
-  test.resources.srcDirs = ['src/main/testresources']
+  main.java.srcDirs += ['src/main/java']
+  main.kotlin.srcDirs += ['src/main/kotlin']
+  test.java.srcDirs += ['src/test/java']
+  test.kotlin.srcDirs += ['src/test/kotlin']
+  main.resources.srcDirs += ['src/main/resources']
+  test.resources.srcDirs += ['src/main/testresources']
 }
 */
 

diff --git a/src/main/kotlin/io/prometheus/agent/AgentGrpcService.kt b/src/main/kotlin/io/prometheus/agent/AgentGrpcService.kt
@@ -152,30 +152,33 @@ internal class AgentGrpcService(private val agent: Agent,
 
   fun registerAgent(initialConnectionLatch: CountDownLatch) {
     val request = newRegisterAgentRequest(agent.agentId, agent.agentName, hostName)
-    blockingStub.registerAgent(request).also { response ->
-      agent.markMsgSent()
-      if (!response.valid)
-        throw RequestFailureException("registerAgent() - ${response.reason}")
-    }
+    blockingStub.registerAgent(request)
+        .also { response ->
+          agent.markMsgSent()
+          if (!response.valid)
+            throw RequestFailureException("registerAgent() - ${response.reason}")
+        }
     initialConnectionLatch.countDown()
   }
 
   fun pathMapSize(): Int {
     val request = GrpcObjects.newPathMapSizeRequest(agent.agentId)
-    return blockingStub.pathMapSize(request).run {
-      agent.markMsgSent()
-      pathCount
-    }
+    return blockingStub.pathMapSize(request)
+        .run {
+          agent.markMsgSent()
+          pathCount
+        }
   }
 
   fun registerPathOnProxy(path: String): Long {
     val request = GrpcObjects.newRegisterPathRequest(agent.agentId, path)
-    return blockingStub.registerPath(request).run {
-      agent.markMsgSent()
-      if (!valid)
-        throw RequestFailureException("registerPath() - $reason")
-      pathId
-    }
+    return blockingStub.registerPath(request)
+        .run {
+          agent.markMsgSent()
+          if (!valid)
+            throw RequestFailureException("registerPath() - $reason")
+          pathId
+        }
   }
 
   fun unregisterPathOnProxy(path: String) {