Upgrade to DAS protocol 0.1.2

raw-labs · Sep 17, 2024 · c52ad43 · c52ad43
1 parent 6f3fb4f
commit c52ad43
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -115,7 +115,7 @@ lazy val root = (project in file("."))
     strictBuildSettings,
     publishSettings,
     libraryDependencies ++= Seq(
-      "com.raw-labs" %% "protocol-das" % "0.1.1" % "compile->compile;test->test",
+      "com.raw-labs" %% "protocol-das" % "0.1.2" % "compile->compile;test->test",
       "com.raw-labs" %% "das-sdk-scala" % "0.1.0" % "compile->compile;test->test"
     )
   )
diff --git a/src/main/scala/com/rawlabs/das/server/DASServer.scala b/src/main/scala/com/rawlabs/das/server/DASServer.scala
@@ -12,7 +12,7 @@
 
 package com.rawlabs.das.server
 
-import com.rawlabs.protocol.das.services.{RegistrationServiceGrpc, TablesServiceGrpc}
+import com.rawlabs.protocol.das.services.{HealthCheckServiceGrpc, RegistrationServiceGrpc, TablesServiceGrpc}
 import com.rawlabs.utils.core.RawSettings
 import io.grpc.{Server, ServerBuilder}
 
@@ -23,12 +23,14 @@ class DASServer(implicit settings: RawSettings) {
   private val dasSdkManager = new DASSdkManager
   private val cache = new DASResultCache()
 
+  private val healthCheckService = HealthCheckServiceGrpc.bindService(new HealthCheckServiceGrpcImpl)
   private val registrationService = RegistrationServiceGrpc.bindService(new RegistrationServiceGrpcImpl(dasSdkManager))
   private val tablesService = TablesServiceGrpc.bindService(new TableServiceGrpcImpl(dasSdkManager, cache))
 
   def start(port: Int): Unit = {
     server = ServerBuilder
       .forPort(port)
+      .addService(healthCheckService)
       .addService(registrationService)
       .addService(tablesService)
       .intercept(new ThrowableHandlingInterceptor)

diff --git a/src/main/scala/com/rawlabs/das/server/RegistrationServiceGrpcImpl.scala b/src/main/scala/com/rawlabs/das/server/RegistrationServiceGrpcImpl.scala
@@ -38,7 +38,8 @@ class RegistrationServiceGrpcImpl(dasSdkManager: DASSdkManager)
     logger.debug(s"Registering DAS with type: ${request.getDefinition.getType}")
     val dasId = dasSdkManager.registerDAS(
       request.getDefinition.getType,
-      request.getDefinition.getOptionsMap.asScala.toMap
+      request.getDefinition.getOptionsMap.asScala.toMap,
+      maybeDasId = if (request.hasId) Some(request.getId) else None
     )
     responseObserver.onNext(dasId)
     responseObserver.onCompleted()