Skip to content

Commit

Permalink
update to latest runtime spi pre-release
Browse files Browse the repository at this point in the history
  • Loading branch information
patriknw committed Dec 3, 2024
1 parent 249e56a commit 7db5938
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion akka-javasdk-maven/akka-javasdk-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<!-- These are dependent on runtime environment and cannot be customized by users -->
<maven.compiler.release>21</maven.compiler.release>
<kalix-runtime.version>1.3.0-2909c94-7-da947d31-SNAPSHOT</kalix-runtime.version>
<kalix-runtime.version>1.3.1-a47bb2b</kalix-runtime.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skip.docker>false</skip.docker>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ import scala.jdk.CollectionConverters._

import akka.javasdk.impl.eventsourcedentity.EventSourcedEntityImpl
import akka.javasdk.impl.timedaction.TimedActionImpl
import akka.runtime.sdk.spi.ConsumerDescriptor
import akka.runtime.sdk.spi.EventSourcedEntityDescriptor
import akka.runtime.sdk.spi.SpiEventSourcedEntity
import akka.runtime.sdk.spi.TimedActionDescriptor
Expand Down Expand Up @@ -399,6 +400,9 @@ private final class Sdk(
new EventSourcedEntityDescriptor(componentId, readOnlyCommandNames, instanceFactory)
}

// FIXME
private val consumerDescriptors = Seq.empty[ConsumerDescriptor]

private val timedActionDescriptors =
componentClasses
.filter(hasComponentId)
Expand All @@ -408,6 +412,7 @@ private final class Sdk(
val timedActionClass = clz.asInstanceOf[Class[TimedAction]]
val timedActionSpi =
new TimedActionImpl[TimedAction](
componentId,
() => wiredInstance(timedActionClass)(sideEffectingComponentInjects(None)),
timedActionClass,
system.classicSystem,
Expand Down Expand Up @@ -553,7 +558,6 @@ private final class Sdk(
}

override def discovery: Discovery = discoveryEndpoint
override def actions: Option[Actions] = actionsEndpoint
override def eventSourcedEntities: Option[EventSourcedEntities] = eventSourcedEntitiesEndpoint
override def eventSourcedEntityDescriptors: Seq[EventSourcedEntityDescriptor] =
Sdk.this.eventSourcedEntityDescriptors
Expand All @@ -565,6 +569,9 @@ private final class Sdk(

override def timedActionsDescriptors: Seq[TimedActionDescriptor] =
Sdk.this.timedActionDescriptors

override def consumersDescriptors: Seq[ConsumerDescriptor] =
Sdk.this.consumerDescriptors
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import org.slf4j.MDC
/** EndMarker */
@InternalApi
private[impl] final class TimedActionImpl[TA <: TimedAction](
componentId: String,
val factory: () => TA,
timedActionClass: Class[TA],
_system: ActorSystem,
Expand Down Expand Up @@ -113,9 +114,7 @@ private[impl] final class TimedActionImpl[TA <: TimedAction](
ex match {
case _ =>
ErrorHandling.withCorrelationId { correlationId =>
log.error(
s"Failure during handling command [${command.name}] from TimedAction component [${command.componentId}].",
ex)
log.error(s"Failure during handling command [${command.name}] from TimedAction component [$componentId].", ex)
protocolFailure(correlationId)
}
}
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object Dependencies {
val ProtocolVersionMinor = 1
val RuntimeImage = "gcr.io/kalix-public/kalix-runtime"
// Remember to bump kalix-runtime.version in akka-javasdk-maven/akka-javasdk-parent if bumping this
val RuntimeVersion = sys.props.getOrElse("kalix-runtime.version", "1.3.0-2909c94-7-da947d31-SNAPSHOT")
val RuntimeVersion = sys.props.getOrElse("kalix-runtime.version", "1.3.1-a47bb2b")
}
// NOTE: embedded SDK should have the AkkaVersion aligned, when updating RuntimeVersion, make sure to check
// if AkkaVersion and AkkaHttpVersion are aligned
Expand Down

0 comments on commit 7db5938

Please sign in to comment.