You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2023/02/28 20:21:49 UTC
[incubator-pekko-management] branch main updated: switch to pekko jars (#17)
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-management.git
The following commit(s) were added to refs/heads/main by this push:
new 0e11018 switch to pekko jars (#17)
0e11018 is described below
commit 0e1101848c356a479ec2a37db7b3af1190ffc13b
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Tue Feb 28 21:21:39 2023 +0100
switch to pekko jars (#17)
---
build.sbt | 18 ++-
.../src/main/resources/reference.conf | 8 +-
.../discovery/awsapi/ecs/AsyncEcsDiscovery.scala | 6 +-
.../awsapi/ecs/AsyncEcsServiceDiscovery.scala | 18 +--
.../awsapi/ecs/AsyncEcsTaskSetDiscovery.scala | 28 ++--
.../src/main/resources/reference.conf | 12 +-
.../awsapi/ec2/Ec2TagBasedServiceDiscovery.scala | 28 ++--
.../discovery/awsapi/ecs/EcsServiceDiscovery.scala | 18 +--
.../discovery/awsapi/ec2/MyConfiguration.java | 2 +-
.../apache/pekko}/discovery/awsapi/ec2/Docs.scala | 2 +-
.../Ec2TagBasedSimpleServiceDiscoveryTest.scala | 4 +-
discovery-consul/src/main/resources/reference.conf | 16 +-
.../discovery/consul/ConsulServiceDiscovery.scala | 32 ++--
.../pekko}/discovery/consul/ConsulSettings.scala | 14 +-
.../bootstrap/discovery/ConsulDiscoverySpec.scala | 21 ++-
.../src/main/resources/reference.conf | 6 +-
.../pekko}/discovery/kubernetes/JsonFormat.scala | 18 ++-
.../kubernetes/KubernetesApiServiceDiscovery.scala | 32 ++--
.../pekko}/discovery/kubernetes/PodList.scala | 4 +-
.../pekko}/discovery/kubernetes/Settings.scala | 8 +-
.../java/docs/KubernetesApiDiscoveryDocsTest.java | 6 +-
.../src/test/resources/application.conf | 2 +-
.../src/test/resources/pods.json | 108 ++++++-------
.../discovery/kubernetes/JsonFormatSpec.scala | 18 +--
.../KubernetesApiServiceDiscoverySpec.scala | 26 +--
.../src/main/resources/reference.conf | 10 +-
.../apache/pekko}/discovery/marathon/AppList.scala | 2 +-
.../pekko}/discovery/marathon/JsonFormat.scala | 4 +-
.../marathon/MarathonApiServiceDiscovery.scala | 23 ++-
.../pekko}/discovery/marathon/Settings.scala | 8 +-
.../src/test/resources/docker-app.json | 2 +-
.../marathon/MarathonApiServiceDiscoverySpec.scala | 8 +-
docs/src/main/paradox/akka-management.md | 100 ++++++------
docs/src/main/paradox/bootstrap/details.md | 4 +-
docs/src/main/paradox/bootstrap/index.md | 88 +++++------
docs/src/main/paradox/bootstrap/istio.md | 2 +-
docs/src/main/paradox/bootstrap/kubernetes-api.md | 12 +-
docs/src/main/paradox/bootstrap/kubernetes.md | 8 +-
docs/src/main/paradox/bootstrap/local-config.md | 14 +-
docs/src/main/paradox/bootstrap/recipes.md | 108 ++++++-------
docs/src/main/paradox/bootstrap/troubleshooting.md | 6 +-
docs/src/main/paradox/cluster-http-management.md | 80 +++++-----
docs/src/main/paradox/cluster-jmx-management.md | 2 +-
docs/src/main/paradox/discovery/aws.md | 92 +++++------
docs/src/main/paradox/discovery/consul.md | 44 +++---
docs/src/main/paradox/discovery/index.md | 10 +-
docs/src/main/paradox/discovery/kubernetes.md | 38 ++---
docs/src/main/paradox/discovery/marathon.md | 38 ++---
docs/src/main/paradox/healthchecks.md | 30 ++--
docs/src/main/paradox/index.md | 16 +-
.../kubernetes-deployment/building-using-maven.md | 2 +-
.../kubernetes-deployment/building-using-sbt.md | 2 +-
.../paradox/kubernetes-deployment/deploying.md | 72 ++++-----
.../kubernetes-deployment/forming-a-cluster.md | 50 +++---
.../main/paradox/kubernetes-deployment/index.md | 4 +-
.../preparing-for-production.md | 16 +-
docs/src/main/paradox/kubernetes-lease.md | 30 ++--
docs/src/main/paradox/loglevels/index.md | 2 +-
docs/src/main/paradox/loglevels/log4j2.md | 42 ++---
docs/src/main/paradox/loglevels/logback.md | 42 ++---
docs/src/main/paradox/migration.md | 58 +++----
integration-test-scripts/aws-api-ec2-tag-based.sh | 2 +-
integration-test/README.md | 4 +-
integration-test/aws-api-ec2/README.md | 12 +-
.../aws-api-ec2/src/it/resources/application.conf | 4 +-
.../pekko}/cluster/bootstrap/IntegrationTest.scala | 26 +--
.../{akka-cluster.json => pekko-cluster.json} | 2 +-
.../src/main/resources/application.conf | 2 +-
.../pekko}/cluster/bootstrap/Ec2DemoApp.scala | 10 +-
integration-test/aws-api-ecs/README.md | 20 +--
.../cfn-templates/ecs-integration-test-app.yaml | 6 +-
.../pekko}/cluster/bootstrap/EcsApiDemoApp.scala | 15 +-
integration-test/dns-api-mesos/build.sbt | 6 +-
.../src/main/resources/application.conf | 4 +-
.../apache/pekko}/cluster/bootstrap/DemoApp.scala | 24 +--
.../{akka-cluster.yml => pekko-cluster.yml} | 2 +-
integration-test/kubernetes-api-java/pom.xml | 50 +++---
.../cluster/bootstrap/demo/ClusterWatcher.java | 12 +-
.../pekko}/cluster/bootstrap/demo/DemoApp.java | 26 +--
.../src/main/resources/application.conf | 10 +-
integration-test/kubernetes-api-java/test.sh | 2 +-
.../{akka-cluster.yml => pekko-cluster.yml} | 2 +-
.../src/main/resources/application.conf | 10 +-
.../apache/pekko}/cluster/bootstrap/DemoApp.scala | 20 +--
integration-test/kubernetes-api/test.sh | 2 +-
.../{akka-cluster.yml => pekko-cluster.yml} | 0
.../src/main/resources/application.conf | 6 +-
.../pekko}/cluster/bootstrap/ClusterApp.scala | 24 +--
.../pekko}/cluster/bootstrap/NoisySingleton.scala | 6 +-
integration-test/kubernetes-dns/test.sh | 2 +-
.../local/src/main/resources/application.conf | 18 +--
.../apache/pekko}/cluster/bootstrap/Main.scala | 16 +-
.../pekko}/management/LocalBootstrapTest.scala | 45 +++---
integration-test/marathon-api-docker/README.md | 16 +-
integration-test/marathon-api-docker/build.sbt | 6 +-
.../marathon/marathon-api-docker-app.json | 2 +-
.../src/main/resources/application.conf | 8 +-
.../bootstrap/MarathonApiDockerDemoApp.scala | 18 +--
integration-test/marathon-api/README.md | 6 +-
integration-test/marathon-api/build.sbt | 6 +-
integration-test/marathon-api/marathon/app.json | 4 +-
.../src/main/resources/application.conf | 2 +-
.../apache/pekko}/cluster/bootstrap/DemoApp.scala | 18 +--
lease-kubernetes-int-test/kubernetes/rbac.yml | 2 +-
.../src/main/resources/application.conf | 6 +-
.../coordination/lease/kubernetes/LeaseSpec.scala | 14 +-
.../lease/kubernetes/LeaseTestSuite.scala | 4 +-
.../lease/kubernetes/TestFailedReason.scala | 4 +-
.../lease/kubernetes/LocalLeaseSpec.scala | 10 +-
.../kubernetes/KubernetesApiIntegrationTest.scala | 14 +-
.../lease/kubernetes/LeaseContentionSpec.scala | 19 +--
lease-kubernetes/src/main/resources/reference.conf | 4 +-
.../lease/kubernetes/KubernetesApi.scala | 8 +-
.../lease/kubernetes/KubernetesLease.scala | 32 ++--
.../lease/kubernetes/KubernetesSettings.scala | 14 +-
.../coordination/lease/kubernetes/LeaseActor.scala | 22 +--
.../kubernetes/internal/KubernetesApiImpl.scala | 44 +++---
.../internal/KubernetesJsonSupport.scala | 6 +-
.../lease/kubernetes/KubernetesApiSpec.scala | 14 +-
.../lease/kubernetes/KubernetesSettingsSpec.scala | 6 +-
.../lease/kubernetes/LeaseActorSpec.scala | 20 +--
.../src/main/resources/reference.conf | 30 ++--
.../cluster/bootstrap/BootstrapLogMarker.scala | 93 -----------
.../cluster/bootstrap/BootstrapLogMarker.scala | 93 +++++++++++
.../cluster/bootstrap/ClusterBootstrap.scala | 63 ++++----
.../bootstrap/ClusterBootstrapSettings.scala | 16 +-
.../management/cluster/bootstrap/JoinDecider.scala | 6 +-
.../bootstrap/LowestAddressJoinDecider.scala | 10 +-
.../cluster/bootstrap/SelfAwareJoinDecider.scala | 14 +-
.../contactpoint/HttpBootstrapJsonProtocol.scala | 6 +-
.../contactpoint/HttpClusterBootstrapRoutes.scala | 32 ++--
.../bootstrap/internal/BootstrapCoordinator.scala | 60 +++----
.../internal/HttpContactPointBootstrap.scala | 49 +++---
.../bootstrap/ClusterBootstrapCompileOnly.java | 12 +-
.../bootstrap/ClusterBootstrapJavaCompileTest.java | 6 +-
.../src/test/resources/reference.conf | 2 +-
.../bootstrap/ClusterBootstrapCompileOnly.scala | 12 +-
.../apache/pekko}/discovery/MockDiscovery.scala | 11 +-
.../cluster/bootstrap/AbstractBootstrapSpec.scala | 2 +-
.../bootstrap/ClusterBootstrapSettingsSpec.scala | 8 +-
.../cluster/bootstrap/InactiveBootstrapSpec.scala | 8 +-
.../bootstrap/LowestAddressJoinDeciderSpec.scala | 61 ++++---
.../ClusterBootstrapAutostartIntegrationSpec.scala | 32 ++--
.../ClusterBootstrapBasePathIntegrationSpec.scala | 35 ++--
...rBootstrapDiscoveryBackoffIntegrationSpec.scala | 34 ++--
.../ClusterBootstrapExistingSeedNodesSpec.scala | 29 ++--
.../ClusterBootstrapIntegrationSpec.scala | 37 ++---
...tryUnreachableContactPointIntegrationSpec.scala | 37 ++---
.../contactpoint/HttpContactPointRoutesSpec.scala | 14 +-
.../internal/BootstrapCoordinatorSpec.scala | 19 ++-
.../internal/HttpContactPointBootstrapSpec.scala | 7 +-
.../cluster}/cluster/ClusterReadViewAccess.java | 8 +-
.../src/main/resources/reference.conf | 14 +-
.../ClusterDomainEventServerSentEventEncoder.scala | 10 +-
.../cluster/ClusterHttpManagementHelper.scala | 6 +-
.../cluster/ClusterHttpManagementProtocol.scala | 21 ++-
.../ClusterHttpManagementRouteProvider.scala | 24 +--
.../cluster/ClusterHttpManagementSettings.scala | 4 +-
.../javadsl/ClusterHttpManagementRoutes.scala | 17 +-
.../cluster/javadsl/ClusterMembershipCheck.scala | 9 +-
.../scaladsl/ClusterHttpManagementRoutes.scala | 52 +++---
.../cluster/scaladsl/ClusterMembershipCheck.scala | 16 +-
.../cluster/http/management/CompileOnlyTest.java | 14 +-
.../http/ClusterHttpManagementJavaCompileTest.java | 6 +-
.../http/javadsl/ClusterReadinessCheckTest.java | 6 +-
.../src/test/resources/application.conf | 2 +-
.../cluster/http/management/CompileOnlySpec.scala | 14 +-
.../scaladsl/ClusterHttpManagementRoutesSpec.scala | 176 ++++++++++-----------
.../ClusterHttpManagementHelperSpec.scala | 20 +--
...sterDomainEventServerSentEventEncoderSpec.scala | 40 ++---
.../ClusterHttpManagementRouteProviderSpec.scala | 12 +-
.../pekko}/management/cluster/MultiDcSpec.scala | 42 ++---
.../ClusterMembershipCheckSettingsSpec.scala | 4 +-
.../scaladsl/ClusterMembershipCheckSpec.scala | 8 +-
.../src/main/resources/reference.conf | 4 +-
.../loglevels/log4j2/LogLevelRoutes.scala | 30 ++--
.../loglevels/log4j2/LogLevelRoutesSpec.scala | 26 +--
.../src/main/resources/reference.conf | 4 +-
.../loglevels/logback/LogLevelRoutes.scala | 32 ++--
.../loglevels/logback/LogLevelRoutesSpec.scala | 27 ++--
.../pki/kubernetes/PemManagersProvider.scala | 14 +-
management/src/main/resources/reference.conf | 34 ++--
.../pekko}/management/HealthCheckRoutes.scala | 18 +--
.../pekko}/management/HealthCheckSettings.scala | 4 +-
.../management/InvalidHealthCheckException.scala | 2 +-
.../pekko}/management/ManagementLogMarker.scala | 26 +--
.../management/PekkoManagementSettings.scala} | 14 +-
.../management/internal/HealthChecksImpl.scala | 29 ++--
.../pekko}/management/javadsl/HealthChecks.scala | 15 +-
.../javadsl/ManagementRouteProvider.scala | 8 +-
.../javadsl/ManagementRouteProviderSettings.scala | 28 ++--
.../management/javadsl/PekkoManagement.scala} | 45 +++---
.../pekko}/management/scaladsl/HealthChecks.scala | 15 +-
.../scaladsl/ManagementRouteProvider.scala | 14 +-
.../scaladsl/ManagementRouteProviderSettings.scala | 24 +--
.../management/scaladsl/PekkoManagement.scala} | 117 +++++++-------
.../apache/pekko}/management/BasicHealthCheck.java | 4 +-
.../apache/pekko}/management/ClusterCheck.java | 8 +-
.../apache/pekko}/management/CodeExamples.java | 18 +--
.../apache/pekko}/management/HealthCheckTest.java | 28 ++--
management/src/test/resources/reference.conf | 2 +-
.../pekko}/management/ExampleHealthCheck.scala | 6 +-
.../apache/pekko}/management/CompileOnly.scala | 14 +-
.../pekko}/management/HealthCheckRoutesSpec.scala | 12 +-
.../management/HealthCheckSettingsSpec.scala | 3 +-
.../pekko}/management/HealthChecksSpec.scala | 111 +++++++------
.../PekkoManagementHttpEndpointSpec.scala} | 130 +++++++--------
project/Dependencies.scala | 141 ++++++++---------
project/project-info.conf | 4 +-
209 files changed, 2284 insertions(+), 2333 deletions(-)
diff --git a/build.sbt b/build.sbt
index 5c495b1..72fdf54 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,6 +2,7 @@ import com.typesafe.sbt.packager.docker.{ Cmd, ExecCmd }
import sbt.Keys.parallelExecution
ThisBuild / resolvers += Resolver.jcenterRepo
+ThisBuild / resolvers += "Apache Snapshots".at("https://repository.apache.org/content/repositories/snapshots/")
// root
lazy val root = project
@@ -282,7 +283,7 @@ lazy val docs = project
.enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, PreprocessPlugin, PublishRsyncPlugin)
.disablePlugins(MimaPlugin)
.settings(
- name := "Pekko Management",
+ name := "Apache Pekko Management",
publish / skip := true,
makeSite := makeSite.dependsOn(LocalRootProject / ScalaUnidoc / doc).value,
Preprocess / siteSubdirName := s"api/pekko-management/${if (isSnapshot.value) "snapshot" else version.value}",
@@ -296,14 +297,15 @@ lazy val docs = project
"date.year" -> Common.currentYear,
"project.url" -> "https://pekko.apache.org/docs/pekko-management/current/",
"canonical.base_url" -> "https://pekko.apache.org/docs/pekko-management/current",
+ "scaladoc.base_url" -> s"https://pekko.apache.org/api/pekko-management/current/",
"scala.binary.version" -> scalaBinaryVersion.value,
- "akka.version" -> Dependencies.AkkaVersion,
- "extref.akka.base_url" -> s"https://pekko.apache.org/docs/pekko/current/%s",
- "scaladoc.akka.base_url" -> s"https://pekko.apache.org/api/pekko/current/",
- "extref.akka-http.base_url" -> s"https://pekko.apache.org/docs/pekko-http/${Dependencies.AkkaHttpBinaryVersion}/%s",
- "scaladoc.akka.http.base_url" -> s"https://pekko.apache.org/api/pekko-http/${Dependencies.AkkaHttpBinaryVersion}/",
- "extref.akka-grpc.base_url" -> s"https://pekko.apache.org/docs/pekko-grpc/current/%s",
- "extref.akka-enhancements.base_url" -> s"https://pekko.apache.org/docs/pekko-enhancements/current/%s",
+ "pekko.version" -> Dependencies.PekkoVersion,
+ "extref.pekko.base_url" -> s"https://pekko.apache.org/docs/pekko/current/%s",
+ "scaladoc.pekko.base_url" -> s"https://pekko.apache.org/api/pekko/current/",
+ "extref.pekko-http.base_url" -> s"https://pekko.apache.org/docs/pekko-http/current/%s",
+ "scaladoc.pekko.http.base_url" -> s"https://pekko.apache.org/api/pekko-http/current/",
+ "extref.pekko-grpc.base_url" -> s"https://pekko.apache.org/docs/pekko-grpc/current/%s",
+ "extref.akka-enhancements.base_url" -> s"https://docs.akka.io/docs/pekko-enhancements/current/%s",
"scaladoc.akka.management.base_url" -> s"/${(Preprocess / siteSubdirName).value}/"),
publishRsyncArtifacts += makeSite.value -> "www/",
publishRsyncHost := "akkarepo@gustav.akka.io")
diff --git a/discovery-aws-api-async/src/main/resources/reference.conf b/discovery-aws-api-async/src/main/resources/reference.conf
index 5272591..c146c49 100644
--- a/discovery-aws-api-async/src/main/resources/reference.conf
+++ b/discovery-aws-api-async/src/main/resources/reference.conf
@@ -1,14 +1,14 @@
######################################################
-# Akka Service Discovery AWS Config #
+# Apache Pekko Service Discovery AWS Config #
######################################################
-akka.discovery {
+pekko.discovery {
# Set the following in your application.conf if you want to use this discovery mechanism:
# method = aws-api-ecs-async
# ApiMayChange
aws-api-ecs-async {
- class = akka.discovery.awsapi.ecs.AsyncEcsServiceDiscovery
+ class = org.apache.pekko.discovery.awsapi.ecs.AsyncEcsServiceDiscovery
cluster = "default"
@@ -19,7 +19,7 @@ akka.discovery {
aws-api-ecs-task-set-async {
- class = akka.discovery.awsapi.ecs.AsyncEcsTaskSetDiscovery
+ class = org.apache.pekko.discovery.awsapi.ecs.AsyncEcsTaskSetDiscovery
cluster = "default"
diff --git a/discovery-aws-api-async/src/main/scala/akka/discovery/awsapi/ecs/AsyncEcsDiscovery.scala b/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsDiscovery.scala
similarity index 88%
rename from discovery-aws-api-async/src/main/scala/akka/discovery/awsapi/ecs/AsyncEcsDiscovery.scala
rename to discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsDiscovery.scala
index acf2751..77375e4 100644
--- a/discovery-aws-api-async/src/main/scala/akka/discovery/awsapi/ecs/AsyncEcsDiscovery.scala
+++ b/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsDiscovery.scala
@@ -11,13 +11,13 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.awsapi.ecs
+package org.apache.pekko.discovery.awsapi.ecs
import java.net.{ InetAddress, NetworkInterface }
import scala.collection.JavaConverters._
-import akka.annotation.ApiMayChange
+import org.apache.pekko.annotation.ApiMayChange
@ApiMayChange
object AsyncEcsDiscovery {
@@ -28,7 +28,7 @@ object AsyncEcsDiscovery {
// (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/container-metadata.html)
// that we ought to be able to use instead to find our IP address, but the
// metadata file does not get set when running on Fargate. So this is our
- // only option for determining what the canonical Akka and akka-management
+ // only option for determining what the canonical Apache Pekko and pekko-management
// hostname values should be set to.
def getContainerAddress: Either[String, InetAddress] =
NetworkInterface.getNetworkInterfaces.asScala
diff --git a/discovery-aws-api-async/src/main/scala/akka/discovery/awsapi/ecs/AsyncEcsServiceDiscovery.scala b/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsServiceDiscovery.scala
similarity index 90%
rename from discovery-aws-api-async/src/main/scala/akka/discovery/awsapi/ecs/AsyncEcsServiceDiscovery.scala
rename to discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsServiceDiscovery.scala
index 171a8b3..fc44027 100644
--- a/discovery-aws-api-async/src/main/scala/akka/discovery/awsapi/ecs/AsyncEcsServiceDiscovery.scala
+++ b/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsServiceDiscovery.scala
@@ -11,24 +11,22 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.awsapi.ecs
+package org.apache.pekko.discovery.awsapi.ecs
import java.net.InetAddress
import java.util.concurrent.TimeoutException
-
import scala.collection.JavaConverters._
import scala.collection.immutable.Seq
import scala.compat.java8.FutureConverters.toScala
import scala.concurrent.duration._
import scala.concurrent.{ ExecutionContext, Future }
import scala.util.Try
-
-import akka.actor.ActorSystem
-import akka.annotation.ApiMayChange
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.discovery.awsapi.ecs.AsyncEcsServiceDiscovery._
-import akka.discovery.{ Lookup, ServiceDiscovery }
-import akka.pattern.after
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.discovery.awsapi.ecs.AsyncEcsServiceDiscovery.{ resolveTasks, Tag }
+import org.apache.pekko.discovery.{ Lookup, ServiceDiscovery }
+import org.apache.pekko.pattern.after
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration
import software.amazon.awssdk.core.retry.RetryPolicy
import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient
@@ -38,7 +36,7 @@ import software.amazon.awssdk.services.ecs.model.{ Tag => _, _ }
@ApiMayChange
class AsyncEcsServiceDiscovery(system: ActorSystem) extends ServiceDiscovery {
- private[this] val config = system.settings.config.getConfig("akka.discovery.aws-api-ecs-async")
+ private[this] val config = system.settings.config.getConfig("pekko.discovery.aws-api-ecs-async")
private[this] val cluster = config.getString("cluster")
private[this] val tags = config
.getConfigList("tags")
diff --git a/discovery-aws-api-async/src/main/scala/akka/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala b/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala
similarity index 88%
rename from discovery-aws-api-async/src/main/scala/akka/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala
rename to discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala
index 1f127fe..5a4039e 100644
--- a/discovery-aws-api-async/src/main/scala/akka/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala
+++ b/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala
@@ -11,29 +11,27 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.awsapi.ecs
+package org.apache.pekko.discovery.awsapi.ecs
import java.net.InetAddress
import java.util.concurrent.TimeoutException
-
import scala.collection.JavaConverters._
import scala.collection.immutable.Seq
import scala.compat.java8.FutureConverters.toScala
import scala.concurrent.duration._
import scala.concurrent.{ ExecutionContext, Future }
import scala.util.Try
-
-import akka.actor.ActorSystem
-import akka.annotation.ApiMayChange
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.discovery.awsapi.ecs.AsyncEcsTaskSetDiscovery._
-import akka.discovery.{ Lookup, ServiceDiscovery }
-import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.unmarshalling.Unmarshal
-import akka.http.scaladsl.{ Http, HttpExt }
-import akka.pattern.after
-import akka.stream.Materializer
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.discovery.awsapi.ecs.AsyncEcsTaskSetDiscovery.resolveTasks
+import org.apache.pekko.discovery.{ Lookup, ServiceDiscovery }
+import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
+import org.apache.pekko.http.scaladsl.{ Http, HttpExt }
+import org.apache.pekko.pattern.after
+import org.apache.pekko.stream.Materializer
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration
import software.amazon.awssdk.core.retry.RetryPolicy
import software.amazon.awssdk.services.ecs._
@@ -50,7 +48,7 @@ import spray.json.DefaultJsonProtocol._
@ApiMayChange
class AsyncEcsTaskSetDiscovery(system: ActorSystem) extends ServiceDiscovery {
- private val config = system.settings.config.getConfig("akka.discovery.aws-api-ecs-task-set-async")
+ private val config = system.settings.config.getConfig("pekko.discovery.aws-api-ecs-task-set-async")
private val cluster = config.getString("cluster")
private lazy val ecsClient = {
diff --git a/discovery-aws-api/src/main/resources/reference.conf b/discovery-aws-api/src/main/resources/reference.conf
index fa80e5c..a34d967 100644
--- a/discovery-aws-api/src/main/resources/reference.conf
+++ b/discovery-aws-api/src/main/resources/reference.conf
@@ -1,8 +1,8 @@
######################################################
-# Akka Service Discovery AWS Config #
+# Apache Pekko Service Discovery AWS Config #
######################################################
-akka.discovery {
+pekko.discovery {
# Set the following in your application.conf if you want to use this discovery mechanism:
# method = aws-api-ec2-tag-based
aws-api-ec2-tag-based {
@@ -11,15 +11,15 @@ akka.discovery {
# or a single argument constructor that takes an ExtendedActorSystem
client-config = ""
- class = akka.discovery.awsapi.ec2.Ec2TagBasedServiceDiscovery
+ class = org.apache.pekko.discovery.awsapi.ec2.Ec2TagBasedServiceDiscovery
tag-key = "service"
# filters have to be in key=value format, separated by semi-colon
filters = ""
- # If you want multiple akka nodes (i.e. JVMs) per EC2 instance, set the following
- # to the list of Akka Management port numbers
+ # If you want multiple Pekko nodes (i.e. JVMs) per EC2 instance, set the following
+ # to the list of Pekko Management port numbers
ports = []
# client may use specified endpoint and region for example ec2.us-west-1.amazonaws.com and us-west-1
@@ -31,7 +31,7 @@ akka.discovery {
# method = aws-api-ecs
aws-api-ecs {
- class = akka.discovery.awsapi.ecs.EcsServiceDiscovery
+ class = org.apache.pekko.discovery.awsapi.ecs.EcsServiceDiscovery
cluster = "default"
diff --git a/discovery-aws-api/src/main/scala/akka/discovery/awsapi/ec2/Ec2TagBasedServiceDiscovery.scala b/discovery-aws-api/src/main/scala/org/apache/pekko/discovery/awsapi/ec2/Ec2TagBasedServiceDiscovery.scala
similarity index 90%
rename from discovery-aws-api/src/main/scala/akka/discovery/awsapi/ec2/Ec2TagBasedServiceDiscovery.scala
rename to discovery-aws-api/src/main/scala/org/apache/pekko/discovery/awsapi/ec2/Ec2TagBasedServiceDiscovery.scala
index 10394d7..9ea0ef2 100644
--- a/discovery-aws-api/src/main/scala/akka/discovery/awsapi/ec2/Ec2TagBasedServiceDiscovery.scala
+++ b/discovery-aws-api/src/main/scala/org/apache/pekko/discovery/awsapi/ec2/Ec2TagBasedServiceDiscovery.scala
@@ -11,23 +11,23 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.awsapi.ec2
+package org.apache.pekko.discovery.awsapi.ec2
-import java.net.InetAddress
-import java.util.concurrent.TimeoutException
-
-import akka.actor.ExtendedActorSystem
-import akka.annotation.InternalApi
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.discovery.awsapi.ec2.Ec2TagBasedServiceDiscovery._
-import akka.discovery.{ Lookup, ServiceDiscovery }
-import akka.event.Logging
-import akka.pattern.after
import com.amazonaws.ClientConfiguration
import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration
import com.amazonaws.retry.PredefinedRetryPolicies
import com.amazonaws.services.ec2.model.{ DescribeInstancesRequest, Filter, Reservation }
import com.amazonaws.services.ec2.{ AmazonEC2, AmazonEC2ClientBuilder }
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.discovery.awsapi.ec2.Ec2TagBasedServiceDiscovery.parseFiltersString
+import org.apache.pekko.discovery.{ Lookup, ServiceDiscovery }
+import org.apache.pekko.event.Logging
+import org.apache.pekko.pattern.after
+
+import java.net.InetAddress
+import java.util.concurrent.TimeoutException
import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.collection.immutable.Seq
@@ -55,9 +55,9 @@ final class Ec2TagBasedServiceDiscovery(system: ExtendedActorSystem) extends Ser
private val log = Logging(system, classOf[Ec2TagBasedServiceDiscovery])
- private implicit val ec: ExecutionContext = system.dispatchers.lookup("akka.actor.default-blocking-io-dispatcher")
+ private implicit val ec: ExecutionContext = system.dispatchers.lookup("pekko.actor.default-blocking-io-dispatcher")
- private val config = system.settings.config.getConfig("akka.discovery.aws-api-ec2-tag-based")
+ private val config = system.settings.config.getConfig("pekko.discovery.aws-api-ec2-tag-based")
private val clientConfigFqcn: Option[String] = { // FQCN of a class that extends com.amazonaws.ClientConfiguration
config.getString("client-config") match {
@@ -74,7 +74,7 @@ final class Ec2TagBasedServiceDiscovery(system: ExtendedActorSystem) extends Ser
private val preDefinedPorts =
config.getIntList("ports").asScala.toList match {
case Nil => None
- case list => Some(list) // Akka Management ports
+ case list => Some(list) // Pekko Management ports
}
private val runningInstancesFilter = new Filter("instance-state-name", List("running").asJava)
diff --git a/discovery-aws-api/src/main/scala/akka/discovery/awsapi/ecs/EcsServiceDiscovery.scala b/discovery-aws-api/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/EcsServiceDiscovery.scala
similarity index 90%
rename from discovery-aws-api/src/main/scala/akka/discovery/awsapi/ecs/EcsServiceDiscovery.scala
rename to discovery-aws-api/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/EcsServiceDiscovery.scala
index 922f606..505b93f 100644
--- a/discovery-aws-api/src/main/scala/akka/discovery/awsapi/ecs/EcsServiceDiscovery.scala
+++ b/discovery-aws-api/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/EcsServiceDiscovery.scala
@@ -11,21 +11,21 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.awsapi.ecs
+package org.apache.pekko.discovery.awsapi.ecs
import java.net.{ InetAddress, NetworkInterface }
import java.util.concurrent.TimeoutException
-
-import akka.actor.ActorSystem
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.discovery.{ Lookup, ServiceDiscovery }
-import akka.discovery.awsapi.ecs.EcsServiceDiscovery._
-import akka.pattern.after
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.discovery.{ Lookup, ServiceDiscovery }
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.discovery.awsapi.ecs.EcsServiceDiscovery.resolveTasks
+import org.apache.pekko.pattern.after
import com.amazonaws.ClientConfiguration
import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration
import com.amazonaws.retry.PredefinedRetryPolicies
import com.amazonaws.services.ecs.model.{ DescribeTasksRequest, DesiredStatus, ListTasksRequest, Task }
import com.amazonaws.services.ecs.{ AmazonECS, AmazonECSClientBuilder }
+
import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.collection.immutable.Seq
@@ -35,7 +35,7 @@ import scala.util.Try
final class EcsServiceDiscovery(system: ActorSystem) extends ServiceDiscovery {
- private[this] val config = system.settings.config.getConfig("akka.discovery.aws-api-ecs")
+ private[this] val config = system.settings.config.getConfig("pekko.discovery.aws-api-ecs")
private[this] val cluster = config.getString("cluster")
private[this] lazy val ecsClient = {
@@ -83,7 +83,7 @@ object EcsServiceDiscovery {
// (https://docs.aws.amazon.com/AmazonECS/latest/developerguide/container-metadata.html)
// that we ought to be able to use instead to find our IP address, but the
// metadata file does not get set when running on Fargate. So this is our
- // only option for determining what the canonical Akka and akka-management
+ // only option for determining what the canonical Apache Pekko and pekko-management
// hostname values should be set to.
private[awsapi] def getContainerAddress: Either[String, InetAddress] =
NetworkInterface.getNetworkInterfaces.asScala
diff --git a/discovery-aws-api/src/test/java/akka/discovery/awsapi/ec2/MyConfiguration.java b/discovery-aws-api/src/test/java/org/apache/pekko/discovery/awsapi/ec2/MyConfiguration.java
similarity index 95%
rename from discovery-aws-api/src/test/java/akka/discovery/awsapi/ec2/MyConfiguration.java
rename to discovery-aws-api/src/test/java/org/apache/pekko/discovery/awsapi/ec2/MyConfiguration.java
index b7125b3..8b0e0b6 100644
--- a/discovery-aws-api/src/test/java/akka/discovery/awsapi/ec2/MyConfiguration.java
+++ b/discovery-aws-api/src/test/java/org/apache/pekko/discovery/awsapi/ec2/MyConfiguration.java
@@ -11,7 +11,7 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.awsapi.ec2;
+package org.apache.pekko.discovery.awsapi.ec2;
//#custom-client-config
// package com.example;
diff --git a/discovery-aws-api/src/test/scala/akka/discovery/awsapi/ec2/Docs.scala b/discovery-aws-api/src/test/scala/org/apache/pekko/discovery/awsapi/ec2/Docs.scala
similarity index 95%
rename from discovery-aws-api/src/test/scala/akka/discovery/awsapi/ec2/Docs.scala
rename to discovery-aws-api/src/test/scala/org/apache/pekko/discovery/awsapi/ec2/Docs.scala
index b309f22..a570f2b 100644
--- a/discovery-aws-api/src/test/scala/akka/discovery/awsapi/ec2/Docs.scala
+++ b/discovery-aws-api/src/test/scala/org/apache/pekko/discovery/awsapi/ec2/Docs.scala
@@ -11,7 +11,7 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.awsapi.ec2
+package org.apache.pekko.discovery.awsapi.ec2
object Docs {
diff --git a/discovery-aws-api/src/test/scala/akka/discovery/awsapi/ec2/Ec2TagBasedSimpleServiceDiscoveryTest.scala b/discovery-aws-api/src/test/scala/org/apache/pekko/discovery/awsapi/ec2/Ec2TagBasedSimpleServiceDiscoveryTest.scala
similarity index 92%
rename from discovery-aws-api/src/test/scala/akka/discovery/awsapi/ec2/Ec2TagBasedSimpleServiceDiscoveryTest.scala
rename to discovery-aws-api/src/test/scala/org/apache/pekko/discovery/awsapi/ec2/Ec2TagBasedSimpleServiceDiscoveryTest.scala
index ac24360..13c914c 100644
--- a/discovery-aws-api/src/test/scala/akka/discovery/awsapi/ec2/Ec2TagBasedSimpleServiceDiscoveryTest.scala
+++ b/discovery-aws-api/src/test/scala/org/apache/pekko/discovery/awsapi/ec2/Ec2TagBasedSimpleServiceDiscoveryTest.scala
@@ -11,10 +11,10 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.awsapi.ec2
+package org.apache.pekko.discovery.awsapi.ec2
-import akka.discovery.awsapi.ec2.Ec2TagBasedServiceDiscovery.parseFiltersString
import com.amazonaws.services.ec2.model.Filter
+import org.apache.pekko.discovery.awsapi.ec2.Ec2TagBasedServiceDiscovery.parseFiltersString
import org.scalatest.funsuite.AnyFunSuite
import org.scalatest.matchers.should.Matchers
diff --git a/discovery-consul/src/main/resources/reference.conf b/discovery-consul/src/main/resources/reference.conf
index d60c896..42ff8cd 100644
--- a/discovery-consul/src/main/resources/reference.conf
+++ b/discovery-consul/src/main/resources/reference.conf
@@ -1,14 +1,14 @@
######################################################
-# Akka Service Discovery Consul Config #
+# Apache Pekko Service Discovery Consul Config #
######################################################
-akka.discovery {
+pekko.discovery {
# Set the following in your application.conf if you want to use this discovery mechanism:
- # impl = akka-consul
+ # impl = pekko-consul
# ApiMayChange
- akka-consul {
- class = akka.discovery.consul.ConsulServiceDiscovery
+ pekko-consul {
+ class = org.apache.pekko.discovery.consul.ConsulServiceDiscovery
consul-host = "127.0.0.1"
consul-port = 8500
@@ -18,8 +18,8 @@ akka.discovery {
# i.e. `system:test` will be found in cluster if the cluster system is named `test`
application-name-tag-prefix = "system:"
- # Prefix for tag containing port number where akka management is set up so that
- # the seed nodes can be found, an example value for the tag would be `akka-management-port:19999`
- application-akka-management-port-tag-prefix = "akka-management-port:"
+ # Prefix for tag containing port number where Pekko management is set up so that
+ # the seed nodes can be found, an example value for the tag would be `pekko-management-port:19999`
+ application-pekko-management-port-tag-prefix = "pekko-management-port:"
}
}
diff --git a/discovery-consul/src/main/scala/akka/discovery/consul/ConsulServiceDiscovery.scala b/discovery-consul/src/main/scala/org/apache/pekko/discovery/consul/ConsulServiceDiscovery.scala
similarity index 88%
rename from discovery-consul/src/main/scala/akka/discovery/consul/ConsulServiceDiscovery.scala
rename to discovery-consul/src/main/scala/org/apache/pekko/discovery/consul/ConsulServiceDiscovery.scala
index 0d34a04..60865a3 100644
--- a/discovery-consul/src/main/scala/akka/discovery/consul/ConsulServiceDiscovery.scala
+++ b/discovery-consul/src/main/scala/org/apache/pekko/discovery/consul/ConsulServiceDiscovery.scala
@@ -11,32 +11,30 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.consul
+package org.apache.pekko.discovery.consul
-import java.net.InetAddress
-import java.util
-import java.util.concurrent.TimeoutException
-
-import akka.actor.ActorSystem
-import scala.collection.immutable.Seq
-import scala.concurrent.{ ExecutionContext, Future, Promise }
-
-import akka.pattern.after
import com.google.common.net.HostAndPort
import com.orbitz.consul.Consul
import com.orbitz.consul.async.ConsulResponseCallback
import com.orbitz.consul.model.ConsulResponse
-import ConsulServiceDiscovery._
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.discovery.{ Lookup, ServiceDiscovery }
import com.orbitz.consul.model.catalog.CatalogService
import com.orbitz.consul.option.QueryOptions
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.discovery.consul.ConsulServiceDiscovery._
+import org.apache.pekko.discovery.{ Lookup, ServiceDiscovery }
+import org.apache.pekko.pattern.after
+
+import java.net.InetAddress
+import java.util
+import java.util.concurrent.TimeoutException
import scala.collection.JavaConverters._
+import scala.collection.immutable.Seq
import scala.concurrent.duration.FiniteDuration
+import scala.concurrent.{ ExecutionContext, Future, Promise }
import scala.util.Try
-import akka.annotation.ApiMayChange
-
@ApiMayChange
class ConsulServiceDiscovery(system: ActorSystem) extends ServiceDiscovery {
@@ -70,8 +68,8 @@ class ConsulServiceDiscovery(system: ActorSystem) extends ServiceDiscovery {
private def extractResolvedTargetFromCatalogService(catalogService: CatalogService) = {
val port = catalogService.getServiceTags.asScala
- .find(_.startsWith(settings.applicationAkkaManagementPortTagPrefix))
- .map(_.replace(settings.applicationAkkaManagementPortTagPrefix, ""))
+ .find(_.startsWith(settings.applicationPekkoManagementPortTagPrefix))
+ .map(_.replace(settings.applicationPekkoManagementPortTagPrefix, ""))
.flatMap { maybePort =>
Try(maybePort.toInt).toOption
}
diff --git a/discovery-consul/src/main/scala/akka/discovery/consul/ConsulSettings.scala b/discovery-consul/src/main/scala/org/apache/pekko/discovery/consul/ConsulSettings.scala
similarity index 69%
rename from discovery-consul/src/main/scala/akka/discovery/consul/ConsulSettings.scala
rename to discovery-consul/src/main/scala/org/apache/pekko/discovery/consul/ConsulSettings.scala
index e171194..488e219 100644
--- a/discovery-consul/src/main/scala/akka/discovery/consul/ConsulSettings.scala
+++ b/discovery-consul/src/main/scala/org/apache/pekko/discovery/consul/ConsulSettings.scala
@@ -11,23 +11,23 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.consul
+package org.apache.pekko.discovery.consul
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
-import akka.annotation.ApiMayChange
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
+import org.apache.pekko.annotation.ApiMayChange
@ApiMayChange
final class ConsulSettings(system: ExtendedActorSystem) extends Extension {
- private val consulConfig = system.settings.config.getConfig("akka.discovery.akka-consul")
+ private val consulConfig = system.settings.config.getConfig("pekko.discovery.pekko-consul")
val consulHost: String = consulConfig.getString("consul-host")
val consulPort: Int = consulConfig.getInt("consul-port")
val applicationNameTagPrefix: String = consulConfig.getString("application-name-tag-prefix")
- val applicationAkkaManagementPortTagPrefix: String =
- consulConfig.getString("application-akka-management-port-tag-prefix")
+ val applicationPekkoManagementPortTagPrefix: String =
+ consulConfig.getString("application-pekko-management-port-tag-prefix")
}
@ApiMayChange
diff --git a/discovery-consul/src/test/scala/akka/cluster/bootstrap/discovery/ConsulDiscoverySpec.scala b/discovery-consul/src/test/scala/org/apache/pekko/cluster/bootstrap/discovery/ConsulDiscoverySpec.scala
similarity index 87%
rename from discovery-consul/src/test/scala/akka/cluster/bootstrap/discovery/ConsulDiscoverySpec.scala
rename to discovery-consul/src/test/scala/org/apache/pekko/cluster/bootstrap/discovery/ConsulDiscoverySpec.scala
index b327583..5c29593 100644
--- a/discovery-consul/src/test/scala/akka/cluster/bootstrap/discovery/ConsulDiscoverySpec.scala
+++ b/discovery-consul/src/test/scala/org/apache/pekko/cluster/bootstrap/discovery/ConsulDiscoverySpec.scala
@@ -11,26 +11,25 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.bootstrap.discovery
+package org.apache.pekko.cluster.bootstrap.discovery
-import java.net.InetAddress
-
-import akka.actor.ActorSystem
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.discovery.consul.ConsulServiceDiscovery
-import akka.testkit.TestKitBase
import com.google.common.net.HostAndPort
import com.orbitz.consul.Consul
import com.orbitz.consul.model.catalog.ImmutableCatalogRegistration
import com.orbitz.consul.model.health.ImmutableService
import com.pszymczyk.consul.{ ConsulProcess, ConsulStarterBuilder }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.discovery.ServiceDiscovery.ResolvedTarget
+import org.apache.pekko.discovery.consul.ConsulServiceDiscovery
+import org.apache.pekko.testkit.TestKitBase
+import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.matchers.should.Matchers
import org.scalatest.time.{ Millis, Seconds, Span }
-import org.scalatest.BeforeAndAfterAll
+import org.scalatest.wordspec.AnyWordSpecLike
+import java.net.InetAddress
import scala.concurrent.duration._
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpecLike
class ConsulDiscoverySpec
extends AnyWordSpecLike
@@ -53,7 +52,7 @@ class ConsulDiscoverySpec
.service(
ImmutableService
.builder()
- .addTags(s"system:${system.name}", "akka-management-port:1234")
+ .addTags(s"system:${system.name}", "pekko-management-port:1234")
.address("127.0.0.1")
.id("test")
.service("test")
diff --git a/discovery-kubernetes-api/src/main/resources/reference.conf b/discovery-kubernetes-api/src/main/resources/reference.conf
index 08e337a..82e3742 100644
--- a/discovery-kubernetes-api/src/main/resources/reference.conf
+++ b/discovery-kubernetes-api/src/main/resources/reference.conf
@@ -1,13 +1,13 @@
######################################################
-# Akka Service Discovery Kubernetes API Config #
+# Apache Pekko Service Discovery Kubernetes API Config #
######################################################
-akka.discovery {
+pekko.discovery {
# Set the following in your application.conf if you want to use this discovery mechanism:
# method = kubernetes-api
kubernetes-api {
- class = akka.discovery.kubernetes.KubernetesApiServiceDiscovery
+ class = org.apache.pekko.discovery.kubernetes.KubernetesApiServiceDiscovery
# API server, cert and token information. Currently these are present on K8s versions: 1.6, 1.7, 1.8, and perhaps more
api-ca-path = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
diff --git a/discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/JsonFormat.scala b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/JsonFormat.scala
similarity index 71%
rename from discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/JsonFormat.scala
rename to discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/JsonFormat.scala
index 0d9f0a8..d07e45c 100644
--- a/discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/JsonFormat.scala
+++ b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/JsonFormat.scala
@@ -11,17 +11,25 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.kubernetes
+package org.apache.pekko.discovery.kubernetes
-import akka.annotation.InternalApi
-import akka.discovery.kubernetes.PodList._
-import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.discovery.kubernetes.PodList.{
+ Container,
+ ContainerPort,
+ ContainerStatus,
+ Metadata,
+ Pod,
+ PodSpec,
+ PodStatus
+}
+import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
import spray.json._
/**
* INTERNAL API
*/
-@InternalApi private[akka] object JsonFormat extends SprayJsonSupport with DefaultJsonProtocol {
+@InternalApi private[pekko] object JsonFormat extends SprayJsonSupport with DefaultJsonProtocol {
implicit val containerPortFormat: JsonFormat[ContainerPort] = jsonFormat2(ContainerPort)
implicit val containerFormat: JsonFormat[Container] = jsonFormat2(Container)
implicit val podSpecFormat: JsonFormat[PodSpec] = jsonFormat1(PodSpec)
diff --git a/discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/KubernetesApiServiceDiscovery.scala b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscovery.scala
similarity index 90%
rename from discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/KubernetesApiServiceDiscovery.scala
rename to discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscovery.scala
index b2847e7..457f474 100644
--- a/discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/KubernetesApiServiceDiscovery.scala
+++ b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscovery.scala
@@ -11,35 +11,34 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.kubernetes
+package org.apache.pekko.discovery.kubernetes
import java.net.InetAddress
import java.nio.file.Files
import java.nio.file.Paths
import java.security.KeyStore
import java.security.SecureRandom
-
import scala.collection.immutable.Seq
import scala.concurrent.Future
import scala.concurrent.duration.FiniteDuration
import scala.util.Try
import scala.util.control.NoStackTrace
import scala.util.control.NonFatal
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.discovery.kubernetes.JsonFormat._
+import org.apache.pekko.discovery.kubernetes.KubernetesApiServiceDiscovery.{ targets, KubernetesApiException }
+import org.apache.pekko.discovery.{ Lookup, ServiceDiscovery }
+import org.apache.pekko.event.Logging
+import org.apache.pekko.http.scaladsl.HttpsConnectionContext
+import org.apache.pekko.http.scaladsl._
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.model.headers.Authorization
+import org.apache.pekko.http.scaladsl.model.headers.OAuth2BearerToken
+import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
+import org.apache.pekko.pki.kubernetes.PemManagersProvider
-import akka.actor.ActorSystem
-import akka.annotation.InternalApi
-import akka.discovery.ServiceDiscovery.Resolved
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.discovery._
-import akka.discovery.kubernetes.JsonFormat._
-import akka.event.Logging
-import akka.http.scaladsl.HttpsConnectionContext
-import akka.http.scaladsl._
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.model.headers.Authorization
-import akka.http.scaladsl.model.headers.OAuth2BearerToken
-import akka.http.scaladsl.unmarshalling.Unmarshal
-import akka.pki.kubernetes.PemManagersProvider
import javax.net.ssl.KeyManager
import javax.net.ssl.KeyManagerFactory
import javax.net.ssl.SSLContext
@@ -103,7 +102,6 @@ object KubernetesApiServiceDiscovery {
*/
class KubernetesApiServiceDiscovery(implicit system: ActorSystem) extends ServiceDiscovery {
- import akka.discovery.kubernetes.KubernetesApiServiceDiscovery._
import system.dispatcher
private val http = Http()
diff --git a/discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/PodList.scala b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/PodList.scala
similarity index 92%
rename from discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/PodList.scala
rename to discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/PodList.scala
index e0b29fe..081193d 100644
--- a/discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/PodList.scala
+++ b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/PodList.scala
@@ -11,10 +11,10 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.kubernetes
+package org.apache.pekko.discovery.kubernetes
import scala.collection.immutable
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
/**
* INTERNAL API
diff --git a/discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/Settings.scala b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/Settings.scala
similarity index 93%
rename from discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/Settings.scala
rename to discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/Settings.scala
index c33484c..97558d4 100644
--- a/discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/Settings.scala
+++ b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/Settings.scala
@@ -11,11 +11,11 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.kubernetes
+package org.apache.pekko.discovery.kubernetes
import java.util.Optional
-import akka.actor._
+import org.apache.pekko.actor._
import com.typesafe.config.Config
import scala.compat.java8.OptionConverters._
@@ -23,7 +23,7 @@ import scala.compat.java8.OptionConverters._
final class Settings(system: ExtendedActorSystem) extends Extension {
/**
- * Copied from AkkaManagementSettings, which we don't depend on.
+ * Copied from PekkoManagementSettings, which we don't depend on.
*/
private implicit class HasDefined(val config: Config) {
def hasDefined(key: String): Boolean =
@@ -35,7 +35,7 @@ final class Settings(system: ExtendedActorSystem) extends Extension {
if (hasDefined(key)) Some(config.getString(key)) else None
}
- private val kubernetesApi = system.settings.config.getConfig("akka.discovery.kubernetes-api")
+ private val kubernetesApi = system.settings.config.getConfig("pekko.discovery.kubernetes-api")
val apiCaPath: String =
kubernetesApi.getString("api-ca-path")
diff --git a/discovery-kubernetes-api/src/test/java/docs/KubernetesApiDiscoveryDocsTest.java b/discovery-kubernetes-api/src/test/java/docs/KubernetesApiDiscoveryDocsTest.java
index 02a173f..4db66c6 100644
--- a/discovery-kubernetes-api/src/test/java/docs/KubernetesApiDiscoveryDocsTest.java
+++ b/discovery-kubernetes-api/src/test/java/docs/KubernetesApiDiscoveryDocsTest.java
@@ -13,9 +13,9 @@
package docs;
-import akka.actor.ActorSystem;
-import akka.discovery.Discovery;
-import akka.discovery.ServiceDiscovery;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.discovery.Discovery;
+import org.apache.pekko.discovery.ServiceDiscovery;
public class KubernetesApiDiscoveryDocsTest {
public void loadKubernetesApiDiscovery() {
diff --git a/discovery-kubernetes-api/src/test/resources/application.conf b/discovery-kubernetes-api/src/test/resources/application.conf
index 6009044..4a7d852 100644
--- a/discovery-kubernetes-api/src/test/resources/application.conf
+++ b/discovery-kubernetes-api/src/test/resources/application.conf
@@ -1,4 +1,4 @@
-akka.discovery {
+pekko.discovery {
kubernetes-api {
# Must exist to load K8s API discovery:
api-ca-path = "discovery-kubernetes-api/src/test/files/ca.crt"
diff --git a/discovery-kubernetes-api/src/test/resources/pods.json b/discovery-kubernetes-api/src/test/resources/pods.json
index b76bbf6..9298d10 100644
--- a/discovery-kubernetes-api/src/test/resources/pods.json
+++ b/discovery-kubernetes-api/src/test/resources/pods.json
@@ -8,26 +8,26 @@
"items": [
{
"metadata": {
- "name": "akka-cluster-tooling-example-v0-1-0-7f854bcc78-dvm9q",
- "generateName": "akka-cluster-tooling-example-v0-1-0-7f854bcc78-",
+ "name": "pekko-cluster-tooling-example-v0-1-0-7f854bcc78-dvm9q",
+ "generateName": "pekko-cluster-tooling-example-v0-1-0-7f854bcc78-",
"namespace": "default",
- "selfLink": "/api/v1/namespaces/default/pods/akka-cluster-tooling-example-v0-1-0-7f854bcc78-dvm9q",
+ "selfLink": "/api/v1/namespaces/default/pods/pekko-cluster-tooling-example-v0-1-0-7f854bcc78-dvm9q",
"uid": "5fe7a41b-da9a-11e7-b064-0800270d668b",
"resourceVersion": "6523",
"creationTimestamp": "2017-12-06T15:30:22Z",
"labels": {
- "appName": "akka-cluster-tooling-example",
- "appNameVersion": "akka-cluster-tooling-example-v0-1-0",
+ "appName": "pekko-cluster-tooling-example",
+ "appNameVersion": "pekko-cluster-tooling-example-v0-1-0",
"pod-template-hash": "3941067734"
},
"annotations": {
- "kubernetes.io/created-by": "{\"kind\":\"SerializedReference\",\"apiVersion\":\"v1\",\"reference\":{\"kind\":\"ReplicaSet\",\"namespace\":\"default\",\"name\":\"akka-cluster-tooling-example-v0-1-0-7f854bcc78\",\"uid\":\"5fdc6a1c-da9a-11e7-b064-0800270d668b\",\"apiVersion\":\"extensions\",\"resourceVersion\":\"3173\"}}\n"
+ "kubernetes.io/created-by": "{\"kind\":\"SerializedReference\",\"apiVersion\":\"v1\",\"reference\":{\"kind\":\"ReplicaSet\",\"namespace\":\"default\",\"name\":\"pekko-cluster-tooling-example-v0-1-0-7f854bcc78\",\"uid\":\"5fdc6a1c-da9a-11e7-b064-0800270d668b\",\"apiVersion\":\"extensions\",\"resourceVersion\":\"3173\"}}\n"
},
"ownerReferences": [
{
"apiVersion": "extensions/v1beta1",
"kind": "ReplicaSet",
- "name": "akka-cluster-tooling-example-v0-1-0-7f854bcc78",
+ "name": "pekko-cluster-tooling-example-v0-1-0-7f854bcc78",
"uid": "5fdc6a1c-da9a-11e7-b064-0800270d668b",
"controller": true,
"blockOwnerDeletion": true
@@ -46,8 +46,8 @@
],
"containers": [
{
- "name": "akka-cluster-tooling-example",
- "image": "akka-cluster-tooling-example/akka-cluster-tooling-example:0.1.0",
+ "name": "pekko-cluster-tooling-example",
+ "image": "pekko-cluster-tooling-example/pekko-cluster-tooling-example:0.1.0",
"ports": [
{
"name": "akka-remote",
@@ -72,7 +72,7 @@
},
{
"name": "RP_APP_NAME",
- "value": "akka-cluster-tooling-example"
+ "value": "pekko-cluster-tooling-example"
},
{
"name": "RP_APP_TYPE",
@@ -248,7 +248,7 @@
},
{
"name": "RP_JAVA_OPTS",
- "value": "-Dconfig.resource=rp-application.conf -Dakka.cluster.bootstrap.contact-point-discovery.effective-name=akka-cluster-tooling-example -Dakka.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=3"
+ "value": "-Dconfig.resource=rp-application.conf -Dpekko.cluster.bootstrap.contact-point-discovery.effective-name=pekko-cluster-tooling-example -Dpekko.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=3"
},
{
"name": "RP_KUBERNETES_POD_IP",
@@ -270,7 +270,7 @@
},
{
"name": "RP_MODULES",
- "value": "akka-cluster-bootstrapping,common,service-discovery"
+ "value": "pekko-cluster-bootstrapping,common,service-discovery"
},
{
"name": "RP_PLATFORM",
@@ -330,7 +330,7 @@
"startTime": "2017-12-06T15:30:22Z",
"containerStatuses": [
{
- "name": "akka-cluster-tooling-example",
+ "name": "pekko-cluster-tooling-example",
"state": {
"running": {
"startedAt": "2017-12-06T17:36:57Z"
@@ -347,7 +347,7 @@
},
"ready": true,
"restartCount": 1,
- "image": "akka-cluster-tooling-example/akka-cluster-tooling-example:0.1.0",
+ "image": "pekko-cluster-tooling-example/pekko-cluster-tooling-example:0.1.0",
"imageID": "docker://sha256:db3827171cfd7cea96f35e75e9df30e198f25b66a8e75e8167b09ad9e1a18c10",
"containerID": "docker://d805076f4737166117229aaa4eaf5e7eb974da0b4c781b2f6ec126d5046a4c3f"
}
@@ -357,26 +357,26 @@
},
{
"metadata": {
- "name": "akka-cluster-tooling-example-v0-1-0-7f854bcc78-m8dqb",
- "generateName": "akka-cluster-tooling-example-v0-1-0-7f854bcc78-",
+ "name": "pekko-cluster-tooling-example-v0-1-0-7f854bcc78-m8dqb",
+ "generateName": "pekko-cluster-tooling-example-v0-1-0-7f854bcc78-",
"namespace": "default",
- "selfLink": "/api/v1/namespaces/default/pods/akka-cluster-tooling-example-v0-1-0-7f854bcc78-m8dqb",
+ "selfLink": "/api/v1/namespaces/default/pods/pekko-cluster-tooling-example-v0-1-0-7f854bcc78-m8dqb",
"uid": "5fe22476-da9a-11e7-b064-0800270d668b",
"resourceVersion": "6520",
"creationTimestamp": "2017-12-06T15:30:22Z",
"labels": {
- "appNameVersion": "akka-cluster-tooling-example-v0-1-0",
+ "appNameVersion": "pekko-cluster-tooling-example-v0-1-0",
"pod-template-hash": "3941067734",
- "appName": "akka-cluster-tooling-example"
+ "appName": "pekko-cluster-tooling-example"
},
"annotations": {
- "kubernetes.io/created-by": "{\"kind\":\"SerializedReference\",\"apiVersion\":\"v1\",\"reference\":{\"kind\":\"ReplicaSet\",\"namespace\":\"default\",\"name\":\"akka-cluster-tooling-example-v0-1-0-7f854bcc78\",\"uid\":\"5fdc6a1c-da9a-11e7-b064-0800270d668b\",\"apiVersion\":\"extensions\",\"resourceVersion\":\"3173\"}}\n"
+ "kubernetes.io/created-by": "{\"kind\":\"SerializedReference\",\"apiVersion\":\"v1\",\"reference\":{\"kind\":\"ReplicaSet\",\"namespace\":\"default\",\"name\":\"pekko-cluster-tooling-example-v0-1-0-7f854bcc78\",\"uid\":\"5fdc6a1c-da9a-11e7-b064-0800270d668b\",\"apiVersion\":\"extensions\",\"resourceVersion\":\"3173\"}}\n"
},
"ownerReferences": [
{
"apiVersion": "extensions/v1beta1",
"kind": "ReplicaSet",
- "name": "akka-cluster-tooling-example-v0-1-0-7f854bcc78",
+ "name": "pekko-cluster-tooling-example-v0-1-0-7f854bcc78",
"uid": "5fdc6a1c-da9a-11e7-b064-0800270d668b",
"controller": true,
"blockOwnerDeletion": true
@@ -395,8 +395,8 @@
],
"containers": [
{
- "name": "akka-cluster-tooling-example",
- "image": "akka-cluster-tooling-example/akka-cluster-tooling-example:0.1.0",
+ "name": "pekko-cluster-tooling-example",
+ "image": "pekko-cluster-tooling-example/pekko-cluster-tooling-example:0.1.0",
"ports": [
{
"name": "akka-remote",
@@ -421,7 +421,7 @@
},
{
"name": "RP_APP_NAME",
- "value": "akka-cluster-tooling-example"
+ "value": "pekko-cluster-tooling-example"
},
{
"name": "RP_APP_TYPE",
@@ -597,7 +597,7 @@
},
{
"name": "RP_JAVA_OPTS",
- "value": "-Dconfig.resource=rp-application.conf -Dakka.cluster.bootstrap.contact-point-discovery.effective-name=akka-cluster-tooling-example -Dakka.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=3"
+ "value": "-Dconfig.resource=rp-application.conf -Dpekko.cluster.bootstrap.contact-point-discovery.effective-name=pekko-cluster-tooling-example -Dpekko.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=3"
},
{
"name": "RP_KUBERNETES_POD_IP",
@@ -619,7 +619,7 @@
},
{
"name": "RP_MODULES",
- "value": "akka-cluster-bootstrapping,common,service-discovery"
+ "value": "pekko-cluster-bootstrapping,common,service-discovery"
},
{
"name": "RP_PLATFORM",
@@ -679,7 +679,7 @@
"startTime": "2017-12-06T15:30:22Z",
"containerStatuses": [
{
- "name": "akka-cluster-tooling-example",
+ "name": "pekko-cluster-tooling-example",
"state": {
"running": {
"startedAt": "2017-12-06T17:36:57Z"
@@ -696,7 +696,7 @@
},
"ready": true,
"restartCount": 1,
- "image": "akka-cluster-tooling-example/akka-cluster-tooling-example:0.1.0",
+ "image": "pekko-cluster-tooling-example/pekko-cluster-tooling-example:0.1.0",
"imageID": "docker://sha256:db3827171cfd7cea96f35e75e9df30e198f25b66a8e75e8167b09ad9e1a18c10",
"containerID": "docker://ba80f96ce994517bc2d49d2930923c54b818bdd3a1aa8e60e42944e8ac4bf730"
}
@@ -706,27 +706,27 @@
},
{
"metadata": {
- "name": "akka-cluster-tooling-example-v0-1-0-7f854bcc78-xncvj",
- "generateName": "akka-cluster-tooling-example-v0-1-0-7f854bcc78-",
+ "name": "pekko-cluster-tooling-example-v0-1-0-7f854bcc78-xncvj",
+ "generateName": "pekko-cluster-tooling-example-v0-1-0-7f854bcc78-",
"namespace": "default",
- "selfLink": "/api/v1/namespaces/default/pods/akka-cluster-tooling-example-v0-1-0-7f854bcc78-xncvj",
+ "selfLink": "/api/v1/namespaces/default/pods/pekko-cluster-tooling-example-v0-1-0-7f854bcc78-xncvj",
"uid": "5fe6b0c7-da9a-11e7-b064-0800270d668b",
"resourceVersion": "6593",
"creationTimestamp": "2017-12-06T15:30:22Z",
"deletionTimestamp": "2017-12-06T16:30:22Z",
"labels": {
"pod-template-hash": "3941067734",
- "appName": "akka-cluster-tooling-example",
- "appNameVersion": "akka-cluster-tooling-example-v0-1-0"
+ "appName": "pekko-cluster-tooling-example",
+ "appNameVersion": "pekko-cluster-tooling-example-v0-1-0"
},
"annotations": {
- "kubernetes.io/created-by": "{\"kind\":\"SerializedReference\",\"apiVersion\":\"v1\",\"reference\":{\"kind\":\"ReplicaSet\",\"namespace\":\"default\",\"name\":\"akka-cluster-tooling-example-v0-1-0-7f854bcc78\",\"uid\":\"5fdc6a1c-da9a-11e7-b064-0800270d668b\",\"apiVersion\":\"extensions\",\"resourceVersion\":\"3173\"}}\n"
+ "kubernetes.io/created-by": "{\"kind\":\"SerializedReference\",\"apiVersion\":\"v1\",\"reference\":{\"kind\":\"ReplicaSet\",\"namespace\":\"default\",\"name\":\"pekko-cluster-tooling-example-v0-1-0-7f854bcc78\",\"uid\":\"5fdc6a1c-da9a-11e7-b064-0800270d668b\",\"apiVersion\":\"extensions\",\"resourceVersion\":\"3173\"}}\n"
},
"ownerReferences": [
{
"apiVersion": "extensions/v1beta1",
"kind": "ReplicaSet",
- "name": "akka-cluster-tooling-example-v0-1-0-7f854bcc78",
+ "name": "pekko-cluster-tooling-example-v0-1-0-7f854bcc78",
"uid": "5fdc6a1c-da9a-11e7-b064-0800270d668b",
"controller": true,
"blockOwnerDeletion": true
@@ -745,8 +745,8 @@
],
"containers": [
{
- "name": "akka-cluster-tooling-example",
- "image": "akka-cluster-tooling-example/akka-cluster-tooling-example:0.1.0",
+ "name": "pekko-cluster-tooling-example",
+ "image": "pekko-cluster-tooling-example/pekko-cluster-tooling-example:0.1.0",
"ports": [
{
"name": "akka-remote",
@@ -771,7 +771,7 @@
},
{
"name": "RP_APP_NAME",
- "value": "akka-cluster-tooling-example"
+ "value": "pekko-cluster-tooling-example"
},
{
"name": "RP_APP_TYPE",
@@ -947,7 +947,7 @@
},
{
"name": "RP_JAVA_OPTS",
- "value": "-Dconfig.resource=rp-application.conf -Dakka.cluster.bootstrap.contact-point-discovery.effective-name=akka-cluster-tooling-example -Dakka.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=3"
+ "value": "-Dconfig.resource=rp-application.conf -Dpekko.cluster.bootstrap.contact-point-discovery.effective-name=pekko-cluster-tooling-example -Dpekko.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=3"
},
{
"name": "RP_KUBERNETES_POD_IP",
@@ -969,7 +969,7 @@
},
{
"name": "RP_MODULES",
- "value": "akka-cluster-bootstrapping,common,service-discovery"
+ "value": "pekko-cluster-bootstrapping,common,service-discovery"
},
{
"name": "RP_PLATFORM",
@@ -1029,7 +1029,7 @@
"startTime": "2017-12-06T15:30:22Z",
"containerStatuses": [
{
- "name": "akka-cluster-tooling-example",
+ "name": "pekko-cluster-tooling-example",
"state": {
"running": {
"startedAt": "2017-12-06T17:37:16Z"
@@ -1046,7 +1046,7 @@
},
"ready": true,
"restartCount": 1,
- "image": "akka-cluster-tooling-example/akka-cluster-tooling-example:0.1.0",
+ "image": "pekko-cluster-tooling-example/pekko-cluster-tooling-example:0.1.0",
"imageID": "docker://sha256:db3827171cfd7cea96f35e75e9df30e198f25b66a8e75e8167b09ad9e1a18c10",
"containerID": "docker://075e85c889ffd715849f8d683702623790c44f93beeea5711a63a8b6ef9e5272"
}
@@ -1056,16 +1056,16 @@
},
{
"metadata": {
- "name": "akka-cluster-tooling-example-job-mt4qt",
- "generateName": "akka-cluster-tooling-example-job-",
+ "name": "pekko-cluster-tooling-example-job-mt4qt",
+ "generateName": "pekko-cluster-tooling-example-job-",
"namespace": "default",
- "selfLink": "/api/v1/namespaces/default/pods/akka-cluster-tooling-example-job-mt4qt",
+ "selfLink": "/api/v1/namespaces/default/pods/pekko-cluster-tooling-example-job-mt4qt",
"uid": "01b49788-4f17-11e9-b630-0262c2d3ba30",
"resourceVersion": "7406832",
"creationTimestamp": "2019-03-25T15:59:44Z",
"labels": {
- "appName": "akka-cluster-tooling-example",
- "appNameVersion": "akka-cluster-tooling-example-v0-1-0"
+ "appName": "pekko-cluster-tooling-example",
+ "appNameVersion": "pekko-cluster-tooling-example-v0-1-0"
},
"annotations": {
},
@@ -1073,7 +1073,7 @@
{
"apiVersion": "batch/v1",
"kind": "Job",
- "name": "akka-cluster-tooling-example-job",
+ "name": "pekko-cluster-tooling-example-job",
"uid": "01b337d0-4f17-11e9-b5d6-06521d8a9508",
"controller": true,
"blockOwnerDeletion": true
@@ -1086,10 +1086,10 @@
],
"containers": [
{
- "name": "akka-cluster-tooling-example",
- "image": "akka-cluster-tooling-example/akka-cluster-tooling-example:0.1.0",
+ "name": "pekko-cluster-tooling-example",
+ "image": "pekko-cluster-tooling-example/pekko-cluster-tooling-example:0.1.0",
"command": [
- "/opt/docker/bin/akka-cluster-tooling-example"
+ "/opt/docker/bin/pekko-cluster-tooling-example"
],
"ports": [
{
@@ -1174,7 +1174,7 @@
"startTime": "2019-03-25T15:59:44Z",
"containerStatuses": [
{
- "name": "akka-cluster-tooling-example",
+ "name": "pekko-cluster-tooling-example",
"state": {
"terminated": {
"exitCode": 0,
@@ -1189,8 +1189,8 @@
},
"ready": false,
"restartCount": 0,
- "image": "akka-cluster-tooling-example/akka-cluster-tooling-example:0.1.0",
- "imageID": "docker-pullable://akka-cluster-tooling-example/akka-cluster-tooling-example@sha256:94d0f1283a3e4f3bb2c69d3209c60e7700e7a02fe34daad3052b11908916aee2",
+ "image": "pekko-cluster-tooling-example/pekko-cluster-tooling-example:0.1.0",
+ "imageID": "docker-pullable://pekko-cluster-tooling-example/pekko-cluster-tooling-example@sha256:94d0f1283a3e4f3bb2c69d3209c60e7700e7a02fe34daad3052b11908916aee2",
"containerID": "docker://12d48773f0dd89624cd4e6b2ce66b0b2918e569d52440f4861f646539d54cd57"
}
],
diff --git a/discovery-kubernetes-api/src/test/scala/akka/discovery/kubernetes/JsonFormatSpec.scala b/discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/JsonFormatSpec.scala
similarity index 77%
rename from discovery-kubernetes-api/src/test/scala/akka/discovery/kubernetes/JsonFormatSpec.scala
rename to discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/JsonFormatSpec.scala
index f0c488b..7851d1b 100644
--- a/discovery-kubernetes-api/src/test/scala/akka/discovery/kubernetes/JsonFormatSpec.scala
+++ b/discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/JsonFormatSpec.scala
@@ -11,7 +11,7 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.kubernetes
+package org.apache.pekko.discovery.kubernetes
import spray.json._
import scala.io.Source
@@ -29,7 +29,7 @@ class JsonFormatSpec extends AnyWordSpec with Matchers {
List(
Pod(
Some(PodSpec(List(Container(
- "akka-cluster-tooling-example",
+ "pekko-cluster-tooling-example",
Some(List(
ContainerPort(Some("akka-remote"), 10000),
ContainerPort(Some("management"), 10001),
@@ -37,12 +37,12 @@ class JsonFormatSpec extends AnyWordSpec with Matchers {
Some(
PodStatus(
Some("172.17.0.4"),
- Some(List(ContainerStatus("akka-cluster-tooling-example", Map(("running", ()))))),
+ Some(List(ContainerStatus("pekko-cluster-tooling-example", Map(("running", ()))))),
Some("Running"))),
Some(Metadata(deletionTimestamp = None))),
Pod(
Some(PodSpec(List(Container(
- "akka-cluster-tooling-example",
+ "pekko-cluster-tooling-example",
Some(List(
ContainerPort(Some("akka-remote"), 10000),
ContainerPort(Some("management"), 10001),
@@ -50,12 +50,12 @@ class JsonFormatSpec extends AnyWordSpec with Matchers {
Some(
PodStatus(
Some("172.17.0.6"),
- Some(List(ContainerStatus("akka-cluster-tooling-example", Map(("running", ()))))),
+ Some(List(ContainerStatus("pekko-cluster-tooling-example", Map(("running", ()))))),
Some("Running"))),
Some(Metadata(deletionTimestamp = None))),
Pod(
Some(PodSpec(List(Container(
- "akka-cluster-tooling-example",
+ "pekko-cluster-tooling-example",
Some(List(
ContainerPort(Some("akka-remote"), 10000),
ContainerPort(Some("management"), 10001),
@@ -63,16 +63,16 @@ class JsonFormatSpec extends AnyWordSpec with Matchers {
Some(
PodStatus(
Some("172.17.0.7"),
- Some(List(ContainerStatus("akka-cluster-tooling-example", Map(("running", ()))))),
+ Some(List(ContainerStatus("pekko-cluster-tooling-example", Map(("running", ()))))),
Some("Running"))),
Some(Metadata(deletionTimestamp = Some("2017-12-06T16:30:22Z")))),
Pod(
Some(PodSpec(
- List(Container("akka-cluster-tooling-example", Some(List(ContainerPort(Some("management"), 10001))))))),
+ List(Container("pekko-cluster-tooling-example", Some(List(ContainerPort(Some("management"), 10001))))))),
Some(
PodStatus(
Some("172.17.0.47"),
- Some(List(ContainerStatus("akka-cluster-tooling-example", Map(("terminated", ()))))),
+ Some(List(ContainerStatus("pekko-cluster-tooling-example", Map(("terminated", ()))))),
Some("Succeeded"))),
Some(Metadata(deletionTimestamp = None)))))
}
diff --git a/discovery-kubernetes-api/src/test/scala/akka/discovery/kubernetes/KubernetesApiServiceDiscoverySpec.scala b/discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscoverySpec.scala
similarity index 92%
rename from discovery-kubernetes-api/src/test/scala/akka/discovery/kubernetes/KubernetesApiServiceDiscoverySpec.scala
rename to discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscoverySpec.scala
index 02320c2..e7dfcfc 100644
--- a/discovery-kubernetes-api/src/test/scala/akka/discovery/kubernetes/KubernetesApiServiceDiscoverySpec.scala
+++ b/discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscoverySpec.scala
@@ -11,13 +11,13 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.kubernetes
+package org.apache.pekko.discovery.kubernetes
import java.net.InetAddress
-import PodList.{ Pod, _ }
-import akka.actor.ActorSystem
-import akka.discovery.Discovery
-import akka.discovery.ServiceDiscovery.ResolvedTarget
+import PodList._
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.discovery.Discovery
+import org.apache.pekko.discovery.ServiceDiscovery.ResolvedTarget
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
@@ -31,7 +31,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec with Matchers {
List(
Pod(
Some(PodSpec(List(Container(
- "akka-cluster-tooling-example",
+ "pekko-cluster-tooling-example",
Some(List(
ContainerPort(Some("akka-remote"), 10000),
ContainerPort(Some("management"), 10001),
@@ -40,7 +40,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec with Matchers {
Some(Metadata(deletionTimestamp = None))),
Pod(
Some(PodSpec(List(Container(
- "akka-cluster-tooling-example",
+ "pekko-cluster-tooling-example",
Some(List(
ContainerPort(Some("akka-remote"), 10000),
ContainerPort(Some("management"), 10001),
@@ -61,7 +61,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec with Matchers {
PodList(
List(Pod(
Some(PodSpec(List(Container(
- "akka-cluster-tooling-example",
+ "pekko-cluster-tooling-example",
Some(List(
ContainerPort(Some("akka-remote"), 10000),
ContainerPort(Some("management"), 10001),
@@ -85,7 +85,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec with Matchers {
// Pod with multiple ports
Pod(
Some(PodSpec(List(Container(
- "akka-cluster-tooling-example",
+ "pekko-cluster-tooling-example",
Some(List(
ContainerPort(Some("akka-remote"), 10000),
ContainerPort(Some("management"), 10001),
@@ -94,14 +94,14 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec with Matchers {
Some(Metadata(deletionTimestamp = None))),
// Pod with no ports
Pod(
- Some(PodSpec(List(Container("akka-cluster-tooling-example", None)))),
+ Some(PodSpec(List(Container("pekko-cluster-tooling-example", None)))),
Some(PodStatus(Some("172.17.0.5"), Some(Nil), Some("Running"))),
Some(Metadata(deletionTimestamp = None))),
// Pod with multiple containers
Pod(
Some(PodSpec(List(
Container(
- "akka-cluster-tooling-example",
+ "pekko-cluster-tooling-example",
Some(List(ContainerPort(Some("akka-remote"), 10000), ContainerPort(Some("management"), 10001)))),
Container("sidecar", Some(List(ContainerPort(Some("http"), 10002))))))),
Some(PodStatus(Some("172.17.0.6"), Some(Nil), Some("Running"))),
@@ -127,7 +127,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec with Matchers {
PodList(
List(Pod(
Some(PodSpec(List(Container(
- "akka-cluster-tooling-example",
+ "pekko-cluster-tooling-example",
Some(List(
ContainerPort(Some("akka-remote"), 10000),
ContainerPort(Some("management"), 10001),
@@ -183,7 +183,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec with Matchers {
List(
Pod(
Some(PodSpec(List(Container(
- "akka-cluster-tooling-example",
+ "pekko-cluster-tooling-example",
Some(List(
ContainerPort(Some("akka-remote"), 10000),
ContainerPort(Some("management"), 10001),
diff --git a/discovery-marathon-api/src/main/resources/reference.conf b/discovery-marathon-api/src/main/resources/reference.conf
index 0a46505..3c253a5 100644
--- a/discovery-marathon-api/src/main/resources/reference.conf
+++ b/discovery-marathon-api/src/main/resources/reference.conf
@@ -1,21 +1,21 @@
######################################################
-# Akka Service Discovery Marathon API Config #
+# Apache Pekko Service Discovery Marathon API Config #
######################################################
-akka.discovery {
+pekko.discovery {
# Set the following in your application.conf if you want to use this discovery mechanism:
# method = marathon-api
# ApiMayChange
marathon-api {
- class = akka.discovery.marathon.MarathonApiServiceDiscovery
+ class = org.apache.pekko.discovery.marathon.MarathonApiServiceDiscovery
# URL for getting list of apps from Marathon. Verified on OSS DC/OS 1.8, 1.9
# TODO: Future improvement would be keys for auth token, CA cert
app-api-url = "http://marathon.mesos:8080/v2/apps"
# Only used in the case that Lookup.portName is not set. Bootstrap sets this from
- # akka.management.cluster.boostrap.contact-point-discovery.port-name
- app-port-name = "akkamgmthttp"
+ # pekko.management.cluster.boostrap.contact-point-discovery.port-name
+ app-port-name = "pekkomgmthttp"
# Used to find other apps running by Marathon. This will be passed as the label query string parameter
# to the apps-api-url defined above.
diff --git a/discovery-marathon-api/src/main/scala/akka/discovery/marathon/AppList.scala b/discovery-marathon-api/src/main/scala/org/apache/pekko/discovery/marathon/AppList.scala
similarity index 95%
rename from discovery-marathon-api/src/main/scala/akka/discovery/marathon/AppList.scala
rename to discovery-marathon-api/src/main/scala/org/apache/pekko/discovery/marathon/AppList.scala
index 9b1c1b1..2e02364 100644
--- a/discovery-marathon-api/src/main/scala/akka/discovery/marathon/AppList.scala
+++ b/discovery-marathon-api/src/main/scala/org/apache/pekko/discovery/marathon/AppList.scala
@@ -11,7 +11,7 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.marathon
+package org.apache.pekko.discovery.marathon
import scala.collection.immutable.Seq
diff --git a/discovery-marathon-api/src/main/scala/akka/discovery/marathon/JsonFormat.scala b/discovery-marathon-api/src/main/scala/org/apache/pekko/discovery/marathon/JsonFormat.scala
similarity index 89%
rename from discovery-marathon-api/src/main/scala/akka/discovery/marathon/JsonFormat.scala
rename to discovery-marathon-api/src/main/scala/org/apache/pekko/discovery/marathon/JsonFormat.scala
index d966fa5..84c4caf 100644
--- a/discovery-marathon-api/src/main/scala/akka/discovery/marathon/JsonFormat.scala
+++ b/discovery-marathon-api/src/main/scala/org/apache/pekko/discovery/marathon/JsonFormat.scala
@@ -11,9 +11,9 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.marathon
+package org.apache.pekko.discovery.marathon
-import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
+import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
import spray.json._
import AppList._
diff --git a/discovery-marathon-api/src/main/scala/akka/discovery/marathon/MarathonApiServiceDiscovery.scala b/discovery-marathon-api/src/main/scala/org/apache/pekko/discovery/marathon/MarathonApiServiceDiscovery.scala
similarity index 85%
rename from discovery-marathon-api/src/main/scala/akka/discovery/marathon/MarathonApiServiceDiscovery.scala
rename to discovery-marathon-api/src/main/scala/org/apache/pekko/discovery/marathon/MarathonApiServiceDiscovery.scala
index 9fc118b..d257a2a 100644
--- a/discovery-marathon-api/src/main/scala/akka/discovery/marathon/MarathonApiServiceDiscovery.scala
+++ b/discovery-marathon-api/src/main/scala/org/apache/pekko/discovery/marathon/MarathonApiServiceDiscovery.scala
@@ -11,25 +11,24 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.marathon
+package org.apache.pekko.discovery.marathon
import java.net.InetAddress
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.scaladsl._
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
-import akka.actor.ActorSystem
-import akka.discovery._
-import akka.http.scaladsl._
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.unmarshalling.Unmarshal
import scala.collection.immutable.Seq
import scala.concurrent.Future
import scala.concurrent.duration.FiniteDuration
import scala.util.Try
-
import AppList._
import JsonFormat._
-import akka.annotation.ApiMayChange
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.event.Logging
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.discovery.{ Lookup, ServiceDiscovery }
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.event.Logging
@ApiMayChange
object MarathonApiServiceDiscovery {
@@ -69,11 +68,11 @@ object MarathonApiServiceDiscovery {
portNumber <- portIndex(app)
taskHost <- task.host
taskPorts <- task.ports
- taskAkkaManagementPort <- taskPorts.lift(portNumber)
+ taskPekkoManagementPort <- taskPorts.lift(portNumber)
} yield {
ResolvedTarget(
host = taskHost,
- port = Some(taskAkkaManagementPort),
+ port = Some(taskPekkoManagementPort),
address = Try(InetAddress.getByName(taskHost)).toOption)
}
}
diff --git a/discovery-marathon-api/src/main/scala/akka/discovery/marathon/Settings.scala b/discovery-marathon-api/src/main/scala/org/apache/pekko/discovery/marathon/Settings.scala
similarity index 82%
rename from discovery-marathon-api/src/main/scala/akka/discovery/marathon/Settings.scala
rename to discovery-marathon-api/src/main/scala/org/apache/pekko/discovery/marathon/Settings.scala
index 2f014ef..859e6e9 100644
--- a/discovery-marathon-api/src/main/scala/akka/discovery/marathon/Settings.scala
+++ b/discovery-marathon-api/src/main/scala/org/apache/pekko/discovery/marathon/Settings.scala
@@ -11,14 +11,14 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.marathon
+package org.apache.pekko.discovery.marathon
-import akka.actor._
-import akka.annotation.ApiMayChange
+import org.apache.pekko.actor._
+import org.apache.pekko.annotation.ApiMayChange
@ApiMayChange
final class Settings(system: ExtendedActorSystem) extends Extension {
- private val marathonApi = system.settings.config.getConfig("akka.discovery.marathon-api")
+ private val marathonApi = system.settings.config.getConfig("pekko.discovery.marathon-api")
val appApiUrl: String =
marathonApi.getString("app-api-url")
diff --git a/discovery-marathon-api/src/test/resources/docker-app.json b/discovery-marathon-api/src/test/resources/docker-app.json
index a6a4868..ac723f9 100644
--- a/discovery-marathon-api/src/test/resources/docker-app.json
+++ b/discovery-marathon-api/src/test/resources/docker-app.json
@@ -42,7 +42,7 @@
"hostPort": 0,
"servicePort": 10206,
"protocol": "tcp",
- "name": "akkamgmthttp",
+ "name": "pekkomgmthttp",
"labels": {}
}
],
diff --git a/discovery-marathon-api/src/test/scala/akka/discovery/marathon/MarathonApiServiceDiscoverySpec.scala b/discovery-marathon-api/src/test/scala/pekko/discovery/marathon/MarathonApiServiceDiscoverySpec.scala
similarity index 90%
rename from discovery-marathon-api/src/test/scala/akka/discovery/marathon/MarathonApiServiceDiscoverySpec.scala
rename to discovery-marathon-api/src/test/scala/pekko/discovery/marathon/MarathonApiServiceDiscoverySpec.scala
index 9018923..bfaea3c 100644
--- a/discovery-marathon-api/src/test/scala/akka/discovery/marathon/MarathonApiServiceDiscoverySpec.scala
+++ b/discovery-marathon-api/src/test/scala/pekko/discovery/marathon/MarathonApiServiceDiscoverySpec.scala
@@ -11,12 +11,12 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery.marathon
+package org.apache.pekko.discovery.marathon
import java.net.InetAddress
-
-import akka.discovery.ServiceDiscovery.ResolvedTarget
+import org.apache.pekko.discovery.ServiceDiscovery.ResolvedTarget
import spray.json._
+
import scala.io.Source
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
@@ -43,7 +43,7 @@ class MarathonApiServiceDiscoverySpec extends AnyWordSpec with Matchers {
val appList = JsonFormat.appListFormat.read(data.parseJson)
- MarathonApiServiceDiscovery.targets(appList, "akkamgmthttp") shouldBe List(
+ MarathonApiServiceDiscovery.targets(appList, "pekkomgmthttp") shouldBe List(
ResolvedTarget(
host = "10.121.48.204",
port = Some(29480),
diff --git a/docs/src/main/paradox/akka-management.md b/docs/src/main/paradox/akka-management.md
index 79e45dd..edb8aca 100644
--- a/docs/src/main/paradox/akka-management.md
+++ b/docs/src/main/paradox/akka-management.md
@@ -1,6 +1,6 @@
-# Akka Management
+# Apache Pekko Management
-Akka Management is the core module of the management utilities which provides a central HTTP endpoint for Akka
+Pekko Management is the core module of the management utilities which provides a central HTTP endpoint for Akka
management extensions.
## Project Info
@@ -9,50 +9,50 @@ management extensions.
## Dependencies
-The main Akka Management dependency is called `akka-management`. By itself however it does not provide any capabilities,
+The main Pekko Management dependency is called `pekko-management`. By itself however it does not provide any capabilities,
and you have to combine it with the management extension libraries that you want to make use of (e.g. cluster http management,
or cluster bootstrap). This design choice enables users to include only the minimal set of features they
actually want to use (and load) in their project.
@@dependency[sbt,Gradle,Maven] {
- symbol1=AkkaManagementVersion
+ symbol1=PekkoManagementVersion
value1="$project.version$"
group="com.lightbend.akka.management"
- artifact="akka-management_$scala.binary.version$"
- version=AkkaManagementVersion
+ artifact="pekko-management_$scala.binary.version$"
+ version=PekkoManagementVersion
}
And in addition to that, include all of the dependencies for the features you'd like to use,
-like `akka-management-bootstrap` etc. Refer to each extensions documentation page to learn about how
+like `pekko-management-bootstrap` etc. Refer to each extensions documentation page to learn about how
to configure and use it.
-Akka Management can be used with Akka $akka.version$ or later.
+Pekko Management can be used with Akka $pekko.version$ or later.
You have to override the following Akka dependencies by defining them explicitly in your build and
define the Akka version to the one that you are using. Latest patch version of Akka is recommended and
-a later version than $akka.version$ can be used.
+a later version than $pekko.version$ can be used.
@@dependency[sbt,Gradle,Maven] {
- symbol1=AkkaVersion
- value1="$akka.version$"
- group=com.typesafe.akka
- artifact=akka-stream_$scala.binary.version$
- version=AkkaVersion
+ symbol1=PekkoVersion
+ value1="$pekko.version$"
+ group=org.apache.pekko
+ artifact=pekko-stream_$scala.binary.version$
+ version=PekkoVersion
}
## Basic Usage
-Remember that Akka Management does not start automatically and the routes will only be exposed once you trigger:
+Remember that Pekko Management does not start automatically and the routes will only be exposed once you trigger:
Scala
-: @@snip[DemoApp.scala](/integration-test/kubernetes-api/src/main/scala/akka/cluster/bootstrap/DemoApp.scala){ #start-akka-management }
+: @@snip[DemoApp.scala](/integration-test/kubernetes-api/src/main/scala/org/apache/pekko/cluster/bootstrap/DemoApp.scala){ #start-akka-management }
Java
-: @@snip[DemoApp.java](/integration-test/kubernetes-api-java/src/main/java/akka/cluster/bootstrap/demo/DemoApp.java){ #start-akka-management }
+: @@snip[DemoApp.java](/integration-test/kubernetes-api-java/src/main/java/org/apache/pekko/cluster/bootstrap/demo/DemoApp.java){ #start-akka-management }
This allows users to prepare anything further before exposing routes for
the bootstrap joining process and other purposes.
-Remember to call `stop` method preferably in @extref:[Coordinated Shutdown](akka:coordinated-shutdown.html).
+Remember to call `stop` method preferably in @extref:[Coordinated Shutdown](pekko:coordinated-shutdown.html).
See [the Lagom example](https://github.com/lagom/lagom/blob/50ecfbf2e0d51fe24fdf6ad71157e1dff97106b9/akka-management/core/src/main/scala/com/lightbend/lagom/internal/akka/management/AkkaManagementTrigger.scala#L73).
@@ -60,7 +60,7 @@ See [the Lagom example](https://github.com/lagom/lagom/blob/50ecfbf2e0d51fe24fdf
You can configure hostname and port to use for the HTTP Cluster management by overriding the following:
-@@snip[application.conf](/management/src/test/scala/akka/management/AkkaManagementHttpEndpointSpec.scala){ #management-host-port }
+@@snip[application.conf](/management/src/test/scala/org/apache/pekko/management/PekkoManagementHttpEndpointSpec.scala){ #management-host-port }
Note that the default value for hostname is `InetAddress.getLocalHost.getHostAddress`, which may or may not evaluate to
`127.0.0.1`.
@@ -71,30 +71,30 @@ it is necessary to set different hostname and port number to bind for the HTTP S
application.conf
: ```hocon
# Get hostname from environmental variable HOST
- akka.management.http.hostname = ${HOST}
+ pekko.management.http.hostname = ${HOST}
# Use port 8558 by default, but use environment variable PORT_8558 if it is defined
- akka.management.http.port = 8558
- akka.management.http.port = ${?PORT_8558}
+ pekko.management.http.port = 8558
+ pekko.management.http.port = ${?PORT_8558}
# Bind to 0.0.0.0:8558 'internally':
- akka.management.http.bind-hostname = 0.0.0.0
- akka.management.http.bind-port = 8558
+ pekko.management.http.bind-hostname = 0.0.0.0
+ pekko.management.http.bind-port = 8558
```
It is also possible to modify the base path of the API, by setting the appropriate value in application.conf:
application.conf
: ```hocon
- akka.management.http.base-path = "myClusterName"
+ pekko.management.http.base-path = "myClusterName"
```
-In this example, with this configuration, then the Akka Management routes will will be exposed at under the `/myClusterName/...`,
+In this example, with this configuration, then the Pekko Management routes will will be exposed at under the `/myClusterName/...`,
base path. For example, when using Akka Cluster Management routes the members information would then be available under
`/myClusterName/shards/{name}` etc.
## Read only routes
-By default extensions to Akka Management should only provide read only routes. This can be changed
-via setting `akka.management.http.route-providers-read-only` to `false`. Each extension can access
+By default extensions to Pekko Management should only provide read only routes. This can be changed
+via setting `pekko.management.http.route-providers-read-only` to `false`. Each extension can access
the value of this property via `ManagementRouteProviderSettings.readOnly` to decide which routes to expose.
For example the `cluster-http` extension only provides read only access to Cluster membership but if `route-provider-read-only` is set
@@ -113,34 +113,34 @@ publicly.
The non-secured usage of the module is as follows:
Scala
-: @@snip[DemoApp.scala](/integration-test/kubernetes-api/src/main/scala/akka/cluster/bootstrap/DemoApp.scala){ #start-akka-management }
+: @@snip[DemoApp.scala](/integration-test/kubernetes-api/src/main/scala/org/apache/pekko/cluster/bootstrap/DemoApp.scala){ #start-akka-management }
Java
-: @@snip[DemoApp.java](/integration-test/kubernetes-api-java/src/main/java/akka/cluster/bootstrap/demo/DemoApp.java){ #start-akka-management }
+: @@snip[DemoApp.java](/integration-test/kubernetes-api-java/src/main/java/org/apache/pekko/cluster/bootstrap/demo/DemoApp.java){ #start-akka-management }
### Enabling TLS/SSL (HTTPS) for Cluster HTTP Management
To enable SSL you need to provide an `SSLContext`. You can find more information about it in
-@extref:[Server HTTPS Support](akka-http:server-side/server-https-support.html).
+@extref:[Server HTTPS Support](pekko-http:server-side/server-https-support.html).
Scala
-: @@snip[AkkaManagementHttpEndpointSpec.scala](/management/src/test/scala/akka/management/AkkaManagementHttpEndpointSpec.scala){ #start-akka-management-with-https-context }
+: @@snip[PekkoManagementHttpEndpointSpec.scala](/management/src/test/scala/org/apache/pekko/management/PekkoManagementHttpEndpointSpec.scala){ #start-akka-management-with-https-context }
Java
-: @@snip[CodeExamples.java](/management/src/test/java/akka/management/CodeExamples.java){ #start-akka-management-with-https-context }
+: @@snip[CodeExamples.java](/management/src/test/java/org/apache/pekko/management/CodeExamples.java){ #start-akka-management-with-https-context }
-You can also refer to [AkkaManagementHttpEndpointSpec](https://github.com/akka/akka-management/blob/119ad1871c3907c2ca528720361b8ccb20234c55/management/src/test/scala/akka/management/AkkaManagementHttpEndpointSpec.scala#L124-L148) where a full example configuring the HTTPS context is shown.
+You can also refer to [PekkoManagementHttpEndpointSpec](https://github.com/akka/akka-management/blob/119ad1871c3907c2ca528720361b8ccb20234c55/management/src/test/scala/org/apache/pekko/management/PekkoManagementHttpEndpointSpec.scala#L124-L148) where a full example configuring the HTTPS context is shown.
### Enabling Basic Authentication
To enable Basic Authentication you need to provide an authenticator object before starting the management extension.
-You can find more information in @extref:[Authenticate Basic Async directive](akka-http:routing-dsl/directives/security-directives/authenticateBasicAsync.html)
+You can find more information in @extref:[Authenticate Basic Async directive](pekko-http:routing-dsl/directives/security-directives/authenticateBasicAsync.html)
Scala
-: @@snip[CompileOnly.scala](/management/src/test/scala/akka/management/CompileOnly.scala){ #basic-auth }
+: @@snip[CompileOnly.scala](/management/src/test/scala/org/apache/pekko/management/CompileOnly.scala){ #basic-auth }
Java
-: @@snip[CodeExamples.java](/management/src/test/java/akka/management/CodeExamples.java){ #basic-auth }
+: @@snip[CodeExamples.java](/management/src/test/java/org/apache/pekko/management/CodeExamples.java){ #basic-auth }
You can combine the two security options in order to enable HTTPS as well as basic authentication.
@@ -148,46 +148,46 @@ In order to do this, invoke `start(transformSettings)` where `transformSettings`
to amend the `ManagementRouteProviderSettings`. Use `.withAuth` and `.withHttpsConnectionContext`
if the `ManagementRouteProviderSettings` to enable authentication and HTTPS respectively.
-## Stopping Akka Management
+## Stopping Pekko Management
-In a dynamic environment you might stop instances of Akka Management, for example if you want to free up resources
+In a dynamic environment you might stop instances of Pekko Management, for example if you want to free up resources
taken by the HTTP server serving the Management routes.
-You can do so by calling `stop()` on @scaladoc[AkkaManagement](akka.management.scaladsl.AkkaManagement).
+You can do so by calling `stop()` on @scaladoc[PekkoManagement](org.apache.pekko.management.scaladsl.PekkoManagement).
This method return a `Future[Done]` to inform when the server has been stopped.
Scala
-: @@snip[CompileOnly.java](/management/src/test/scala/akka/management/CompileOnly.scala) { #stopping }
+: @@snip[CompileOnly.java](/management/src/test/scala/org/apache/pekko/management/CompileOnly.scala) { #stopping }
Java
-: @@snip[CodeExamples.java](/management/src/test/scala/akka/management/CompileOnly.scala) { #stopping }
+: @@snip[CodeExamples.java](/management/src/test/scala/org/apache/pekko/management/CompileOnly.scala) { #stopping }
## Developing Extensions
-This project provides a set of management extensions. To write third-party extensions to Akka Management, here
+This project provides a set of management extensions. To write third-party extensions to Pekko Management, here
are few pointers about how it all works together.
-The `akka-management` module provides the central HTTP endpoint to which extensions can register themselves.
+The `pekko-management` module provides the central HTTP endpoint to which extensions can register themselves.
An extension can contribute to the exposed HTTP routes by defining named route providers in the
-`akka.management.http.routes` configuration section in its own `reference.conf`. The core `AkkaManagement`
+`pekko.management.http.routes` configuration section in its own `reference.conf`. The core `PekkoManagement`
extension collects all the routes and serves them together under the Management HTTP server. This enables
easy extension of management capabilities (such as health-checks or cluster information etc)
without the boilerplate and overhead to start separate HTTP servers for each extension.
For example, the "Cluster HTTP Management" module exposes HTTP routes that can be used to monitor,
and even trigger joining/leaving/downing decisions via HTTP calls to these routes. The routes and
-logic for these are implemented inside the `akka-management-cluster-http`.
+logic for these are implemented inside the `pekko-management-cluster-http`.
Management route providers should be regular extensions that additionally extend the
-`akka.management.scaladsl.ManagementRoutesProvider` or `akka.management.javadsl.ManagementRoutesProvider`
+`org.apache.pekko.management.scaladsl.ManagementRoutesProvider` or `org.apache.pekko.management.javadsl.ManagementRoutesProvider`
interface.
Libraries may register routes into the management routes by defining entries to this setting
the library `reference.conf`:
```
-akka.management.http.routes {
+pekko.management.http.routes {
name = "FQCN"
}
```
@@ -201,14 +201,14 @@ Route providers included by a library (from reference.conf) can be excluded by a
by using `""` or `null` as the FQCN of the named entry, for example:
```
-akka.management.http.routes {
+pekko.management.http.routes {
cluster-management = ""
}
```
As a best practice, Management extensions that do something proactively should not be
started automatically, but rather manually by the user. One example of that is Cluster Bootstrap.
-It contributes routes to Akka Management, but the bootstrapping process does not start unless
+It contributes routes to Pekko Management, but the bootstrapping process does not start unless
`ClusterBootstrap().start()` is invoked. Thus, the user can decide when exactly
the application is ready to start joining an existing cluster. When cluster bootstrap is autostarted through configuration
there is no control over this and the extension is started with the actor system.
diff --git a/docs/src/main/paradox/bootstrap/details.md b/docs/src/main/paradox/bootstrap/details.md
index 14a8243..d67dbec 100644
--- a/docs/src/main/paradox/bootstrap/details.md
+++ b/docs/src/main/paradox/bootstrap/details.md
@@ -1,13 +1,13 @@
# Bootstrap process
Below is a description of the bootstrap process in more detail.
-All configuration properties references below are in the `akka.management.cluster.bootstrap` section.
+All configuration properties references below are in the `pekko.management.cluster.bootstrap` section.
- Each node discovers its "neighbours" using Akka Discovery
- Some initial negotiation between the nodes must take place to safely form a new cluster when there is no
existing cluster.
- The node starts to probe the Contact Points of the discovered nodes (which are HTTP endpoints, exposed via
- Akka Management by the Bootstrap Management Extension) for known seeds to join.
+ Pekko Management by the Bootstrap Management Extension) for known seeds to join.
- When a cluster exists the seed nodes are returned from probing the discovered Contact Points. It can
immediately join such seed nodes and the following steps for the initial bootstrap are not needed.
- When no cluster exists yet, none of the contacted nodes return any seed nodes during the probing process. The following
diff --git a/docs/src/main/paradox/bootstrap/index.md b/docs/src/main/paradox/bootstrap/index.md
index 3b37ea3..c09338c 100644
--- a/docs/src/main/paradox/bootstrap/index.md
+++ b/docs/src/main/paradox/bootstrap/index.md
@@ -1,5 +1,5 @@
<a id="bootstrap"></a>
-# Akka Cluster Bootstrap
+# Apache Pekko Cluster Bootstrap
@@@ index
@@ -20,7 +20,7 @@ environment you want to run your cluster in.
Bootstrap depends on:
* @ref:[Akka Discovery](../discovery/index.md) to discover other members of the cluster
- * @ref:[Akka Management](../akka-management.md) to host HTTP endpoints used during the bootstrap process
+ * @ref:[Pekko Management](../akka-management.md) to host HTTP endpoints used during the bootstrap process
A discovery mechanism needs to be chosen. A good default choice is DNS.
@@ -30,64 +30,64 @@ A discovery mechanism needs to be chosen. A good default choice is DNS.
## Dependency
-Add `akka-management-cluster-bootstrap` and one or more discovery mechanisms to use for the discovery process.
+Add `pekko-management-cluster-bootstrap` and one or more discovery mechanisms to use for the discovery process.
-For example, you might choose to use the @extref:[DNS discovery](akka:discovery/index.html#discovery-method-dns)
+For example, you might choose to use the @extref:[DNS discovery](pekko:discovery/index.html#discovery-method-dns)
and bootstrap extensions:
@@dependency[sbt,Gradle,Maven] {
- symbol=AkkaVersion
- value=$akka.version$
- symbol1=AkkaManagementVersion
+ symbol=PekkoVersion
+ value=$pekko.version$
+ symbol1=PekkoManagementVersion
value1=$project.version$
group=com.lightbend.akka.management
artifact=akka-management-cluster-bootstrap_$scala.binary.version$
- version=AkkaManagementVersion
- group2=com.typesafe.akka
- artifact2=akka-discovery_$scala.binary.version$
- version2=AkkaVersion
+ version=PekkoManagementVersion
+ group2=org.apache.pekko
+ artifact2=pekko-discovery_$scala.binary.version$
+ version2=PekkoVersion
}
-Akka Cluster Bootstrap can be used with Akka $akka.version$ or later.
+Akka Cluster Bootstrap can be used with Akka $pekko.version$ or later.
You have to override the following Akka dependencies by defining them explicitly in your build and
define the Akka version to the one that you are using. Latest patch version of Akka is recommended and
-a later version than $akka.version$ can be used.
+a later version than $pekko.version$ can be used.
@@dependency[sbt,Gradle,Maven] {
- symbol=AkkaVersion
- value=$akka.version$
- group=com.typesafe.akka
- artifact=akka-cluster_$scala.binary.version$
- version=AkkaVersion
- group2=com.typesafe.akka
- artifact2=akka-discovery_$scala.binary.version$
- version2=AkkaVersion
+ symbol=PekkoVersion
+ value=$pekko.version$
+ group=org.apache.pekko
+ artifact=pekko-cluster_$scala.binary.version$
+ version=PekkoVersion
+ group2=org.apache.pekko
+ artifact2=pekko-discovery_$scala.binary.version$
+ version2=PekkoVersion
}
@@@ note
-`akka-discovery` is already a transitive dependency of `akka-management-cluster-bootstrap` but it can
+`pekko-discovery` is already a transitive dependency of `pekko-management-cluster-bootstrap` but it can
be good to define it explicitly in the build of the application to align the Akka versions with other
dependencies from the application. The version must be the same across all Akka modules, e.g.
-`akka-actor`, `akka-discovery` and `akka-cluster` must be of the same version.
+`pekko-actor`, `pekko-discovery` and `pekko-cluster` must be of the same version.
-The minimum supported Akka version is $akka.version$. Use the same Akka version for `akka-discovery`
+The minimum supported Akka version is $pekko.version$. Use the same Akka version for `pekko-discovery`
as for other Akka dependencies in the application. Latest patch version of Akka is recommended and
-a later version than $akka.version$ can be used.
+a later version than $pekko.version$ can be used.
@@@
## Using
-Akka management must be started as well as the bootstrap process, this can either be done through config or programmatically.
+Pekko management must be started as well as the bootstrap process, this can either be done through config or programmatically.
**Through config**
-Listing the `ClusterBootstrap` extension among the autoloaded `akka.extensions` in `application.conf` will also cause it to autostart:
+Listing the `ClusterBootstrap` extension among the autoloaded `pekko.extensions` in `application.conf` will also cause it to autostart:
```
-akka.extensions = ["akka.management.cluster.bootstrap.ClusterBootstrap"]
+pekko.extensions = ["org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap"]
```
If management or bootstrap configuration is incorrect, the autostart will log an error and terminate the actor system.
@@ -95,28 +95,28 @@ If management or bootstrap configuration is incorrect, the autostart will log an
**Programmatically**
Scala
-: @@snip [CompileOnly.scala](/management-cluster-bootstrap/src/test/scala/doc/akka/management/cluster/bootstrap/ClusterBootstrapCompileOnly.scala) { #start }
+: @@snip [CompileOnly.scala](/management-cluster-bootstrap/src/test/scala/doc/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapCompileOnly.scala) { #start }
Java
-: @@snip [CompileOnly.java](/management-cluster-bootstrap/src/test/java/jdoc/akka/management/cluster/bootstrap/ClusterBootstrapCompileOnly.java) { #start }
+: @@snip [CompileOnly.java](/management-cluster-bootstrap/src/test/java/jdoc/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapCompileOnly.java) { #start }
-`AkkaManagment().start()` will return a @Scala[`Future`]@Java[`CompletionStage`] that will fail if management cannot be started. It is
+`PekkoManagment().start()` will return a @Scala[`Future`]@Java[`CompletionStage`] that will fail if management cannot be started. It is
a good idea to act on such a failure, for example by logging an error and terminating the actor system.
Ensure that `seed-nodes` is not present in configuration and that either autoloading through config or `start()` is called on every node.
The following configuration is required, more details for each and additional configuration can be found in [reference.conf](https://github.com/akka/akka-management/blob/master/cluster-bootstrap/src/main/resources/reference.conf):
-* `akka.management.cluster.bootstrap.contact-point-discovery.service-name`: a unique name in the deployment environment for this cluster
+* `pekko.management.cluster.bootstrap.contact-point-discovery.service-name`: a unique name in the deployment environment for this cluster
instance which is used to lookup peers in service discovery. If unset, it will be derived from the `ActorSystem` name.
-* `akka.management.cluster.bootstrap.contact-point-discovery.discovery-method`: the intended service discovery mechanism (from what choices Akka Discovery provides).
- If unset, falls back to the system-wide default from `akka.discovery.method`.
+* `pekko.management.cluster.bootstrap.contact-point-discovery.discovery-method`: the intended service discovery mechanism (from what choices Akka Discovery provides).
+ If unset, falls back to the system-wide default from `pekko.discovery.method`.
## How It Works
-* Each node exposes an HTTP endpoint `/bootstrap/seed-nodes`. This is provided by `akka-management-cluster-bootstrap` and
- exposed automatically by starting Akka management.
+* Each node exposes an HTTP endpoint `/bootstrap/seed-nodes`. This is provided by `pekko-management-cluster-bootstrap` and
+ exposed automatically by starting Pekko management.
* During bootstrap each node queries service discovery repeatedly to get the initial contact points until at least the
number of contact points ([and recommended exactly equal](#exact_contact_point)) as defined in `contact-point-discovery.required-contact-point-nr` has been found.
* Each node then probes the found contact points' `/bootstrap/seed-nodes` endpoint to see if a cluster has already
@@ -133,7 +133,7 @@ See @ref[full bootstrap process and advanced configuration](details.md) for more
As Akka Cluster allows nodes to join to a cluster using multiple different methods, the precedence of each method
is strictly defined and is as follows:
-- If `akka.cluster.seed-nodes` (in your `application.conf`) are non-empty, those nodes will be joined, and bootstrap
+- If `pekko.cluster.seed-nodes` (in your `application.conf`) are non-empty, those nodes will be joined, and bootstrap
will NOT execute even if `start()` is called or autostart through configuration is enabled, however a warning will be logged.
- If an explicit `cluster.join` or `cluster.joinSeedNodes` is invoked before the bootstrap completes, that
joining would take precedence over the bootstrap (but it's not recommended to do so, see below).
@@ -141,7 +141,7 @@ is strictly defined and is as follows:
@@@ warning
It is NOT recommended to mix various joining mechanisms. Pick one mechanism and stick to it in order to
- avoid any surprises during cluster formation. E.g. do NOT set `akka.cluster.seed-nodes` if you are going
+ avoid any surprises during cluster formation. E.g. do NOT set `pekko.cluster.seed-nodes` if you are going
to be using the Bootstrap mechanism.
@@@
@@ -152,11 +152,11 @@ is strictly defined and is as follows:
Cluster Bootstrap will always attempt to join an existing cluster if possible. However if no other contact point advertises any `seed-nodes` a
new cluster will be formed by the node decided by the `JoinDecider` where the default sorts the addresses then picks the lowest.
-A setting is provided, `akka.management.cluster.bootstrap.new-cluster-enabled` that can be disable new cluster formation to only allow the
+A setting is provided, `pekko.management.cluster.bootstrap.new-cluster-enabled` that can be disable new cluster formation to only allow the
node to join existing clusters.
-* On initial deployment use the default `akka.management.cluster.bootstrap.new-cluster-enabled=on`
-* Following the initial deployment it is recommended to set `akka.management.cluster.bootstrap.new-cluster-enabled=off`
+* On initial deployment use the default `pekko.management.cluster.bootstrap.new-cluster-enabled=on`
+* Following the initial deployment it is recommended to set `pekko.management.cluster.bootstrap.new-cluster-enabled=off`
with an immediate re-deployment once the initial cluster has formed
This can be used to provide additional safety during restarts and redeploys while
@@ -179,7 +179,7 @@ considered. The following configuration will result in your application being sh
join the discovered seed nodes. In this case, the orchestrator (i.e. Kubernetes or Marathon) will restart your node
and the operation will (presumably) eventually succeed. You'll want to specify the following in your `application.conf` file:
-@@snip [CompileOnly.scala](/integration-test/local/src/main/resources/application.conf) { #coorindated-shutdown }
+@@snip [CompileOnly.scala](/integration-test/local/src/main/resources/application.conf) { #coordinated-shutdown }
### Rolling updates
@@ -189,7 +189,7 @@ Akka Cluster can handle hard failures using a downing provider such as Lightbend
However this should not be relied upon for regular rolling redeploys. Features such as `ClusterSingleton`s and `ClusterSharding`
can safely restart actors on new nodes far quicker when it is certain that a node has shutdown rather than crashed.
-Graceful leaving will happen with the default settings as it is part of @extref:[Coordinated Shutdown](akka:actors.html#coordinated-shutdown).
+Graceful leaving will happen with the default settings as it is part of @extref:[Coordinated Shutdown](pekko:actors.html#coordinated-shutdown).
Just ensure that a node is sent a `SIGTERM` and not a `SIGKILL`. Environments such as Kubernetes will do this, it is important to ensure
that if JVM is wrapped with a script that it forwards the signal.
@@ -216,7 +216,7 @@ for Kubernetes deployments. Cluster Sharding uses a singleton internally so this
Nodes can crash causing cluster members to become unreachable. This is a tricky problem as it is not
possible to distinguish between a network partition and a node failure. To rectify this in an automated manner,
-make sure you enable the @extref:[Split Brain Resolver](akka:split-brain-resolver.html)
+make sure you enable the @extref:[Split Brain Resolver](pekko:split-brain-resolver.html)
This module has a number of strategies that can ensure that the cluster continues to function
during network partitions and node failures.
diff --git a/docs/src/main/paradox/bootstrap/istio.md b/docs/src/main/paradox/bootstrap/istio.md
index 2cc6be8..0f4f214 100644
--- a/docs/src/main/paradox/bootstrap/istio.md
+++ b/docs/src/main/paradox/bootstrap/istio.md
@@ -19,7 +19,7 @@ annotations:
## Allowing inbound communication
-Inbound connections to Akka management and remoting also need to bypass the sidecar proxy. By default, Istio will redirect all incoming traffic to the ports listed in the containers port specification to the sidecar proxy. Hence, there are two ways to ensure that the Akka management and remoting traffic bypasses the proxy, either explicitly configure the incoming ports to redirect, or don't list the Akka management and remoting ports in the container's ports specification.
+Inbound connections to Pekko management and remoting also need to bypass the sidecar proxy. By default, Istio will redirect all incoming traffic to the ports listed in the containers port specification to the sidecar proxy. Hence, there are two ways to ensure that the Pekko management and remoting traffic bypasses the proxy, either explicitly configure the incoming ports to redirect, or don't list the Pekko management and remoting ports in the container's ports specification.
The inbound ports to redirect can be configured using the `traffic.sidecar.istio.io/includeInboundPorts` annotation. If your service offers a REST endpoint on port 8080, then you might configure that like so:
diff --git a/docs/src/main/paradox/bootstrap/kubernetes-api.md b/docs/src/main/paradox/bootstrap/kubernetes-api.md
index 0342fb0..22c48f7 100644
--- a/docs/src/main/paradox/bootstrap/kubernetes-api.md
+++ b/docs/src/main/paradox/bootstrap/kubernetes-api.md
@@ -11,24 +11,24 @@ The following Kubernetes resources are created:
An example deployment (used for integration testing):
-@@snip [akka-cluster.yml](/integration-test/kubernetes-api/kubernetes/akka-cluster.yml) { #deployment }
+@@snip [pekko-cluster.yml](/integration-test/kubernetes-api/kubernetes/pekko-cluster.yml) { #deployment }
An example `Role` and `Rolebinding` to allow the nodes to query the Kubernetes API server:
-@@snip [akka-cluster.yml](/integration-test/kubernetes-api/kubernetes/akka-cluster.yml) { #rbac }
+@@snip [pekko-cluster.yml](/integration-test/kubernetes-api/kubernetes/pekko-cluster.yml) { #rbac }
The User name includes the namespace, this will need updated for your namespace.
The following configuration is required:
-* Set `akka.management.cluster.bootstrap.contact-point-discovery.discovery-method` to `kubernetes-api`
-* Set `akka.discovery.kubernetes-api.pod-label-selector` to a label selector that will match the Akka pods e.g. `app=%s`
+* Set `pekko.management.cluster.bootstrap.contact-point-discovery.discovery-method` to `kubernetes-api`
+* Set `pekko.discovery.kubernetes-api.pod-label-selector` to a label selector that will match the Akka pods e.g. `app=%s`
-@@snip [akka-cluster.yml](/integration-test/kubernetes-api/src/main/resources/application.conf) { #discovery-config }
+@@snip [pekko-cluster.yml](/integration-test/kubernetes-api/src/main/resources/application.conf) { #discovery-config }
The lookup needs to know which namespace to look in. By default, this will be detected by reading the namespace
from the service account secret, in `/var/run/secrets/kubernetes.io/serviceaccount/namespace`, but can be overridden by
-setting `akka.discovery.kubernetes-api.pod-namespace`.
+setting `pekko.discovery.kubernetes-api.pod-namespace`.
For more details on how to configure the Kubernetes deployment see @ref:[recipes](recipes.md).
diff --git a/docs/src/main/paradox/bootstrap/kubernetes.md b/docs/src/main/paradox/bootstrap/kubernetes.md
index de113a0..965e6c5 100644
--- a/docs/src/main/paradox/bootstrap/kubernetes.md
+++ b/docs/src/main/paradox/bootstrap/kubernetes.md
@@ -4,10 +4,10 @@ An example project that can be deployed to kubernetes via `minikube` is in `inte
The project shows how to:
-* Use Akka Bootstrap with `akka-dns` with cluster formation via DNS SRV records
-* Use a headless service for internal and Akka management/bootstrap so that readiness probes for prod traffic don't interfere with bootstrap
+* Use Pekko Bootstrap with `pekko-dns` with cluster formation via DNS SRV records
+* Use a headless service for internal and Pekko management/bootstrap so that readiness probes for prod traffic don't interfere with bootstrap
* Note that this requires the use of the `publishNotReadyAddresses`, which replaces the `service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"` annotation , so bootstrap can see the pods before they are ready. Check your Kubernetes environment supports this feature
-* If required use a separate service and/or ingress for user-facing endpoints, for example @extref:[HTTP](akka-http:) or @extref:[gRPC](akka-grpc:)
+* If required use a separate service and/or ingress for user-facing endpoints, for example @extref:[HTTP](pekko-http:) or @extref:[gRPC](pekko-grpc:)
### Internal headless service for bootstrap
@@ -16,7 +16,7 @@ as there is no use case for load balancing across management/remoting ports.
Set endpoints to be published before readiness checks pass as these endpoints are required to bootstrap the Cluster
and make the application ready.
-@@snip [akka-cluster.yml](/integration-test/kubernetes-dns/kubernetes/akka-cluster.yml) { #headless }
+@@snip [pekko-cluster.yml](/integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml) { #headless }
Note there are currently two ways to specify that addresses should be published if not ready, the initial way via an annotation
`service.alpha.kubernetes.io/tolerate-unready-endpoints` and via the new officially supported way as the property `publishNotReadyAddresses`.
diff --git a/docs/src/main/paradox/bootstrap/local-config.md b/docs/src/main/paradox/bootstrap/local-config.md
index 650b9fc..d0d9c2f 100644
--- a/docs/src/main/paradox/bootstrap/local-config.md
+++ b/docs/src/main/paradox/bootstrap/local-config.md
@@ -1,12 +1,12 @@
# Local using config
-@extref:[Configuration](akka:/discovery/index.html#discovery-method-configuration) based discovery can be used to see the
+@extref:[Configuration](pekko:/discovery/index.html#discovery-method-configuration) based discovery can be used to see the
Cluster Bootstrap process run locally within an IDE or from the command line.
To use `config` service discovery set the following configuration:
-* `akka.management.cluster.bootstrap.contact-point-discovery.discovery-method` to `config`
-* `akka.discovery.config.services.[cluster-name]` to the endpoinds of the Akka nodes
+* `pekko.management.cluster.bootstrap.contact-point-discovery.discovery-method` to `config`
+* `pekko.discovery.config.services.[cluster-name]` to the endpoinds of the Akka nodes
For example:
@@ -20,7 +20,7 @@ Akka bootstrap is then configured to lookup `local-cluster` in the `config`:
Three main methods can be run, only overriding the host so the ActorSystem's can all bind to the same port:
-@@snip [application.conf](/integration-test/local/src/main/scala/akka/cluster/bootstrap/Main.scala) { #main }
+@@snip [application.conf](/integration-test/local/src/main/scala/org/apache/pekko/cluster/bootstrap/Main.scala) { #main }
The example uses three loopback addresses: `127.0.0.2-4`. On Mac you'll need to set these up:
@@ -35,9 +35,9 @@ On Linux this should not be required.
Run the three mains: `Node1`, `Node2` and `Node3` and they will form a cluster either in your IDE or from the command line:
```
-sbt "integration-test-local/runMain akka.cluster.bootstrap.Node1"
-sbt "integration-test-local/runMain akka.cluster.bootstrap.Node2"
-sbt "integration-test-local/runMain akka.cluster.bootstrap.Node3"
+sbt "integration-test-local/runMain org.apache.pekko.cluster.bootstrap.Node1"
+sbt "integration-test-local/runMain org.apache.pekko.cluster.bootstrap.Node2"
+sbt "integration-test-local/runMain org.apache.pekko.cluster.bootstrap.Node3"
```
The first time one of the Nodes will form a new cluster and the others will join. Any subsequent restarts
diff --git a/docs/src/main/paradox/bootstrap/recipes.md b/docs/src/main/paradox/bootstrap/recipes.md
index 7ff9c4f..3899d0e 100644
--- a/docs/src/main/paradox/bootstrap/recipes.md
+++ b/docs/src/main/paradox/bootstrap/recipes.md
@@ -1,12 +1,12 @@
# Bootstrap environments
-A set of integration tests projects can be found in [integration-test folder of the Akka Management project](https://github.com/akka/akka-management/tree/master/integration-test).
-These test various Akka management features together in various environments such as Kubernetes.
+A set of integration tests projects can be found in [integration-test folder of the Pekko Management project](https://github.com/akka/akka-management/tree/master/integration-test).
+These test various Pekko management features together in various environments such as Kubernetes.
The following samples exist as standalone projects:
-* [Akka Cluster bootstrap using the Kubernetes API with Java/Maven](https://github.com/akka/akka-sample-cluster-kubernetes-java)
-* [Akka Cluster bootstrap using DNS in Kubernetes](https://github.com/akka/akka-sample-cluster-kubernetes-dns-java)
+* [Akka Cluster bootstrap using the Kubernetes API with Java/Maven](https://github.com/akka/pekko-sample-cluster-kubernetes-java)
+* [Akka Cluster bootstrap using DNS in Kubernetes](https://github.com/akka/pekko-sample-cluster-kubernetes-dns-java)
## Local
@@ -25,7 +25,7 @@ The recommended approach is to:
### Example project
-To get started, it might be helpful to have a look at the [Akka Cluster on Kubernetes](https://developer.lightbend.com/start/?group=akka&project=akka-sample-cluster-kubernetes-java) example project.
+To get started, it might be helpful to have a look at the [Akka Cluster on Kubernetes](https://developer.lightbend.com/start/?group=akka&project=pekko-sample-cluster-kubernetes-java) example project.
### Kubernetes Deployment
@@ -37,7 +37,7 @@ For small clusters it may make sense to set `maxUnavailable` to 0 and `maxSurge`
This means that a new pod is created before removing any existing pods so if the new pod fails the cluster remains
at full strength until a rollback happens. For large clusters it may be too slow to do 1 pod at a time.
-If using @extref:[Split Brain Resolver](akka:split-brain-resolver.html) have a `maxUnavailable` that will not cause downing
+If using @extref:[Split Brain Resolver](pekko:split-brain-resolver.html) have a `maxUnavailable` that will not cause downing
### Cluster singletons
@@ -49,7 +49,7 @@ with cluster singletons as they are typically removed last and then the cluster
For production traffic e.g. HTTP use a regular service or an alternative ingress mechanism.
With an appropriate readiness check this results in traffic not being routed until bootstrap has finished.
-@@snip [akka-cluster.yml](/integration-test/kubernetes-dns/kubernetes/akka-cluster.yml) { #public }
+@@snip [pekko-cluster.yml](/integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml) { #public }
This will result in a ClusterIP being created and only added to `Endpoints` when the pods are `ready`
@@ -57,39 +57,39 @@ Note that the `app` is the same for both services as they both refer to the same
### Health checks
-`akka-management` includes a HTTP route for readiness and liveness checks.
-`akka-management-cluster-http` includes readiness check for the Akka Cluster membership. To use it
+`pekko-management` includes a HTTP route for readiness and liveness checks.
+`pekko-management-cluster-http` includes readiness check for the Akka Cluster membership. To use it
add the following dependency:
@@dependency[sbt,Gradle,Maven] {
- symbol1=AkkaManagementVersion
+ symbol1=PekkoManagementVersion
value1=$project.version$
group=com.lightbend.akka.management
artifact=akka-management-cluster-http_$scala.binary.version$
- version=AkkaManagementVersion
+ version=PekkoManagementVersion
}
-Akka Cluster HTTP Management can be used with Akka $akka.version$ or later.
+Akka Cluster HTTP Management can be used with Akka $pekko.version$ or later.
You have to override the following Akka dependencies by defining them explicitly in your build and
define the Akka version to the one that you are using. Latest patch version of Akka is recommended and
-a later version than $akka.version$ can be used.
+a later version than $pekko.version$ can be used.
@@dependency[sbt,Gradle,Maven] {
- symbol=AkkaVersion
- value=$akka.version$
- group=com.typesafe.akka
- artifact=akka-cluster-sharding_$scala.binary.version$
- version=AkkaVersion
- group2=com.typesafe.akka
- artifact2=akka-discovery_$scala.binary.version$
- version2=AkkaVersion
+ symbol=PekkoVersion
+ value=$pekko.version$
+ group=org.apache.pekko
+ artifact=pekko-cluster-sharding_$scala.binary.version$
+ version=PekkoVersion
+ group2=org.apache.pekko
+ artifact2=pekko-discovery_$scala.binary.version$
+ version2=PekkoVersion
}
-The readiness check is exposed on the Akka Management port as a `GET` on `/ready` and the liveness check is a `GET` on `/alive`
+The readiness check is exposed on the Pekko Management port as a `GET` on `/ready` and the liveness check is a `GET` on `/alive`
Configure them to be used in your deployment:
-@@snip [akka-cluster.yml](/integration-test/kubernetes-dns/kubernetes/akka-cluster.yml) { #health }
+@@snip [pekko-cluster.yml](/integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml) { #health }
This will mean that a pod won't get traffic until it is part of a cluster, which is important
@@ -99,13 +99,13 @@ if either `ClusterSharding` or `ClusterSingleton` are used.
### Contact point discovery
-Contact point discovery can use either `kubernetes` or `akka-dns` service discovery. Details
+Contact point discovery can use either `kubernetes` or `pekko-dns` service discovery. Details
on additional resources required and how they work:
* @ref[Kubernetes using `kubernetes-api` discovery](kubernetes-api.md)
-* @ref[Kubernetes using `akka-dns` discovery](kubernetes.md)
+* @ref[Kubernetes using `pekko-dns` discovery](kubernetes.md)
-Kubernetes-api is the more battle tested mechanism, DNS was added in Akka 2.5.15 and Akka Management 0.18.
+Kubernetes-api is the more battle tested mechanism, DNS was added in Akka 2.5.15 and Pekko Management 0.18.
DNS has the benefit that it is agnostic of Kubernetes so does not require pods be able to communicate with the API
server. However it requires a headless service that supports the `publishNotReadyAddresses` feature. If your Kubernetes setup
does not support `publishNotReadyAddresses` yet then use the `kubernetes-api` discovery mechanism.
@@ -119,7 +119,7 @@ For considerations and configuration necessary for bootstrapping an Akka cluster
The following steps work for the `integration-test/kubernetes-api` or the `integration-test/kubernetes-dns` sub-project:
To run the demo in a real Kubernetes or OpenShift cluster the images must be pushed to a registry that cluster
-has access to and then `kubernetes/akka-cluster.yml` (in either sub-project) modified with the full image path.
+has access to and then `kubernetes/pekko-cluster.yml` (in either sub-project) modified with the full image path.
The following shows how the sample can be run in a local cluster using either `minishift` or `minikube`. Unless
explicitly stated `minikube` can be replaced with `minishift` and `kubectl` with `oc` in any of the commands below.
@@ -137,7 +137,7 @@ $ eval $(minikube docker-env)
```
Publish the application docker image locally. If running this project in a real cluster you'll need to publish the image to a repository
-that is accessible from your Kubernetes cluster and update the `kubernetes/akka-cluster.yml` with the new image name.
+that is accessible from your Kubernetes cluster and update the `kubernetes/pekko-cluster.yml` with the new image name.
```
$ sbt shell
@@ -145,9 +145,9 @@ $ sbt shell
> docker:publishLocal
```
-You can run multiple different Akka Bootstrap-based applications in the same namespace,
+You can run multiple different Pekko Bootstrap-based applications in the same namespace,
alongside any other containers that belong to the same logical application.
-The resources in `kubernetes/akka-cluster.yml` are configured to run in the `akka-bootstrap-demo-ns` namespace.
+The resources in `kubernetes/pekko-cluster.yml` are configured to run in the `akka-bootstrap-demo-ns` namespace.
Change that to the namespace you want to deploy to. If you do not have a namespace to run your application in yet,
create it:
@@ -171,22 +171,22 @@ Next deploy the application:
```
# minikube using Kubernetes API
-kubectl apply -f integration-test/kubernetes-api/kubernetes/akka-cluster.yml
+kubectl apply -f integration-test/kubernetes-api/kubernetes/pekko-cluster.yml
or
# minikube using DNS
-kubectl apply -f integration-test/kubernetes-dns/kubernetes/akka-cluster.yml
+kubectl apply -f integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml
or
# minishift using Kubernetes API
-oc apply -f integration-test/kubernetes-api/kubernetes/akka-cluster.yaml
+oc apply -f integration-test/kubernetes-api/kubernetes/pekko-cluster.yaml
or
# minishift using DNS
-oc apply -f integration-test/kubernetes-dns/kubernetes/akka-cluster.yaml
+oc apply -f integration-test/kubernetes-dns/kubernetes/pekko-cluster.yaml
```
This will create and start running a number of Pods hosting the application. The application nodes will form a cluster.
@@ -202,26 +202,26 @@ $ kubectl logs $POD --follow | less
```
```
-[INFO] [12/13/2018 07:13:42.867] [main] [ClusterBootstrap(akka://default)] Initiating bootstrap procedure using akka.discovery.akka-dns method...
-[DEBUG] [12/13/2018 07:13:42.906] [default-akka.actor.default-dispatcher-2] [TimerScheduler(akka://default)] Start timer [resolve-key] with generation [1]
-[DEBUG] [12/13/2018 07:13:42.919] [default-akka.actor.default-dispatcher-2] [TimerScheduler(akka://default)] Start timer [decide-key] with generation [2]
-[INFO] [12/13/2018 07:13:42.924] [default-akka.actor.default-dispatcher-2] [akka.tcp://default@172.17.0.7:2552/system/bootstrapCoordinator] Locating service members. Using discovery [akka.discovery.dns.DnsSimpleServiceDiscovery], join decider [akka.management.cluster.bootstrap.LowestAddressJoinDecider]
-[INFO] [12/13/2018 07:13:42.933] [default-akka.actor.default-dispatcher-2] [akka.tcp://default@172.17.0.7:2552/system/bootstrapCoordinator] Looking up [Lookup(integration-test-kubernetes-dns-internal.akka-bootstrap.svc.cluster.local,Some(management),Some(tcp))]
-[DEBUG] [12/13/2018 07:13:42.936] [default-akka.actor.default-dispatcher-2] [DnsSimpleServiceDiscovery(akka://default)] Lookup [Lookup(integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local,Some(management),Some(tcp))] translated to SRV query [_management._tcp.integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local] as contains portName and protocol
-[DEBUG] [12/13/2018 07:13:42.995] [default-akka.actor.default-dispatcher-18] [akka.tcp://default@172.17.0.7:2552/system/IO-DNS] Resolution request for _management._tcp.integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local Srv from Actor[akka://default/temp/$a]
-[DEBUG] [12/13/2018 07:13:43.011] [default-akka.actor.default-dispatcher-6] [akka.tcp://default@172.17.0.7:2552/system/IO-DNS/async-dns/$a] Attempting to resolve _management._tcp.integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local with Actor[akka://default/system/IO-DNS/async-dns/$a/$a#1272991285]
-[DEBUG] [12/13/2018 07:13:43.049] [default-akka.actor.default-dispatcher-18] [akka.tcp://default@172.17.0.7:2552/system/IO-TCP/selectors/$a/0] Successfully bound to /0.0.0.0:8558
-[DEBUG] [12/13/2018 07:13:43.134] [default-akka.actor.default-dispatcher-18] [akka.tcp://default@172.17.0.7:2552/system/IO-DNS/async-dns/$a/$a] Resolving [_management._tcp.integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local] (SRV)
-[INFO] [12/13/2018 07:13:43.147] [default-akka.actor.default-dispatcher-6] [AkkaManagement(akka://default)] Bound Akka Management (HTTP) endpoint to: 0.0.0.0:8558
-[DEBUG] [12/13/2018 07:13:43.156] [default-akka.actor.default-dispatcher-5] [akka.tcp://default@172.17.0.7:2552/system/IO-TCP/selectors/$a/1] Successfully bound to /0.0.0.0:8080
+[INFO] [12/13/2018 07:13:42.867] [main] [ClusterBootstrap(pekko://default)] Initiating bootstrap procedure using pekko.discovery.pekko-dns method...
+[DEBUG] [12/13/2018 07:13:42.906] [default-akka.actor.default-dispatcher-2] [TimerScheduler(pekko://default)] Start timer [resolve-key] with generation [1]
+[DEBUG] [12/13/2018 07:13:42.919] [default-akka.actor.default-dispatcher-2] [TimerScheduler(pekko://default)] Start timer [decide-key] with generation [2]
+[INFO] [12/13/2018 07:13:42.924] [default-akka.actor.default-dispatcher-2] [pekko.tcp://default@172.17.0.7:2552/system/bootstrapCoordinator] Locating service members. Using discovery [pekko.discovery.dns.DnsSimpleServiceDiscovery], join decider [org.apache.pekko.management.cluster.bootstrap.LowestAddressJoinDecider]
+[INFO] [12/13/2018 07:13:42.933] [default-akka.actor.default-dispatcher-2] [pekko.tcp://default@172.17.0.7:2552/system/bootstrapCoordinator] Looking up [Lookup(integration-test-kubernetes-dns-internal.akka-bootstrap.svc.cluster.local,Some(management),Some(tcp))]
+[DEBUG] [12/13/2018 07:13:42.936] [default-akka.actor.default-dispatcher-2] [DnsSimpleServiceDiscovery(pekko://default)] Lookup [Lookup(integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local,Some(management),Some(tcp))] translated to SRV query [_management._tcp.integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local] as contains portName and protocol
+[DEBUG] [12/13/2018 07:13:42.995] [default-akka.actor.default-dispatcher-18] [pekko.tcp://default@172.17.0.7:2552/system/IO-DNS] Resolution request for _management._tcp.integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local Srv from Actor[pekko://default/temp/$a]
+[DEBUG] [12/13/2018 07:13:43.011] [default-akka.actor.default-dispatcher-6] [pekko.tcp://default@172.17.0.7:2552/system/IO-DNS/async-dns/$a] Attempting to resolve _management._tcp.integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local with Actor[pekko://default/system/IO-DNS/async-dns/$a/$a#1272991285]
+[DEBUG] [12/13/2018 07:13:43.049] [default-akka.actor.default-dispatcher-18] [pekko.tcp://default@172.17.0.7:2552/system/IO-TCP/selectors/$a/0] Successfully bound to /0.0.0.0:8558
+[DEBUG] [12/13/2018 07:13:43.134] [default-akka.actor.default-dispatcher-18] [pekko.tcp://default@172.17.0.7:2552/system/IO-DNS/async-dns/$a/$a] Resolving [_management._tcp.integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local] (SRV)
+[INFO] [12/13/2018 07:13:43.147] [default-akka.actor.default-dispatcher-6] [PekkoManagement(pekko://default)] Bound Pekko Management (HTTP) endpoint to: 0.0.0.0:8558
+[DEBUG] [12/13/2018 07:13:43.156] [default-akka.actor.default-dispatcher-5] [pekko.tcp://default@172.17.0.7:2552/system/IO-TCP/selectors/$a/1] Successfully bound to /0.0.0.0:8080
[INFO] [12/13/2018 07:13:43.180] [main] [akka.actor.ActorSystemImpl(default)] Server online at http://localhost:8080/
....
-[INFO] [12/13/2018 07:13:50.631] [default-akka.actor.default-dispatcher-5] [akka.cluster.Cluster(akka://default)] Cluster Node [akka.tcp://default@172.17.0.7:2552] - Welcome from [akka.tcp://default@172.17.0.6:2552]
-[DEBUG] [12/13/2018 07:13:50.644] [default-akka.remote.default-remote-dispatcher-22] [akka.serialization.Serialization(akka://default)] Using serializer [akka.cluster.protobuf.ClusterMessageSerializer] for message [akka.cluster.GossipEnvelope]
-[INFO] [12/13/2018 07:13:50.659] [default-akka.actor.default-dispatcher-18] [akka.tcp://default@172.17.0.7:2552/user/$b] Cluster akka.tcp://default@172.17.0.7:2552 >>> MemberUp(Member(address = akka.tcp://default@172.17.0.6:2552, status = Up))
-[INFO] [12/13/2018 07:13:50.676] [default-akka.actor.default-dispatcher-20] [akka.tcp://default@172.17.0.7:2552/user/$b] Cluster akka.tcp://default@172.17.0.7:2552 >>> MemberJoined(Member(address = akka.tcp://default@172.17.0.7:2552, status = Joining))
-[INFO] [12/13/2018 07:13:50.716] [default-akka.actor.default-dispatcher-6] [akka.tcp://default@172.17.0.7:2552/user/$b] Cluster akka.tcp://default@172.17.0.7:2552 >>> LeaderChanged(Some(akka.tcp://default@172.17.0.6:2552))
-[INFO] [12/13/2018 07:13:50.720] [default-akka.actor.default-dispatcher-3] [akka.tcp://default@172.17.0.7:2552/user/$b] Cluster akka.tcp://default@172.17.0.7:2552 >>> RoleLeaderChanged(dc-default,Some(akka.tcp://default@172.17.0.6:2552))
-[INFO] [12/13/2018 07:13:50.727] [default-akka.actor.default-dispatcher-6] [akka.tcp://default@172.17.0.7:2552/user/$b] Cluster akka.tcp://default@172.17.0.7:2552 >>> SeenChanged(true,Set(akka.tcp://default@172.17.0.6:2552, akka.tcp://default@172.17.0.7:2552))
-[INFO] [12/13/2018 07:13:50.733] [default-akka.actor.default-dispatcher-5] [akka.tcp://default@172.17.0.7:2552/user/$b] Cluster akka.tcp://default@172.17.0.7:2552 >>> ReachabilityChanged()
+[INFO] [12/13/2018 07:13:50.631] [default-akka.actor.default-dispatcher-5] [org.apache.pekko.cluster.Cluster(pekko://default)] Cluster Node [pekko.tcp://default@172.17.0.7:2552] - Welcome from [pekko.tcp://default@172.17.0.6:2552]
+[DEBUG] [12/13/2018 07:13:50.644] [default-pekko.remote.default-remote-dispatcher-22] [akka.serialization.Serialization(pekko://default)] Using serializer [org.apache.pekko.cluster.protobuf.ClusterMessageSerializer] for message [org.apache.pekko.cluster.GossipEnvelope]
+[INFO] [12/13/2018 07:13:50.659] [default-akka.actor.default-dispatcher-18] [pekko.tcp://default@172.17.0.7:2552/user/$b] Cluster pekko.tcp://default@172.17.0.7:2552 >>> MemberUp(Member(address = pekko.tcp://default@172.17.0.6:2552, status = Up))
+[INFO] [12/13/2018 07:13:50.676] [default-akka.actor.default-dispatcher-20] [pekko.tcp://default@172.17.0.7:2552/user/$b] Cluster pekko.tcp://default@172.17.0.7:2552 >>> MemberJoined(Member(address = pekko.tcp://default@172.17.0.7:2552, status = Joining))
+[INFO] [12/13/2018 07:13:50.716] [default-akka.actor.default-dispatcher-6] [pekko.tcp://default@172.17.0.7:2552/user/$b] Cluster pekko.tcp://default@172.17.0.7:2552 >>> LeaderChanged(Some(pekko.tcp://default@172.17.0.6:2552))
+[INFO] [12/13/2018 07:13:50.720] [default-akka.actor.default-dispatcher-3] [pekko.tcp://default@172.17.0.7:2552/user/$b] Cluster pekko.tcp://default@172.17.0.7:2552 >>> RoleLeaderChanged(dc-default,Some(pekko.tcp://default@172.17.0.6:2552))
+[INFO] [12/13/2018 07:13:50.727] [default-akka.actor.default-dispatcher-6] [pekko.tcp://default@172.17.0.7:2552/user/$b] Cluster pekko.tcp://default@172.17.0.7:2552 >>> SeenChanged(true,Set(pekko.tcp://default@172.17.0.6:2552, pekko.tcp://default@172.17.0.7:2552))
+[INFO] [12/13/2018 07:13:50.733] [default-akka.actor.default-dispatcher-5] [pekko.tcp://default@172.17.0.7:2552/user/$b] Cluster pekko.tcp://default@172.17.0.7:2552 >>> ReachabilityChanged()
```
diff --git a/docs/src/main/paradox/bootstrap/troubleshooting.md b/docs/src/main/paradox/bootstrap/troubleshooting.md
index 935a609..1c3b02f 100644
--- a/docs/src/main/paradox/bootstrap/troubleshooting.md
+++ b/docs/src/main/paradox/bootstrap/troubleshooting.md
@@ -4,15 +4,15 @@
When troubleshooting cluster bootstrap, it could be helpful to enable `DEBUG` logging for:
-* `akka.discovery`
-* `akka.management.cluster.bootstrap`
+* `org.apache.pekko.discovery`
+* `org.apache.pekko.management.cluster.bootstrap`
## Kubernetes API `HTTP chunk size exceeds the configured limit` during contact point discovery
Increase the max chunk size with:
```
-akka.http.client.parsing.max-chunk-size = 20m
+pekko.http.client.parsing.max-chunk-size = 20m
```
This should only be necessary if the cluster size is 100s of nodes.
diff --git a/docs/src/main/paradox/cluster-http-management.md b/docs/src/main/paradox/cluster-http-management.md
index 8e849e9..68cd8ca 100644
--- a/docs/src/main/paradox/cluster-http-management.md
+++ b/docs/src/main/paradox/cluster-http-management.md
@@ -1,11 +1,11 @@
<a id="http-cluster-management"></a>
# Cluster HTTP Management
-Akka Management Cluster HTTP is a Management extension that allows interaction with an `akka-cluster` through an HTTP interface.
+Pekko Management Cluster HTTP is a Management extension that allows interaction with an `pekko-cluster` through an HTTP interface.
This management extension exposes different operations to manage nodes in a cluster as well as health checks based
on the cluster state.
-The operations exposed are comparable to the Command Line Management tool or the JMX interface `akka-cluster` provides.
+The operations exposed are comparable to the Command Line Management tool or the JMX interface `pekko-cluster` provides.
## Project Info
@@ -17,46 +17,46 @@ The Akka Cluster HTTP Management is a separate jar file.
Make sure to include it along with the core akka-management library in your project:
@@dependency[sbt,Gradle,Maven] {
- symbol1=AkkaManagementVersion
+ symbol1=PekkoManagementVersion
value1="$project.version$"
group=com.lightbend.akka.management
artifact=akka-management_$scala.binary.version$
- version=AkkaManagementVersion
+ version=PekkoManagementVersion
group2=com.lightbend.akka.management
artifact2=akka-management-cluster-http_$scala.binary.version$
- version2=AkkaManagementVersion
+ version2=PekkoManagementVersion
}
-Akka Cluster HTTP Management can be used with Akka $akka.version$ or later.
+Akka Cluster HTTP Management can be used with Akka $pekko.version$ or later.
You have to override the following Akka dependencies by defining them explicitly in your build and
define the Akka version to the one that you are using. Latest patch version of Akka is recommended and
-a later version than $akka.version$ can be used.
+a later version than $pekko.version$ can be used.
@@dependency[sbt,Gradle,Maven] {
- symbol=AkkaVersion
- value=$akka.version$
- group=com.typesafe.akka
- artifact=akka-cluster-sharding_$scala.binary.version$
- version=AkkaVersion
- group2=com.typesafe.akka
- artifact2=akka-discovery_$scala.binary.version$
- version2=AkkaVersion
+ symbol=PekkoVersion
+ value=$pekko.version$
+ group=org.apache.pekko
+ artifact=pekko-cluster-sharding_$scala.binary.version$
+ version=PekkoVersion
+ group2=org.apache.pekko
+ artifact2=pekko-discovery_$scala.binary.version$
+ version2=PekkoVersion
}
## Running
-To make sure the Akka Cluster HTTP Management is running, register it with Akka Management:
+To make sure the Akka Cluster HTTP Management is running, register it with Pekko Management:
Scala
-: @@snip [CompileOnlySpec.scala](/management-cluster-http/src/test/scala/doc/akka/cluster/http/management/CompileOnlySpec.scala) { #loading }
+: @@snip [CompileOnlySpec.scala](/management-cluster-http/src/test/scala/doc/org/apache/pekko/cluster/http/management/CompileOnlySpec.scala) { #loading }
Java
-: @@snip [CompileOnlyTest.java](/management-cluster-http/src/test/java/jdoc/akka/cluster/http/management/CompileOnlyTest.java) { #loading }
+: @@snip [CompileOnlyTest.java](/management-cluster-http/src/test/java/jdoc/org/apache/pekko/cluster/http/management/CompileOnlyTest.java) { #loading }
## API Definition
The following table describes the usage of the API. All `GET` operations are exposed by default. `POST`, `PUT` and `DELETE` operations
-are only enabled if `akka.management.http.route-providers-read-only` is set to `false`.
+are only enabled if `pekko.management.http.route-providers-read-only` is set to `false`.
| Path | HTTP method | Required form fields | Description
| ---------------------------- | ----------- | ------------------------------------ | -----------
@@ -70,7 +70,7 @@ are only enabled if `akka.management.http.route-providers-read-only` is set to `
| `/cluster/members/{address}` | PUT | operation: Leave | Executes leave operation in cluster for provided `{address}`.
| `/cluster/shards/{name}` | GET | None | Returns shard info for the shard region with the provided `{name}`
-The expected format of `address` follows the Cluster URI convention. Example: `akka://Main@myhostname.com:3311`
+The expected format of `address` follows the Cluster URI convention. Example: `pekko://Main@myhostname.com:3311`
In the paths `address` is also allowed to be provided without the protocol prefix. Example: `Main@myhostname.com:3311`
@@ -114,10 +114,10 @@ Example response:
Transfer-Encoding: chunked
Content-Type: text/event-stream
- data:{"member":{"dataCenter":"default","roles":["dc-default"],"status":"Up","uniqueAddress":{"address":"akka://default@127.0.0.1:2551","longUid":-2440990093160003086}},"type":"MemberUp"}
+ data:{"member":{"dataCenter":"default","roles":["dc-default"],"status":"Up","uniqueAddress":{"address":"pekko://default@127.0.0.1:2551","longUid":-2440990093160003086}},"type":"MemberUp"}
event:MemberUp
- data:{"address":"akka://default@127.0.0.1:2551","type":"LeaderChanged"}
+ data:{"address":"pekko://default@127.0.0.1:2551","type":"LeaderChanged"}
event:LeaderChanged
### Get /cluster/domain-events responses
@@ -137,18 +137,18 @@ Example response:
Example response:
{
- "selfNode": "akka.tcp://test@10.10.10.10:1111",
+ "selfNode": "pekko.tcp://test@10.10.10.10:1111",
"members": [
{
- "node": "akka.tcp://test@10.10.10.10:1111",
+ "node": "pekko.tcp://test@10.10.10.10:1111",
"nodeUid": "1116964444",
"status": "Up",
"roles": []
}
],
"unreachable": [],
- "leader: "akka.tcp://test@10.10.10.10:1111",
- "oldest: "akka.tcp://test@10.10.10.10:1111"
+ "leader: "pekko.tcp://test@10.10.10.10:1111",
+ "oldest: "pekko.tcp://test@10.10.10.10:1111"
}
Where `oldest` is the oldest node in the current datacenter.
@@ -162,7 +162,7 @@ Where `oldest` is the oldest node in the current datacenter.
Example response:
- Joining akka.tcp://test@10.10.10.10:111
+ Joining pekko.tcp://test@10.10.10.10:111
### Get /cluster/members/{address} responses
@@ -175,7 +175,7 @@ Example response:
Example response:
{
- "node": "akka.tcp://test@10.10.10.10:1111",
+ "node": "pekko.tcp://test@10.10.10.10:1111",
"nodeUid": "-169203556",
"status": "Up",
"roles": []
@@ -191,7 +191,7 @@ Example response:
Example response:
- Leaving akka.tcp://test@10.10.10.10:111
+ Leaving pekko.tcp://test@10.10.10.10:111
### Put /cluster/members/{address} responses
@@ -205,7 +205,7 @@ Example response:
Example response:
- Downing akka.tcp://test@10.10.10.10:111
+ Downing pekko.tcp://test@10.10.10.10:111
### Get /cluster/shard responses
@@ -237,24 +237,24 @@ Example response:
]
}
-## Hosting the routes in an existing Akka HTTP server
+## Hosting the routes in an existing Pekko HTTP server
-Starting `AkkaMangement` starts an Akka HTTP server and hosts the Cluster HTTP Routes. The routes can also be added
-to an existing Akka HTTP server. To access all the routes:
+Starting `AkkaMangement` starts a Pekko HTTP server and hosts the Cluster HTTP Routes. The routes can also be added
+to an existing Pekko HTTP server. To access all the routes:
Scala
-: @@snip [CompileOnlySpec.scala](/management-cluster-http/src/test/scala/doc/akka/cluster/http/management/CompileOnlySpec.scala) { #all }
+: @@snip [CompileOnlySpec.scala](/management-cluster-http/src/test/scala/doc/org/apache/pekko/cluster/http/management/CompileOnlySpec.scala) { #all }
Java
-: @@snip [CompileOnlyTest.java](/management-cluster-http/src/test/java/jdoc/akka/cluster/http/management/CompileOnlyTest.java) { #all }
+: @@snip [CompileOnlyTest.java](/management-cluster-http/src/test/java/jdoc/org/apache/pekko/cluster/http/management/CompileOnlyTest.java) { #all }
Just the read only routes can be accessed:
Scala
-: @@snip [CompileOnlySpec.scala](/management-cluster-http/src/test/scala/doc/akka/cluster/http/management/CompileOnlySpec.scala) { #read-only }
+: @@snip [CompileOnlySpec.scala](/management-cluster-http/src/test/scala/doc/org/apache/pekko/cluster/http/management/CompileOnlySpec.scala) { #read-only }
Java
-: @@snip [CompileOnlyTest.java](/management-cluster-http/src/test/java/jdoc/akka/cluster/http/management/CompileOnlyTest.java) { #read-only }
+: @@snip [CompileOnlyTest.java](/management-cluster-http/src/test/java/jdoc/org/apache/pekko/cluster/http/management/CompileOnlyTest.java) { #read-only }
## Disable routes
@@ -262,7 +262,7 @@ The Cluster HTTP Routes are included by default when this module is used. It can
configuration, for example if the cluster membership health checks are to be included but not the other Cluster HTTP Routes.
```
-akka.management.http.routes {
+pekko.management.http.routes {
cluster-management = ""
}
```
@@ -271,12 +271,12 @@ akka.management.http.routes {
A cluster membership @ref:[health check](healthchecks.md) is included that is designed to be used as a readiness check.
-By default the health check returns `true` when a node is either `Up` or `WeaklyUp`. Can be configured with `akka.management.cluster.health-checks.ready-states`.
+By default the health check returns `true` when a node is either `Up` or `WeaklyUp`. Can be configured with `pekko.management.cluster.health-checks.ready-states`.
The cluster membership readiness check can be disabled with configuration:
```
-akka.management.health-checks.readiness-checks {
+pekko.management.health-checks.readiness-checks {
cluster-membership = ""
}
```
diff --git a/docs/src/main/paradox/cluster-jmx-management.md b/docs/src/main/paradox/cluster-jmx-management.md
index 5bb0e4c..6487301 100644
--- a/docs/src/main/paradox/cluster-jmx-management.md
+++ b/docs/src/main/paradox/cluster-jmx-management.md
@@ -1,4 +1,4 @@
# Built-in JMX Management
Akka has built-in JMX beans which you can use to manage the cluster, read more about them in the Akka
-documentation: @extref:[Cluster Usage: JMX](akka:cluster-usage.html#cluster-jmx)
+documentation: @extref:[Cluster Usage: JMX](pekko:cluster-usage.html#cluster-jmx)
diff --git a/docs/src/main/paradox/discovery/aws.md b/docs/src/main/paradox/discovery/aws.md
index 52be1d7..5284338 100644
--- a/docs/src/main/paradox/discovery/aws.md
+++ b/docs/src/main/paradox/discovery/aws.md
@@ -30,7 +30,7 @@ instead.
### Discovery Method: AWS API - EC2 Tag-Based Discovery
You can use tags to simply mark the instances that belong to the same cluster. Use a tag that
-has "service" as the key and set the value equal to the name of your service (same value as `akka.management.cluster.bootstrap.contact-point-discovery.service-name`
+has "service" as the key and set the value equal to the name of your service (same value as `pekko.management.cluster.bootstrap.contact-point-discovery.service-name`
defined in `application.conf`, if you're using this module for bootstrapping your Akka cluster).
Screenshot of two tagged EC2 instances:
@@ -50,33 +50,33 @@ ensure the "Tag New Instances" option is checked.
This is a separate JAR file:
@@dependency[sbt,Gradle,Maven] {
- symbol1=AkkaManagementVersion
+ symbol1=PekkoManagementVersion
value1=$project.version$
- group="com.lightbend.akka.discovery"
- artifact="akka-discovery-aws-api_$scala.binary.version$"
- version=AkkaManagementVersion
+ group="com.lightbend.pekko.discovery"
+ artifact="pekko-discovery-aws-api_$scala.binary.version$"
+ version=PekkoManagementVersion
}
-`akka-discovery-aws-api` can be used with Akka $akka.version$ or later.
+`pekko-discovery-aws-api` can be used with Akka $pekko.version$ or later.
You have to override the following Akka dependencies by defining them explicitly in your build and
define the Akka version to the one that you are using. Latest patch version of Akka is recommended and
-a later version than $akka.version$ can be used.
+a later version than $pekko.version$ can be used.
@@dependency[sbt,Gradle,Maven] {
- symbol=AkkaVersion
- value=$akka.version$
- group=com.typesafe.akka
- artifact=akka-cluster_$scala.binary.version$
- version=AkkaVersion
- group2=com.typesafe.akka
- artifact2=akka-discovery_$scala.binary.version$
- version2=AkkaVersion
+ symbol=PekkoVersion
+ value=$pekko.version$
+ group=org.apache.pekko
+ artifact=pekko-cluster_$scala.binary.version$
+ version=PekkoVersion
+ group2=org.apache.pekko
+ artifact2=pekko-discovery_$scala.binary.version$
+ version2=PekkoVersion
}
And in your `application.conf`:
```
-akka.discovery {
+pekko.discovery {
method = aws-api-ec2-tag-based
}
```
@@ -93,10 +93,10 @@ Attach this IAM role to the EC2 instances that need to access the discovery impl
same security group and [the proper rules have to be set](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/security-group-rules-reference.html#sg-rules-other-instances).
* You can set additional filters (by instance type, region, other tags etc.) in your application.conf file, in the
-`akka.discovery.aws-api-ec2-tag-based.filters` key. The filters have to be key=value pairs separated by the semicolon
+`pekko.discovery.aws-api-ec2-tag-based.filters` key. The filters have to be key=value pairs separated by the semicolon
character. For example:
```
- akka {
+ pekko {
discovery {
aws-api-ec2-tag-based {
filters = "instance-type=m1.small;tag:purpose=production"
@@ -109,11 +109,11 @@ character. For example:
separates cluster members solely by their EC2 IP address. However, we can change the default configuration to indicate multiple ports per discovered EC2 IP, and achieve
a setup with multiple Akka nodes (i.e. multiple JVMs) per EC2 instance.
```
- akka {
+ pekko {
discovery {
aws-api-ec2-tag-based {
ports = [8557, 8558, 8559] # 3 Akka nodes per EC2 instance
- # note that the above need to be the ports associated with the *Akka Management* extension
+ # note that the above need to be the ports associated with the *Pekko Management* extension
}
}
}
@@ -121,13 +121,13 @@ a setup with multiple Akka nodes (i.e. multiple JVMs) per EC2 instance.
Note: this comes with the limitation that each EC2 instance has to have the same number of Akka nodes.
* You can change the default tag key from "service" to something else. This can be done via `application.conf`, by
-setting `akka.discovery.aws-api-ec2-tag-based.tag-key` to something else.
+setting `pekko.discovery.aws-api-ec2-tag-based.tag-key` to something else.
```
- akka.discovery.aws-api-ec2-tag-based.tag-key = "akka-cluster"
+ pekko.discovery.aws-api-ec2-tag-based.tag-key = "pekko-cluster"
```
-* If your service is running in a docker container, you will need to configure Akka Management with separate
- IPs for binding and discovery. This is because Akka Management needs to _bind_ to the internal docker IP,
+* If your service is running in a docker container, you will need to configure Pekko Management with separate
+ IPs for binding and discovery. This is because Pekko Management needs to _bind_ to the internal docker IP,
but will _discover_ the "host" IP (the EC2 private IP) on the AWS API. See @ref:[Basic
Configuration](../akka-management.md) on how to separate the bind IP from the discovery IP.
@@ -144,7 +144,7 @@ If you're using ECS with
mode networking, you can have all task instances of a given ECS service discover
each other. If you're using this module for bootstrapping your Akka cluster that
you'll do so by setting the value of
-`akka.management.cluster.bootstrap.contact-point-discovery.service-name` to that of the
+`pekko.management.cluster.bootstrap.contact-point-discovery.service-name` to that of the
ECS service itself.
Screenshot of two ECS task instances (the service name is
@@ -157,24 +157,24 @@ Screenshot of two ECS task instances (the service name is
There are two "flavours" of the ECS Discovery module.
-##### akka-discovery-aws-api
+##### pekko-discovery-aws-api
This uses the mainstream AWS SDK. The advantage here is that if you've already
got the mainstream AWS SDK as a dependency you're not now also bringing in the
preview SDK. The disadvantage is that the mainstream SDK does blocking IO.
@@dependency[sbt,Gradle,Maven] {
- symbol1=AkkaManagementVersion
+ symbol1=PekkoManagementVersion
value1=$project.version$
- group="com.lightbend.akka.discovery"
- artifact="akka-discovery-aws-api_$scala.binary.version$"
- version=AkkaManagementVersion
+ group="com.lightbend.pekko.discovery"
+ artifact="pekko-discovery-aws-api_$scala.binary.version$"
+ version=PekkoManagementVersion
}
And in your `application.conf`:
```
-akka.discovery {
+pekko.discovery {
method = aws-api-ecs
aws-api-ecs {
# Defaults to "default" to match the AWS default cluster name if not overridden
@@ -184,7 +184,7 @@ akka.discovery {
```
-##### akka-discovery-aws-api-async
+##### pekko-discovery-aws-api-async
This uses the preview AWS SDK. The advantage here is that the SDK does
non-blocking IO, which you probably want. You might need to think carefully
@@ -192,15 +192,15 @@ before using this though if you've already got the mainstream AWS SDK as a
dependency.
Once the async AWS SDK is out of preview it is likely that the
-`akka-discovery-aws-api` module will be discontinued in favour of
-`akka-discovery-aws-api-async`.
+`pekko-discovery-aws-api` module will be discontinued in favour of
+`pekko-discovery-aws-api-async`.
@@dependency[sbt,Gradle,Maven] {
- symbol1=AkkaManagementVersion
+ symbol1=PekkoManagementVersion
value1=$project.version$
- group="com.lightbend.akka.discovery"
- artifact="akka-discovery-aws-api-async_$scala.binary.version$"
- version=AkkaManagementVersion
+ group="com.lightbend.pekko.discovery"
+ artifact="pekko-discovery-aws-api-async_$scala.binary.version$"
+ version=PekkoManagementVersion
}
We have 2 approaches in ECS: `aws-api-ecs-async` and `aws-api-ecs-task-set-async`.
@@ -210,7 +210,7 @@ We have 2 approaches in ECS: `aws-api-ecs-async` and `aws-api-ecs-task-set-async
In your `application.conf`:
```
-akka.discovery {
+pekko.discovery {
method = aws-api-ecs-async
aws-api-ecs-async {
# Defaults to "default" to match the AWS default cluster name if not overridden
@@ -224,7 +224,7 @@ akka.discovery {
```
This will query the AWS API to retrieve all running tasks of the ESC service specified at
-`akka.management.cluster.bootstrap.contact-point-discovery.service-name`.
+`pekko.management.cluster.bootstrap.contact-point-discovery.service-name`.
###### aws-api-ecs-task-set-async
@@ -233,7 +233,7 @@ If you use AWS CodeDeploy, you probably want to use this method of discovery.
In your `application.conf`:
```
-akka.discovery {
+pekko.discovery {
method = aws-api-ecs-task-set-async
aws-api-ecs-task-set-async {
# Defaults to "default" to match the AWS default cluster name if not overridden
@@ -262,9 +262,9 @@ Notes:
rules have to be set. See the docs for
[Task Networking with the `awsvpc` Network Mode](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-networking.html).
-* akka-remote by default sets `akka.remote.netty.tcp.hostname` to the result of
+* akka-remote by default sets `pekko.remote.netty.tcp.hostname` to the result of
`InetAddress.getLocalHost.getHostAddress`, and akka-management does the same
- for `akka.management.http.hostname`. However,
+ for `pekko.management.http.hostname`. However,
`InetAddress.getLocalHost.getHostAddress` throws an exception when running in
awsvpc mode (because the container name cannot be resolved), so you will need
to set this explicitly. An alternative host address discovery method is
@@ -275,16 +275,16 @@ Notes:
* Because ECS service discovery is only able to discover IP addresses (not ports
too) you'll need to set
- `akka.management.cluster.bootstrap.contact-point.fallback-port = 8558`, where
+ `pekko.management.cluster.bootstrap.contact-point.fallback-port = 8558`, where
8558 is whatever port you choose to bind akka-management to.
* You can set additional filters to only discover nodes with specific tag values in
- your application.conf file, in the `akka.discovery.aws-api-ecs-async.tags` key.
+ your application.conf file, in the `pekko.discovery.aws-api-ecs-async.tags` key.
An empty list of tags will not filter any nodes out.
For example:
```
- akka {
+ pekko {
discovery {
aws-api-ecs-async {
tags = [
diff --git a/docs/src/main/paradox/discovery/consul.md b/docs/src/main/paradox/discovery/consul.md
index c853ae3..2113b84 100644
--- a/docs/src/main/paradox/discovery/consul.md
+++ b/docs/src/main/paradox/discovery/consul.md
@@ -3,7 +3,7 @@
@@@ warning
This module is community maintained and the Lightbend subscription doesn't cover support for this module.
- It is also marked as @extref:[may change](akka:common/may-change.html).
+ It is also marked as @extref:[may change](pekko:common/may-change.html).
That means that the API, configuration or semantics can change without warning or deprecation period.
@@@
@@ -17,34 +17,34 @@ If you are using Consul to do the service discovery this would allow you to base
@@project-info{ projectId="discovery-consul" }
@@dependency[sbt,Gradle,Maven] {
- symbol1=AkkaManagementVersion
+ symbol1=PekkoManagementVersion
value1=$project.version$
- group="com.lightbend.akka.discovery"
- artifact="akka-discovery-consul_$scala.binary.version$"
- version=AkkaManagementVersion
+ group="com.lightbend.pekko.discovery"
+ artifact="pekko-discovery-consul_$scala.binary.version$"
+ version=PekkoManagementVersion
}
-`akka-discovery-consul` can be used with Akka $akka.version$ or later.
+`pekko-discovery-consul` can be used with Akka $pekko.version$ or later.
You have to override the following Akka dependencies by defining them explicitly in your build and
define the Akka version to the one that you are using. Latest patch version of Akka is recommended and
-a later version than $akka.version$ can be used.
+a later version than $pekko.version$ can be used.
@@dependency[sbt,Gradle,Maven] {
- symbol=AkkaVersion
- value=$akka.version$
- group=com.typesafe.akka
- artifact=akka-cluster_$scala.binary.version$
- version=AkkaVersion
- group2=com.typesafe.akka
- artifact2=akka-discovery_$scala.binary.version$
- version2=AkkaVersion
+ symbol=PekkoVersion
+ value=$pekko.version$
+ group=org.apache.pekko
+ artifact=pekko-cluster_$scala.binary.version$
+ version=PekkoVersion
+ group2=org.apache.pekko
+ artifact2=pekko-discovery_$scala.binary.version$
+ version2=PekkoVersion
}
In your application conf add:
```
-akka.discovery {
- method = akka-consul
- akka-consul {
+pekko.discovery {
+ method = pekko-consul
+ pekko-consul {
#How to connect to Consul to fetch services data
consul-host = "127.0.0.1"
@@ -55,9 +55,9 @@ akka.discovery {
# i.e. `system:test` will be found in cluster if the cluster system is named `test`
application-name-tag-prefix = "system:"
- # Prefix for tag containing port number where akka management is set up so that
- # the seed nodes can be found, an example value for the tag would be `akka-management-port:19999`
- application-akka-management-port-tag-prefix = "akka-management-port:"
+ # Prefix for tag containing port number where pekko management is set up so that
+ # the seed nodes can be found, an example value for the tag would be `pekko-management-port:19999`
+ application-pekko-management-port-tag-prefix = "pekko-management-port:"
}
}
```
@@ -66,6 +66,6 @@ Notes:
* Since tags in Consul services are simple strings, prefixes are necessary to ensure that proper values are read.
-* If Akka management port tag is not found on service in Consul the implementation defaults to catalog service port.
+* If Pekko management port tag is not found on service in Consul the implementation defaults to catalog service port.
diff --git a/docs/src/main/paradox/discovery/index.md b/docs/src/main/paradox/discovery/index.md
index 9900249..7d0e813 100644
--- a/docs/src/main/paradox/discovery/index.md
+++ b/docs/src/main/paradox/discovery/index.md
@@ -1,17 +1,17 @@
-# Akka Discovery Methods
+# Apache Pekko Discovery Methods
-As of version `1.0.0` of Akka Management @extref:[Akka Discovery](akka:discovery/index.html)
-has become a core Akka module. Older versions of Service Discovery from Akka Management are not compatible with the
+As of version `1.0.0` of Pekko Management @extref:[Akka Discovery](pekko:discovery/index.html)
+has become a core Akka module. Older versions of Service Discovery from Pekko Management are not compatible with the
Akka Discovery module in Akka.
-Akka Management contains methods for:
+Pekko Management contains methods for:
* @ref[Kubernetes](kubernetes.md)
* @ref[Consul](consul.md)
* @ref[Marathon](marathon.md)
* @ref[AWS](aws.md)
-The @ref[Kubernetes](kubernetes.md) and @extref:[Akka Discovery DNS](akka:discovery/index.html#discovery-method-dns)
+The @ref[Kubernetes](kubernetes.md) and @extref:[Akka Discovery DNS](pekko:discovery/index.html#discovery-method-dns)
methods are known to be well used and tested. The others are community contributions that are not tested as
part of the build and release process.
diff --git a/docs/src/main/paradox/discovery/kubernetes.md b/docs/src/main/paradox/discovery/kubernetes.md
index 496cbe4..bf71565 100644
--- a/docs/src/main/paradox/discovery/kubernetes.md
+++ b/docs/src/main/paradox/discovery/kubernetes.md
@@ -2,7 +2,7 @@
If you want to use Kubernetes for @ref[Cluster Bootstrap](../bootstrap/index.md), please follow the @ref[Cluster Bootstrap Kubernetes API](../bootstrap/kubernetes-api.md) documentation that is tailored for that use case.
-The typical way to consume a service in Kubernetes is to discover it through DNS: this will take into account liveness/readiness checks, and depending on the configuration take care of load balancing (removing the need for client-side load balancing). For this reason, for general usage the @extref:[`akka-dns`](akka:discovery/index.html#discovery-method-dns) implementation is usually a better fit for discovering services in Kubernetes. However, in some cases, such as for @ref[Cluster Boot [...]
+The typical way to consume a service in Kubernetes is to discover it through DNS: this will take into account liveness/readiness checks, and depending on the configuration take care of load balancing (removing the need for client-side load balancing). For this reason, for general usage the @extref:[`pekko-dns`](pekko:discovery/index.html#discovery-method-dns) implementation is usually a better fit for discovering services in Kubernetes. However, in some cases, such as for @ref[Cluster Bo [...]
## Project Info
@@ -13,27 +13,27 @@ The typical way to consume a service in Kubernetes is to discover it through DNS
First, add the dependency on the component:
@@dependency[sbt,Gradle,Maven] {
- symbol1=AkkaManagementVersion
+ symbol1=PekkoManagementVersion
value1=$project.version$
- group="com.lightbend.akka.discovery"
- artifact="akka-discovery-kubernetes-api_$scala.binary.version$"
- version=AkkaManagementVersion
+ group="com.lightbend.pekko.discovery"
+ artifact="pekko-discovery-kubernetes-api_$scala.binary.version$"
+ version=PekkoManagementVersion
}
-`akka-discovery-kubernetes-api` can be used with Akka $akka.version$ or later.
+`pekko-discovery-kubernetes-api` can be used with Akka $pekko.version$ or later.
You have to override the following Akka dependencies by defining them explicitly in your build and
define the Akka version to the one that you are using. Latest patch version of Akka is recommended and
-a later version than $akka.version$ can be used.
+a later version than $pekko.version$ can be used.
@@dependency[sbt,Gradle,Maven] {
- symbol=AkkaVersion
- value=$akka.version$
- group=com.typesafe.akka
- artifact=akka-cluster_$scala.binary.version$
- version=AkkaVersion
- group2=com.typesafe.akka
- artifact2=akka-discovery_$scala.binary.version$
- version2=AkkaVersion
+ symbol=PekkoVersion
+ value=$pekko.version$
+ group=org.apache.pekko
+ artifact=pekko-cluster_$scala.binary.version$
+ version=PekkoVersion
+ group2=org.apache.pekko
+ artifact2=pekko-discovery_$scala.binary.version$
+ version2=PekkoVersion
}
As described above, it is uncommon to use the Kubernetes API discovery
@@ -42,7 +42,7 @@ Bootstrap, it is sufficient to configure it as described @ref[here](../bootstrap
Otherwise, to load it manually, use `loadServiceDiscovery` on the `Discovery` extension:
Scala
-: @@snip [KubernetesApiServiceDiscoverySpec.scala](/discovery-kubernetes-api/src/test/scala/akka/discovery/kubernetes/KubernetesApiServiceDiscoverySpec.scala) { #kubernetes-api-discovery }
+: @@snip [KubernetesApiServiceDiscoverySpec.scala](/discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscoverySpec.scala) { #kubernetes-api-discovery }
Java
: @@snip [KubernetesApiDiscoveryDocsTest.java](/discovery-kubernetes-api/src/test/java/docs/KubernetesApiDiscoveryDocsTest.java) { #kubernetes-api-discovery }
@@ -53,7 +53,7 @@ what namespace they reside in. Below, you'll find the default configuration. It
values in your `application.conf`.
```
-akka.discovery {
+pekko.discovery {
kubernetes-api {
# Namespace discovery path
#
@@ -101,7 +101,7 @@ spec:
containerPort: 2552
protocol: TCP
# When
- # akka.management.cluster.bootstrap.contact-point-discovery.port-name
+ # pekko.management.cluster.bootstrap.contact-point-discovery.port-name
# is defined, it must correspond to this name:
- name: management
containerPort: 8558
@@ -118,4 +118,4 @@ Adjust as necessary.
> Using Google Kubernetes Engine? Your user will need permission to grant roles. See [Google's Documentation](https://cloud.google.com/kubernetes-engine/docs/how-to/role-based-access-control#prerequisites_for_using_role-based_access_control) for more information.
-@@snip [akka-cluster.yml](/integration-test/kubernetes-api/kubernetes/akka-cluster.yml) { #rbac }
+@@snip [pekko-cluster.yml](/integration-test/kubernetes-api/kubernetes/pekko-cluster.yml) { #rbac }
diff --git a/docs/src/main/paradox/discovery/marathon.md b/docs/src/main/paradox/discovery/marathon.md
index f0761d2..76ca4f0 100644
--- a/docs/src/main/paradox/discovery/marathon.md
+++ b/docs/src/main/paradox/discovery/marathon.md
@@ -3,7 +3,7 @@
@@@ warning
This module is community maintained and the Lightbend subscription doesn't cover support for this module.
- It is also marked as @extref:[may change](akka:common/may-change.html).
+ It is also marked as @extref:[may change](pekko:common/may-change.html).
That means that the API, configuration or semantics can change without warning or deprecation period.
@@@
@@ -14,7 +14,7 @@ If you're a Mesos or DC/OS user, you can use the provided Marathon API implement
to your Marathon JSON (named `ACTOR_SYSTEM_NAME` by default) and set the value equal to the name of the configured
effective name, which defaults to your applications actor system name.
-You'll also have to add a named port, by default `akkamgmthttp`, and ensure that Akka Management's HTTP interface
+You'll also have to add a named port, by default `pekkomgmthttp`, and ensure that Pekko Management's HTTP interface
is bound to this port.
## Project Info
@@ -26,33 +26,33 @@ is bound to this port.
This is a separate JAR file:
@@dependency[sbt,Gradle,Maven] {
- symbol1=AkkaManagementVersion
+ symbol1=PekkoManagementVersion
value1=$project.version$
- group="com.lightbend.akka.discovery"
- artifact="akka-discovery-marathon-api_$scala.binary.version$"
- version=AkkaManagementVersion
+ group="com.lightbend.pekko.discovery"
+ artifact="pekko-discovery-marathon-api_$scala.binary.version$"
+ version=PekkoManagementVersion
}
-`akka-discovery-marathon-api` can be used with Akka $akka.version$ or later.
+`pekko-discovery-marathon-api` can be used with Akka $pekko.version$ or later.
You have to override the following Akka dependencies by defining them explicitly in your build and
define the Akka version to the one that you are using. Latest patch version of Akka is recommended and
-a later version than $akka.version$ can be used.
+a later version than $pekko.version$ can be used.
@@dependency[sbt,Gradle,Maven] {
- symbol=AkkaVersion
- value=$akka.version$
- group=com.typesafe.akka
- artifact=akka-cluster_$scala.binary.version$
- version=AkkaVersion
- group2=com.typesafe.akka
- artifact2=akka-discovery_$scala.binary.version$
- version2=AkkaVersion
+ symbol=PekkoVersion
+ value=$pekko.version$
+ group=org.apache.pekko
+ artifact=pekko-cluster_$scala.binary.version$
+ version=PekkoVersion
+ group2=org.apache.pekko
+ artifact2=pekko-discovery_$scala.binary.version$
+ version2=PekkoVersion
}
And in your `application.conf`:
```
-akka.discovery {
+pekko.discovery {
method = marathon-api
}
```
@@ -61,7 +61,7 @@ And in your `marathon.json`:
```
{
...
- "cmd": "path-to-your-app -Dakka.remote.netty.tcp.hostname=$HOST -Dakka.remote.netty.tcp.port=$PORT_AKKAREMOTE -Dakka.management.http.hostname=$HOST -Dakka.management.http.port=$PORT_AKKAMGMTHTTP",
+ "cmd": "path-to-your-app -Dpekko.remote.netty.tcp.hostname=$HOST -Dpekko.remote.netty.tcp.port=$PORT_AKKAREMOTE -Dpekko.management.http.hostname=$HOST -Dpekko.management.http.port=$PORT_AKKAMGMTHTTP",
"labels": {
"ACTOR_SYSTEM_NAME": "my-system"
@@ -69,7 +69,7 @@ And in your `marathon.json`:
"portDefinitions": [
{ "port": 0, "name": "akkaremote" },
- { "port": 0, "name": "akkamgmthttp" }
+ { "port": 0, "name": "pekkomgmthttp" }
]
...
}
diff --git a/docs/src/main/paradox/healthchecks.md b/docs/src/main/paradox/healthchecks.md
index d4edec8..bfa645e 100644
--- a/docs/src/main/paradox/healthchecks.md
+++ b/docs/src/main/paradox/healthchecks.md
@@ -1,6 +1,6 @@
# Health checks
-Akka Management supports two kinds of health checks:
+Pekko Management supports two kinds of health checks:
* Readiness checks: should the application receive external traffic, for example waiting for the following to complete
* Joining a Cluster
@@ -13,33 +13,33 @@ This matches [Kubernetes Health checks](https://kubernetes.io/docs/tasks/configu
See [Kubernetes Liveness and Readiness Probes: How to Avoid Shooting Yourself in the Foot](https://blog.colinbreck.com/kubernetes-liveness-and-readiness-probes-how-to-avoid-shooting-yourself-in-the-foot/) for a
good overview of how to use readiness and liveness probes.
-Akka Management provides endpoints for readiness and liveness checks out of the box at `/ready` and `/alive` (paths can be configured, see below).
+Pekko Management provides endpoints for readiness and liveness checks out of the box at `/ready` and `/alive` (paths can be configured, see below).
Configuration settings are used to add checks to back those endpoints. When called, each endpoint will only report to be healthy when
*all* the configured health checks (for the particular kind, readiness or liveness) are succeeding.
## Defining a Health Check
A health check must extend @scala[`Function0[Future[Boolean]]`]@java[`Supplier[CompletionStage[Boolean]]`] and have either a no argument constructor or a constructor
-with a single argument of type `ActorSystem.` A general type is used rather than a specific interface so that modules such as `akka-cluster` can
-provide health checks without depending on Akka management.
+with a single argument of type `ActorSystem.` A general type is used rather than a specific interface so that modules such as `pekko-cluster` can
+provide health checks without depending on Pekko management.
Having access to the `ActorSystem` allows loading of any external resource via an Akka extension e.g. `Cluster` or a database connection. Health checks
return a @scala[`Future`]@java[`CompletionStage`] so that an asynchronous action can be taken.
Scala
-: @@snip [ExampleHealthCheck.scala](/management/src/test/scala/doc/akka/management/ExampleHealthCheck.scala) { #basic}
+: @@snip [ExampleHealthCheck.scala](/management/src/test/scala/doc/org/apache/pekko/management/ExampleHealthCheck.scala) { #basic}
Java
-: @@snip [ExampleHealthCheck.java](/management/src/test/java/jdoc/akka/management/BasicHealthCheck.java) { #basic}
+: @@snip [ExampleHealthCheck.java](/management/src/test/java/jdoc/org/apache/pekko/management/BasicHealthCheck.java) { #basic}
Typically the `ActorSystem` is used to get a hold of any state needed to execute the check e.g.
Scala
-: @@snip [ExampleHealthCheck.scala](/management/src/test/scala/doc/akka/management/ExampleHealthCheck.scala) { #cluster }
+: @@snip [ExampleHealthCheck.scala](/management/src/test/scala/doc/org/apache/pekko/management/ExampleHealthCheck.scala) { #cluster }
Java
-: @@snip [ExampleHealthCheck.java](/management/src/test/java/jdoc/akka/management/ClusterCheck.java) { #cluster }
+: @@snip [ExampleHealthCheck.java](/management/src/test/java/jdoc/org/apache/pekko/management/ClusterCheck.java) { #cluster }
Note that @ref:[Cluster Http Management](cluster-http-management.md) includes a health check for cluster membership that is configurable for which states are considered healthy.
@@ -49,26 +49,26 @@ Any of the above health checks can be configured as either readiness checks or l
Health checks are picked up from configuration. Modules are expected to provide health checks e.g. @ref:[Cluster Http Management](cluster-http-management.md) provides a cluster readiness check.
-Application specific health checks can be added a `name = <fully qualified class name>` to `akka.management.health-checks.readiness-checks` or `akka.management.health-checks.liveness-checks` e.g.
+Application specific health checks can be added a `name = <fully qualified class name>` to `pekko.management.health-checks.readiness-checks` or `pekko.management.health-checks.liveness-checks` e.g.
@@snip [reference.conf](/management-cluster-http/src/main/resources/reference.conf) { #health }
-## Hosting health checks as an Akka Management Route
+## Hosting health checks as an Pekko Management Route
-Health checks can be hosted via the Akka management HTTP server. The `akka.management.HealthCheckRoutes` is enabled
-by default as an Akka management route provider.
+Health checks can be hosted via the Pekko management HTTP server. The `pekko.management.HealthCheckRoutes` is enabled
+by default as a Pekko management route provider.
By default all readiness checks are hosted on `/ready` and liveness checks are hosted on `/alive`. If all of the checks
for an endpoint succeed a `200` is returned, if any fail or return `false` a `500` is returned. The paths are
-configurable via `akka.management.health-checks.readiness-path` and `akka.management.health-checks.liveness-path` e.g.
+configurable via `pekko.management.health-checks.readiness-path` and `pekko.management.health-checks.liveness-path` e.g.
@@snip [application.conf](/integration-test/local/src/main/resources/application.conf) { #health }
-The `akka.management.HealthCheckRoutes` can be disabled with the following configuration but that also
+The `org.apache.pekko.management.HealthCheckRoutes` can be disabled with the following configuration but that also
means that the configured `readiness-checks` and `liveness-checks` will not be used.
```
-akka.management.http.routes {
+pekko.management.http.routes {
health-checks = ""
}
```
diff --git a/docs/src/main/paradox/index.md b/docs/src/main/paradox/index.md
index e1ece47..0d7aaa0 100644
--- a/docs/src/main/paradox/index.md
+++ b/docs/src/main/paradox/index.md
@@ -1,32 +1,32 @@
-# Akka Management
+# Apache Pekko Management
-Akka Management is a suite of tools for operating Akka Clusters.
+Pekko Management is a suite of tools for operating Akka Clusters.
The current version may only be used with Akka 2.6.
## Overview
-Akka Management consists of multiple modules:
+Pekko Management consists of multiple modules:
- * @ref[akka-management](akka-management.md) is the base module that provides an extensible HTTP management endpoint for Akka management tools as well a @ref[pluggable health check mechanism](healthchecks.md).
- * @ref[akka-cluster-bootstrap](bootstrap/index.md) helps bootstrapping an Akka cluster using @extref:[Akka Discovery](akka:discovery/index.html).
+ * @ref[akka-management](akka-management.md) is the base module that provides an extensible HTTP management endpoint for Pekko management tools as well a @ref[pluggable health check mechanism](healthchecks.md).
+ * @ref[pekko-cluster-bootstrap](bootstrap/index.md) helps bootstrapping an Akka cluster using @extref:[Akka Discovery](pekko:discovery/index.html).
* @ref[akka-management-cluster-http](cluster-http-management.md) is a module that provides HTTP endpoints for introspecting and managing Akka clusters.
* @ref[kubernetes-lease](kubernetes-lease.md) a lease backed by Kubernetes API server.
- As well as @extref:[Akka Discovery](akka:discovery/index.html) methods for:
+ As well as @extref:[Akka Discovery](pekko:discovery/index.html) methods for:
* @ref[Kubernetes API](discovery/kubernetes.md)
* @ref[Consul](discovery/consul.md)
* @ref[Marathon API](discovery/marathon.md)
* @ref[AWS](discovery/aws.md)
-Various parts of Akka management can be used together for deploying Akka Cluster applications to Kubernetes.
+Various parts of Pekko management can be used together for deploying Akka Cluster applications to Kubernetes.
* @ref[Deploying Akka Cluster to Kubernetes](kubernetes-deployment/index.md)
@@@ index
- [Deploy guide for Kubernetes](kubernetes-deployment/index.md)
- - [Akka Management](akka-management.md)
+ - [Pekko Management](akka-management.md)
- [Migrating from older versions](migration.md)
- [Health Checks](healthchecks.md)
- [Akka Cluster Bootstrap](bootstrap/index.md)
diff --git a/docs/src/main/paradox/kubernetes-deployment/building-using-maven.md b/docs/src/main/paradox/kubernetes-deployment/building-using-maven.md
index 425b53a..a8b012f 100644
--- a/docs/src/main/paradox/kubernetes-deployment/building-using-maven.md
+++ b/docs/src/main/paradox/kubernetes-deployment/building-using-maven.md
@@ -64,7 +64,7 @@ The version number will only change when you create a new git commit. If you are
<arg>java</arg>
<arg>-cp</arg>
<arg>/maven/*</arg>
- <arg>akka.cluster.bootstrap.demo.DemoApp</arg>
+ <arg>org.apache.pekko.cluster.bootstrap.demo.DemoApp</arg>
</exec>
</entryPoint>
<assembly>
diff --git a/docs/src/main/paradox/kubernetes-deployment/building-using-sbt.md b/docs/src/main/paradox/kubernetes-deployment/building-using-sbt.md
index 9f51480..21b3dee 100644
--- a/docs/src/main/paradox/kubernetes-deployment/building-using-sbt.md
+++ b/docs/src/main/paradox/kubernetes-deployment/building-using-sbt.md
@@ -23,7 +23,7 @@ enablePlugins(JavaAppPackaging, DockerPlugin)
Here we're telling native packager to package our application as a Java application that can be run from the command line. This will package up all the applications dependencies (jar files), and generate a start script to start the application. To generate this start script, native packager needs to know what the applications main class is. When the application only has one main class in its source folder, sbt will detect this automatically, but in case there are multiple, or the main cl [...]
```scala
-Compile / mainClass := Some("akka.sample.cluster.kubernetes.DemoApp")
+Compile / mainClass := Some("prg.apache.pekko.sample.cluster.kubernetes.DemoApp")
```
### Selecting a JDK
diff --git a/docs/src/main/paradox/kubernetes-deployment/deploying.md b/docs/src/main/paradox/kubernetes-deployment/deploying.md
index fe2a278..259fdda 100644
--- a/docs/src/main/paradox/kubernetes-deployment/deploying.md
+++ b/docs/src/main/paradox/kubernetes-deployment/deploying.md
@@ -10,10 +10,10 @@ kubectl config set-context --current --namespace=appka-1
Having configured a DeploymentSpec, Role, and RoleBinding they can be created with:
```
-kubectl apply -f kubernetes/akka-cluster.yaml
+kubectl apply -f kubernetes/pekko-cluster.yaml
```
-Where akka `kubernetes/akka-cluster.yaml` is location of the Kubernetes resources files in the samples.
+Where akka `kubernetes/pekko-cluster.yaml` is location of the Kubernetes resources files in the samples.
@@@note
If you haven't been creating the files as you go for the guide, but rather are relying on the existing
@@ -27,9 +27,9 @@ Immediately after running this, you should see the three pods when you run `kube
@@@vars
```
-akka-sample-cluster-kubernetes-756894d68d-9sltd 0/1 Running 0 9s
-akka-sample-cluster-kubernetes-756894d68d-bccdv 0/1 Running 0 9s
-akka-sample-cluster-kubernetes-756894d68d-d8h5j 0/1 Running 0 9s
+pekko-sample-cluster-kubernetes-756894d68d-9sltd 0/1 Running 0 9s
+pekko-sample-cluster-kubernetes-756894d68d-bccdv 0/1 Running 0 9s
+pekko-sample-cluster-kubernetes-756894d68d-d8h5j 0/1 Running 0 9s
```
@@@
@@ -50,7 +50,7 @@ You can also pass the name of a specific pod from the list returned by `kubectl
(the actual name is random so you'll need to copy from your output, not use the name in this guide):
```sh
-kubectl logs -f pods/akka-sample-cluster-kubernetes-756894d68d-9sltd
+kubectl logs -f pods/pekko-sample-cluster-kubernetes-756894d68d-9sltd
```
By default, the logging in the application during startup is reasonably noisy. You may wish to set the logging to a higher threshold (eg warn) if you wish to
@@ -59,47 +59,47 @@ make the logs quieter, but for now it will help us to understand what is happeni
@@@vars
```
-1 [INFO] [akka.remote.artery.tcp.ArteryTcpTransport] - Remoting started with transport [Artery tcp]; listening on address [akka://Appka@172.17.0.6:25520] with UID [4609278524397890522] MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=main, akkaSource=ArteryTcpTransport(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:51.188UTC}
- [INFO] [akka.cluster.Cluster] [] [Appka-akka.actor.default-dispatcher-3] - Cluster Node [akka://Appka@172.17.0.6:25520] - Starting up, Akka version [2.6.5] ... MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=main, akkaSource=Cluster(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:51.240UTC}
- [INFO] [akka.cluster.Cluster] [] [Appka-akka.actor.default-dispatcher-6] - Cluster Node [akka://Appka@172.17.0.6:25520] - No seed-nodes configured, manual cluster join required, see https://doc.akka.io/docs/akka/current/typed/cluster.html#joining MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.internal-dispatcher-5, akkaSource=Cluster(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:51.619UTC}
- [INFO] [akka.cluster.bootstrap.demo.DemoApp] [] [Appka-akka.actor.default-dispatcher-6] - Started [akka://Appka], cluster.selfAddress = akka://Appka@172.17.0.6:25520) MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, akkaSource=akka://Appka/user, sourceActorSystem=Appka}
+1 [INFO] [org.apache.pekko.remote.artery.tcp.ArteryTcpTransport] - Remoting started with transport [Artery tcp]; listening on address [pekko://Appka@172.17.0.6:25520] with UID [4609278524397890522] MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=main, akkaSource=ArteryTcpTransport(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:51.188UTC}
+ [INFO] [org.apache.pekko.cluster.Cluster] [] [Appka-akka.actor.default-dispatcher-3] - Cluster Node [pekko://Appka@172.17.0.6:25520] - Starting up, Akka version [2.6.5] ... MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=main, akkaSource=Cluster(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:51.240UTC}
+ [INFO] [org.apache.pekko.cluster.Cluster] [] [Appka-akka.actor.default-dispatcher-6] - Cluster Node [pekko://Appka@172.17.0.6:25520] - No seed-nodes configured, manual cluster join required, see https://doc.akka.io/docs/akka/current/typed/cluster.html#joining MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.internal-dispatcher-5, akkaSource=Cluster(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:51.619UTC}
+ [INFO] [org.apache.pekko.cluster.bootstrap.demo.DemoApp] [] [Appka-akka.actor.default-dispatcher-6] - Started [pekko://Appka], cluster.selfAddress = pekko://Appka@172.17.0.6:25520) MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, akkaSource=pekko://Appka/user, sourceActorSystem=Appka}
-2a [INFO] [akka.management.internal.HealthChecksImpl] [] [Appka-akka.actor.default-dispatcher-3] - Loading readiness checks [(cluster-membership,akka.management.cluster.scaladsl.ClusterMembershipCheck), (example-ready,akka.cluster.bootstrap.demo.DemoHealthCheck)] MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=HealthChecksImpl(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.510UTC}
- [INFO] [akka.management.internal.HealthChecksImpl] [] [Appka-akka.actor.default-dispatcher-3] - Loading liveness checks [] MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=HealthChecksImpl(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.510UTC}
- [INFO] [akka.management.scaladsl.AkkaManagement] [] [Appka-akka.actor.default-dispatcher-13] - Binding Akka Management (HTTP) endpoint to: 172.17.0.6:8558 MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=AkkaManagement(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.534UTC}
+2a [INFO] [org.apache.management.internal.HealthChecksImpl] [] [Appka-akka.actor.default-dispatcher-3] - Loading readiness checks [(cluster-membership,org.apache.pekko.management.cluster.scaladsl.ClusterMembershipCheck), (example-ready,org.apache.pekko.cluster.bootstrap.demo.DemoHealthCheck)] MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=HealthChecksImpl(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.510UTC}
+ [INFO] [org.apache.management.internal.HealthChecksImpl] [] [Appka-akka.actor.default-dispatcher-3] - Loading liveness checks [] MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=HealthChecksImpl(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.510UTC}
+ [INFO] [org.apache.pekko.management.scaladsl.PekkoManagement] [] [Appka-akka.actor.default-dispatcher-13] - Binding Pekko Management (HTTP) endpoint to: 172.17.0.6:8558 MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=PekkoManagement(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.534UTC}
-2b [INFO] [akka.management.scaladsl.AkkaManagement] [] [Appka-akka.actor.default-dispatcher-3] - Including HTTP management routes for ClusterHttpManagementRouteProvider MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=AkkaManagement(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.546UTC}
- [INFO] [akka.management.scaladsl.AkkaManagement] [] [Appka-akka.actor.default-dispatcher-3] - Including HTTP management routes for ClusterBootstrap MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=AkkaManagement(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.620UTC}
- [INFO] [akka.management.cluster.bootstrap.ClusterBootstrap] [] [Appka-akka.actor.default-dispatcher-3] - Using self contact point address: http://172.17.0.6:8558 MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=ClusterBootstrap(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.624UTC}
- [INFO] [akka.management.scaladsl.AkkaManagement] [] [Appka-akka.actor.default-dispatcher-3] - Including HTTP management routes for HealthCheckRoutes MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=AkkaManagement(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.651UTC}
- [INFO] [akka.management.scaladsl.AkkaManagement] [akkaManagementBound] [Appka-akka.actor.default-dispatcher-3] - Bound Akka Management (HTTP) endpoint to: 172.17.0.6:8558 MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, akkaHttpAddress=172.17.0.6:8558, sourceThread=Appka-akka.actor.default-dispatcher-13, akkaSource=AkkaManagement(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.692UTC}
+2b [INFO] [org.apache.pekko.management.scaladsl.PekkoManagement] [] [Appka-akka.actor.default-dispatcher-3] - Including HTTP management routes for ClusterHttpManagementRouteProvider MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=PekkoManagement(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.546UTC}
+ [INFO] [org.apache.pekko.management.scaladsl.PekkoManagement] [] [Appka-akka.actor.default-dispatcher-3] - Including HTTP management routes for ClusterBootstrap MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=PekkoManagement(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.620UTC}
+ [INFO] [org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap] [] [Appka-akka.actor.default-dispatcher-3] - Using self contact point address: http://172.17.0.6:8558 MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=ClusterBootstrap(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.624UTC}
+ [INFO] [org.apache.pekko.management.scaladsl.PekkoManagement] [] [Appka-akka.actor.default-dispatcher-3] - Including HTTP management routes for HealthCheckRoutes MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=PekkoManagement(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.651UTC}
+ [INFO] [org.apache.pekko.management.scaladsl.PekkoManagement] [akkaManagementBound] [Appka-akka.actor.default-dispatcher-3] - Bound Pekko Management (HTTP) endpoint to: 172.17.0.6:8558 MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, akkaHttpAddress=172.17.0.6:8558, sourceThread=Appka-akka.actor.default-dispatcher-13, akkaSource=PekkoManagement(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.692UTC}
-3 [INFO] [akka.management.cluster.bootstrap.ClusterBootstrap] [] [Appka-akka.actor.default-dispatcher-3] - Initiating bootstrap procedure using kubernetes-api method... MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=ClusterBootstrap(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.671UTC}
- [INFO] [akka.management.cluster.bootstrap.ClusterBootstrap] [] [Appka-akka.actor.default-dispatcher-3] - Bootstrap using `akka.discovery` method: kubernetes-api MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=ClusterBootstrap(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.673UTC}
+3 [INFO] [org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap] [] [Appka-akka.actor.default-dispatcher-3] - Initiating bootstrap procedure using kubernetes-api method... MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=ClusterBootstrap(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.671UTC}
+ [INFO] [org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap] [] [Appka-akka.actor.default-dispatcher-3] - Bootstrap using `pekko.discovery` method: kubernetes-api MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-6, akkaSource=ClusterBootstrap(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.673UTC}
-4 [INFO] [akka.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapInit] [Appka-akka.actor.default-dispatcher-3] - Locating service members. Using discovery [akka.discovery.kubernetes.KubernetesApiServiceDiscovery], join decider [akka.management.cluster.bootstrap.LowestAddressJoinDecider], scheme [http] MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-13, akkaSource=akka://Appka/system/bootstrapCoordinator, sourceAct [...]
- [INFO] [akka.management.cluster.bootstrap.internal.BootstrapCoordinator] [] [Appka-akka.actor.default-dispatcher-3] - Looking up [Lookup(appka,None,Some(tcp))] MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-13, akkaSource=akka://Appka/system/bootstrapCoordinator, sourceActorSystem=Appka, akkaTimestamp=10:04:53.844UTC}
- [INFO] [akka.discovery.kubernetes.KubernetesApiServiceDiscovery] [] [Appka-akka.actor.default-dispatcher-3] - Querying for pods with label selector: [app=appka]. Namespace: [appka-1]. Port: [None] MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-13, akkaSource=KubernetesApiServiceDiscovery(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.844UTC}
+4 [INFO] [org.apache.pekko.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapInit] [Appka-akka.actor.default-dispatcher-3] - Locating service members. Using discovery [pekko.discovery.kubernetes.KubernetesApiServiceDiscovery], join decider [org.apache.pekko.management.cluster.bootstrap.LowestAddressJoinDecider], scheme [http] MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-13, akkaSource=pekko://Appka/system/boo [...]
+ [INFO] [org.apache.pekko.management.cluster.bootstrap.internal.BootstrapCoordinator] [] [Appka-akka.actor.default-dispatcher-3] - Looking up [Lookup(appka,None,Some(tcp))] MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-13, akkaSource=pekko://Appka/system/bootstrapCoordinator, sourceActorSystem=Appka, akkaTimestamp=10:04:53.844UTC}
+ [INFO] [org.apache.pekko.discovery.kubernetes.KubernetesApiServiceDiscovery] [] [Appka-akka.actor.default-dispatcher-3] - Querying for pods with label selector: [app=appka]. Namespace: [appka-1]. Port: [None] MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-13, akkaSource=KubernetesApiServiceDiscovery(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.844UTC}
-5 [INFO] [akka.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapResolved] [Appka-akka.actor.default-dispatcher-3] - Located service members based on: [Lookup(appka,None,Some(tcp))]: [ResolvedTarget(172-17-0-6.appka-1.pod.cluster.local,None,Some(/172.17.0.6)), ResolvedTarget(172-17-0-7.appka-1.pod.cluster.local,None,Some(/172.17.0.7)), ResolvedTarget(172-17-0-5.appka-1.pod.cluster.local,None,Some(/172.17.0.5))], filtered to [172-17-0-5.appka-1.pod.cluster.local:0 [...]
+5 [INFO] [org.apache.pekko.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapResolved] [Appka-akka.actor.default-dispatcher-3] - Located service members based on: [Lookup(appka,None,Some(tcp))]: [ResolvedTarget(172-17-0-6.appka-1.pod.cluster.local,None,Some(/172.17.0.6)), ResolvedTarget(172-17-0-7.appka-1.pod.cluster.local,None,Some(/172.17.0.7)), ResolvedTarget(172-17-0-5.appka-1.pod.cluster.local,None,Some(/172.17.0.5))], filtered to [172-17-0-5.appka-1.pod.clu [...]
-6 [INFO] [akka.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapSeedNodes] [Appka-akka.actor.default-dispatcher-20] - Contact point [akka://Appka@172.17.0.5:25520] returned [1] seed-nodes [akka://Appka@172.17.0.5:25520] MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-11, akkaSource=akka://Appka/system/bootstrapCoordinator, sourceActorSystem=Appka, akkaTimestamp=10:05:01.306UTC, akkaSeedNodes=akka://Appka@172.17.0 [...]
- [INFO] [akka.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapJoin] [Appka-akka.actor.default-dispatcher-20] - Joining [akka://Appka@172.17.0.6:25520] to existing cluster [akka://Appka@172.17.0.5:25520] MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-11, akkaSource=akka://Appka/system/bootstrapCoordinator, sourceActorSystem=Appka, akkaTimestamp=10:05:01.309UTC, akkaSeedNodes=akka://Appka@172.17.0.5:25520}
+6 [INFO] [org.apache.pekko.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapSeedNodes] [Appka-akka.actor.default-dispatcher-20] - Contact point [pekko://Appka@172.17.0.5:25520] returned [1] seed-nodes [pekko://Appka@172.17.0.5:25520] MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-11, akkaSource=pekko://Appka/system/bootstrapCoordinator, sourceActorSystem=Appka, akkaTimestamp=10:05:01.306UTC, pekkoSeedNodes=pek [...]
+ [INFO] [org.apache.pekko.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapJoin] [Appka-akka.actor.default-dispatcher-20] - Joining [pekko://Appka@172.17.0.6:25520] to existing cluster [pekko://Appka@172.17.0.5:25520] MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.default-dispatcher-11, akkaSource=pekko://Appka/system/bootstrapCoordinator, sourceActorSystem=Appka, akkaTimestamp=10:05:01.309UTC, pekkoSeedNodes=pekko://Appka@172. [...]
-7 [INFO] [akka.cluster.Cluster] [] [Appka-akka.actor.default-dispatcher-11] - Cluster Node [akka://Appka@172.17.0.6:25520] - Welcome from [akka://Appka@172.17.0.5:25520] MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.internal-dispatcher-2, akkaSource=Cluster(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:05:01.918UTC}
- [INFO] [akka.cluster.bootstrap.demo.DemoApp] [] [Appka-akka.actor.default-dispatcher-19] - MemberEvent: MemberUp(Member(address = akka://Appka@172.17.0.5:25520, status = Up)) MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, akkaSource=akka://Appka/user, sourceActorSystem=Appka}
- [INFO] [akka.cluster.bootstrap.demo.DemoApp] [] [Appka-akka.actor.default-dispatcher-19] - MemberEvent: MemberJoined(Member(address = akka://Appka@172.17.0.6:25520, status = Joining)) MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, akkaSource=akka://Appka/user, sourceActorSystem=Appka}
- [INFO] [akka.cluster.bootstrap.demo.DemoApp] [] [Appka-akka.actor.default-dispatcher-19] - MemberEvent: MemberJoined(Member(address = akka://Appka@172.17.0.7:25520, status = Joining)) MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, akkaSource=akka://Appka/user, sourceActorSystem=Appka}
- [INFO] [akka.cluster.bootstrap.demo.DemoApp] [] [Appka-akka.actor.default-dispatcher-19] - MemberEvent: MemberUp(Member(address = akka://Appka@172.17.0.6:25520, status = Up)) MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, akkaSource=akka://Appka/user, sourceActorSystem=Appka}
- [INFO] [akka.cluster.bootstrap.demo.DemoApp] [] [Appka-akka.actor.default-dispatcher-19] - MemberEvent: MemberUp(Member(address = akka://Appka@172.17.0.7:25520, status = Up)) MDC: {akkaAddress=akka://Appka@172.17.0.6:25520, akkaSource=akka://Appka/user, sourceActorSystem=Appka}
+7 [INFO] [org.apache.pekko.cluster.Cluster] [] [Appka-akka.actor.default-dispatcher-11] - Cluster Node [pekko://Appka@172.17.0.6:25520] - Welcome from [pekko://Appka@172.17.0.5:25520] MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, sourceThread=Appka-akka.actor.internal-dispatcher-2, akkaSource=Cluster(pekko://Appka), sourceActorSystem=Appka, akkaTimestamp=10:05:01.918UTC}
+ [INFO] [org.apache.pekko.cluster.bootstrap.demo.DemoApp] [] [Appka-akka.actor.default-dispatcher-19] - MemberEvent: MemberUp(Member(address = pekko://Appka@172.17.0.5:25520, status = Up)) MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, akkaSource=pekko://Appka/user, sourceActorSystem=Appka}
+ [INFO] [org.apache.pekko.cluster.bootstrap.demo.DemoApp] [] [Appka-akka.actor.default-dispatcher-19] - MemberEvent: MemberJoined(Member(address = pekko://Appka@172.17.0.6:25520, status = Joining)) MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, akkaSource=pekko://Appka/user, sourceActorSystem=Appka}
+ [INFO] [org.apache.pekko.cluster.bootstrap.demo.DemoApp] [] [Appka-akka.actor.default-dispatcher-19] - MemberEvent: MemberJoined(Member(address = pekko://Appka@172.17.0.7:25520, status = Joining)) MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, akkaSource=pekko://Appka/user, sourceActorSystem=Appka}
+ [INFO] [org.apache.pekko.cluster.bootstrap.demo.DemoApp] [] [Appka-akka.actor.default-dispatcher-19] - MemberEvent: MemberUp(Member(address = pekko://Appka@172.17.0.6:25520, status = Up)) MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, akkaSource=pekko://Appka/user, sourceActorSystem=Appka}
+ [INFO] [org.apache.pekko.cluster.bootstrap.demo.DemoApp] [] [Appka-akka.actor.default-dispatcher-19] - MemberEvent: MemberUp(Member(address = pekko://Appka@172.17.0.7:25520, status = Up)) MDC: {pekkoAddress=pekko://Appka@172.17.0.6:25520, akkaSource=pekko://Appka/user, sourceActorSystem=Appka}
```
@@@
An explanation of these messages is as follows.
1. These are init messages, showing that remoting has started on port 25520. The IP address should be the pods IP address from which other pods can access it, while the port number should match the configured remoting number, defaulting to 25520.
-2. Init messages for Akka management, once again, the IP address should be the pods IP address, while the port number should be the port number you've configured for Akka management to use, defaulting to 8558.
- Akka management is also hosting the readiness and liveness checks.
+2. Init messages for Pekko management, once again, the IP address should be the pods IP address, while the port number should be the port number you've configured for Pekko management to use, defaulting to 8558.
+ Pekko management is also hosting the readiness and liveness checks.
3. Now the cluster bootstrap process is starting. The service name should match your Akka system name or configured service name in cluster bootstrap, and the port should match your configured port name. In this guide we kept these as the default values.
This and subsequent messages will be repeated many times as cluster bootstrap polls Kubernetes and the other pods to determine what pods have been started, and whether and where a cluster has been formed.
4. This is the disocvery process. The bootstarp coordinator uses the Kubernetes discovery mechanism. The label selector should be one that will return your pods, and the namespace should match your applications namespace. The namespace is picked up automatically.
@@ -115,7 +115,7 @@ and ends up joining a pod with IP `172.17.0.5` as it has a lower IP.
If you look in the logs of that pod, you'll see a message like this:
```
-[INFO] [akka.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapJoinSelf] [Appka-akka.actor.default-dispatcher-19] - Initiating new cluster, self-joining [akka://Appka@172.17.0.5:25520]. Other nodes are expected to locate this cluster via continued contact-point probing. MDC: {akkaAddress=akka://Appka@172.17.0.5:25520, sourceThread=Appka-akka.actor.default-dispatcher-11, akkaSource=akka://Appka/system/bootstrapCoordinator, sourceActorSystem=Appka, akkaTimestamp=10: [...]
+[INFO] [org.apache.pekko.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapJoinSelf] [Appka-akka.actor.default-dispatcher-19] - Initiating new cluster, self-joining [pekko://Appka@172.17.0.5:25520]. Other nodes are expected to locate this cluster via continued contact-point probing. MDC: {pekkoAddress=pekko://Appka@172.17.0.5:25520, sourceThread=Appka-akka.actor.default-dispatcher-11, akkaSource=pekko://Appka/system/bootstrapCoordinator, sourceActorSystem=Appka, a [...]
```
This message will appear after a timeout called the stable margin, which defaults to 5 seconds, at that point, the pod has seen that there have been no changes to the number of pods deployed for 5 seconds, and so given that it has the lowest IP address, it considers it safe for it to start a new cluster.
@@ -140,7 +140,7 @@ To deploy the samples to minikube:
```
kubectl apply -f kubernetes/namespace.json
kubectl config set-context --current --namespace=appka-1
-kubectl apply -f kubernetes/akka-cluster.yml
+kubectl apply -f kubernetes/pekko-cluster.yml
```
Finally, create a service so that you can then test [http://127.0.0.1:8080](http://127.0.0.1:8080)
diff --git a/docs/src/main/paradox/kubernetes-deployment/forming-a-cluster.md b/docs/src/main/paradox/kubernetes-deployment/forming-a-cluster.md
index aaee009..5cae478 100644
--- a/docs/src/main/paradox/kubernetes-deployment/forming-a-cluster.md
+++ b/docs/src/main/paradox/kubernetes-deployment/forming-a-cluster.md
@@ -20,29 +20,29 @@ For a much more detailed description of this process, see the [Akka Cluster Boot
Add the following dependencies to your application:
-* Akka Management Cluster HTTP: This provides HTTP management endpoints as well as a @ref[cluster health check](../cluster-http-management.md#health-checks)
+* Pekko Management Cluster HTTP: This provides HTTP management endpoints as well as a @ref[cluster health check](../cluster-http-management.md#health-checks)
* @ref[Akka Discovery Kubernetes](../discovery/kubernetes.md): This provides a discovery mechanism that queries the Kubernetes API
-* @ref[Akka Bootstrap](../bootstrap/index.md): This bootstraps the cluster from nodes discovered via the Kubernetes API
+* @ref[Pekko Bootstrap](../bootstrap/index.md): This bootstraps the cluster from nodes discovered via the Kubernetes API
@@dependency[sbt,Gradle,Maven] {
- symbol1=AkkaManagementVersion
+ symbol1=PekkoManagementVersion
value1=$project.version$
group=com.lightbend.akka.management
artifact=akka-management-cluster-http_$scala.binary.version$
- version=AkkaManagementVersion
+ version=PekkoManagementVersion
group2=com.lightbend.akka.management
artifact2=akka-management-cluster-bootstrap_$scala.binary.version$
- version2=AkkaManagementVersion
- group3="com.lightbend.akka.discovery"
- artifact3="akka-discovery-kubernetes-api_$scala.binary.version$"
- version3=AkkaManagementVersion
+ version2=PekkoManagementVersion
+ group3="com.lightbend.pekko.discovery"
+ artifact3="pekko-discovery-kubernetes-api_$scala.binary.version$"
+ version3=PekkoManagementVersion
}
## Configuring Cluster Bootstrap
-There are three components that need to be configured: Akka Cluster, Akka Management HTTP, and Akka Cluster Bootstrap.
+There are three components that need to be configured: Akka Cluster, Pekko Management HTTP, and Akka Cluster Bootstrap.
-### Akka Cluster
+### Apache Pekko Cluster
Set three things for Akka Cluster:
@@ -51,7 +51,7 @@ Set three things for Akka Cluster:
* Exit the JVM on ActorSystem termination to allow Kubernetes to re-create it.
```HOCON
-akka {
+pekko {
actor {
provider = cluster
}
@@ -62,11 +62,11 @@ akka {
coordinated-shutdown.exit-jvm = on
}
```
-### Akka Management HTTP
+### Apache Pekko Management HTTP
-The default configuration for Akka management HTTP is suitable for use in Kubernetes, it will bind to a default port of 8558 on the pods external IP address.
+The default configuration for Pekko management HTTP is suitable for use in Kubernetes, it will bind to a default port of 8558 on the pods external IP address.
-### Akka Cluster Bootstrap
+### Apache Pekko Cluster Bootstrap
To configure Cluster Bootstrap, we need to tell it which discovery method will be used to discover the other nodes in the cluster.
This uses Akka Discovery to find nodes, however, the discovery method and configuration used in Cluster Bootstrap will often be different
@@ -80,7 +80,7 @@ Hence, we need to use a different discovery method for Cluster Bootstrap, and fo
use the Kubernetes API, which will return all nodes regardless of their readiness state.
```
-akka.management {
+pekko.management {
cluster.bootstrap {
contact-point-discovery {
discovery-method = kubernetes-api
@@ -94,14 +94,14 @@ You can optionally specify a `service-name` otherwise the name of the AkkaSystem
## Starting
-To ensure that Cluster Bootstrap is started, both the Cluster Bootstrap and the Akka Management extensions must be started.
-This can be done by invoking the `start` method on both the `ClusterBoostrap` and `AkkaManagement` extensions when your application starts up.
+To ensure that Cluster Bootstrap is started, both the Cluster Bootstrap and the Pekko Management extensions must be started.
+This can be done by invoking the `start` method on both the `ClusterBoostrap` and `PekkoManagement` extensions when your application starts up.
Scala
-: @@snip [CompileOnly.scala](/management-cluster-bootstrap/src/test/scala/doc/akka/management/cluster/bootstrap/ClusterBootstrapCompileOnly.scala) { #start }
+: @@snip [CompileOnly.scala](/management-cluster-bootstrap/src/test/scala/doc/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapCompileOnly.scala) { #start }
Java
-: @@snip [CompileOnly.java](/management-cluster-bootstrap/src/test/java/jdoc/akka/management/cluster/bootstrap/ClusterBootstrapCompileOnly.java) { #start }
+: @@snip [CompileOnly.java](/management-cluster-bootstrap/src/test/java/jdoc/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapCompileOnly.java) { #start }
## Role-Based Access Control
@@ -109,7 +109,7 @@ By default, pods are unable to use the Kubernetes API because they are not authe
In order to allow the applications pods to form an Akka Cluster using the Kubernetes API, we need to define some Role-Based Access Control (RBAC) roles and bindings.
RBAC allows the configuration of access control using two key concepts, roles, and role bindings. A role is a set of permissions to access something
-in the Kubernetes API. For example, a `pod-reader` role may have permission to perform the `list`, `get` and `watch` operations on the `pods` resource in a particular namespace, by default the same namespace that the role is configured in. In fact, that's exactly what we are going to configure, as this is the permission that our pods need. Here's the spec for the `pod-reader` role to be added in `kubernetes/akka-cluster.yaml`:
+in the Kubernetes API. For example, a `pod-reader` role may have permission to perform the `list`, `get` and `watch` operations on the `pods` resource in a particular namespace, by default the same namespace that the role is configured in. In fact, that's exactly what we are going to configure, as this is the permission that our pods need. Here's the spec for the `pod-reader` role to be added in `kubernetes/pekko-cluster.yaml`:
```yaml
---
@@ -130,7 +130,7 @@ service account, otherwise, you can define your own service accounts. Kubernetes
that pods filesystem, allowing the pod to use them to make authenticated requests on the Kubernetes API.
Since we are just using the default service account, we need to bind our role to the default service account so that our pod will be able to
-access the Kubernetes API as a `pod-reader`. In `kubernetes/akka-cluster.yaml`:
+access the Kubernetes API as a `pod-reader`. In `kubernetes/pekko-cluster.yaml`:
```yaml
---
@@ -164,17 +164,17 @@ the configuration overhead of doing this very high though, it's not what Kuberne
## Health Checks
-Akka management HTTP includes @ref[health check routes](../healthchecks.md) that will expose liveness and readiness health checks on `/alive` and `/ready` respectively.
+Pekko management HTTP includes @ref[health check routes](../healthchecks.md) that will expose liveness and readiness health checks on `/alive` and `/ready` respectively.
In Kubernetes, if an application is live, it means it is running - it hasn't crashed. But it may not necessarily be ready to serve requests, for example, it might not yet have managed to connect to a database, or, in our case, it may not have formed a cluster yet.
By separating [liveness and readiness](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes), Kubernetes can distinguish between fatal errors, like crashing, and transient errors, like not being able to contact other resources that the application depends on, allowing Kubernetes to make more intelligent decisions about whether an application needs to be restarted, or if it just needs to be given time to sort itself out.
-These routes expose information which is the result of multiple internal checks. For example, by depending on `akka-management-cluster-http` the health checks will take cluster membership status into consideration and will be a check to ensure that a cluster has been formed.
+These routes expose information which is the result of multiple internal checks. For example, by depending on `pekko-management-cluster-http` the health checks will take cluster membership status into consideration and will be a check to ensure that a cluster has been formed.
-Finally, we need to configure the health checks. As mentioned earlier, Akka Management HTTP provides health check endpoints for us, both for readiness and liveness. Kubernetes just needs to be told about this. The first thing we do is configure a name for the management port, while not strictly necessary, this allows us to refer to it by name in the probes, rather than repeating the port number each time. We'll configure some of the numbers around here, we're going to tell Kubernetes to [...]
+Finally, we need to configure the health checks. As mentioned earlier, Pekko Management HTTP provides health check endpoints for us, both for readiness and liveness. Kubernetes just needs to be told about this. The first thing we do is configure a name for the management port, while not strictly necessary, this allows us to refer to it by name in the probes, rather than repeating the port number each time. We'll configure some of the numbers around here, we're going to tell Kubernetes to [...]
-Health check probes can be adjusted in `kubernetes/akka-cluster.yaml`:
+Health check probes can be adjusted in `kubernetes/pekko-cluster.yaml`:
```yaml
ports:
diff --git a/docs/src/main/paradox/kubernetes-deployment/index.md b/docs/src/main/paradox/kubernetes-deployment/index.md
index 52eed2a..6bb0bb6 100644
--- a/docs/src/main/paradox/kubernetes-deployment/index.md
+++ b/docs/src/main/paradox/kubernetes-deployment/index.md
@@ -7,8 +7,8 @@ Alternatively, you can deploy to Kubernetes according to this guide, but that re
For this guide we will be using the Akka Cluster in Kubernetes sample.
It is available for both:
- * [Java](https://developer.lightbend.com/start/?group=akka&project=akka-sample-cluster-kubernetes-java)
- * [Scala](https://developer.lightbend.com/start/?group=akka&project=akka-sample-cluster-kubernetes-scala)
+ * [Java](https://developer.lightbend.com/start/?group=akka&project=pekko-sample-cluster-kubernetes-java)
+ * [Scala](https://developer.lightbend.com/start/?group=akka&project=pekko-sample-cluster-kubernetes-scala)
@@toc { depth=2 }
diff --git a/docs/src/main/paradox/kubernetes-deployment/preparing-for-production.md b/docs/src/main/paradox/kubernetes-deployment/preparing-for-production.md
index 72b2996..c9435df 100644
--- a/docs/src/main/paradox/kubernetes-deployment/preparing-for-production.md
+++ b/docs/src/main/paradox/kubernetes-deployment/preparing-for-production.md
@@ -8,12 +8,12 @@ In preparation for production, we need to do two main things:
The final configuration file and deployment spec are in the sample application.
In this guide we will show snippets. Locations of the samples:
-* [Java](https://developer.lightbend.com/start/?group=akka&project=akka-sample-cluster-kubernetes-java)
-* [Scala](https://developer.lightbend.com/start/?group=akka&project=akka-sample-cluster-kubernetes-scala)
+* [Java](https://developer.lightbend.com/start/?group=akka&project=pekko-sample-cluster-kubernetes-java)
+* [Scala](https://developer.lightbend.com/start/?group=akka&project=pekko-sample-cluster-kubernetes-scala)
## Deployment Spec
-Create a deployment spec in `kubernetes/akka-cluster.yaml`. The following configuration uses:
+Create a deployment spec in `kubernetes/pekko-cluster.yaml`. The following configuration uses:
* Application name / Actor system name: `appka`
* Namespace: `appka-1`
@@ -40,7 +40,7 @@ spec:
spec:
containers:
- name: appka
- image: akka-sample-cluster-kubernetes-scala:latest
+ image: pekko-sample-cluster-kubernetes-scala:latest
readinessProbe:
httpGet:
path: /ready
@@ -68,18 +68,18 @@ Here are a few things to note:
* We're using a Kubernetes deployment. Deployments are logical groupings of pods that represent a single service using the same template.
They support [configurable rolling updates](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#deploymentstrategy-v1-apps),
meaning the cluster will be gradually upgraded, rather than upgrading every node at once and incurring an outage.
-* We label the pod in the `template` with `app: appka`. This must match the ActorSystem name so that @ref[Akka Bootstrap](../bootstrap/index.md) finds the other nodes in the cluster.
-* The image we're using is `akka-sample-cluster-kubernetes:latest`. This corresponds to the name and version of the service in our build.
+* We label the pod in the `template` with `app: appka`. This must match the ActorSystem name so that @ref[Pekko Bootstrap](../bootstrap/index.md) finds the other nodes in the cluster.
+* The image we're using is `pekko-sample-cluster-kubernetes:latest`. This corresponds to the name and version of the service in our build.
We will discuss how to select an appropriate version number below.
* We've only requested minimal CPU to the pods for this service. This is suitable for a local deployment, but you may wish to increase it if you're
deploying to a real deployment. Note that we also haven't set a CPU limit, this is because it's
[recommended that JVMs do not set a CPU limit](https://doc.akka.io/docs/akka/current/additional/deploying.html#resource-limits).
-* We've configured a liveness probe and readiness probe. These are provided out of the box by Akka Management and are discussed later.
+* We've configured a liveness probe and readiness probe. These are provided out of the box by Pekko Management and are discussed later.
## Image version number
We use a version tag of `latest` for the image. Not specifying a tag is the same as using the `latest` tag. We could have just specify
-`akka-sample-cluster-kubernetes`, and this would mean the same thing as `akka-sample-cluster-kubernetes:latest`.
+`pekko-sample-cluster-kubernetes`, and this would mean the same thing as `pekko-sample-cluster-kubernetes:latest`.
For production, the use of the `latest` tag is bad practice.
For development, it's convenient and usually fine. We recommend if
diff --git a/docs/src/main/paradox/kubernetes-lease.md b/docs/src/main/paradox/kubernetes-lease.md
index ca4a77e..a848396 100644
--- a/docs/src/main/paradox/kubernetes-lease.md
+++ b/docs/src/main/paradox/kubernetes-lease.md
@@ -2,7 +2,7 @@
@@@ warning
-This module is marked as @extref:[May Change](akka:common/may-change.html)
+This module is marked as @extref:[May Change](pekko:common/may-change.html)
The API, configuration and behavior may change based on feedback from initial usage.
@@@
@@ -14,32 +14,32 @@ that have been used to build a distributed lease/lock.
A lease can be used for:
-* @extref[Split Brain Resolver](akka:split-brain-resolver.html#lease). An additional safety measure so that only one SBR instance can make the decision to remain up.
-* @extref:[Cluster Singleton](akka:typed/cluster-singleton.html#lease). A singleton manager can be configured to acquire a lease before creating the singleton.
-* @extref:[Cluster Sharding](akka:typed/cluster-sharding.html#lease). Each `Shard` can be configured to acquire a lease before creating entity actors.
+* @extref[Split Brain Resolver](pekko:split-brain-resolver.html#lease). An additional safety measure so that only one SBR instance can make the decision to remain up.
+* @extref:[Cluster Singleton](pekko:typed/cluster-singleton.html#lease). A singleton manager can be configured to acquire a lease before creating the singleton.
+* @extref:[Cluster Sharding](pekko:typed/cluster-sharding.html#lease). Each `Shard` can be configured to acquire a lease before creating entity actors.
In all cases the use of the lease increases the consistency of the feature. However, as the Kubernetes API server
and its backing `etcd` cluster can also be subject to failure and network issues any use of this lease can reduce availability.
### Lease Instances
-* With @extref[Split Brain Resolver](akka:split-brain-resolver.html#lease) there will be one lease per Akka Cluster
+* With @extref[Split Brain Resolver](pekko:split-brain-resolver.html#lease) there will be one lease per Akka Cluster
* With multiple Akka Clusters using SBRs in the same namespace, e.g. multiple Lagom
applications, you must ensure different `ActorSystem` names because they all need a separate lease.
* With Cluster Sharding and Cluster Singleton there will be more leases
- - For @extref:[Cluster Singleton](akka:typed/cluster-singleton.html#lease) there will be one per singleton.
- - For @extref:[Cluster Sharding](akka:typed/cluster-sharding.html#lease), there will be one per shard per type.
+ - For @extref:[Cluster Singleton](pekko:typed/cluster-singleton.html#lease) there will be one per singleton.
+ - For @extref:[Cluster Sharding](pekko:typed/cluster-sharding.html#lease), there will be one per shard per type.
### Configuring
#### Dependency
@@dependency[sbt,Maven,Gradle] {
- symbol1=AkkaManagementVersion
+ symbol1=PekkoManagementVersion
value1=$project.version$
group="com.lightbend.akka.management"
- artifact="akka-lease-kubernetes_$scala.binary.version$"
- version=AkkaManagementVersion
+ artifact="pekko-lease-kubernetes_$scala.binary.version$"
+ version=PekkoManagementVersion
}
#### Creating the Custom Resource Definition for the lease
@@ -106,7 +106,7 @@ Where `sbr-lease.yml` contains:
apiVersion: "akka.io/v1"
kind: Lease
metadata:
- name: <YOUR_ACTORSYSTEM_NAME>-akka-sbr
+ name: <YOUR_ACTORSYSTEM_NAME>-pekko-sbr
spec:
owner: ""
time: 0
@@ -125,13 +125,13 @@ To enable the lease for use within SBR:
```
-akka {
+pekko {
cluster {
- downing-provider-class = "akka.cluster.sbr.SplitBrainResolverProvider"
+ downing-provider-class = "org.apache.pekko.cluster.sbr.SplitBrainResolverProvider"
split-brain-resolver {
active-strategy = "lease-majority"
lease-majority {
- lease-implementation = "akka.coordination.lease.kubernetes"
+ lease-implementation = "pekko.coordination.lease.kubernetes"
}
}
}
@@ -147,6 +147,6 @@ akka {
Q. What happens if the node that holds the lease crashes?
-A. Each lease has a Time To Live (TTL) that is set `akka.coordination.lease.kubernetes.heartbeat-timeout` which defaults to 120s. A lease holder updates the lease every `1/10` of the timeout to keep the lease. If the TTL passes without
+A. Each lease has a Time To Live (TTL) that is set `pekko.coordination.lease.kubernetes.heartbeat-timeout` which defaults to 120s. A lease holder updates the lease every `1/10` of the timeout to keep the lease. If the TTL passes without
the lease being updated another node is allowed to take the lease. For ultimate safety this timeout can be set very high but then an operator would need to come and clear the lease if a lease owner crashes with the lease taken.
diff --git a/docs/src/main/paradox/loglevels/index.md b/docs/src/main/paradox/loglevels/index.md
index dc52c51..239ad64 100644
--- a/docs/src/main/paradox/loglevels/index.md
+++ b/docs/src/main/paradox/loglevels/index.md
@@ -1,6 +1,6 @@
# Dynamic Log Levels
-Dynamic Log Levels for Akka Management provides a route where log levels can be read and set over HTTP.
+Dynamic Log Levels for Pekko Management provides a route where log levels can be read and set over HTTP.
@@@ index
diff --git a/docs/src/main/paradox/loglevels/log4j2.md b/docs/src/main/paradox/loglevels/log4j2.md
index e8a3c34..1081b57 100644
--- a/docs/src/main/paradox/loglevels/log4j2.md
+++ b/docs/src/main/paradox/loglevels/log4j2.md
@@ -1,41 +1,41 @@
# Log4j2
-Dynamic Log Levels for Log4j2 hooks into Akka Management and provides a route where log levels can be read and set over HTTP.
+Dynamic Log Levels for Log4j2 hooks into Pekko Management and provides a route where log levels can be read and set over HTTP.
## Project Info
@@project-info{ projectId="management-loglevels-log4j2" }
-Requires @ref:[Akka Management](../akka-management.md) and that the application uses [Log4j2](https://logging.apache.org/log4j/2.x/) as logging backend.
+Requires @ref:[Pekko Management](../akka-management.md) and that the application uses [Log4j2](https://logging.apache.org/log4j/2.x/) as logging backend.
@@dependency[sbt,Gradle,Maven] {
- symbol1=AkkaManagementVersion
+ symbol1=PekkoManagementVersion
value1=$project.version$
group=com.lightbend.akka.management
artifact=akka-management-loglevels-log4j2_$scala.binary.version$
- version=AkkaManagementVersion
+ version=PekkoManagementVersion
group2=com.lightbend.akka.management
artifact2=akka-management_$scala.binary.version$
- version2=AkkaManagementVersion
+ version2=PekkoManagementVersion
}
-Akka Management and `akka-management-loglevels-log4j2` can be used with Akka $akka.version$ or later.
+Pekko Management and `pekko-management-loglevels-log4j2` can be used with Akka $pekko.version$ or later.
You have to override the following Akka dependencies by defining them explicitly in your build and
define the Akka version to the one that you are using. Latest patch version of Akka is recommended and
-a later version than $akka.version$ can be used.
+a later version than $pekko.version$ can be used.
@@dependency[sbt,Gradle,Maven] {
- symbol=AkkaVersion
- value=$akka.version$
- group=com.typesafe.akka
- artifact=akka-stream_$scala.binary.version$
- version=AkkaVersion
- group2=com.typesafe.akka
- artifact2=akka-slf4j_$scala.binary.version$
- version2=AkkaVersion
+ symbol=PekkoVersion
+ value=$pekko.version$
+ group=org.apache.pekko
+ artifact=pekko-stream_$scala.binary.version$
+ version=PekkoVersion
+ group2=org.apache.pekko
+ artifact2=pekko-slf4j_$scala.binary.version$
+ version2=PekkoVersion
}
-With Akka Management started and this module on the classpath the module is automatically picked up and provides the following two HTTP routes:
+With Pekko Management started and this module on the classpath the module is automatically picked up and provides the following two HTTP routes:
### Reading Logger Levels
@@ -43,7 +43,7 @@ A HTTP `GET` request to `loglevel/log4j2?logger=[logger name]` will return the l
### Changing Logger Levels
-Only enabled if `akka.management.http.route-providers-read-only` is set to `false`.
+Only enabled if `pekko.management.http.route-providers-read-only` is set to `false`.
@@@ warning
@@ -62,15 +62,15 @@ curl -X PUT "http://127.0.0.1:8558/loglevel/log4j2?logger=com.example.MyActor&le
#### Classic and Internal Akka Logger Level
Internal Akka actors and classic Akka does logging through the built in API there is an [additional level of filtering](https://doc.akka.io/docs/akka/current/logging.html#slf4j) using the
-`akka.loglevel` setting. If you have not set `akka.loglevel` to `DEBUG` (recommended) log entries from the classic logging API may never reach the logger backend at all.
+`pekko.loglevel` setting. If you have not set `pekko.loglevel` to `DEBUG` (recommended) log entries from the classic logging API may never reach the logger backend at all.
-The current level configured with `akka.loglevel` can be inspected with a GET request to `loglevel/akka`.
+The current level configured with `pekko.loglevel` can be inspected with a GET request to `loglevel/pekko`.
-If management `read-only` is set to `false` PUT requests to `loglevel/akka?level=[level name]` will dynamically change that.
+If management `read-only` is set to `false` PUT requests to `loglevel/pekko?level=[level name]` will dynamically change that.
Note that the allowed level for Akka Classic logging is a subset of the loglevels supported by SLF4j, valid values are `OFF`, `DEBUG`, `INFO`, `WARNING` and `ERROR`.
For example using curl:
```
-curl -X PUT "http://127.0.0.1:8558/loglevel/akka?level=DEBUG"
+curl -X PUT "http://127.0.0.1:8558/loglevel/pekko?level=DEBUG"
```
diff --git a/docs/src/main/paradox/loglevels/logback.md b/docs/src/main/paradox/loglevels/logback.md
index eaa8b14..a3fcb2a 100644
--- a/docs/src/main/paradox/loglevels/logback.md
+++ b/docs/src/main/paradox/loglevels/logback.md
@@ -1,41 +1,41 @@
# Logback
-Dynamic Log Levels for Logback hooks into Akka Management and provides a route where log levels can be read and set over HTTP.
+Dynamic Log Levels for Logback hooks into Pekko Management and provides a route where log levels can be read and set over HTTP.
## Project Info
@@project-info{ projectId="management-loglevels-logback" }
-Requires @ref:[Akka Management](../akka-management.md) and that the application uses [Logback](http://logback.qos.ch) as logging backend.
+Requires @ref:[Pekko Management](../akka-management.md) and that the application uses [Logback](http://logback.qos.ch) as logging backend.
@@dependency[sbt,Gradle,Maven] {
- symbol1=AkkaManagementVersion
+ symbol1=PekkoManagementVersion
value1=$project.version$
group=com.lightbend.akka.management
artifact=akka-management-loglevels-logback_$scala.binary.version$
- version=AkkaManagementVersion
+ version=PekkoManagementVersion
group2=com.lightbend.akka.management
artifact2=akka-management_$scala.binary.version$
- version2=AkkaManagementVersion
+ version2=PekkoManagementVersion
}
-Akka Management and `akka-management-loglevels-logback` can be used with Akka $akka.version$ or later.
+Pekko Management and `pekko-management-loglevels-logback` can be used with Akka $pekko.version$ or later.
You have to override the following Akka dependencies by defining them explicitly in your build and
define the Akka version to the one that you are using. Latest patch version of Akka is recommended and
-a later version than $akka.version$ can be used.
+a later version than $pekko.version$ can be used.
@@dependency[sbt,Gradle,Maven] {
- symbol=AkkaVersion
- value=$akka.version$
- group=com.typesafe.akka
- artifact=akka-stream_$scala.binary.version$
- version=AkkaVersion
- group2=com.typesafe.akka
- artifact2=akka-slf4j_$scala.binary.version$
- version2=AkkaVersion
+ symbol=PekkoVersion
+ value=$pekko.version$
+ group=org.apache.pekko
+ artifact=pekko-stream_$scala.binary.version$
+ version=PekkoVersion
+ group2=org.apache.pekko
+ artifact2=pekko-slf4j_$scala.binary.version$
+ version2=PekkoVersion
}
-With Akka Management started and this module on the classpath the module is automatically picked up and provides the following two HTTP routes:
+With Pekko Management started and this module on the classpath the module is automatically picked up and provides the following two HTTP routes:
### Reading Logger Levels
@@ -43,7 +43,7 @@ A HTTP `GET` request to `loglevel/logback?logger=[logger name]` will return the
### Changing Logger Levels
-Only enabled if `akka.management.http.route-providers-read-only` is set to `false`.
+Only enabled if `pekko.management.http.route-providers-read-only` is set to `false`.
@@@ warning
@@ -62,15 +62,15 @@ curl -X PUT "http://127.0.0.1:8558/loglevel/logback?logger=com.example.MyActor&l
#### Classic and Internal Akka Logger Level
Internal Akka actors and classic Akka does logging through the built in API there is an [additional level of filtering](https://doc.akka.io/docs/akka/current/logging.html#slf4j) using the
-`akka.loglevel` setting. If you have not set `akka.loglevel` to `DEBUG` (recommended) log entries from the classic logging API may never reach the logger backend at all.
+`pekko.loglevel` setting. If you have not set `pekko.loglevel` to `DEBUG` (recommended) log entries from the classic logging API may never reach the logger backend at all.
-The current level configured with `akka.loglevel` can be inspected with a GET request to `loglevel/akka`.
+The current level configured with `pekko.loglevel` can be inspected with a GET request to `loglevel/pekko`.
-If management `read-only` is set to `false` PUT requests to `loglevel/akka?level=[level name]` will dynamically change that.
+If management `read-only` is set to `false` PUT requests to `loglevel/pekko?level=[level name]` will dynamically change that.
Note that the allowed level for Akka Classic logging is a subset of the loglevels supported by SLF4j, valid values are `OFF`, `DEBUG`, `INFO`, `WARNING` and `ERROR`.
For example using curl:
```
-curl -X PUT "http://127.0.0.1:8558/loglevel/akka?level=DEBUG"
+curl -X PUT "http://127.0.0.1:8558/loglevel/pekko?level=DEBUG"
```
diff --git a/docs/src/main/paradox/migration.md b/docs/src/main/paradox/migration.md
index 5d94431..8f29e34 100644
--- a/docs/src/main/paradox/migration.md
+++ b/docs/src/main/paradox/migration.md
@@ -5,54 +5,54 @@
Version requirements:
* Akka 2.5.19 or later
-* Akka HTTP 10.1.7 or later
+* Pekko HTTP 10.1.7 or later
### Source changes
-* `AkkaManagement` moved to package `akka.management.scaladsl.AkkaManagement`, if using from Java use `akka.management.javadsl.AkkaManagement`
-* If implementing custom ManagementRouteProvider the package changed to `akka.management.scaladsl.ManagementRouteProvider`/`akka.management.javadsl.ManagementRouteProvider`
-* `AkkaManagement.start` and `AkkaManagement.routes` may throw IllegalArgumentException instead of returning Try
-* Auth and HTTPS has changed by using overloaded methods of `AkkaManagement.start` and `AkkaManagement.routes`, see the @ref[docs for more details](akka-management.md#enabling-basic-authentication)
+* `PekkoManagement` moved to package `org.apache.pekko.management.scaladsl.PekkoManagement`, if using from Java use `org.apache.pekko.management.javadsl.PekkoManagement`
+* If implementing custom ManagementRouteProvider the package changed to `org.apache.pekko.management.scaladsl.ManagementRouteProvider`/`org.apache.pekko.management.javadsl.ManagementRouteProvider`
+* `PekkoManagement.start` and `PekkoManagement.routes` may throw IllegalArgumentException instead of returning Try
+* Auth and HTTPS has changed by using overloaded methods of `PekkoManagement.start` and `PekkoManagement.routes`, see the @ref[docs for more details](akka-management.md#enabling-basic-authentication)
### Configuration changes
-* `akka.management.cluster.http.healthcheck.ready-states` moved to `akka.management.cluster.health-check.ready-states`
-* `akka.management.cluster.bootstrap.form-new-cluster` renamed to `akka.management.cluster.bootstrap.new-cluster-enabled`
+* `org.apache.pekko.management.cluster.http.healthcheck.ready-states` moved to `org.apache.pekko.management.cluster.health-check.ready-states`
+* `org.apache.pekko.management.cluster.bootstrap.form-new-cluster` renamed to `org.apache.pekko.management.cluster.bootstrap.new-cluster-enabled`
#### route-providers
-`akka.management.cluster.route-providers` changed from being a list of fully qualified class names to
-a configuration object `akka.management.cluster.routes` with named route providers. The reason for the
+`org.apache.pekko.management.cluster.route-providers` changed from being a list of fully qualified class names to
+a configuration object `org.apache.pekko.management.cluster.routes` with named route providers. The reason for the
change was to be able to exclude a route provider that was included by a library (from reference.conf) by
using `""` or `null` as the FQCN of the named entry, for example:
```
-akka.management.http.routes {
+pekko.management.http.routes {
health-checks = ""
}
```
-By default the `akka.management.HealthCheckRoutes` is enabled.
+By default the `org.apache.pekko.management.HealthCheckRoutes` is enabled.
-### Akka Discovery
+### Apache Pekko Discovery
-For Akka Management version 1.0 Service Discovery as well as the config, DNS and aggregate discovery methods
-were made core Akka module. The following steps are required when upgrading to 1.0 of Akka Management.
+For Pekko Management version 1.0 Service Discovery as well as the config, DNS and aggregate discovery methods
+were made core Akka module. The following steps are required when upgrading to 1.0 of Pekko Management.
Remove dependencies for:
@@dependency[sbt,Gradle,Maven] {
- group="com.lightbend.akka.discovery"
- artifact="akka-discovery"
+ group="com.lightbend.pekko.discovery"
+ artifact="pekko-discovery"
version="old_akka_management_version"
- group2="com.lightbend.akka.discovery"
- artifact2="akka-discovery-dns"
+ group2="com.lightbend.pekko.discovery"
+ artifact2="pekko-discovery-dns"
version2="old_akka_management_version"
- group3="com.lightbend.akka.discovery"
- artifact3="akka-discovery-config"
+ group3="com.lightbend.pekko.discovery"
+ artifact3="pekko-discovery-config"
version3="old_akka_management_version"
- group4="com.lightbend.akka.discovery"
- artifact4="akka-discovery-aggregate"
+ group4="com.lightbend.pekko.discovery"
+ artifact4="pekko-discovery-aggregate"
version4="old_akka_management_version"
}
@@ -60,16 +60,16 @@ If using Cluster Bootstrap the new dependency will be brought in automatically.
If using Service Discovery directly add the following dependency:
@@dependency[sbt,Gradle,Maven] {
- group="com.typesafe.akka"
- artifact="akka-discovery"
+ group="org.apache.pekko"
+ artifact="pekko-discovery"
version="latest_akka_version"
}
-Setting the service discovery method now has to be the unqualified name e.g `kubernetes-api` rather than `akka.discovery.kubernets-api`.
-If using a custom discovery method the configuration for the discovery method must live under `akka.discovery`.
+Setting the service discovery method now has to be the unqualified name e.g `kubernetes-api` rather than `pekko.discovery.kubernets-api`.
+If using a custom discovery method the configuration for the discovery method must live under `pekko.discovery`.
-For bootstrap it is recommended to set the service discovery method via `akka.management.cluster.bootstrap.contact-point-discovery.discovery-method`
-rather then overriding the global service discovery mechanism with `akka.discovery.method`
+For bootstrap it is recommended to set the service discovery method via `org.apache.pekko.management.cluster.bootstrap.contact-point-discovery.discovery-method`
+rather then overriding the global service discovery mechanism with `pekko.discovery.method`
### DNS
@@ -97,7 +97,7 @@ that is mounted to each Kubernetes container. The namespace can be overridden wi
### Cluster HTTP
The `cluster-http` module now only exposes read only routes by default. To enable destructive operations such as downing members
-set `akka.management.http.route-providers-read-only` to `false.
+set `pekko.management.http.route-providers-read-only` to `false.
diff --git a/integration-test-scripts/aws-api-ec2-tag-based.sh b/integration-test-scripts/aws-api-ec2-tag-based.sh
index 2227746..e2c5c8e 100755
--- a/integration-test-scripts/aws-api-ec2-tag-based.sh
+++ b/integration-test-scripts/aws-api-ec2-tag-based.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
echo Running integration tests for aws-api-ec2-tag-based
-echo You need to run this from the root folder of the akka-management project
+echo You need to run this from the root folder of the pekko-management project
export BUILD_ID=$TRAVIS_JOB_NUMBER-$TRAVIS_JOB_ID
diff --git a/integration-test/README.md b/integration-test/README.md
index 5dcdc91..7689911 100644
--- a/integration-test/README.md
+++ b/integration-test/README.md
@@ -1,6 +1,6 @@
-# Akka Management Integration Tests
+# Apache Pekko Management Integration Tests
-A set of projects that test Akka Bootstrap along with other Akka Management features in various environments.
+A set of projects that test Apache Pekko Bootstrap along with other Apache Pekko Management features in various environments.
Currently the following run as part of CI:
diff --git a/integration-test/aws-api-ec2/README.md b/integration-test/aws-api-ec2/README.md
index c47828d..f9fb1e1 100644
--- a/integration-test/aws-api-ec2/README.md
+++ b/integration-test/aws-api-ec2/README.md
@@ -21,11 +21,11 @@ ssh into them - you may need to install Java 8 ( you can use this [guide](https:
Step 2: Create IAM Role
-----------------------
-Since the `akka-discovery-aws-api` module uses the AWS HTTP API, we need to make sure that the proper security authorizations are
+Since the `pekko-discovery-aws-api` module uses the AWS HTTP API, we need to make sure that the proper security authorizations are
in place. Hence, this step is about creating a IAM role. The IAM section is in the AWS Management Console, under "Services" and
under "Security, Identity & Compliance". Click "Create role" and select "AWS service" (for type of trusted entity) and EC2
(for the service that will use this role). Attach the "AmazonEC2ReadOnlyAccess" permission to this role.
-This permission should be sufficient for the `akka-discovery-aws-api` module to do its job.
+This permission should be sufficient for the `pekko-discovery-aws-api` module to do its job.
Step 3: Attach IAM Role
@@ -44,7 +44,7 @@ care about are 2552 and 8558. However, we don't want to open these ports to the
instances can *privately* communicate with each other if they are part of the same security group *and* if the proper inbound
rules are set.
-Create a security group called "akka-cluster". Once the security group is created, select it and go to "edit inbound rules".
+Create a security group called "pekko-cluster". Once the security group is created, select it and go to "edit inbound rules".
First, add a custom TCP rule to allow yourself ssh access (port: 22, source: My IP). Then, add two custom TCP rules (for ports 8558, 2552)
using a custom source: the ID of the security group.
@@ -55,7 +55,7 @@ See the screenshot below.
Step 5: Attach Security Group
-----------------------------
-Assign the 'akka-cluster' security group to your EC2 instances.
+Assign the 'pekko-cluster' security group to your EC2 instances.
Step 6: Package the App
-----------------------
@@ -76,7 +76,7 @@ Step 7: Tag Instances
---------------------
Tag your instances with tag "service" -> "products-api".
-The demo app is configured (via the "akka.discovery.aws-api-ec2-tag-based.filters" key, see the application.conf file)
+The demo app is configured (via the "pekko.discovery.aws-api-ec2-tag-based.filters" key, see the application.conf file)
to require an additional tag "purpose" -> "demo".
@@ -93,7 +93,7 @@ Unzip the package and run the app like this on each instance:
$ unzip app.zip
$ cd app/bin
$ MY_IP=`curl -s http://169.254.169.254/latest/meta-data/local-ipv4`
-$ ./integration-test-aws-api-ec2-tag-based -Dakka.management.http.hostname=$MY_IP -Dakka.remote.netty.tcp.hostname=$MY_IP
+$ ./integration-test-aws-api-ec2-tag-based -Dpekko.management.http.hostname=$MY_IP -Dpekko.remote.netty.tcp.hostname=$MY_IP
```
Follow the logs and watch for signs of successful cluster formation (e.g., a welcome message from one of the nodes).
diff --git a/integration-test/aws-api-ec2/src/it/resources/application.conf b/integration-test/aws-api-ec2/src/it/resources/application.conf
index 4ae4513..89c5d30 100644
--- a/integration-test/aws-api-ec2/src/it/resources/application.conf
+++ b/integration-test/aws-api-ec2/src/it/resources/application.conf
@@ -1,7 +1,7 @@
-akka {
+pekko {
log-config-on-start = "off"
actor {
provider = "local"
- # the integration test uses akka just for the Akka Http client, so we can turn off the cluster
+ # the integration test uses Pekko just for the Pekko Http client, so we can turn off the cluster
}
}
\ No newline at end of file
diff --git a/integration-test/aws-api-ec2/src/it/scala/akka/cluster/bootstrap/IntegrationTest.scala b/integration-test/aws-api-ec2/src/it/scala/org/apache/pekko/cluster/bootstrap/IntegrationTest.scala
similarity index 94%
rename from integration-test/aws-api-ec2/src/it/scala/akka/cluster/bootstrap/IntegrationTest.scala
rename to integration-test/aws-api-ec2/src/it/scala/org/apache/pekko/cluster/bootstrap/IntegrationTest.scala
index 4a085fb..d71f102 100644
--- a/integration-test/aws-api-ec2/src/it/scala/akka/cluster/bootstrap/IntegrationTest.scala
+++ b/integration-test/aws-api-ec2/src/it/scala/org/apache/pekko/cluster/bootstrap/IntegrationTest.scala
@@ -10,24 +10,24 @@
/*
* Copyright (C) 2017 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.bootstrap
-
-import akka.actor.ActorSystem
-import akka.event.Logging
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.HttpRequest
-import akka.management.cluster.{ ClusterHttpManagementJsonProtocol, ClusterMembers }
-import akka.util.ByteString
+package org.apache.pekko.cluster.bootstrap
+
import com.amazonaws.services.cloudformation.AmazonCloudFormationClientBuilder
import com.amazonaws.services.cloudformation.model._
import com.amazonaws.services.ec2.AmazonEC2ClientBuilder
import com.amazonaws.services.ec2.model.{ DescribeInstancesRequest, Filter, Reservation }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.event.Logging
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model.HttpRequest
+import org.apache.pekko.management.cluster.{ ClusterHttpManagementJsonProtocol, ClusterMembers }
+import org.apache.pekko.util.ByteString
+import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.PatienceConfiguration.{ Interval, Timeout }
import org.scalatest.concurrent.{ Eventually, ScalaFutures }
-import org.scalatest.time.{ Seconds, Span, SpanSugar }
-import org.scalatest.BeforeAndAfterAll
import org.scalatest.funsuite.AnyFunSuite
import org.scalatest.matchers.should.Matchers
+import org.scalatest.time.{ Seconds, Span, SpanSugar }
import spray.json._
import scala.concurrent.{ Await, Future }
@@ -76,7 +76,7 @@ class IntegrationTest
private val region = "us-east-1"
- private val stackName = s"AkkaManagementIntegrationTestEC2TagBased-${buildId.replace(".", "-")}"
+ private val stackName = s"PekkoManagementIntegrationTestEC2TagBased-${buildId.replace(".", "-")}"
private val awsCfClient = AmazonCloudFormationClientBuilder.standard().withRegion(region).build()
@@ -104,7 +104,7 @@ class IntegrationTest
log.info("setting up infrastructure using CloudFormation")
- val template = readTemplateFromResourceFolder("CloudFormation/akka-cluster.json")
+ val template = readTemplateFromResourceFolder("CloudFormation/pekko-cluster.json")
val myIp: String = s"$getMyIp/32"
@@ -193,7 +193,7 @@ class IntegrationTest
clusterPublicIps should have size instanceCount
clusterPrivateIps should have size instanceCount
- val expectedNodes: Set[String] = clusterPrivateIps.map(ip => s"akka.tcp://demo@$ip:2552").toSet
+ val expectedNodes: Set[String] = clusterPrivateIps.map(ip => s"pekko.tcp://demo@$ip:2552").toSet
eventually {
diff --git a/integration-test/aws-api-ec2/src/main/resources/CloudFormation/akka-cluster.json b/integration-test/aws-api-ec2/src/main/resources/CloudFormation/pekko-cluster.json
similarity index 97%
rename from integration-test/aws-api-ec2/src/main/resources/CloudFormation/akka-cluster.json
rename to integration-test/aws-api-ec2/src/main/resources/CloudFormation/pekko-cluster.json
index 91aa643..33de6af 100644
--- a/integration-test/aws-api-ec2/src/main/resources/CloudFormation/akka-cluster.json
+++ b/integration-test/aws-api-ec2/src/main/resources/CloudFormation/pekko-cluster.json
@@ -71,7 +71,7 @@
"cd app\n",
"cd bin\n",
"MY_IP=`curl -s http://169.254.169.254/latest/meta-data/local-ipv4`\n",
- "./bootstrap-demo-aws-api-ec2-tag-based -Dakka.management.http.hostname=$MY_IP -Dakka.remote.netty.tcp.hostname=$MY_IP &"
+ "./bootstrap-demo-aws-api-ec2-tag-based -Dpekko.management.http.hostname=$MY_IP -Dpekko.remote.netty.tcp.hostname=$MY_IP &"
]]
}
}
diff --git a/integration-test/aws-api-ec2/src/main/resources/application.conf b/integration-test/aws-api-ec2/src/main/resources/application.conf
index 4da7601..87073fc 100644
--- a/integration-test/aws-api-ec2/src/main/resources/application.conf
+++ b/integration-test/aws-api-ec2/src/main/resources/application.conf
@@ -1,7 +1,7 @@
purpose = "demo"
purpose = ${?PURPOSE}
-akka {
+pekko {
discovery {
diff --git a/integration-test/aws-api-ec2/src/main/scala/akka/cluster/bootstrap/Ec2DemoApp.scala b/integration-test/aws-api-ec2/src/main/scala/org/apache/pekko/cluster/bootstrap/Ec2DemoApp.scala
similarity index 65%
rename from integration-test/aws-api-ec2/src/main/scala/akka/cluster/bootstrap/Ec2DemoApp.scala
rename to integration-test/aws-api-ec2/src/main/scala/org/apache/pekko/cluster/bootstrap/Ec2DemoApp.scala
index da62d87..c9b17dc 100644
--- a/integration-test/aws-api-ec2/src/main/scala/akka/cluster/bootstrap/Ec2DemoApp.scala
+++ b/integration-test/aws-api-ec2/src/main/scala/org/apache/pekko/cluster/bootstrap/Ec2DemoApp.scala
@@ -11,17 +11,17 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.bootstrap
+package org.apache.pekko.cluster.bootstrap
-import akka.actor.ActorSystem
-import akka.management.cluster.bootstrap.ClusterBootstrap
-import akka.management.scaladsl.AkkaManagement
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.management.scaladsl.PekkoManagement
object Ec2DemoApp extends App {
implicit val system = ActorSystem("demo")
- AkkaManagement(system).start()
+ PekkoManagement(system).start()
ClusterBootstrap(system).start()
diff --git a/integration-test/aws-api-ecs/README.md b/integration-test/aws-api-ecs/README.md
index 008bed7..2d86c41 100644
--- a/integration-test/aws-api-ecs/README.md
+++ b/integration-test/aws-api-ecs/README.md
@@ -87,10 +87,10 @@ When the cluster has fully formed you should see output like this:
```
{
- "leader": "akka.tcp://ecsBootstrapDemoApp@172.31.0.248:2552",
+ "leader": "pekko.tcp://ecsBootstrapDemoApp@172.31.0.248:2552",
"members": [
{
- "node": "akka.tcp://ecsBootstrapDemoApp@172.31.0.248:2552",
+ "node": "pekko.tcp://ecsBootstrapDemoApp@172.31.0.248:2552",
"nodeUid": "-801839214",
"roles": [
"dc-default"
@@ -98,7 +98,7 @@ When the cluster has fully formed you should see output like this:
"status": "Up"
},
{
- "node": "akka.tcp://ecsBootstrapDemoApp@172.31.92.234:2552",
+ "node": "pekko.tcp://ecsBootstrapDemoApp@172.31.92.234:2552",
"nodeUid": "-1965866076",
"roles": [
"dc-default"
@@ -106,7 +106,7 @@ When the cluster has fully formed you should see output like this:
"status": "Up"
},
{
- "node": "akka.tcp://ecsBootstrapDemoApp@172.31.41.181:2552",
+ "node": "pekko.tcp://ecsBootstrapDemoApp@172.31.41.181:2552",
"nodeUid": "1441500118",
"roles": [
"dc-default"
@@ -114,7 +114,7 @@ When the cluster has fully formed you should see output like this:
"status": "Up"
},
{
- "node": "akka.tcp://ecsBootstrapDemoApp@172.31.58.83:2552",
+ "node": "pekko.tcp://ecsBootstrapDemoApp@172.31.58.83:2552",
"nodeUid": "443867006",
"roles": [
"dc-default"
@@ -122,7 +122,7 @@ When the cluster has fully formed you should see output like this:
"status": "Up"
},
{
- "node": "akka.tcp://ecsBootstrapDemoApp@172.31.67.222:2552",
+ "node": "pekko.tcp://ecsBootstrapDemoApp@172.31.67.222:2552",
"nodeUid": "-17061216",
"roles": [
"dc-default"
@@ -130,16 +130,16 @@ When the cluster has fully formed you should see output like this:
"status": "Up"
}
],
- "oldest": "akka.tcp://ecsBootstrapDemoApp@172.31.0.248:2552",
- "selfNode": "akka.tcp://ecsBootstrapDemoApp@172.31.58.83:2552",
+ "oldest": "pekko.tcp://ecsBootstrapDemoApp@172.31.0.248:2552",
+ "selfNode": "pekko.tcp://ecsBootstrapDemoApp@172.31.58.83:2552",
"unreachable": []
}
```
Nicely done!
-You can also observe the log output from akka-cluster-bootstrap and
-akka-cluster by navigating to the CloudWatch area of the AWS Management
+You can also observe the log output from pekko-cluster-bootstrap and
+pekko-cluster by navigating to the CloudWatch area of the AWS Management
Console, opening the Logs tab, and selecting the demo Log Group:
diff --git a/integration-test/aws-api-ecs/cfn-templates/ecs-integration-test-app.yaml b/integration-test/aws-api-ecs/cfn-templates/ecs-integration-test-app.yaml
index 91658dc..75a4f4d 100644
--- a/integration-test/aws-api-ecs/cfn-templates/ecs-integration-test-app.yaml
+++ b/integration-test/aws-api-ecs/cfn-templates/ecs-integration-test-app.yaml
@@ -71,9 +71,9 @@ Resources:
awslogs-stream-prefix: bootstrap-demo-aws-api-ecs
Environment:
- Name: JAVA_OPTS
- Value: !Sub "-Dakka.management.cluster.bootstrap.\
+ Value: !Sub "-Dpekko.management.cluster.bootstrap.\
contact-point-discovery.service-name=${AWS::StackName}
- -Dakka.discovery.aws-api-ecs-async.cluster=ecs-integration-test-app"
+ -Dpekko.discovery.aws-api-ecs-async.cluster=ecs-integration-test-app"
ServiceSecurityGroup:
Type: AWS::EC2::SecurityGroup
Properties:
@@ -87,7 +87,7 @@ Resources:
FromPort: 8558
ToPort: 8558
CidrIpv6: "::/0"
- ServiceSecurityGroupAkkaManagementSelfIngress:
+ ServiceSecurityGroupPekkoManagementSelfIngress:
Type: AWS::EC2::SecurityGroupIngress
Properties:
GroupId: !GetAtt ServiceSecurityGroup.GroupId
diff --git a/integration-test/aws-api-ecs/src/main/scala/akka/cluster/bootstrap/EcsApiDemoApp.scala b/integration-test/aws-api-ecs/src/main/scala/org/apache/pekko/cluster/bootstrap/EcsApiDemoApp.scala
similarity index 80%
rename from integration-test/aws-api-ecs/src/main/scala/akka/cluster/bootstrap/EcsApiDemoApp.scala
rename to integration-test/aws-api-ecs/src/main/scala/org/apache/pekko/cluster/bootstrap/EcsApiDemoApp.scala
index 344b474..0f743d1 100644
--- a/integration-test/aws-api-ecs/src/main/scala/akka/cluster/bootstrap/EcsApiDemoApp.scala
+++ b/integration-test/aws-api-ecs/src/main/scala/org/apache/pekko/cluster/bootstrap/EcsApiDemoApp.scala
@@ -11,15 +11,14 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.bootstrap
+package org.apache.pekko.cluster.bootstrap
import java.net.InetAddress
-
-import akka.actor.ActorSystem
-import akka.discovery.awsapi.ecs.AsyncEcsDiscovery
-import akka.management.cluster.bootstrap.ClusterBootstrap
-import akka.management.scaladsl.AkkaManagement
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.discovery.awsapi.ecs.AsyncEcsDiscovery
import com.typesafe.config.ConfigFactory
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.management.scaladsl.PekkoManagement
object EcsApiDemoApp {
@@ -29,7 +28,7 @@ object EcsApiDemoApp {
.systemProperties()
.withFallback(
ConfigFactory.parseString(s"""
- |akka {
+ |pekko {
| actor.provider = "cluster"
| management {
| cluster.bootstrap.contact-point.fallback-port = 8558
@@ -40,7 +39,7 @@ object EcsApiDemoApp {
|}
""".stripMargin))
val system = ActorSystem("ecsBootstrapDemoApp", config)
- AkkaManagement(system).start()
+ PekkoManagement(system).start()
ClusterBootstrap(system).start()
}
diff --git a/integration-test/dns-api-mesos/build.sbt b/integration-test/dns-api-mesos/build.sbt
index e579fbf..e1ba033 100644
--- a/integration-test/dns-api-mesos/build.sbt
+++ b/integration-test/dns-api-mesos/build.sbt
@@ -5,10 +5,10 @@ scalaVersion := "2.12.16"
def akkaManagementVersion(version: String) = version.split('+')(0)
-libraryDependencies += "com.lightbend.akka.management" %% "akka-management-cluster-bootstrap" % akkaManagementVersion(
+libraryDependencies += "com.lightbend.akka.management" %% "pekko-management-cluster-bootstrap" % akkaManagementVersion(
version.value)
-libraryDependencies += "com.lightbend.akka.management" %% "akka-management-cluster-http" % akkaManagementVersion(
+libraryDependencies += "com.lightbend.akka.management" %% "pekko-management-cluster-http" % akkaManagementVersion(
version.value)
-libraryDependencies += "com.typesafe.akka" %% "akka-discovery" % "2.5.20"
+libraryDependencies += "org.apache.pekko" %% "pekko-discovery" % "2.5.20"
diff --git a/integration-test/dns-api-mesos/src/main/resources/application.conf b/integration-test/dns-api-mesos/src/main/resources/application.conf
index 643bb67..097b8df 100644
--- a/integration-test/dns-api-mesos/src/main/resources/application.conf
+++ b/integration-test/dns-api-mesos/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+pekko {
loglevel = INFO
@@ -55,7 +55,7 @@ akka {
effective-name = ${?SERVICE_NAME}
# Config path of discovery method to be used to locate the initial contact points.
- discovery-method = akka-dns
+ discovery-method = pekko-dns
}
# Configured how we communicate with the contact point once it is discovered
diff --git a/integration-test/dns-api-mesos/src/main/scala/akka/cluster/bootstrap/DemoApp.scala b/integration-test/dns-api-mesos/src/main/scala/org/apache/pekko/cluster/bootstrap/DemoApp.scala
similarity index 64%
rename from integration-test/dns-api-mesos/src/main/scala/akka/cluster/bootstrap/DemoApp.scala
rename to integration-test/dns-api-mesos/src/main/scala/org/apache/pekko/cluster/bootstrap/DemoApp.scala
index d8b265c..62c7968 100644
--- a/integration-test/dns-api-mesos/src/main/scala/akka/cluster/bootstrap/DemoApp.scala
+++ b/integration-test/dns-api-mesos/src/main/scala/org/apache/pekko/cluster/bootstrap/DemoApp.scala
@@ -10,16 +10,16 @@
/*
* Copyright (C) 2017 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.bootstrap
-
-import akka.actor.{ Actor, ActorLogging, ActorSystem, Props }
-import akka.cluster.ClusterEvent.ClusterDomainEvent
-import akka.cluster.{ Cluster, ClusterEvent }
-import akka.http.scaladsl.Http
-import akka.management.scaladsl.AkkaManagement
-import akka.management.cluster.bootstrap.ClusterBootstrap
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+package org.apache.pekko.cluster.bootstrap
+
+import org.apache.pekko.actor.{ Actor, ActorLogging, ActorSystem, Props }
+import org.apache.pekko.cluster.ClusterEvent.ClusterDomainEvent
+import org.apache.pekko.cluster.{ Cluster, ClusterEvent }
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.management.scaladsl.PekkoManagement
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.scaladsl.Source
import com.typesafe.config.ConfigFactory
object DemoApp extends App {
@@ -32,13 +32,13 @@ object DemoApp extends App {
log.info("Started [{}], cluster.selfAddress = {}", system, cluster.selfAddress)
- AkkaManagement(system).start()
+ PekkoManagement(system).start()
ClusterBootstrap(system).start()
cluster
.subscribe(system.actorOf(Props[ClusterWatcher]), ClusterEvent.InitialStateAsEvents, classOf[ClusterDomainEvent])
- import akka.http.scaladsl.server.Directives._
+ import org.apache.pekko.http.scaladsl.server.Directives._
Http().bindAndHandle(complete("Hello world"), "0.0.0.0", 8080)
}
diff --git a/integration-test/kubernetes-api-java/kubernetes/akka-cluster.yml b/integration-test/kubernetes-api-java/kubernetes/pekko-cluster.yml
similarity index 96%
rename from integration-test/kubernetes-api-java/kubernetes/akka-cluster.yml
rename to integration-test/kubernetes-api-java/kubernetes/pekko-cluster.yml
index 6742fe7..7120458 100644
--- a/integration-test/kubernetes-api-java/kubernetes/akka-cluster.yml
+++ b/integration-test/kubernetes-api-java/kubernetes/pekko-cluster.yml
@@ -71,7 +71,7 @@ metadata:
subjects:
# Uses the default service account.
# Consider creating a dedicated service account to run your
- # Akka Cluster services and binding the role to that one.
+ # Apache Pekko Cluster services and binding the role to that one.
- kind: ServiceAccount
name: default
roleRef:
diff --git a/integration-test/kubernetes-api-java/pom.xml b/integration-test/kubernetes-api-java/pom.xml
index 39a7f69..2609ba8 100644
--- a/integration-test/kubernetes-api-java/pom.xml
+++ b/integration-test/kubernetes-api-java/pom.xml
@@ -18,27 +18,35 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<encoding>UTF-8</encoding>
- <akka.version>2.6.20</akka.version>
- <akka.http.version>10.2.10</akka.http.version>
+ <pekko.version>0.0.0+26599-83545a33-SNAPSHOT</pekko.version>
+ <pekko.http.version>0.0.0+4298-26846a02-SNAPSHOT</pekko.http.version>
<pekko-management.version>0.0.0</pekko-management.version> <!-- set by build -->
<scala.binary.version>2.12</scala.binary.version>
</properties>
+ <repositories>
+ <repository>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
- <groupId>com.typesafe.akka</groupId>
- <artifactId>akka-stream_${scala.binary.version}</artifactId>
- <version>${akka.version}</version>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-stream_${scala.binary.version}</artifactId>
+ <version>${pekko.version}</version>
</dependency>
<dependency>
- <groupId>com.typesafe.akka</groupId>
- <artifactId>akka-cluster_${scala.binary.version}</artifactId>
- <version>${akka.version}</version>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-cluster_${scala.binary.version}</artifactId>
+ <version>${pekko.version}</version>
</dependency>
<dependency>
- <groupId>com.typesafe.akka</groupId>
- <artifactId>akka-slf4j_${scala.binary.version}</artifactId>
- <version>${akka.version}</version>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-slf4j_${scala.binary.version}</artifactId>
+ <version>${pekko.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -56,19 +64,19 @@
<version>${pekko-management.version}</version>
</dependency>
<dependency>
- <groupId>com.typesafe.akka</groupId>
- <artifactId>akka-http-core_${scala.binary.version}</artifactId>
- <version>${akka.http.version}</version>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-http-core_${scala.binary.version}</artifactId>
+ <version>${pekko.http.version}</version>
</dependency>
<dependency>
- <groupId>com.typesafe.akka</groupId>
- <artifactId>akka-http_${scala.binary.version}</artifactId>
- <version>${akka.http.version}</version>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-http_${scala.binary.version}</artifactId>
+ <version>${pekko.http.version}</version>
</dependency>
<dependency>
- <groupId>com.typesafe.akka</groupId>
- <artifactId>akka-http-spray-json_${scala.binary.version}</artifactId>
- <version>${akka.http.version}</version>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-http-spray-json_${scala.binary.version}</artifactId>
+ <version>${pekko.http.version}</version>
</dependency>
</dependencies>
@@ -98,7 +106,7 @@
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
- <Main-Class>akka.cluster.bootstrap.demo.DemoApp</Main-Class>
+ <Main-Class>org.apache.pekko.cluster.bootstrap.demo.DemoApp</Main-Class>
</manifestEntries>
</transformer>
</transformers>
diff --git a/integration-test/kubernetes-api-java/src/main/java/akka/cluster/bootstrap/demo/ClusterWatcher.java b/integration-test/kubernetes-api-java/src/main/java/org/apache/pekko/cluster/bootstrap/demo/ClusterWatcher.java
similarity index 73%
rename from integration-test/kubernetes-api-java/src/main/java/akka/cluster/bootstrap/demo/ClusterWatcher.java
rename to integration-test/kubernetes-api-java/src/main/java/org/apache/pekko/cluster/bootstrap/demo/ClusterWatcher.java
index 6890592..81bdbbc 100644
--- a/integration-test/kubernetes-api-java/src/main/java/akka/cluster/bootstrap/demo/ClusterWatcher.java
+++ b/integration-test/kubernetes-api-java/src/main/java/org/apache/pekko/cluster/bootstrap/demo/ClusterWatcher.java
@@ -11,13 +11,13 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.bootstrap.demo;
+package org.apache.pekko.cluster.bootstrap.demo;
-import akka.actor.AbstractActor;
-import akka.cluster.Cluster;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.japi.pf.ReceiveBuilder;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.cluster.Cluster;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.japi.pf.ReceiveBuilder;
public class ClusterWatcher extends AbstractActor {
LoggingAdapter log = Logging.getLogger(getContext().getSystem(), this);
diff --git a/integration-test/kubernetes-api-java/src/main/java/akka/cluster/bootstrap/demo/DemoApp.java b/integration-test/kubernetes-api-java/src/main/java/org/apache/pekko/cluster/bootstrap/demo/DemoApp.java
similarity index 68%
rename from integration-test/kubernetes-api-java/src/main/java/akka/cluster/bootstrap/demo/DemoApp.java
rename to integration-test/kubernetes-api-java/src/main/java/org/apache/pekko/cluster/bootstrap/demo/DemoApp.java
index dbc8ff4..85d607b 100644
--- a/integration-test/kubernetes-api-java/src/main/java/akka/cluster/bootstrap/demo/DemoApp.java
+++ b/integration-test/kubernetes-api-java/src/main/java/org/apache/pekko/cluster/bootstrap/demo/DemoApp.java
@@ -11,21 +11,21 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.bootstrap.demo;
-
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-import akka.cluster.Cluster;
-import akka.cluster.ClusterEvent;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.server.AllDirectives;
+package org.apache.pekko.cluster.bootstrap.demo;
+
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
+import org.apache.pekko.cluster.Cluster;
+import org.apache.pekko.cluster.ClusterEvent;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
//#start-akka-management
-import akka.management.javadsl.AkkaManagement;
+import org.apache.pekko.management.javadsl.PekkoManagement;
//#start-akka-management
-import akka.management.cluster.bootstrap.ClusterBootstrap;
-import akka.stream.Materializer;
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap;
+import org.apache.pekko.stream.Materializer;
public class DemoApp extends AllDirectives {
@@ -38,7 +38,7 @@ public class DemoApp extends AllDirectives {
system.log().info("Started [" + system + "], cluster.selfAddress = " + cluster.selfAddress() + ")");
//#start-akka-management
- AkkaManagement.get(system).start();
+ PekkoManagement.get(system).start();
//#start-akka-management
ClusterBootstrap.get(system).start();
diff --git a/integration-test/kubernetes-api-java/src/main/resources/application.conf b/integration-test/kubernetes-api-java/src/main/resources/application.conf
index c14aed6..c9b8d92 100644
--- a/integration-test/kubernetes-api-java/src/main/resources/application.conf
+++ b/integration-test/kubernetes-api-java/src/main/resources/application.conf
@@ -1,19 +1,19 @@
-akka {
- loggers = ["akka.event.slf4j.Slf4jLogger"]
+pekko {
+ loggers = ["org.apache.pekko.event.slf4j.Slf4jLogger"]
loglevel = "DEBUG"
- logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
+ logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter"
actor.provider = cluster
}
#discovery-config
-akka.discovery {
+pekko.discovery {
kubernetes-api {
# in fact, this is already the default:
pod-label-selector = "app=%s"
}
}
-akka.management {
+pekko.management {
cluster.bootstrap {
contact-point-discovery {
discovery-method = kubernetes-api
diff --git a/integration-test/kubernetes-api-java/test.sh b/integration-test/kubernetes-api-java/test.sh
index 63edf8f..d372df9 100755
--- a/integration-test/kubernetes-api-java/test.sh
+++ b/integration-test/kubernetes-api-java/test.sh
@@ -12,7 +12,7 @@ mvn -Dpekko-management.version=$VERSION clean package docker:build
export NAMESPACE=akka-bootstrap-demo-ns
kubectl create namespace $NAMESPACE || true
-kubectl -n $NAMESPACE apply -f kubernetes/akka-cluster.yml
+kubectl -n $NAMESPACE apply -f kubernetes/pekko-cluster.yml
for i in {1..10}
do
diff --git a/integration-test/kubernetes-api/kubernetes/akka-cluster.yml b/integration-test/kubernetes-api/kubernetes/pekko-cluster.yml
similarity index 97%
rename from integration-test/kubernetes-api/kubernetes/akka-cluster.yml
rename to integration-test/kubernetes-api/kubernetes/pekko-cluster.yml
index e7c6ab6..3262d68 100644
--- a/integration-test/kubernetes-api/kubernetes/akka-cluster.yml
+++ b/integration-test/kubernetes-api/kubernetes/pekko-cluster.yml
@@ -78,7 +78,7 @@ metadata:
subjects:
# Uses the default service account.
# Consider creating a dedicated service account to run your
- # Akka Cluster services and binding the role to that one.
+ # Apache Pekko Cluster services and binding the role to that one.
- kind: ServiceAccount
name: default
roleRef:
diff --git a/integration-test/kubernetes-api/src/main/resources/application.conf b/integration-test/kubernetes-api/src/main/resources/application.conf
index c14aed6..c9b8d92 100644
--- a/integration-test/kubernetes-api/src/main/resources/application.conf
+++ b/integration-test/kubernetes-api/src/main/resources/application.conf
@@ -1,19 +1,19 @@
-akka {
- loggers = ["akka.event.slf4j.Slf4jLogger"]
+pekko {
+ loggers = ["org.apache.pekko.event.slf4j.Slf4jLogger"]
loglevel = "DEBUG"
- logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
+ logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter"
actor.provider = cluster
}
#discovery-config
-akka.discovery {
+pekko.discovery {
kubernetes-api {
# in fact, this is already the default:
pod-label-selector = "app=%s"
}
}
-akka.management {
+pekko.management {
cluster.bootstrap {
contact-point-discovery {
discovery-method = kubernetes-api
diff --git a/integration-test/kubernetes-api/src/main/scala/akka/cluster/bootstrap/DemoApp.scala b/integration-test/kubernetes-api/src/main/scala/org/apache/pekko/cluster/bootstrap/DemoApp.scala
similarity index 71%
rename from integration-test/kubernetes-api/src/main/scala/akka/cluster/bootstrap/DemoApp.scala
rename to integration-test/kubernetes-api/src/main/scala/org/apache/pekko/cluster/bootstrap/DemoApp.scala
index 7a65d4a..caf89f4 100644
--- a/integration-test/kubernetes-api/src/main/scala/akka/cluster/bootstrap/DemoApp.scala
+++ b/integration-test/kubernetes-api/src/main/scala/org/apache/pekko/cluster/bootstrap/DemoApp.scala
@@ -11,17 +11,17 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.bootstrap
+package org.apache.pekko.cluster.bootstrap
-import akka.actor.{ Actor, ActorLogging, ActorSystem, Props }
-import akka.cluster.ClusterEvent.ClusterDomainEvent
-import akka.cluster.{ Cluster, ClusterEvent }
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.server.Directives._
-import akka.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.actor.{ Actor, ActorLogging, ActorSystem, Props }
+import org.apache.pekko.cluster.ClusterEvent.ClusterDomainEvent
+import org.apache.pekko.cluster.{ Cluster, ClusterEvent }
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.server.Directives._
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.management.scaladsl.PekkoManagement
//#start-akka-management
-import akka.management.scaladsl.AkkaManagement
//#start-akka-management
@@ -35,7 +35,7 @@ object DemoApp extends App {
log.info(s"Started [$system], cluster.selfAddress = ${cluster.selfAddress}")
// #start-akka-management
- AkkaManagement(system).start()
+ PekkoManagement(system).start()
// #start-akka-management
ClusterBootstrap(system).start()
diff --git a/integration-test/kubernetes-api/test.sh b/integration-test/kubernetes-api/test.sh
index 60765bd..7867177 100755
--- a/integration-test/kubernetes-api/test.sh
+++ b/integration-test/kubernetes-api/test.sh
@@ -5,7 +5,7 @@ set -exu
export NAMESPACE=akka-bootstrap-demo-ns
export APP_NAME=akka-bootstrap-demo
export PROJECT_NAME=integration-test-kubernetes-api
-export DEPLOYMENT=integration-test/kubernetes-api/kubernetes/akka-cluster.yml
+export DEPLOYMENT=integration-test/kubernetes-api/kubernetes/pekko-cluster.yml
integration-test/scripts/kubernetes-test.sh
diff --git a/integration-test/kubernetes-dns/kubernetes/akka-cluster.yml b/integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml
similarity index 100%
rename from integration-test/kubernetes-dns/kubernetes/akka-cluster.yml
rename to integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml
diff --git a/integration-test/kubernetes-dns/src/main/resources/application.conf b/integration-test/kubernetes-dns/src/main/resources/application.conf
index 6bbc018..80de891 100644
--- a/integration-test/kubernetes-dns/src/main/resources/application.conf
+++ b/integration-test/kubernetes-dns/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+pekko {
loglevel = DEBUG
actor {
provider = "cluster"
@@ -11,10 +11,10 @@ akka {
}
#management
-akka.management {
+pekko.management {
cluster.bootstrap {
contact-point-discovery {
- discovery-method = akka-dns
+ discovery-method = pekko-dns
}
}
diff --git a/integration-test/kubernetes-dns/src/main/scala/akka/cluster/bootstrap/ClusterApp.scala b/integration-test/kubernetes-dns/src/main/scala/org/apache/pekko/cluster/bootstrap/ClusterApp.scala
similarity index 67%
rename from integration-test/kubernetes-dns/src/main/scala/akka/cluster/bootstrap/ClusterApp.scala
rename to integration-test/kubernetes-dns/src/main/scala/org/apache/pekko/cluster/bootstrap/ClusterApp.scala
index 78b7969..4d5e3ac 100644
--- a/integration-test/kubernetes-dns/src/main/scala/akka/cluster/bootstrap/ClusterApp.scala
+++ b/integration-test/kubernetes-dns/src/main/scala/org/apache/pekko/cluster/bootstrap/ClusterApp.scala
@@ -11,17 +11,17 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.bootstrap
+package org.apache.pekko.cluster.bootstrap
-import akka.actor.{ Actor, ActorLogging, ActorSystem, PoisonPill, Props }
-import akka.cluster.ClusterEvent.ClusterDomainEvent
-import akka.cluster.singleton.{ ClusterSingletonManager, ClusterSingletonManagerSettings }
-import akka.cluster.{ Cluster, ClusterEvent }
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.server.Directives._
-import akka.management.cluster.bootstrap.ClusterBootstrap
-import akka.management.scaladsl.AkkaManagement
+import org.apache.pekko.actor.{ Actor, ActorLogging, ActorSystem, PoisonPill, Props }
+import org.apache.pekko.cluster.ClusterEvent.ClusterDomainEvent
+import org.apache.pekko.cluster.singleton.{ ClusterSingletonManager, ClusterSingletonManagerSettings }
+import org.apache.pekko.cluster.{ Cluster, ClusterEvent }
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.server.Directives._
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.management.scaladsl.PekkoManagement
object ClusterApp {
@@ -30,8 +30,8 @@ object ClusterApp {
implicit val system = ActorSystem()
val cluster = Cluster(system)
- system.log.info("Starting Akka Management")
- AkkaManagement(system).start()
+ system.log.info("Starting Pekko Management")
+ PekkoManagement(system).start()
ClusterBootstrap(system).start()
system.actorOf(
diff --git a/integration-test/kubernetes-dns/src/main/scala/akka/cluster/bootstrap/NoisySingleton.scala b/integration-test/kubernetes-dns/src/main/scala/org/apache/pekko/cluster/bootstrap/NoisySingleton.scala
similarity index 84%
rename from integration-test/kubernetes-dns/src/main/scala/akka/cluster/bootstrap/NoisySingleton.scala
rename to integration-test/kubernetes-dns/src/main/scala/org/apache/pekko/cluster/bootstrap/NoisySingleton.scala
index 7bb49cd..5666df5 100644
--- a/integration-test/kubernetes-dns/src/main/scala/akka/cluster/bootstrap/NoisySingleton.scala
+++ b/integration-test/kubernetes-dns/src/main/scala/org/apache/pekko/cluster/bootstrap/NoisySingleton.scala
@@ -11,10 +11,10 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.bootstrap
+package org.apache.pekko.cluster.bootstrap
-import akka.actor.Actor
-import akka.actor.ActorLogging
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.ActorLogging
class NoisySingleton extends Actor with ActorLogging {
diff --git a/integration-test/kubernetes-dns/test.sh b/integration-test/kubernetes-dns/test.sh
index 8c452bb..e231dbb 100755
--- a/integration-test/kubernetes-dns/test.sh
+++ b/integration-test/kubernetes-dns/test.sh
@@ -5,6 +5,6 @@ set -exu
export NAMESPACE=akka-bootstrap-demo-ns
export APP_NAME=akka-bootstrap-demo
export PROJECT_NAME=integration-test-kubernetes-dns
-export DEPLOYMENT=integration-test/kubernetes-dns/kubernetes/akka-cluster.yml
+export DEPLOYMENT=integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml
integration-test/scripts/kubernetes-test.sh
diff --git a/integration-test/local/src/main/resources/application.conf b/integration-test/local/src/main/resources/application.conf
index 34d6e70..901b7b4 100644
--- a/integration-test/local/src/main/resources/application.conf
+++ b/integration-test/local/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+pekko {
loglevel = INFO
actor {
@@ -16,13 +16,13 @@ akka {
}
-#coorindated-shutdown
-akka.cluster.shutdown-after-unsuccessful-join-seed-nodes = 30s
-akka.coordinated-shutdown.exit-jvm = on
-#coorindated-shutdown
+#coordinated-shutdown
+pekko.cluster.shutdown-after-unsuccessful-join-seed-nodes = 30s
+pekko.coordinated-shutdown.exit-jvm = on
+#coordinated-shutdown
#discovery
-akka.discovery {
+pekko.discovery {
config.services = {
local-cluster = {
endpoints = [
@@ -45,18 +45,18 @@ akka.discovery {
#discovery
#health
-akka.management.health-checks {
+pekko.management.health-checks {
readiness-path = "health/ready"
liveness-path = "health/alive"
}
#health
-akka.management.http {
+pekko.management.http {
route-providers-read-only = false
}
#bootstrap
-akka.management {
+pekko.management {
cluster.bootstrap {
contact-point-discovery {
service-name = "local-cluster"
diff --git a/integration-test/local/src/main/scala/akka/cluster/bootstrap/Main.scala b/integration-test/local/src/main/scala/org/apache/pekko/cluster/bootstrap/Main.scala
similarity index 68%
rename from integration-test/local/src/main/scala/akka/cluster/bootstrap/Main.scala
rename to integration-test/local/src/main/scala/org/apache/pekko/cluster/bootstrap/Main.scala
index f256d52..6193d48 100644
--- a/integration-test/local/src/main/scala/akka/cluster/bootstrap/Main.scala
+++ b/integration-test/local/src/main/scala/org/apache/pekko/cluster/bootstrap/Main.scala
@@ -11,13 +11,13 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.bootstrap
+package org.apache.pekko.cluster.bootstrap
-import akka.actor.ActorSystem
-import akka.cluster.Cluster
-import akka.management.cluster.bootstrap.ClusterBootstrap
-import akka.management.scaladsl.AkkaManagement
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.cluster.Cluster
import com.typesafe.config.{ Config, ConfigFactory }
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.management.scaladsl.PekkoManagement
//#main
object Node1 extends App {
@@ -35,12 +35,12 @@ object Node3 extends App {
class Main(nr: Int) {
val config: Config = ConfigFactory.parseString(s"""
- akka.remote.artery.canonical.hostname = "127.0.0.$nr"
- akka.management.http.hostname = "127.0.0.$nr"
+ pekko.remote.artery.canonical.hostname = "127.0.0.$nr"
+ pekko.management.http.hostname = "127.0.0.$nr"
""").withFallback(ConfigFactory.load())
val system = ActorSystem("local-cluster", config)
- AkkaManagement(system).start()
+ PekkoManagement(system).start()
ClusterBootstrap(system).start()
diff --git a/integration-test/local/src/test/scala/akka/management/LocalBootstrapTest.scala b/integration-test/local/src/test/scala/org/apache/pekko/management/LocalBootstrapTest.scala
similarity index 80%
rename from integration-test/local/src/test/scala/akka/management/LocalBootstrapTest.scala
rename to integration-test/local/src/test/scala/org/apache/pekko/management/LocalBootstrapTest.scala
index 3b51c0f..3d81881 100644
--- a/integration-test/local/src/test/scala/akka/management/LocalBootstrapTest.scala
+++ b/integration-test/local/src/test/scala/org/apache/pekko/management/LocalBootstrapTest.scala
@@ -11,36 +11,29 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management
+package org.apache.pekko.management
-import scala.concurrent.duration._
-
-import akka.actor.ActorSystem
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.HttpRequest
-import akka.http.scaladsl.model.StatusCode
-import akka.http.scaladsl.model.StatusCodes
-import akka.management.cluster.bootstrap.ClusterBootstrap
-import akka.management.scaladsl.AkkaManagement
-import akka.testkit.SocketUtil
-import akka.testkit.TestKit
import com.typesafe.config.ConfigFactory
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.cluster.{ Cluster, MemberStatus }
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model.{ HttpRequest, StatusCode, StatusCodes }
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.management.scaladsl.PekkoManagement
+import org.apache.pekko.testkit.{ SocketUtil, TestKit }
import org.scalatest.BeforeAndAfterAll
-import org.scalatest.concurrent.Eventually
-import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.concurrent.{ Eventually, ScalaFutures }
import org.scalatest.matchers.should.Matchers
-import org.scalatest.time.Millis
-import org.scalatest.time.Seconds
-import org.scalatest.time.Span
+import org.scalatest.time.{ Millis, Seconds, Span }
import org.scalatest.wordspec.AnyWordSpec
+import scala.concurrent.duration._
+
object LocalBootstrapTest {
val managementPorts = SocketUtil.temporaryServerAddresses(3, "127.0.0.1").map(_.getPort)
// See src/main/resources/application.conf for bootstrap settings which are used in docs so needs tested
val config = ConfigFactory.parseString(s"""
- akka.remote.artery {
+ pekko.remote.artery {
enabled = on
transport = tcp
canonical {
@@ -48,11 +41,11 @@ object LocalBootstrapTest {
port = 0
}
}
- akka.management {
+ pekko.management {
http.hostname = "127.0.0.1"
cluster.bootstrap.contact-point-discovery.port-name = "management"
}
- akka.discovery {
+ pekko.discovery {
config.services = {
local-cluster = {
endpoints = [
@@ -89,12 +82,12 @@ class LocalBootstrapTest extends AnyWordSpec with ScalaFutures with Matchers wit
ActorSystem(
"local-cluster",
ConfigFactory.parseString(s"""
- akka.management.http.port = $managementPort
- akka.coordinated-shutdown.exit-jvm = off
+ pekko.management.http.port = $managementPort
+ pekko.coordinated-shutdown.exit-jvm = off
""".stripMargin).withFallback(config))
override def afterAll(): Unit = {
- // TODO: shutdown Akka HTTP connection pools. Requires Akka HTTP 10.2
+ // TODO: shutdown Pekko HTTP connection pools. Requires Pekko HTTP 10.2
systems.reverse.foreach { sys =>
TestKit.shutdownActorSystem(sys, 3.seconds)
}
@@ -114,7 +107,7 @@ class LocalBootstrapTest extends AnyWordSpec with ScalaFutures with Matchers wit
"Cluster bootstrap with health checks" should {
systems = managementPorts.map(newSystem)
val clusters = systems.map(Cluster.apply)
- systems.foreach(AkkaManagement(_).start())
+ systems.foreach(PekkoManagement(_).start())
// for http client
implicit val system = systems(0)
diff --git a/integration-test/marathon-api-docker/README.md b/integration-test/marathon-api-docker/README.md
index 60867ea..8efbee8 100644
--- a/integration-test/marathon-api-docker/README.md
+++ b/integration-test/marathon-api-docker/README.md
@@ -6,13 +6,13 @@ network bridge mode with automatic host port allocation.
Marathon API discovery mechanism uses Marathon API to find other application instances (contact points) to form Akka cluster.
In order to identify contact points it uses a label assigned to the application in the application description and
-a port name to identify Akka HTTP management port:
+a port name to identify Pekko HTTP management port:
Label need to be defined in two places.
First place is the application configuration:
see `integration-test/marathon-api-docker/src/main/resources/application.conf`:
```
- akka.management.cluster.bootstrap.contact-point-discovery.effective-name = "marathon-api-docker-app-label"
+ pekko.management.cluster.bootstrap.contact-point-discovery.effective-name = "marathon-api-docker-app-label"
```
> NOTE: if `effective-name` is not defined explicitly then Discovery Mechanism will use concatenation of
@@ -31,19 +31,19 @@ see `marathon/marathon-api-docker-app.json`:
```
> NOTE: Discovery Mechanism uses `ACTOR_SYSTEM_NAME` label name as a part of Marathon API query param to find relevant contact points.
-> This default value can be overridden in the application config `akka.discovery.marathon-api.app-label-query`
+> This default value can be overridden in the application config `pekko.discovery.marathon-api.app-label-query`
-After Discovery mechanism found potential contact points by the label it needs to find Akka HTTP management port.
+After Discovery mechanism found potential contact points by the label it needs to find Pekko HTTP management port.
It uses `app-port-name`:
see `src/main/resources/application.conf`:
```
...
-akka.discovery.marathon-api.app-port-name = "akkamgmthttp"
+pekko.discovery.marathon-api.app-port-name = "pekkomgmthttp"
...
```
-it should match with Akka HTTP management port name in Marathon application description docker port declaration:
+it should match with Pekko HTTP management port name in Marathon application description docker port declaration:
see `marathon/marathon-api-docker-app.json`:
```
...
@@ -58,7 +58,7 @@ see `marathon/marathon-api-docker-app.json`:
"hostPort": 0,
"servicePort": 10206,
"protocol": "tcp",
- "name": "akkamgmthttp"
+ "name": "pekkomgmthttp"
...
```
@@ -69,7 +69,7 @@ How to Build
`export DOCKER_USER=<your-docker-hub-account>`
-2. In order to build and publish this example into your docker hub repo run next command from `akka-management` work folder
+2. In order to build and publish this example into your docker hub repo run next command from `pekko-management` work folder
`sbt integration-test-marathon-api-docker/docker:publish`
diff --git a/integration-test/marathon-api-docker/build.sbt b/integration-test/marathon-api-docker/build.sbt
index 7e5dac3..8b01b1a 100644
--- a/integration-test/marathon-api-docker/build.sbt
+++ b/integration-test/marathon-api-docker/build.sbt
@@ -13,6 +13,6 @@ dockerUsername := sys.env.get("DOCKER_USER")
val akkaManagementVersion = "1.1.4"
libraryDependencies ++= Vector(
- "com.lightbend.akka.management" %% "akka-management-cluster-bootstrap" % akkaManagementVersion,
- "com.lightbend.akka.management" %% "akka-management-cluster-http" % akkaManagementVersion,
- "com.lightbend.akka.discovery" %% "akka-discovery-marathon-api" % akkaManagementVersion)
+ "org.apache.pekko" %% "pekko-management-cluster-bootstrap" % akkaManagementVersion,
+ "org.apache.pekko" %% "pekko-management-cluster-http" % akkaManagementVersion,
+ "org.apache.pekko" %% "pekko-discovery-marathon-api" % akkaManagementVersion)
diff --git a/integration-test/marathon-api-docker/marathon/marathon-api-docker-app.json b/integration-test/marathon-api-docker/marathon/marathon-api-docker-app.json
index e285c2d..84c469f 100644
--- a/integration-test/marathon-api-docker/marathon/marathon-api-docker-app.json
+++ b/integration-test/marathon-api-docker/marathon/marathon-api-docker-app.json
@@ -40,7 +40,7 @@
"hostPort": 0,
"servicePort": 10206,
"protocol": "tcp",
- "name": "akkamgmthttp"
+ "name": "pekkomgmthttp"
}
],
"privileged": false,
diff --git a/integration-test/marathon-api-docker/src/main/resources/application.conf b/integration-test/marathon-api-docker/src/main/resources/application.conf
index 884fd05..1853475 100644
--- a/integration-test/marathon-api-docker/src/main/resources/application.conf
+++ b/integration-test/marathon-api-docker/src/main/resources/application.conf
@@ -1,16 +1,16 @@
-akka {
+pekko {
loglevel = INFO
discovery {
marathon-api {
- class = akka.discovery.marathon.MarathonApiServiceDiscovery
+ class = org.apache.pekko.discovery.marathon.MarathonApiServiceDiscovery
# URL for getting list of apps from Marathon. Verified on OSS DC/OS 1.8, 1.9
app-api-url = "http://marathon.mesos:8080/v2/apps"
- # The name of the akka management port - this cannot have underscores or dashes (env var name)
- app-port-name = "akkamgmthttp"
+ # The name of the pekko management port - this cannot have underscores or dashes (env var name)
+ app-port-name = "pekkomgmthttp"
# Used to find other apps running by Marathon. This will be passed as the label query string parameter
# to the apps-api-url defined above.
diff --git a/integration-test/marathon-api-docker/src/main/scala/akka/cluster/bootstrap/MarathonApiDockerDemoApp.scala b/integration-test/marathon-api-docker/src/main/scala/org/apache/pekko/cluster/bootstrap/MarathonApiDockerDemoApp.scala
similarity index 71%
rename from integration-test/marathon-api-docker/src/main/scala/akka/cluster/bootstrap/MarathonApiDockerDemoApp.scala
rename to integration-test/marathon-api-docker/src/main/scala/org/apache/pekko/cluster/bootstrap/MarathonApiDockerDemoApp.scala
index 7fb8f26..3a69c83 100644
--- a/integration-test/marathon-api-docker/src/main/scala/akka/cluster/bootstrap/MarathonApiDockerDemoApp.scala
+++ b/integration-test/marathon-api-docker/src/main/scala/org/apache/pekko/cluster/bootstrap/MarathonApiDockerDemoApp.scala
@@ -11,15 +11,15 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.bootstrap
+package org.apache.pekko.cluster.bootstrap
-import akka.actor.ActorSystem
-import akka.cluster.{ Cluster, MemberStatus }
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.server.Directives._
-import akka.management.cluster.bootstrap.ClusterBootstrap
-import akka.management.scaladsl.AkkaManagement
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.cluster.{ Cluster, MemberStatus }
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.server.Directives._
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.management.scaladsl.PekkoManagement
object MarathonApiDockerDemoApp extends App {
implicit val system = ActorSystem("my-system")
@@ -42,7 +42,7 @@ object MarathonApiDockerDemoApp extends App {
path("healthy")(complete(if (isHealthy()) StatusCodes.OK else StatusCodes.ServiceUnavailable)),
path("ready")(complete(if (isReady()) StatusCodes.OK else StatusCodes.ServiceUnavailable)))
- AkkaManagement(system).start()
+ PekkoManagement(system).start()
ClusterBootstrap(system).start()
private val host: String = sys.env.get("HOST").getOrElse("127.0.0.1")
diff --git a/integration-test/marathon-api/README.md b/integration-test/marathon-api/README.md
index 8fcbe32..81fa611 100644
--- a/integration-test/marathon-api/README.md
+++ b/integration-test/marathon-api/README.md
@@ -54,7 +54,7 @@ dcos task log --follow integration-test-marathon-api-0.1.0
Successful log output will look something like the following:
```
-[INFO] [01/11/2018 21:19:48.113] [my-system-akka.actor.default-dispatcher-6] [akka.cluster.Cluster(akka://my-system)] Cluster Node [akka.tcp://my-system@192.168.65.111:14878] - Sending InitJoinAck message from node [akka.tcp://my-system@192.168.65.111:14878] to [Actor[akka.tcp://my-system@192.168.65.111:7664/system/cluster/core/daemon/joinSeedNodeProcess-1#-1012708477]]
-[INFO] [01/11/2018 21:19:48.145] [my-system-akka.actor.default-dispatcher-6] [akka.cluster.Cluster(akka://my-system)] Cluster Node [akka.tcp://my-system@192.168.65.111:14878] - Node [akka.tcp://my-system@192.168.65.111:7664] is JOINING, roles [dc-default]
-[INFO] [01/11/2018 21:19:49.139] [my-system-akka.actor.default-dispatcher-18] [akka.cluster.Cluster(akka://my-system)] Cluster Node [akka.tcp://my-system@192.168.65.111:14878] - Leader is moving node [akka.tcp://my-system@192.168.65.111:7664] to [Up]
+[INFO] [01/11/2018 21:19:48.113] [my-system-akka.actor.default-dispatcher-6] [org.apache.pekko.cluster.Cluster(pekko://my-system)] Cluster Node [pekko.tcp://my-system@192.168.65.111:14878] - Sending InitJoinAck message from node [pekko.tcp://my-system@192.168.65.111:14878] to [Actor[pekko.tcp://my-system@192.168.65.111:7664/system/cluster/core/daemon/joinSeedNodeProcess-1#-1012708477]]
+[INFO] [01/11/2018 21:19:48.145] [my-system-akka.actor.default-dispatcher-6] [org.apache.pekko.cluster.Cluster(pekko://my-system)] Cluster Node [pekko.tcp://my-system@192.168.65.111:14878] - Node [pekko.tcp://my-system@192.168.65.111:7664] is JOINING, roles [dc-default]
+[INFO] [01/11/2018 21:19:49.139] [my-system-akka.actor.default-dispatcher-18] [org.apache.pekko.cluster.Cluster(pekko://my-system)] Cluster Node [pekko.tcp://my-system@192.168.65.111:14878] - Leader is moving node [pekko.tcp://my-system@192.168.65.111:7664] to [Up]
```
diff --git a/integration-test/marathon-api/build.sbt b/integration-test/marathon-api/build.sbt
index faad6cb..ec36988 100644
--- a/integration-test/marathon-api/build.sbt
+++ b/integration-test/marathon-api/build.sbt
@@ -9,6 +9,6 @@ scalaVersion := "2.12.16"
val akkaManagementVersion = "1.10.0"
libraryDependencies ++= Vector(
- "com.lightbend.akka.management" %% "akka-management-cluster-bootstrap" % akkaManagementVersion,
- "com.lightbend.akka.management" %% "akka-management-cluster-http" % akkaManagementVersion,
- "com.lightbend.akka.discovery" %% "akka-discovery-marathon-api" % akkaManagementVersion)
+ "org.apache.pekko" %% "pekko-management-cluster-bootstrap" % akkaManagementVersion,
+ "org.apache.pekko" %% "pekko-management-cluster-http" % akkaManagementVersion,
+ "org.apache.pekko" %% "pekko-discovery-marathon-api" % akkaManagementVersion)
diff --git a/integration-test/marathon-api/marathon/app.json b/integration-test/marathon-api/marathon/app.json
index 87325d5..9020f27 100644
--- a/integration-test/marathon-api/marathon/app.json
+++ b/integration-test/marathon-api/marathon/app.json
@@ -1,6 +1,6 @@
{
"id": "/bootstrap-demo-marathon-api-0.1.0",
- "cmd": "./bootstrap-demo-marathon-api-0.1.0/bin/bootstrap-joining-demo-marathon-api -java-home $(echo $(pwd)/jre*) -Dakka.remote.netty.tcp.hostname=$HOST -Dakka.remote.netty.tcp.port=$PORT_AKKAREMOTE -Dakka.management.http.hostname=$HOST -Dakka.management.http.port=$PORT_AKKAMGMTHTTP",
+ "cmd": "./bootstrap-demo-marathon-api-0.1.0/bin/bootstrap-joining-demo-marathon-api -java-home $(echo $(pwd)/jre*) -Dpekko.remote.netty.tcp.hostname=$HOST -Dpekko.remote.netty.tcp.port=$PORT_AKKAREMOTE -Dpekko.management.http.hostname=$HOST -Dpekko.management.http.port=$PORT_AKKAMGMTHTTP",
"cpus": 1.0,
"mem": 512,
"instances": 2,
@@ -18,7 +18,7 @@
},
{
"port": 0,
- "name": "akkamgmthttp"
+ "name": "pekkomgmthttp"
}
],
"readinessChecks": [{
diff --git a/integration-test/marathon-api/src/main/resources/application.conf b/integration-test/marathon-api/src/main/resources/application.conf
index c2ee4a7..4651b42 100644
--- a/integration-test/marathon-api/src/main/resources/application.conf
+++ b/integration-test/marathon-api/src/main/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+pekko {
actor {
provider = "cluster"
}
diff --git a/integration-test/marathon-api/src/main/scala/akka/cluster/bootstrap/DemoApp.scala b/integration-test/marathon-api/src/main/scala/org/apache/pekko/cluster/bootstrap/DemoApp.scala
similarity index 70%
rename from integration-test/marathon-api/src/main/scala/akka/cluster/bootstrap/DemoApp.scala
rename to integration-test/marathon-api/src/main/scala/org/apache/pekko/cluster/bootstrap/DemoApp.scala
index ceeeb0f..251a912 100644
--- a/integration-test/marathon-api/src/main/scala/akka/cluster/bootstrap/DemoApp.scala
+++ b/integration-test/marathon-api/src/main/scala/org/apache/pekko/cluster/bootstrap/DemoApp.scala
@@ -11,15 +11,15 @@
* Copyright (C) 2017 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.bootstrap
+package org.apache.pekko.cluster.bootstrap
-import akka.actor.ActorSystem
-import akka.cluster.{ Cluster, MemberStatus }
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.server.Directives._
-import akka.management.scaladsl.AkkaManagement
-import akka.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.cluster.{ Cluster, MemberStatus }
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.server.Directives._
+import org.apache.pekko.management.scaladsl.PekkoManagement
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
object DemoApp extends App {
implicit val system = ActorSystem("my-system")
@@ -42,7 +42,7 @@ object DemoApp extends App {
path("healthy")(complete(if (isHealthy()) StatusCodes.OK else StatusCodes.ServiceUnavailable)),
path("ready")(complete(if (isReady()) StatusCodes.OK else StatusCodes.ServiceUnavailable)))
- AkkaManagement(system).start()
+ PekkoManagement(system).start()
ClusterBootstrap(system).start()
Http().bindAndHandle(
diff --git a/lease-kubernetes-int-test/kubernetes/rbac.yml b/lease-kubernetes-int-test/kubernetes/rbac.yml
index a3a60a6..a5a43de 100644
--- a/lease-kubernetes-int-test/kubernetes/rbac.yml
+++ b/lease-kubernetes-int-test/kubernetes/rbac.yml
@@ -14,7 +14,7 @@ metadata:
subjects:
# Uses the default service account.
# Consider creating a dedicated service account to run your
- # Akka Cluster services and binding the role to that one.
+ # Apache Pekko Cluster services and binding the role to that one.
- kind: ServiceAccount
name: default
roleRef:
diff --git a/lease-kubernetes-int-test/src/main/resources/application.conf b/lease-kubernetes-int-test/src/main/resources/application.conf
index b5e5f4f..a017a5d 100644
--- a/lease-kubernetes-int-test/src/main/resources/application.conf
+++ b/lease-kubernetes-int-test/src/main/resources/application.conf
@@ -1,12 +1,12 @@
-akka {
+pekko {
loglevel = DEBUG
coordinated-shutdown {
reason-overrides {
- "akka.coordination.lease.kubernetes.TestFailedReason$" {
+ "pekko.coordination.lease.kubernetes.TestFailedReason$" {
exit-jvm = on
exit-code = -1
}
- "akka.coordination.lease.kubernetes.TestPassedReason$" {
+ "pekko.coordination.lease.kubernetes.TestPassedReason$" {
exit-jvm = on
exit-code = 0
}
diff --git a/lease-kubernetes-int-test/src/main/scala/akka/coordination/lease/kubernetes/LeaseSpec.scala b/lease-kubernetes-int-test/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseSpec.scala
similarity index 84%
rename from lease-kubernetes-int-test/src/main/scala/akka/coordination/lease/kubernetes/LeaseSpec.scala
rename to lease-kubernetes-int-test/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseSpec.scala
index c6a3878..c7bfa98 100644
--- a/lease-kubernetes-int-test/src/main/scala/akka/coordination/lease/kubernetes/LeaseSpec.scala
+++ b/lease-kubernetes-int-test/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseSpec.scala
@@ -11,12 +11,12 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.coordination.lease.kubernetes
+package org.apache.pekko.coordination.lease.kubernetes
-import akka.actor.ActorSystem
-import akka.coordination.lease.TimeoutSettings
-import akka.coordination.lease.kubernetes.internal.KubernetesApiImpl
-import akka.coordination.lease.scaladsl.LeaseProvider
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.coordination.lease.TimeoutSettings
+import org.apache.pekko.coordination.lease.kubernetes.internal.KubernetesApiImpl
+import org.apache.pekko.coordination.lease.scaladsl.LeaseProvider
import org.scalatest.concurrent.{ Eventually, ScalaFutures }
import org.scalatest.time.{ Milliseconds, Seconds, Span }
import org.scalatest.BeforeAndAfterAll
@@ -41,8 +41,8 @@ abstract class LeaseSpec() extends AnyWordSpec with ScalaFutures with BeforeAndA
val client2 = "client2"
// two leases instances for the same lease name
- lazy val lease1Client1 = underTest.getLease(leaseName, "akka.coordination.lease.kubernetes", client1)
- lazy val lease1Client2 = underTest.getLease(leaseName, "akka.coordination.lease.kubernetes", client2)
+ lazy val lease1Client1 = underTest.getLease(leaseName, "pekko.coordination.lease.kubernetes", client1)
+ lazy val lease1Client2 = underTest.getLease(leaseName, "pekko.coordination.lease.kubernetes", client2)
"A lease" should {
diff --git a/lease-kubernetes-int-test/src/main/scala/akka/coordination/lease/kubernetes/LeaseTestSuite.scala b/lease-kubernetes-int-test/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseTestSuite.scala
similarity index 93%
rename from lease-kubernetes-int-test/src/main/scala/akka/coordination/lease/kubernetes/LeaseTestSuite.scala
rename to lease-kubernetes-int-test/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseTestSuite.scala
index 6f1c418..55e40dc 100644
--- a/lease-kubernetes-int-test/src/main/scala/akka/coordination/lease/kubernetes/LeaseTestSuite.scala
+++ b/lease-kubernetes-int-test/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseTestSuite.scala
@@ -11,9 +11,9 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.coordination.lease.kubernetes
+package org.apache.pekko.coordination.lease.kubernetes
-import akka.actor.{ ActorSystem, CoordinatedShutdown }
+import org.apache.pekko.actor.{ ActorSystem, CoordinatedShutdown }
import org.scalatest.{ Args, Filter, Reporter, Stopper }
import org.scalatest.events.{ Event, TestFailed }
diff --git a/lease-kubernetes-int-test/src/main/scala/akka/coordination/lease/kubernetes/TestFailedReason.scala b/lease-kubernetes-int-test/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/TestFailedReason.scala
similarity index 79%
rename from lease-kubernetes-int-test/src/main/scala/akka/coordination/lease/kubernetes/TestFailedReason.scala
rename to lease-kubernetes-int-test/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/TestFailedReason.scala
index 890b48c..346c196 100644
--- a/lease-kubernetes-int-test/src/main/scala/akka/coordination/lease/kubernetes/TestFailedReason.scala
+++ b/lease-kubernetes-int-test/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/TestFailedReason.scala
@@ -11,9 +11,9 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.coordination.lease.kubernetes
+package org.apache.pekko.coordination.lease.kubernetes
-import akka.actor.CoordinatedShutdown.Reason
+import org.apache.pekko.actor.CoordinatedShutdown.Reason
object TestFailedReason extends Reason
object TestPassedReason extends Reason
diff --git a/lease-kubernetes-int-test/src/test/scala/akka/lease/kubernetes/LocalLeaseSpec.scala b/lease-kubernetes-int-test/src/test/scala/pekko/lease/kubernetes/LocalLeaseSpec.scala
similarity index 79%
rename from lease-kubernetes-int-test/src/test/scala/akka/lease/kubernetes/LocalLeaseSpec.scala
rename to lease-kubernetes-int-test/src/test/scala/pekko/lease/kubernetes/LocalLeaseSpec.scala
index d7d0a85..f17c0b2 100644
--- a/lease-kubernetes-int-test/src/test/scala/akka/lease/kubernetes/LocalLeaseSpec.scala
+++ b/lease-kubernetes-int-test/src/test/scala/pekko/lease/kubernetes/LocalLeaseSpec.scala
@@ -11,9 +11,11 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.coordination.lease.kubernetes
-import akka.actor.ActorSystem
+package org.apache.pekko.lease.kubernetes
+
import com.typesafe.config.ConfigFactory
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.coordination.lease.kubernetes.LeaseSpec
// For testing locally with a kubectl proxy 8080
// the actual spec is run in kubernetes from Jenkins
@@ -21,8 +23,8 @@ abstract class LocalLeaseSpec extends LeaseSpec {
private lazy val _system = ActorSystem(
"LocalLeaseSpec",
ConfigFactory.parseString("""
- akka.loglevel = INFO
- akka.coordination.lease.kubernetes {
+ pekko.loglevel = INFO
+ pekko.coordination.lease.kubernetes {
api-service-host = localhost
api-service-port = 8080
namespace = "akka-lease-tests"
diff --git a/lease-kubernetes/src/it/scala/akka/coordination/lease/kubernetes/KubernetesApiIntegrationTest.scala b/lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesApiIntegrationTest.scala
similarity index 93%
rename from lease-kubernetes/src/it/scala/akka/coordination/lease/kubernetes/KubernetesApiIntegrationTest.scala
rename to lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesApiIntegrationTest.scala
index f5455e7..61e1660 100644
--- a/lease-kubernetes/src/it/scala/akka/coordination/lease/kubernetes/KubernetesApiIntegrationTest.scala
+++ b/lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesApiIntegrationTest.scala
@@ -1,9 +1,9 @@
-package akka.coordination.lease.kubernetes
+package org.apache.pekko.coordination.lease.kubernetes
-import akka.Done
-import akka.actor.ActorSystem
-import akka.coordination.lease.kubernetes.internal.KubernetesApiImpl
-import akka.testkit.TestKit
+import org.apache.pekko.Done
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.coordination.lease.kubernetes.internal.KubernetesApiImpl
+import org.apache.pekko.testkit.TestKit
import com.typesafe.config.ConfigFactory
import org.scalatest.{ BeforeAndAfterAll, CancelAfterFailure }
import org.scalatest.concurrent.{ Eventually, ScalaFutures }
@@ -23,8 +23,8 @@ import scala.concurrent.duration._
class KubernetesApiIntegrationTest extends TestKit(ActorSystem("KubernetesApiIntegrationSpec",
ConfigFactory.parseString(
"""
- akka.loglevel = DEBUG
- akka.coordination.lease.kubernetes.lease-operation-timeout = 1.5s
+ pekko.loglevel = DEBUG
+ pekko.coordination.lease.kubernetes.lease-operation-timeout = 1.5s
""")))
with AnyWordSpecLike with Matchers
with ScalaFutures with BeforeAndAfterAll with CancelAfterFailure with Eventually {
diff --git a/lease-kubernetes/src/it/scala/akka/coordination/lease/kubernetes/LeaseContentionSpec.scala b/lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseContentionSpec.scala
similarity index 81%
rename from lease-kubernetes/src/it/scala/akka/coordination/lease/kubernetes/LeaseContentionSpec.scala
rename to lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseContentionSpec.scala
index 0a2c1db..e766a50 100644
--- a/lease-kubernetes/src/it/scala/akka/coordination/lease/kubernetes/LeaseContentionSpec.scala
+++ b/lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseContentionSpec.scala
@@ -1,4 +1,4 @@
-package akka.coordination.lease.kubernetes
+package org.apache.pekko.coordination.lease.kubernetes
import java.util.concurrent.Executors
@@ -6,11 +6,11 @@ import scala.collection.immutable
import scala.concurrent.ExecutionContext
import scala.concurrent.Future
-import akka.actor.ActorSystem
-import akka.coordination.lease.TimeoutSettings
-import akka.coordination.lease.kubernetes.internal.KubernetesApiImpl
-import akka.coordination.lease.scaladsl.LeaseProvider
-import akka.testkit.TestKit
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.coordination.lease.TimeoutSettings
+import org.apache.pekko.coordination.lease.kubernetes.internal.KubernetesApiImpl
+import org.apache.pekko.coordination.lease.scaladsl.LeaseProvider
+import org.apache.pekko.testkit.TestKit
import com.typesafe.config.ConfigFactory
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.wordspec.AnyWordSpecLike
@@ -29,8 +29,8 @@ import org.scalatest.matchers.should.Matchers
class LeaseContentionSpec extends TestKit(ActorSystem("LeaseContentionSpec",
ConfigFactory.parseString(
"""
- akka.loglevel = INFO
- akka.coordination.lease.kubernetes {
+ pekko.loglevel = INFO
+ pekko.coordination.lease.kubernetes {
api-service-host = localhost
api-service-port = 8080
namespace = "lease"
@@ -44,7 +44,8 @@ class LeaseContentionSpec extends TestKit(ActorSystem("LeaseContentionSpec",
// for cleanup
val k8sApi = new KubernetesApiImpl(system,
- KubernetesSettings(system, TimeoutSettings(system.settings.config.getConfig("akka.coordination.lease.kubernetes"))))
+ KubernetesSettings(system,
+ TimeoutSettings(system.settings.config.getConfig("pekko.coordination.lease.kubernetes"))))
val lease1 = "contended-lease"
val lease2 = "contended-lease-2"
diff --git a/lease-kubernetes/src/main/resources/reference.conf b/lease-kubernetes/src/main/resources/reference.conf
index fb57e52..a4963f9 100644
--- a/lease-kubernetes/src/main/resources/reference.conf
+++ b/lease-kubernetes/src/main/resources/reference.conf
@@ -1,6 +1,6 @@
-akka.coordination.lease.kubernetes {
+pekko.coordination.lease.kubernetes {
- lease-class = "akka.coordination.lease.kubernetes.KubernetesLease"
+ lease-class = "org.apache.pekko.coordination.lease.kubernetes.KubernetesLease"
api-ca-path = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
api-token-path = "/var/run/secrets/kubernetes.io/serviceaccount/token"
diff --git a/lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/KubernetesApi.scala b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesApi.scala
similarity index 86%
rename from lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/KubernetesApi.scala
rename to lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesApi.scala
index 1f704fa..31d56cf 100644
--- a/lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/KubernetesApi.scala
+++ b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesApi.scala
@@ -11,9 +11,9 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.coordination.lease.kubernetes
+package org.apache.pekko.coordination.lease.kubernetes
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
import scala.concurrent.Future
@@ -21,14 +21,14 @@ import scala.concurrent.Future
* INTERNAL API
*/
@InternalApi
-private[akka] case class LeaseResource(owner: Option[String], version: String, time: Long) {
+private[pekko] case class LeaseResource(owner: Option[String], version: String, time: Long) {
def isTaken(): Boolean = owner.isDefined
}
/**
* INTERNAL API
*/
-private[akka] trait KubernetesApi {
+private[pekko] trait KubernetesApi {
/**
* Reads a Lease from the API server. If it doesn't exist it tries to create it.
diff --git a/lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/KubernetesLease.scala b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesLease.scala
similarity index 80%
rename from lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/KubernetesLease.scala
rename to lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesLease.scala
index 9e35bd8..f57ff69 100644
--- a/lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/KubernetesLease.scala
+++ b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesLease.scala
@@ -11,7 +11,7 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.coordination.lease.kubernetes
+package org.apache.pekko.coordination.lease.kubernetes
import java.text.Normalizer
import java.util.concurrent.atomic.AtomicBoolean
@@ -19,22 +19,22 @@ import java.util.concurrent.atomic.AtomicInteger
import scala.concurrent.Future
-import akka.actor.ExtendedActorSystem
-import akka.coordination.lease.kubernetes.KubernetesLease.makeDNS1039Compatible
-import akka.coordination.lease.kubernetes.LeaseActor._
-import akka.coordination.lease.kubernetes.internal.KubernetesApiImpl
-import akka.coordination.lease.scaladsl.Lease
-import akka.coordination.lease.LeaseException
-import akka.coordination.lease.LeaseSettings
-import akka.coordination.lease.LeaseTimeoutException
-import akka.dispatch.ExecutionContexts
-import akka.pattern.AskTimeoutException
-import akka.util.ConstantFun
-import akka.util.Timeout
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.coordination.lease.kubernetes.KubernetesLease.makeDNS1039Compatible
+import org.apache.pekko.coordination.lease.kubernetes.LeaseActor._
+import org.apache.pekko.coordination.lease.kubernetes.internal.KubernetesApiImpl
+import org.apache.pekko.coordination.lease.scaladsl.Lease
+import org.apache.pekko.coordination.lease.LeaseException
+import org.apache.pekko.coordination.lease.LeaseSettings
+import org.apache.pekko.coordination.lease.LeaseTimeoutException
+import org.apache.pekko.dispatch.ExecutionContexts
+import org.apache.pekko.pattern.AskTimeoutException
+import org.apache.pekko.util.ConstantFun
+import org.apache.pekko.util.Timeout
import org.slf4j.LoggerFactory
object KubernetesLease {
- val configPath = "akka.coordination.lease.kubernetes"
+ val configPath = "pekko.coordination.lease.kubernetes"
private val leaseCounter = new AtomicInteger(1)
/**
@@ -61,10 +61,10 @@ object KubernetesLease {
}
}
-class KubernetesLease private[akka] (system: ExtendedActorSystem, leaseTaken: AtomicBoolean, settings: LeaseSettings)
+class KubernetesLease private[pekko] (system: ExtendedActorSystem, leaseTaken: AtomicBoolean, settings: LeaseSettings)
extends Lease(settings) {
- import akka.pattern.ask
+ import org.apache.pekko.pattern.ask
import system.dispatcher
private val logger = LoggerFactory.getLogger(classOf[KubernetesLease])
diff --git a/lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/KubernetesSettings.scala b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesSettings.scala
similarity index 87%
rename from lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/KubernetesSettings.scala
rename to lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesSettings.scala
index b55efdb..d783e7f 100644
--- a/lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/KubernetesSettings.scala
+++ b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesSettings.scala
@@ -11,12 +11,12 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.coordination.lease.kubernetes
+package org.apache.pekko.coordination.lease.kubernetes
-import akka.actor.ActorSystem
-import akka.annotation.InternalApi
-import akka.coordination.lease.TimeoutSettings
-import akka.util.JavaDurationConverters._
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.coordination.lease.TimeoutSettings
+import org.apache.pekko.util.JavaDurationConverters._
import com.typesafe.config.Config
import scala.concurrent.duration.{ FiniteDuration, _ }
@@ -25,7 +25,7 @@ import scala.concurrent.duration.{ FiniteDuration, _ }
* INTERNAL API
*/
@InternalApi
-private[akka] object KubernetesSettings {
+private[pekko] object KubernetesSettings {
private implicit class HasDefined(val config: Config) {
def hasDefined(key: String): Boolean =
@@ -70,7 +70,7 @@ private[akka] object KubernetesSettings {
* INTERNAL API
*/
@InternalApi
-private[akka] class KubernetesSettings(
+private[pekko] class KubernetesSettings(
val apiCaPath: String,
val apiTokenPath: String,
val apiServerHost: String,
diff --git a/lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/LeaseActor.scala b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActor.scala
similarity index 95%
rename from lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/LeaseActor.scala
rename to lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActor.scala
index 1979cf0..6c14655 100644
--- a/lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/LeaseActor.scala
+++ b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActor.scala
@@ -11,17 +11,17 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.coordination.lease.kubernetes
+package org.apache.pekko.coordination.lease.kubernetes
import java.util.concurrent.atomic.AtomicBoolean
-import akka.actor.Status.Failure
-import akka.actor.{ ActorRef, DeadLetterSuppression, FSM, LoggingFSM, Props }
-import akka.annotation.InternalApi
-import akka.coordination.lease.kubernetes.LeaseActor._
-import akka.coordination.lease.{ LeaseSettings, LeaseTimeoutException }
-import akka.util.ConstantFun
-import akka.util.PrettyDuration._
+import org.apache.pekko.actor.Status.Failure
+import org.apache.pekko.actor.{ ActorRef, DeadLetterSuppression, FSM, LoggingFSM, Props }
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.coordination.lease.kubernetes.LeaseActor._
+import org.apache.pekko.coordination.lease.{ LeaseSettings, LeaseTimeoutException }
+import org.apache.pekko.util.ConstantFun
+import org.apache.pekko.util.PrettyDuration._
import scala.concurrent.duration._
import scala.util.control.NonFatal
@@ -30,7 +30,7 @@ import scala.util.control.NonFatal
* INTERNAL API
*/
@InternalApi
-private[akka] object LeaseActor {
+private[pekko] object LeaseActor {
sealed trait State
case object Idle extends State
@@ -87,14 +87,14 @@ private[akka] object LeaseActor {
* INTERNAL API
*/
@InternalApi
-private[akka] class LeaseActor(
+private[pekko] class LeaseActor(
k8sApi: KubernetesApi,
settings: LeaseSettings,
leaseName: String,
granted: AtomicBoolean)
extends LoggingFSM[State, Data] {
- import akka.pattern.pipe
+ import org.apache.pekko.pattern.pipe
import context.dispatcher
private val ownerName = settings.ownerName
diff --git a/lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/internal/KubernetesApiImpl.scala b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/KubernetesApiImpl.scala
similarity index 90%
rename from lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/internal/KubernetesApiImpl.scala
rename to lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/KubernetesApiImpl.scala
index ef6bd5f..5f13ab0 100644
--- a/lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/internal/KubernetesApiImpl.scala
+++ b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/KubernetesApiImpl.scala
@@ -11,7 +11,7 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.coordination.lease.kubernetes.internal
+package org.apache.pekko.coordination.lease.kubernetes.internal
import java.nio.file.Files
import java.nio.file.Paths
@@ -22,25 +22,25 @@ import scala.collection.immutable
import scala.concurrent.Future
import scala.util.control.NonFatal
-import akka.Done
-import akka.actor.ActorSystem
-import akka.annotation.InternalApi
-import akka.coordination.lease.LeaseException
-import akka.coordination.lease.LeaseTimeoutException
-import akka.coordination.lease.kubernetes.KubernetesApi
-import akka.coordination.lease.kubernetes.KubernetesSettings
-import akka.coordination.lease.kubernetes.LeaseResource
-import akka.event.Logging
-import akka.http.scaladsl.ConnectionContext
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.HttpsConnectionContext
-import akka.http.scaladsl.marshalling.Marshal
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.model.headers.Authorization
-import akka.http.scaladsl.model.headers.OAuth2BearerToken
-import akka.http.scaladsl.unmarshalling.Unmarshal
-import akka.pattern.after
-import akka.pki.kubernetes.PemManagersProvider
+import org.apache.pekko.Done
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.coordination.lease.LeaseException
+import org.apache.pekko.coordination.lease.LeaseTimeoutException
+import org.apache.pekko.coordination.lease.kubernetes.KubernetesApi
+import org.apache.pekko.coordination.lease.kubernetes.KubernetesSettings
+import org.apache.pekko.coordination.lease.kubernetes.LeaseResource
+import org.apache.pekko.event.Logging
+import org.apache.pekko.http.scaladsl.ConnectionContext
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.HttpsConnectionContext
+import org.apache.pekko.http.scaladsl.marshalling.Marshal
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.model.headers.Authorization
+import org.apache.pekko.http.scaladsl.model.headers.OAuth2BearerToken
+import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
+import org.apache.pekko.pattern.after
+import org.apache.pekko.pki.kubernetes.PemManagersProvider
import javax.net.ssl.KeyManager
import javax.net.ssl.KeyManagerFactory
import javax.net.ssl.SSLContext
@@ -50,7 +50,7 @@ import javax.net.ssl.TrustManager
* Could be shared between leases: https://github.com/akka/akka-management/issues/680
* INTERNAL API
*/
-@InternalApi private[akka] class KubernetesApiImpl(system: ActorSystem, settings: KubernetesSettings)
+@InternalApi private[pekko] class KubernetesApiImpl(system: ActorSystem, settings: KubernetesSettings)
extends KubernetesApi
with KubernetesJsonSupport {
@@ -188,7 +188,7 @@ PUTs must contain resourceVersions. Response:
} yield result
}
- private[akka] def removeLease(name: String): Future[Done] = {
+ private[pekko] def removeLease(name: String): Future[Done] = {
for {
response <- makeRequest(
requestForPath(pathForLease(name), HttpMethods.DELETE),
diff --git a/lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/internal/KubernetesJsonSupport.scala b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/KubernetesJsonSupport.scala
similarity index 86%
rename from lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/internal/KubernetesJsonSupport.scala
rename to lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/KubernetesJsonSupport.scala
index 6c9111f..fcb63c9 100644
--- a/lease-kubernetes/src/main/scala/akka/coordination/lease/kubernetes/internal/KubernetesJsonSupport.scala
+++ b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/KubernetesJsonSupport.scala
@@ -11,10 +11,10 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.coordination.lease.kubernetes.internal
+package org.apache.pekko.coordination.lease.kubernetes.internal
-import akka.annotation.InternalApi
-import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
import spray.json.{ DefaultJsonProtocol, JsonFormat, RootJsonFormat }
/**
diff --git a/lease-kubernetes/src/test/scala/akka/coordination/lease/kubernetes/KubernetesApiSpec.scala b/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesApiSpec.scala
similarity index 96%
rename from lease-kubernetes/src/test/scala/akka/coordination/lease/kubernetes/KubernetesApiSpec.scala
rename to lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesApiSpec.scala
index ea24ed0..e608585 100644
--- a/lease-kubernetes/src/test/scala/akka/coordination/lease/kubernetes/KubernetesApiSpec.scala
+++ b/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesApiSpec.scala
@@ -11,14 +11,14 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.coordination.lease.kubernetes
+package org.apache.pekko.coordination.lease.kubernetes
import scala.concurrent.duration._
-import akka.Done
-import akka.actor.ActorSystem
-import akka.coordination.lease.kubernetes.internal.KubernetesApiImpl
-import akka.http.scaladsl.model.StatusCodes
-import akka.testkit.TestKit
+import org.apache.pekko.Done
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.coordination.lease.kubernetes.internal.KubernetesApiImpl
+import org.apache.pekko.http.scaladsl.model.StatusCodes
+import org.apache.pekko.testkit.TestKit
import com.github.tomakehurst.wiremock.WireMockServer
import com.github.tomakehurst.wiremock.client.WireMock
import com.github.tomakehurst.wiremock.client.WireMock._
@@ -34,7 +34,7 @@ class KubernetesApiSpec
extends TestKit(
ActorSystem(
"KubernetesApiSpec",
- ConfigFactory.parseString("""akka.coordination.lease.kubernetes {
+ ConfigFactory.parseString("""pekko.coordination.lease.kubernetes {
| lease-operation-timeout = 10s
|}
|""".stripMargin)))
diff --git a/lease-kubernetes/src/test/scala/akka/coordination/lease/kubernetes/KubernetesSettingsSpec.scala b/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesSettingsSpec.scala
similarity index 89%
rename from lease-kubernetes/src/test/scala/akka/coordination/lease/kubernetes/KubernetesSettingsSpec.scala
rename to lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesSettingsSpec.scala
index e62af62..bd60393 100644
--- a/lease-kubernetes/src/test/scala/akka/coordination/lease/kubernetes/KubernetesSettingsSpec.scala
+++ b/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesSettingsSpec.scala
@@ -11,9 +11,9 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.coordination.lease.kubernetes
+package org.apache.pekko.coordination.lease.kubernetes
-import akka.coordination.lease.TimeoutSettings
+import org.apache.pekko.coordination.lease.TimeoutSettings
import com.typesafe.config.ConfigFactory
import scala.concurrent.duration._
import org.scalatest.matchers.should.Matchers
@@ -24,7 +24,7 @@ class KubernetesSettingsSpec extends AnyWordSpec with Matchers {
private def conf(overrides: String): KubernetesSettings = {
val c = ConfigFactory
.parseString(overrides)
- .withFallback(ConfigFactory.load().getConfig("akka.coordination.lease.kubernetes"))
+ .withFallback(ConfigFactory.load().getConfig("pekko.coordination.lease.kubernetes"))
KubernetesSettings(c, TimeoutSettings(c))
}
diff --git a/lease-kubernetes/src/test/scala/akka/coordination/lease/kubernetes/LeaseActorSpec.scala b/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActorSpec.scala
similarity index 97%
rename from lease-kubernetes/src/test/scala/akka/coordination/lease/kubernetes/LeaseActorSpec.scala
rename to lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActorSpec.scala
index 4140f17..59aa0fd 100644
--- a/lease-kubernetes/src/test/scala/akka/coordination/lease/kubernetes/LeaseActorSpec.scala
+++ b/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActorSpec.scala
@@ -11,17 +11,17 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.coordination.lease.kubernetes
+package org.apache.pekko.coordination.lease.kubernetes
import java.util.concurrent.atomic.AtomicBoolean
-import akka.actor.Status.Failure
-import akka.actor.{ ActorRef, ActorSystem }
-import akka.coordination.lease.kubernetes.LeaseActor._
-import akka.coordination.lease.{ LeaseException, LeaseSettings, TimeoutSettings }
-import akka.pattern.ask
-import akka.testkit.{ TestKit, TestProbe }
-import akka.util.{ ConstantFun, Timeout }
+import org.apache.pekko.actor.Status.Failure
+import org.apache.pekko.actor.{ ActorRef, ActorSystem }
+import org.apache.pekko.coordination.lease.kubernetes.LeaseActor._
+import org.apache.pekko.coordination.lease.{ LeaseException, LeaseSettings, TimeoutSettings }
+import org.apache.pekko.pattern.ask
+import org.apache.pekko.testkit.{ TestKit, TestProbe }
+import org.apache.pekko.util.{ ConstantFun, Timeout }
import com.typesafe.config.ConfigFactory
import org.scalatest.BeforeAndAfterAll
@@ -52,8 +52,8 @@ class LeaseActorSpec
ActorSystem(
"LeaseActorSpec",
ConfigFactory.parseString("""
- akka.loggers = []
- akka.loglevel = DEBUG
+ pekko.loggers = []
+ pekko.loglevel = DEBUG
akka.stdout-loglevel = DEBUG
akka.actor.debug.fsm = true
""")))
diff --git a/management-cluster-bootstrap/src/main/resources/reference.conf b/management-cluster-bootstrap/src/main/resources/reference.conf
index 5d4294d..e14c4d8 100644
--- a/management-cluster-bootstrap/src/main/resources/reference.conf
+++ b/management-cluster-bootstrap/src/main/resources/reference.conf
@@ -1,12 +1,12 @@
######################################################
-# Akka Cluster Bootstrap Config #
+# Apache Pekko Cluster Bootstrap Config #
######################################################
-akka.management {
+pekko.management {
- # registers bootstrap routes to be included in akka-management's http endpoint
+ # registers bootstrap routes to be included in pekko-management's http endpoint
http.routes {
- cluster-bootstrap = "akka.management.cluster.bootstrap.ClusterBootstrap$"
+ cluster-bootstrap = "org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap$"
}
cluster.bootstrap {
@@ -30,9 +30,9 @@ akka.management {
service-name = "<service-name>"
service-name = ${?AKKA_CLUSTER_BOOTSTRAP_SERVICE_NAME}
- # The portName passed to discovery. This should be set to the name of the port for Akka Management
+ # The portName passed to discovery. This should be set to the name of the port for Pekko Management
# If set to "", `None` is passed to the discovery mechanism and
- # ${akka.management.http.port} is assumed.
+ # ${pekko.management.http.port} is assumed.
port-name = ""
port-name= ${?AKKA_CLUSTER_BOOTSTRAP_PORT_NAME}
@@ -56,14 +56,14 @@ akka.management {
# Config path of discovery method to be used to locate the initial contact points.
# It must be a fully qualified config path to the discovery's config section.
#
- # By setting this to `akka.discovery` we ride on the configuration mechanisms that akka-discovery has,
+ # By setting this to `pekko.discovery` we ride on the configuration mechanisms that pekko-discovery has,
# and reuse what is configured for it. You can set it explicitly to something else here, if you want to
# use a different discovery mechanism for the bootstrap than for the rest of the application.
- discovery-method = akka.discovery
+ discovery-method = pekko.discovery
# Amount of time for which a discovery observation must remain "stable"
# (i.e. not change list of discovered contact-points) before a join decision can be made.
- # This is done to decrease the likelyhood of performing decisions on fluctuating observations.
+ # This is done to decrease the likelihood of performing decisions on fluctuating observations.
#
# This timeout represents a tradeoff between safety and quickness of forming a new cluster.
stable-margin = 5 seconds
@@ -111,15 +111,15 @@ akka.management {
# If no port is discovered along with the host/ip of a contact point this port will be used as fallback
# Also, when no port-name is used and multiple results are returned for a given service with at least one
# port defined, this port is used to disambiguate. When set to <fallback-port>, defaults to the value of
- # akka.management.http.port
+ # pekko.management.http.port
fallback-port = "<fallback-port>"
# by default when no port-name is set only the contact points that contain the fallback-port
- # are used for probing. This makes the scenario where each akka node has multiple ports
+ # are used for probing. This makes the scenario where each pekko node has multiple ports
# returned from service discovery (e.g. management, remoting, front-end HTTP) work without
- # having to configure a port-name. If instead service discovery will return only akka management
+ # having to configure a port-name. If instead service discovery will return only pekko management
# ports without specifying a port-name, e.g. management has dynamic ports and its own service
- # name, then set this to false to stop the results being filterted
+ # name, then set this to false to stop the results being filtered
filter-on-fallback-port = true
# If some discovered seed node will keep failing to connect for specified period of time,
@@ -136,10 +136,10 @@ akka.management {
join-decider {
# Implementation of JoinDecider.
- # It must extend akka.management.cluster.bootstrap.JoinDecider and
+ # It must extend org.apache.pekko.management.cluster.bootstrap.JoinDecider and
# have public constructor with ActorSystem and ClusterBootstrapSettings
# parameters.
- class = "akka.management.cluster.bootstrap.LowestAddressJoinDecider"
+ class = "org.apache.pekko.management.cluster.bootstrap.LowestAddressJoinDecider"
}
}
diff --git a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/BootstrapLogMarker.scala b/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/BootstrapLogMarker.scala
deleted file mode 100644
index aa8bcb7..0000000
--- a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/BootstrapLogMarker.scala
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * license agreements; and to You under the Apache License, version 2.0:
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * This file is part of the Apache Pekko project, derived from Akka.
- */
-
-/*
- * Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
- */
-
-package akka.management.cluster.bootstrap
-
-import akka.actor.Address
-import akka.annotation.ApiMayChange
-import akka.annotation.InternalApi
-import akka.event.LogMarker
-
-/**
- * This is public with the purpose to document the used markers and properties of log events.
- * No guarantee that it will remain binary compatible, but the marker names and properties
- * are considered public API and will not be changed without notice.
- */
-@ApiMayChange
-object BootstrapLogMarker {
-
- /**
- * INTERNAL API
- */
- @InternalApi private[akka] object Properties {
- val ContactPoints = "akkaContactPoints"
- val SeedNodes = "akkaSeedNodes"
- }
-
- /**
- * Marker "akkaBootstrapInit" of log event when Akka Bootstrap is initialized.
- */
- val init: LogMarker =
- LogMarker("akkaBootstrapInit")
-
- /**
- * Marker "akkaBootstrapResolved" of log event when contact points have been resolved.
- * @param contactPoints The hostname and port of the resolved and selected contact points. Included as property "akkaContactPoints".
- */
- def resolved(contactPoints: Iterable[String]): LogMarker =
- LogMarker("akkaBootstrapResolved", Map(Properties.ContactPoints -> contactPoints.mkString(", ")))
-
- /**
- * Marker "akkaBootstrapResolveFailed" of log event when resolve of contact points failed.
- */
- val resolveFailed: LogMarker =
- LogMarker("akkaBootstrapResolveFailed")
-
- /**
- * Marker "akkaBootstrapInProgress" of log event when bootstrap is in progress.
- * @param contactPoints The hostname and port of the resolved and selected contact points. Included as property "akkaContactPoints".
- * @param seedNodes The address of the observed seed nodes of the Akka Cluster. Included as property "akkaSeedNodes".
- */
- def inProgress(contactPoints: Set[String], seedNodes: Set[Address]): LogMarker =
- LogMarker(
- "akkaBootstrapInProgress",
- Map(Properties.ContactPoints -> contactPoints.mkString(", "), Properties.SeedNodes -> seedNodes.mkString(", ")))
-
- /**
- * Marker "akkaBootstrapSeedNodes" of log event when seed nodes of the Akka Cluster have been discovered.
- * @param seedNodes The address of the observed seed nodes of the Akka Cluster. Included as property "akkaSeedNodes".
- */
- def seedNodes(seedNodes: Set[Address]): LogMarker =
- LogMarker("akkaBootstrapSeedNodes", Map(Properties.SeedNodes -> seedNodes.mkString(", ")))
-
- /**
- * Marker "akkaBootstrapJoin" of log event when joining the seed nodes of an existing Akka Cluster.
- * @param seedNodes The address of the seed nodes of the Akka Cluster. Included as property "akkaSeedNodes".
- */
- def join(seedNodes: Set[Address]): LogMarker =
- LogMarker("akkaBootstrapJoin", Map(Properties.SeedNodes -> seedNodes.mkString(", ")))
-
- /**
- * Marker "akkaBootstrapJoinSelf" of log event when joining self to form a new Akka Cluster.
- */
- val joinSelf: LogMarker =
- LogMarker("akkaBootstrapJoinSelf")
-
- /**
- * Marker "akkaBootstrapResolveFailed" of log event when resolve of contact points failed.
- * @param contactPoints The hostname and port of the resolved and selected contact points. Included as property "akkaContactPoints".
- */
- def seedNodesProbingFailed(contactPoints: Iterable[String]): LogMarker =
- LogMarker("akkaBootstrapSeedNodesProbingFailed", Map(Properties.ContactPoints -> contactPoints.mkString(", ")))
-
-}
diff --git a/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/BootstrapLogMarker.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/BootstrapLogMarker.scala
new file mode 100644
index 0000000..b92832e
--- /dev/null
+++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/BootstrapLogMarker.scala
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, derived from Akka.
+ */
+
+/*
+ * Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
+ */
+
+package org.apache.pekko.management.cluster.bootstrap
+
+import org.apache.pekko.actor.Address
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.event.LogMarker
+
+/**
+ * This is public with the purpose to document the used markers and properties of log events.
+ * No guarantee that it will remain binary compatible, but the marker names and properties
+ * are considered public API and will not be changed without notice.
+ */
+@ApiMayChange
+object BootstrapLogMarker {
+
+ /**
+ * INTERNAL API
+ */
+ @InternalApi private[pekko] object Properties {
+ val ContactPoints = "pekkoContactPoints"
+ val SeedNodes = "pekkoSeedNodes"
+ }
+
+ /**
+ * Marker "pekkoBootstrapInit" of log event when Pekko Bootstrap is initialized.
+ */
+ val init: LogMarker =
+ LogMarker("pekkoBootstrapInit")
+
+ /**
+ * Marker "pekkoBootstrapResolved" of log event when contact points have been resolved.
+ * @param contactPoints The hostname and port of the resolved and selected contact points. Included as property "pekkoContactPoints".
+ */
+ def resolved(contactPoints: Iterable[String]): LogMarker =
+ LogMarker("pekkoBootstrapResolved", Map(Properties.ContactPoints -> contactPoints.mkString(", ")))
+
+ /**
+ * Marker "pekkoBootstrapResolveFailed" of log event when resolve of contact points failed.
+ */
+ val resolveFailed: LogMarker =
+ LogMarker("pekkoBootstrapResolveFailed")
+
+ /**
+ * Marker "pekkoBootstrapInProgress" of log event when bootstrap is in progress.
+ * @param contactPoints The hostname and port of the resolved and selected contact points. Included as property "pekkoContactPoints".
+ * @param seedNodes The address of the observed seed nodes of the Akka Cluster. Included as property "pekkoSeedNodes".
+ */
+ def inProgress(contactPoints: Set[String], seedNodes: Set[Address]): LogMarker =
+ LogMarker(
+ "pekkoBootstrapInProgress",
+ Map(Properties.ContactPoints -> contactPoints.mkString(", "), Properties.SeedNodes -> seedNodes.mkString(", ")))
+
+ /**
+ * Marker "pekkoBootstrapSeedNodes" of log event when seed nodes of the Akka Cluster have been discovered.
+ * @param seedNodes The address of the observed seed nodes of the Akka Cluster. Included as property "pekkoSeedNodes".
+ */
+ def seedNodes(seedNodes: Set[Address]): LogMarker =
+ LogMarker("pekkoBootstrapSeedNodes", Map(Properties.SeedNodes -> seedNodes.mkString(", ")))
+
+ /**
+ * Marker "pekkoBootstrapJoin" of log event when joining the seed nodes of an existing Akka Cluster.
+ * @param seedNodes The address of the seed nodes of the Akka Cluster. Included as property "pekkoSeedNodes".
+ */
+ def join(seedNodes: Set[Address]): LogMarker =
+ LogMarker("pekkoBootstrapJoin", Map(Properties.SeedNodes -> seedNodes.mkString(", ")))
+
+ /**
+ * Marker "pekkoBootstrapJoinSelf" of log event when joining self to form a new Akka Cluster.
+ */
+ val joinSelf: LogMarker =
+ LogMarker("pekkoBootstrapJoinSelf")
+
+ /**
+ * Marker "pekkoBootstrapResolveFailed" of log event when resolve of contact points failed.
+ * @param contactPoints The hostname and port of the resolved and selected contact points. Included as property "pekkoContactPoints".
+ */
+ def seedNodesProbingFailed(contactPoints: Iterable[String]): LogMarker =
+ LogMarker("pekkoBootstrapSeedNodesProbingFailed", Map(Properties.ContactPoints -> contactPoints.mkString(", ")))
+
+}
diff --git a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/ClusterBootstrap.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrap.scala
similarity index 73%
rename from management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/ClusterBootstrap.scala
rename to management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrap.scala
index c0d87e5..418fce0 100644
--- a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/ClusterBootstrap.scala
+++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrap.scala
@@ -11,27 +11,26 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap
-
-import akka.AkkaVersion
-import akka.actor.ActorSystem
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.actor.ExtensionIdProvider
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.discovery.Discovery
-import akka.discovery.ServiceDiscovery
-import akka.event.Logging
-import akka.http.scaladsl.model.Uri
-import akka.http.scaladsl.server.Route
-import akka.management.cluster.bootstrap.contactpoint.HttpClusterBootstrapRoutes
-import akka.management.cluster.bootstrap.internal.BootstrapCoordinator
-import akka.management.scaladsl.AkkaManagement
-import akka.management.scaladsl.ManagementRouteProvider
-import akka.management.scaladsl.ManagementRouteProviderSettings
+package org.apache.pekko.management.cluster.bootstrap
+
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.ClassicActorSystemProvider
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.actor.Extension
+import org.apache.pekko.actor.ExtensionId
+import org.apache.pekko.actor.ExtensionIdProvider
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.discovery.Discovery
+import org.apache.pekko.discovery.ServiceDiscovery
+import org.apache.pekko.event.Logging
+import org.apache.pekko.management.cluster.bootstrap.contactpoint.HttpClusterBootstrapRoutes
+import org.apache.pekko.management.cluster.bootstrap.internal.BootstrapCoordinator
+import org.apache.pekko.management.scaladsl.PekkoManagement
+import org.apache.pekko.management.scaladsl.ManagementRouteProvider
+import org.apache.pekko.management.scaladsl.ManagementRouteProviderSettings
+import org.apache.pekko.http.scaladsl.model.Uri
+import org.apache.pekko.http.scaladsl.server.Route
import java.util.concurrent.atomic.AtomicReference
import scala.concurrent.duration._
@@ -49,20 +48,18 @@ final class ClusterBootstrap(implicit system: ExtendedActorSystem) extends Exten
private final val bootstrapStep = new AtomicReference[BootstrapStep](NotRunning)
- AkkaVersion.require("cluster-bootstrap", "2.5.27")
-
val settings: ClusterBootstrapSettings = ClusterBootstrapSettings(system.settings.config, log)
// used for initial discovery of contact points
lazy val discovery: ServiceDiscovery =
settings.contactPointDiscovery.discoveryMethod match {
- case "akka.discovery" =>
+ case "pekko.discovery" =>
val discovery = Discovery(system).discovery
- log.info("Bootstrap using default `akka.discovery` method: {}", Logging.simpleName(discovery))
+ log.info("Bootstrap using default `pekko.discovery` method: {}", Logging.simpleName(discovery))
discovery
case otherDiscoveryMechanism =>
- log.info("Bootstrap using `akka.discovery` method: {}", otherDiscoveryMechanism)
+ log.info("Bootstrap using `pekko.discovery` method: {}", otherDiscoveryMechanism)
Discovery(system).loadServiceDiscovery(otherDiscoveryMechanism)
}
@@ -78,11 +75,11 @@ final class ClusterBootstrap(implicit system: ExtendedActorSystem) extends Exten
// autostart if the extension is loaded through the config extension list
private val autostart =
- system.settings.config.getStringList("akka.extensions").contains(classOf[ClusterBootstrap].getName)
+ system.settings.config.getStringList("pekko.extensions").contains(classOf[ClusterBootstrap].getName)
if (autostart) {
- log.info("ClusterBootstrap loaded through 'akka.extensions' auto starting management and bootstrap.")
- // Akka Management hosts the HTTP routes used by bootstrap
+ log.info("ClusterBootstrap loaded through 'pekko.extensions' auto starting management and bootstrap.")
+ // Pekko Management hosts the HTTP routes used by bootstrap
// we can't let it block extension init, so run it in a different thread and let constructor complete
Future {
def autostartFailed(ex: Throwable): Unit = {
@@ -90,7 +87,7 @@ final class ClusterBootstrap(implicit system: ExtendedActorSystem) extends Exten
system.terminate()
}
try {
- AkkaManagement(system).start().failed.foreach(autostartFailed)
+ PekkoManagement(system).start().failed.foreach(autostartFailed)
ClusterBootstrap(system).start()
} catch {
case NonFatal(ex) => autostartFailed(ex)
@@ -108,7 +105,7 @@ final class ClusterBootstrap(implicit system: ExtendedActorSystem) extends Exten
def start(): Unit =
if (Cluster(system).settings.SeedNodes.nonEmpty) {
log.warning(
- "Application is configured with specific `akka.cluster.seed-nodes`: {}, bailing out of the bootstrap process! " +
+ "Application is configured with specific `pekko.cluster.seed-nodes`: {}, bailing out of the bootstrap process! " +
"If you want to use the automatic bootstrap mechanism, make sure to NOT set explicit seed nodes in the configuration. " +
"This node will attempt to join the configured seed nodes.",
Cluster(system).settings.SeedNodes.mkString("[", ", ", "]"))
@@ -147,11 +144,11 @@ final class ClusterBootstrap(implicit system: ExtendedActorSystem) extends Exten
* and if so, we may opt to join ourselves using the address.
*/
@InternalApi
- private[akka] def setSelfContactPoint(baseUri: Uri): Unit =
+ private[pekko] def setSelfContactPoint(baseUri: Uri): Unit =
_selfContactPointUri.success(baseUri)
/** INTERNAL API */
- @InternalApi private[akka] def selfContactPoint: Future[Uri] = _selfContactPointUri.future
+ @InternalApi private[pekko] def selfContactPoint: Future[Uri] = _selfContactPointUri.future
}
object ClusterBootstrap extends ExtensionId[ClusterBootstrap] with ExtensionIdProvider {
diff --git a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/ClusterBootstrapSettings.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapSettings.scala
similarity index 92%
rename from management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/ClusterBootstrapSettings.scala
rename to management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapSettings.scala
index 1b71f15..7764e13 100644
--- a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/ClusterBootstrapSettings.scala
+++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapSettings.scala
@@ -11,28 +11,28 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap
+package org.apache.pekko.management.cluster.bootstrap
import java.util.Locale
import java.util.Optional
import java.util.concurrent.TimeUnit
-import akka.actor.ActorSystem
-import akka.event.LoggingAdapter
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.event.LoggingAdapter
import com.typesafe.config.Config
import scala.concurrent.duration.{ FiniteDuration, _ }
import scala.compat.java8.OptionConverters._
-import akka.util.JavaDurationConverters._
+import org.apache.pekko.util.JavaDurationConverters._
final class ClusterBootstrapSettings(config: Config, log: LoggingAdapter) {
- import akka.management.AkkaManagementSettings._
+ import org.apache.pekko.management.PekkoManagementSettings._
val managementBasePath: Option[String] =
- Option(config.getString("akka.management.http.base-path")).filter(_.trim.nonEmpty)
+ Option(config.getString("pekko.management.http.base-path")).filter(_.trim.nonEmpty)
def getManagementBasePath: Optional[String] = managementBasePath.asJava
- private val bootConfig = config.getConfig("akka.management.cluster.bootstrap")
+ private val bootConfig = config.getConfig("pekko.management.cluster.bootstrap")
val newClusterEnabled: Boolean = {
if (bootConfig.hasPath("form-new-cluster")) {
@@ -137,7 +137,7 @@ final class ClusterBootstrapSettings(config: Config, log: LoggingAdapter) {
contactPointConfig
.optDefinedValue("fallback-port")
.map(_.toInt)
- .getOrElse(config.getInt("akka.management.http.port"))
+ .getOrElse(config.getInt("pekko.management.http.port"))
val filterOnFallbackPort: Boolean =
contactPointConfig.getBoolean("filter-on-fallback-port")
diff --git a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/JoinDecider.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/JoinDecider.scala
similarity index 96%
rename from management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/JoinDecider.scala
rename to management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/JoinDecider.scala
index ead982a..5b51cd3 100644
--- a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/JoinDecider.scala
+++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/JoinDecider.scala
@@ -11,14 +11,14 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap
+package org.apache.pekko.management.cluster.bootstrap
import java.time.LocalDateTime
import scala.collection.JavaConverters._
import scala.concurrent.Future
-import akka.actor.Address
-import akka.discovery.ServiceDiscovery.ResolvedTarget
+import org.apache.pekko.actor.Address
+import org.apache.pekko.discovery.ServiceDiscovery.ResolvedTarget
/**
* The decisions of joining existing seed-nodes or join self to form new
diff --git a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/LowestAddressJoinDecider.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/LowestAddressJoinDecider.scala
similarity index 97%
rename from management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/LowestAddressJoinDecider.scala
rename to management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/LowestAddressJoinDecider.scala
index 150c624..12a5553 100644
--- a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/LowestAddressJoinDecider.scala
+++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/LowestAddressJoinDecider.scala
@@ -11,15 +11,15 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap
+package org.apache.pekko.management.cluster.bootstrap
import java.time.Duration
import scala.concurrent.Future
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.util.unused
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.Address
+import org.apache.pekko.discovery.ServiceDiscovery.ResolvedTarget
+import org.apache.pekko.util.unused
/**
* The decision of joining "self" is made by deterministically sorting the discovered services
diff --git a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/SelfAwareJoinDecider.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/SelfAwareJoinDecider.scala
similarity index 86%
rename from management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/SelfAwareJoinDecider.scala
rename to management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/SelfAwareJoinDecider.scala
index 0296690..ecba349 100644
--- a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/SelfAwareJoinDecider.scala
+++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/SelfAwareJoinDecider.scala
@@ -11,12 +11,12 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap
+package org.apache.pekko.management.cluster.bootstrap
-import akka.actor.ActorSystem
-import akka.annotation.InternalApi
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.event.Logging
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.discovery.ServiceDiscovery.ResolvedTarget
+import org.apache.pekko.event.Logging
import scala.concurrent.Await
import scala.concurrent.duration._
@@ -24,7 +24,7 @@ import scala.concurrent.duration._
/**
* INTERNAL API
*
- * Class for further behavior in a [[akka.management.cluster.bootstrap.JoinDecider]]
+ * Class for further behavior in a [[org.apache.pekko.management.cluster.bootstrap.JoinDecider]]
* leveraging self host logic.
*/
@InternalApi private[bootstrap] abstract class SelfAwareJoinDecider(
@@ -42,7 +42,7 @@ import scala.concurrent.duration._
/**
* The value `ClusterBootstrap(system).selfContactPoints` is set prior
- * to HTTP binding, during [[akka.management.scaladsl.AkkaManagement.start()]], hence we
+ * to HTTP binding, during [[org.apache.pekko.management.scaladsl.PekkoManagement.start()]], hence we
* accept blocking on this initialization. If no value is received, the future will fail with
* a `TimeoutException` and ClusterBootstrap will log an explanatory error to the user.
*/
diff --git a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/contactpoint/HttpBootstrapJsonProtocol.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/HttpBootstrapJsonProtocol.scala
similarity index 88%
rename from management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/contactpoint/HttpBootstrapJsonProtocol.scala
rename to management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/HttpBootstrapJsonProtocol.scala
index 44e1923..a0dc0b0 100644
--- a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/contactpoint/HttpBootstrapJsonProtocol.scala
+++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/HttpBootstrapJsonProtocol.scala
@@ -11,10 +11,10 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap.contactpoint
+package org.apache.pekko.management.cluster.bootstrap.contactpoint
-import akka.actor.{ Address, AddressFromURIString }
-import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
+import org.apache.pekko.actor.{ Address, AddressFromURIString }
+import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
import spray.json.{ DefaultJsonProtocol, JsString, JsValue, RootJsonFormat }
trait HttpBootstrapJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol {
diff --git a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/contactpoint/HttpClusterBootstrapRoutes.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/HttpClusterBootstrapRoutes.scala
similarity index 70%
rename from management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/contactpoint/HttpClusterBootstrapRoutes.scala
rename to management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/HttpClusterBootstrapRoutes.scala
index 9028d77..27e1c36 100644
--- a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/contactpoint/HttpClusterBootstrapRoutes.scala
+++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/HttpClusterBootstrapRoutes.scala
@@ -11,30 +11,26 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap.contactpoint
+package org.apache.pekko.management.cluster.bootstrap.contactpoint
-import scala.concurrent.duration._
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.cluster.{ Cluster, Member }
+import org.apache.pekko.event.{ Logging, LoggingAdapter }
+import org.apache.pekko.http.javadsl.server.directives.RouteAdapter
+import org.apache.pekko.http.scaladsl.model.{ HttpRequest, Uri }
+import org.apache.pekko.http.scaladsl.server.Route
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrapSettings
+import org.apache.pekko.management.cluster.bootstrap.contactpoint.HttpBootstrapJsonProtocol.{ ClusterMember, SeedNodes }
-import akka.actor.ActorSystem
-import akka.cluster.Cluster
-import akka.cluster.Member
-import akka.event.Logging
-import akka.event.LoggingAdapter
-import akka.http.javadsl.server.directives.RouteAdapter
-import akka.http.scaladsl.model.HttpRequest
-import akka.http.scaladsl.model.Uri
-import akka.http.scaladsl.server.Route
-import akka.management.cluster.bootstrap.ClusterBootstrapSettings
-import akka.management.cluster.bootstrap.contactpoint.HttpBootstrapJsonProtocol.ClusterMember
-import akka.management.cluster.bootstrap.contactpoint.HttpBootstrapJsonProtocol.SeedNodes
+import scala.concurrent.duration._
final class HttpClusterBootstrapRoutes(settings: ClusterBootstrapSettings) extends HttpBootstrapJsonProtocol {
- import akka.http.scaladsl.server.Directives._
+ import org.apache.pekko.http.scaladsl.server.Directives._
private def routeGetSeedNodes: Route = extractClientIP { clientIp =>
extractActorSystem { implicit system =>
- import akka.cluster.MemberStatus
+ import org.apache.pekko.cluster.MemberStatus
val cluster = Cluster(system)
def memberToClusterMember(m: Member): ClusterMember =
@@ -69,7 +65,7 @@ final class HttpClusterBootstrapRoutes(settings: ClusterBootstrapSettings) exten
}
/** Java API */
- def getRoutes: akka.http.javadsl.server.Route = RouteAdapter(routes)
+ def getRoutes: org.apache.pekko.http.javadsl.server.Route = RouteAdapter(routes)
private def log(implicit sys: ActorSystem): LoggingAdapter =
Logging(sys, classOf[HttpClusterBootstrapRoutes])
@@ -78,7 +74,7 @@ final class HttpClusterBootstrapRoutes(settings: ClusterBootstrapSettings) exten
object ClusterBootstrapRequests {
- import akka.http.scaladsl.client.RequestBuilding._
+ import org.apache.pekko.http.scaladsl.client.RequestBuilding._
def bootstrapSeedNodes(baseUri: Uri): HttpRequest =
Get(baseUri + "/bootstrap/seed-nodes")
diff --git a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/internal/BootstrapCoordinator.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/BootstrapCoordinator.scala
similarity index 92%
rename from management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/internal/BootstrapCoordinator.scala
rename to management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/BootstrapCoordinator.scala
index 3aadfb1..3c66796 100644
--- a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/internal/BootstrapCoordinator.scala
+++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/BootstrapCoordinator.scala
@@ -11,43 +11,43 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap.internal
+package org.apache.pekko.management.cluster.bootstrap.internal
import java.time.LocalDateTime
import java.util.concurrent.ThreadLocalRandom
-
import scala.collection.immutable
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.actor.Address
+import org.apache.pekko.actor.DeadLetterSuppression
+import org.apache.pekko.actor.Props
+import org.apache.pekko.actor.Status.Failure
+import org.apache.pekko.actor.Timers
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.discovery.{ Lookup, ServiceDiscovery }
+import org.apache.pekko.discovery.ServiceDiscovery.ResolvedTarget
+import org.apache.pekko.http.scaladsl.model.Uri
+import org.apache.pekko.pattern.pipe
-import akka.actor.Actor
-import akka.actor.ActorRef
-import akka.actor.Address
-import akka.actor.DeadLetterSuppression
-import akka.actor.Props
-import akka.actor.Status.Failure
-import akka.actor.Timers
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.discovery.{ Lookup, ServiceDiscovery }
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.http.scaladsl.model.Uri
-import akka.management.cluster.bootstrap.ClusterBootstrapSettings
-import akka.management.cluster.bootstrap.JoinDecider
-import akka.management.cluster.bootstrap.JoinDecision
-import akka.management.cluster.bootstrap.JoinOtherSeedNodes
-import akka.management.cluster.bootstrap.JoinSelf
-import akka.management.cluster.bootstrap.KeepProbing
-import akka.management.cluster.bootstrap.SeedNodesInformation
-import akka.management.cluster.bootstrap.SeedNodesObservation
-import akka.pattern.pipe
import scala.concurrent.duration._
import scala.util.Try
-
-import akka.event.Logging
-import akka.management.cluster.bootstrap.BootstrapLogMarker
+import org.apache.pekko.event.Logging
+import org.apache.pekko.management.cluster.bootstrap.{
+ BootstrapLogMarker,
+ ClusterBootstrapSettings,
+ JoinDecider,
+ JoinDecision,
+ JoinOtherSeedNodes,
+ JoinSelf,
+ KeepProbing,
+ SeedNodesInformation,
+ SeedNodesObservation
+}
/** INTERNAL API */
@InternalApi
-private[akka] object BootstrapCoordinator {
+private[pekko] object BootstrapCoordinator {
def props(discovery: ServiceDiscovery, joinDecider: JoinDecider, settings: ClusterBootstrapSettings): Props =
Props(new BootstrapCoordinator(discovery, joinDecider, settings))
@@ -79,7 +79,7 @@ private[akka] object BootstrapCoordinator {
else this
}
- private[akka] def selectHosts(
+ private[pekko] def selectHosts(
lookup: Lookup,
fallbackPort: Int,
filterOnFallbackPort: Boolean,
@@ -135,7 +135,7 @@ private[akka] object BootstrapCoordinator {
// also known as the "Baron von Bootstrappen"
/** INTERNAL API */
@InternalApi
-private[akka] class BootstrapCoordinator(
+private[pekko] class BootstrapCoordinator(
discovery: ServiceDiscovery,
joinDecider: JoinDecider,
settings: ClusterBootstrapSettings) extends Actor
@@ -168,7 +168,7 @@ private[akka] class BootstrapCoordinator(
def backoffDiscoveryInterval(): Unit = {
discoveryFailedBackoffCounter += 1
}
- private[akka] def backedOffInterval(
+ private[pekko] def backedOffInterval(
restartCount: Int,
minBackoff: FiniteDuration,
maxBackoff: FiniteDuration,
diff --git a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/internal/HttpContactPointBootstrap.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrap.scala
similarity index 83%
rename from management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/internal/HttpContactPointBootstrap.scala
rename to management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrap.scala
index 8b9fa5e..bef60e8 100644
--- a/management-cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/internal/HttpContactPointBootstrap.scala
+++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrap.scala
@@ -11,36 +11,37 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap.internal
+package org.apache.pekko.management.cluster.bootstrap.internal
import java.time.LocalDateTime
import java.util.concurrent.ThreadLocalRandom
import java.util.concurrent.TimeoutException
-
import scala.concurrent.Future
import scala.concurrent.duration._
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.DeadLetterSuppression
-import akka.actor.Props
-import akka.actor.Status
-import akka.actor.Timers
-import akka.annotation.InternalApi
-import akka.cluster.Cluster
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.HttpResponse
-import akka.http.scaladsl.model.StatusCodes
-import akka.http.scaladsl.model.Uri
-import akka.http.scaladsl.model.Uri.Host
-import akka.http.scaladsl.settings.ConnectionPoolSettings
-import akka.http.scaladsl.unmarshalling.Unmarshal
-import akka.management.cluster.bootstrap.ClusterBootstrapSettings
-import akka.management.cluster.bootstrap.contactpoint.ClusterBootstrapRequests
-import akka.management.cluster.bootstrap.contactpoint.HttpBootstrapJsonProtocol
-import akka.management.cluster.bootstrap.contactpoint.HttpBootstrapJsonProtocol.SeedNodes
-import akka.pattern.after
-import akka.pattern.pipe
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.ActorLogging
+import org.apache.pekko.actor.DeadLetterSuppression
+import org.apache.pekko.actor.Props
+import org.apache.pekko.actor.Status
+import org.apache.pekko.actor.Timers
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.discovery.ServiceDiscovery.ResolvedTarget
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model.HttpResponse
+import org.apache.pekko.http.scaladsl.model.StatusCodes
+import org.apache.pekko.http.scaladsl.model.Uri
+import org.apache.pekko.http.scaladsl.model.Uri.Host
+import org.apache.pekko.http.scaladsl.settings.ConnectionPoolSettings
+import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrapSettings
+import org.apache.pekko.management.cluster.bootstrap.contactpoint.HttpBootstrapJsonProtocol.SeedNodes
+import org.apache.pekko.management.cluster.bootstrap.contactpoint.{
+ ClusterBootstrapRequests,
+ HttpBootstrapJsonProtocol
+}
+import org.apache.pekko.pattern.after
+import org.apache.pekko.pattern.pipe
@InternalApi
private[bootstrap] object HttpContactPointBootstrap {
diff --git a/management-cluster-bootstrap/src/test/java/jdoc/akka/management/cluster/bootstrap/ClusterBootstrapCompileOnly.java b/management-cluster-bootstrap/src/test/java/jdoc/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapCompileOnly.java
similarity index 65%
rename from management-cluster-bootstrap/src/test/java/jdoc/akka/management/cluster/bootstrap/ClusterBootstrapCompileOnly.java
rename to management-cluster-bootstrap/src/test/java/jdoc/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapCompileOnly.java
index 4c396d3..9a234c4 100644
--- a/management-cluster-bootstrap/src/test/java/jdoc/akka/management/cluster/bootstrap/ClusterBootstrapCompileOnly.java
+++ b/management-cluster-bootstrap/src/test/java/jdoc/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapCompileOnly.java
@@ -11,11 +11,11 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package jdoc.akka.management.cluster.bootstrap;
+package jdoc.org.apache.pekko.management.cluster.bootstrap;
-import akka.actor.ActorSystem;
-import akka.management.scaladsl.AkkaManagement;
-import akka.management.cluster.bootstrap.ClusterBootstrap;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.management.scaladsl.PekkoManagement;
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap;
public class ClusterBootstrapCompileOnly {
public static void bootstrap() {
@@ -23,8 +23,8 @@ public class ClusterBootstrapCompileOnly {
ActorSystem system = ActorSystem.create();
//#start
- // Akka Management hosts the HTTP routes used by bootstrap
- AkkaManagement.get(system).start();
+ // Pekko Management hosts the HTTP routes used by bootstrap
+ PekkoManagement.get(system).start();
// Starting the bootstrap process needs to be done explicitly
ClusterBootstrap.get(system).start();
diff --git a/management-cluster-bootstrap/src/test/java/akka/management/cluster/bootstrap/ClusterBootstrapJavaCompileTest.java b/management-cluster-bootstrap/src/test/java/org/apache/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapJavaCompileTest.java
similarity index 77%
rename from management-cluster-bootstrap/src/test/java/akka/management/cluster/bootstrap/ClusterBootstrapJavaCompileTest.java
rename to management-cluster-bootstrap/src/test/java/org/apache/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapJavaCompileTest.java
index 9928fec..a4ce797 100644
--- a/management-cluster-bootstrap/src/test/java/akka/management/cluster/bootstrap/ClusterBootstrapJavaCompileTest.java
+++ b/management-cluster-bootstrap/src/test/java/org/apache/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapJavaCompileTest.java
@@ -11,10 +11,10 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap;
+package org.apache.org.apache.pekko.management.cluster.bootstrap;
-import akka.actor.ActorSystem;
-import akka.management.cluster.bootstrap.ClusterBootstrap;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap;
import org.junit.Test;
public class ClusterBootstrapJavaCompileTest {
diff --git a/management-cluster-bootstrap/src/test/resources/reference.conf b/management-cluster-bootstrap/src/test/resources/reference.conf
index 1cca876..08de2e2 100644
--- a/management-cluster-bootstrap/src/test/resources/reference.conf
+++ b/management-cluster-bootstrap/src/test/resources/reference.conf
@@ -1,4 +1,4 @@
-akka {
+pekko {
actor {
provider = "cluster"
}
diff --git a/management-cluster-bootstrap/src/test/scala/doc/akka/management/cluster/bootstrap/ClusterBootstrapCompileOnly.scala b/management-cluster-bootstrap/src/test/scala/doc/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapCompileOnly.scala
similarity index 62%
rename from management-cluster-bootstrap/src/test/scala/doc/akka/management/cluster/bootstrap/ClusterBootstrapCompileOnly.scala
rename to management-cluster-bootstrap/src/test/scala/doc/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapCompileOnly.scala
index e708816..a8214f3 100644
--- a/management-cluster-bootstrap/src/test/scala/doc/akka/management/cluster/bootstrap/ClusterBootstrapCompileOnly.scala
+++ b/management-cluster-bootstrap/src/test/scala/doc/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapCompileOnly.scala
@@ -11,19 +11,19 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package doc.akka.management.cluster.bootstrap
+package doc.org.apache.pekko.management.cluster.bootstrap
-import akka.actor.ActorSystem
-import akka.management.cluster.bootstrap.ClusterBootstrap
-import akka.management.scaladsl.AkkaManagement
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.management.scaladsl.PekkoManagement
object ClusterBootstrapCompileOnly {
val system = ActorSystem()
// #start
- // Akka Management hosts the HTTP routes used by bootstrap
- AkkaManagement(system).start()
+ // Pekko Management hosts the HTTP routes used by bootstrap
+ PekkoManagement(system).start()
// Starting the bootstrap process needs to be done explicitly
ClusterBootstrap(system).start()
diff --git a/management-cluster-bootstrap/src/test/scala/akka/discovery/MockDiscovery.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/discovery/MockDiscovery.scala
similarity index 88%
rename from management-cluster-bootstrap/src/test/scala/akka/discovery/MockDiscovery.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/discovery/MockDiscovery.scala
index 947cf85..36621b3 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/discovery/MockDiscovery.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/discovery/MockDiscovery.scala
@@ -11,14 +11,13 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.discovery
+package org.apache.pekko.discovery
import java.util.concurrent.atomic.AtomicReference
-
-import akka.actor.ActorSystem
-import akka.annotation.InternalApi
-import akka.discovery.ServiceDiscovery.Resolved
-import akka.event.Logging
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.discovery.ServiceDiscovery.Resolved
+import org.apache.pekko.event.Logging
import scala.concurrent.Future
import scala.concurrent.duration.FiniteDuration
diff --git a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/AbstractBootstrapSpec.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/AbstractBootstrapSpec.scala
similarity index 92%
rename from management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/AbstractBootstrapSpec.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/AbstractBootstrapSpec.scala
index 919c12a..7d1b7d7 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/AbstractBootstrapSpec.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/AbstractBootstrapSpec.scala
@@ -11,7 +11,7 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap
+package org.apache.pekko.management.cluster.bootstrap
import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.ScalaFutures
diff --git a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/ClusterBootstrapSettingsSpec.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapSettingsSpec.scala
similarity index 84%
rename from management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/ClusterBootstrapSettingsSpec.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapSettingsSpec.scala
index 7984404..d5b8043 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/ClusterBootstrapSettingsSpec.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapSettingsSpec.scala
@@ -11,9 +11,9 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap
+package org.apache.pekko.management.cluster.bootstrap
-import akka.event.NoLogging
+import org.apache.pekko.event.NoLogging
import com.typesafe.config.ConfigFactory
/** Currently just tests recent changes. Please enhance accordingly. */
@@ -29,7 +29,7 @@ class ClusterBootstrapSettingsSpec extends AbstractBootstrapSpec {
}
"have the expected overrides " in {
- val overrides = ConfigFactory.parseString("akka.management.cluster.bootstrap.new-cluster-enabled=off")
+ val overrides = ConfigFactory.parseString("pekko.management.cluster.bootstrap.new-cluster-enabled=off")
val settings = ClusterBootstrapSettings(overrides.withFallback(config), NoLogging)
settings.newClusterEnabled should ===(false)
}
@@ -38,7 +38,7 @@ class ClusterBootstrapSettingsSpec extends AbstractBootstrapSpec {
val settings =
ClusterBootstrapSettings(
config.withFallback(ConfigFactory.parseString("""
- akka.management.cluster.bootstrap {
+ pekko.management.cluster.bootstrap {
form-new-cluster=on
new-cluster-enabled=off
}""")),
diff --git a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/InactiveBootstrapSpec.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/InactiveBootstrapSpec.scala
similarity index 80%
rename from management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/InactiveBootstrapSpec.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/InactiveBootstrapSpec.scala
index 4a69715..a54b89c 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/InactiveBootstrapSpec.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/InactiveBootstrapSpec.scala
@@ -11,10 +11,10 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap
+package org.apache.pekko.management.cluster.bootstrap
-import akka.actor.ActorSystem
-import akka.management.scaladsl.AkkaManagement
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.management.scaladsl.PekkoManagement
class InactiveBootstrapSpec extends AbstractBootstrapSpec {
val system = ActorSystem("InactiveBootstrapSpec")
@@ -22,7 +22,7 @@ class InactiveBootstrapSpec extends AbstractBootstrapSpec {
"cluster-bootstrap on the classpath" should {
"not fail management routes if bootstrap is not configured or used" in {
// this will call ClusterBootstrap(system) which should not fail even if discovery is not configured
- AkkaManagement(system)
+ PekkoManagement(system)
}
}
diff --git a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/LowestAddressJoinDeciderSpec.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/LowestAddressJoinDeciderSpec.scala
similarity index 85%
rename from management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/LowestAddressJoinDeciderSpec.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/LowestAddressJoinDeciderSpec.scala
index d4902b4..f903cc4 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/LowestAddressJoinDeciderSpec.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/LowestAddressJoinDeciderSpec.scala
@@ -11,18 +11,17 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap
+package org.apache.pekko.management.cluster.bootstrap
import java.time.LocalDateTime
import java.net.InetAddress
-
import scala.concurrent.duration._
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.event.NoLogging
-import akka.testkit.SocketUtil
-import akka.testkit.TestKit
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.Address
+import org.apache.pekko.discovery.ServiceDiscovery.ResolvedTarget
+import org.apache.pekko.event.NoLogging
+import org.apache.pekko.testkit.SocketUtil
+import org.apache.pekko.testkit.TestKit
import com.typesafe.config.ConfigFactory
abstract class JoinDeciderSpec extends AbstractBootstrapSpec {
@@ -32,7 +31,7 @@ abstract class JoinDeciderSpec extends AbstractBootstrapSpec {
val config =
ConfigFactory.parseString(s"""
- akka {
+ pekko {
loglevel = INFO
cluster.http.management.port = $managementPort
@@ -40,7 +39,7 @@ abstract class JoinDeciderSpec extends AbstractBootstrapSpec {
remote.artery.canonical.port = $remotingPort
discovery {
- mock-dns.class = "akka.discovery.MockDiscovery"
+ mock-dns.class = "org.apache.pekko.discovery.MockDiscovery"
}
management {
@@ -129,10 +128,10 @@ class LowestAddressJoinDeciderSpec extends JoinDeciderSpec {
new SeedNodesObservation(
now.minusSeconds(1),
contactA,
- Address("akka", "join-decider-spec-system", "10.0.0.2", 2552),
- Set(Address("akka", "join-decider-spec-system", "10.0.0.2", 2552)))))
+ Address("pekko", "join-decider-spec-system", "10.0.0.2", 2552),
+ Set(Address("pekko", "join-decider-spec-system", "10.0.0.2", 2552)))))
decider.decide(info).futureValue should ===(
- JoinOtherSeedNodes(Set(Address("akka", "join-decider-spec-system", "10.0.0.2", 2552))))
+ JoinOtherSeedNodes(Set(Address("pekko", "join-decider-spec-system", "10.0.0.2", 2552))))
}
"keep probing when contact points changed within stable-margin" in {
@@ -146,17 +145,17 @@ class LowestAddressJoinDeciderSpec extends JoinDeciderSpec {
new SeedNodesObservation(
now.minusSeconds(1),
contactA,
- Address("akka", "join-decider-spec-system", "10.0.0.2", 2552),
+ Address("pekko", "join-decider-spec-system", "10.0.0.2", 2552),
Set.empty),
new SeedNodesObservation(
now.minusSeconds(1),
contactB,
- Address("akka", "join-decider-spec-system", "b", 2552),
+ Address("pekko", "join-decider-spec-system", "b", 2552),
Set.empty),
new SeedNodesObservation(
now.minusSeconds(1),
contactC,
- Address("akka", "join-decider-spec-system", "c", 2552),
+ Address("pekko", "join-decider-spec-system", "c", 2552),
Set.empty)))
decider.decide(info).futureValue should ===(KeepProbing)
}
@@ -172,12 +171,12 @@ class LowestAddressJoinDeciderSpec extends JoinDeciderSpec {
new SeedNodesObservation(
now.minusSeconds(1),
contactA,
- Address("akka", "join-decider-spec-system", "10.0.0.2", 2552),
+ Address("pekko", "join-decider-spec-system", "10.0.0.2", 2552),
Set.empty),
new SeedNodesObservation(
now.minusSeconds(1),
contactB,
- Address("akka", "join-decider-spec-system", "b", 2552),
+ Address("pekko", "join-decider-spec-system", "b", 2552),
Set.empty)))
decider.decide(info).futureValue should ===(KeepProbing)
}
@@ -193,12 +192,12 @@ class LowestAddressJoinDeciderSpec extends JoinDeciderSpec {
new SeedNodesObservation(
now.minusSeconds(1),
contactA,
- Address("akka", "join-decider-spec-system", "10.0.0.2", 2552),
+ Address("pekko", "join-decider-spec-system", "10.0.0.2", 2552),
Set.empty),
new SeedNodesObservation(
now.minusSeconds(1),
contactB,
- Address("akka", "join-decider-spec-system", "b", 2552),
+ Address("pekko", "join-decider-spec-system", "b", 2552),
Set.empty))
// << 2 < required-contact-point-nr
)
@@ -218,17 +217,17 @@ class LowestAddressJoinDeciderSpec extends JoinDeciderSpec {
new SeedNodesObservation(
now.minusSeconds(1),
contactA,
- Address("akka", "join-decider-spec-system", "10.0.0.2", 2552),
+ Address("pekko", "join-decider-spec-system", "10.0.0.2", 2552),
Set.empty),
new SeedNodesObservation(
now.minusSeconds(1),
contactB,
- Address("akka", "join-decider-spec-system", "b", 2552),
+ Address("pekko", "join-decider-spec-system", "b", 2552),
Set.empty),
new SeedNodesObservation(
now.minusSeconds(1),
contactC,
- Address("akka", "join-decider-spec-system", "c", 2552),
+ Address("pekko", "join-decider-spec-system", "c", 2552),
Set.empty)))
decider.decide(info).futureValue should ===(JoinSelf)
}
@@ -240,7 +239,7 @@ class SelfAwareJoinDeciderSpec extends JoinDeciderSpec {
override val remotingPort = 0
val disabled =
- ConfigFactory.parseString("akka.management.cluster.bootstrap.new-cluster-enabled=off")
+ ConfigFactory.parseString("pekko.management.cluster.bootstrap.new-cluster-enabled=off")
override lazy val system = ActorSystem("join-decider-spec-system-selfaware", disabled.withFallback(config))
@@ -256,17 +255,17 @@ class SelfAwareJoinDeciderSpec extends JoinDeciderSpec {
new SeedNodesObservation(
now.minusSeconds(1),
contactA,
- Address("akka", "join-decider-spec-system-selfaware", "10.0.0.2", 2552),
+ Address("pekko", "join-decider-spec-system-selfaware", "10.0.0.2", 2552),
Set.empty),
new SeedNodesObservation(
now.minusSeconds(1),
contactB,
- Address("akka", "join-decider-spec-system-selfaware", "b", 2552),
+ Address("pekko", "join-decider-spec-system-selfaware", "b", 2552),
Set.empty),
new SeedNodesObservation(
now.minusSeconds(1),
contactC,
- Address("akka", "join-decider-spec-system-selfaware", "c", 2552),
+ Address("pekko", "join-decider-spec-system-selfaware", "c", 2552),
Set.empty)))
}
@@ -300,7 +299,7 @@ class SelfAwareJoinDeciderIPv6Spec extends JoinDeciderSpec {
override val remotingPort = 0
val disabled =
- ConfigFactory.parseString("akka.management.cluster.bootstrap.new-cluster-enabled=off")
+ ConfigFactory.parseString("pekko.management.cluster.bootstrap.new-cluster-enabled=off")
override lazy val system = ActorSystem("join-decider-spec-system-selfaware-ipv6", disabled.withFallback(config))
@@ -331,17 +330,17 @@ class SelfAwareJoinDeciderIPv6Spec extends JoinDeciderSpec {
new SeedNodesObservation(
now.minusSeconds(1),
contactIPv6A,
- Address("akka", "join-decider-spec-system-selfaware-ipv6", "[240b:c0e0:202:5e2b:b424:2:0:450]", 2552),
+ Address("pekko", "join-decider-spec-system-selfaware-ipv6", "[240b:c0e0:202:5e2b:b424:2:0:450]", 2552),
Set.empty),
new SeedNodesObservation(
now.minusSeconds(1),
contactIPv6B,
- Address("akka", "join-decider-spec-system-selfaware-ipv6", "[240b:c0e0:202:5e2b:b424:2:0:cc4]", 2552),
+ Address("pekko", "join-decider-spec-system-selfaware-ipv6", "[240b:c0e0:202:5e2b:b424:2:0:cc4]", 2552),
Set.empty),
new SeedNodesObservation(
now.minusSeconds(1),
contactIPv6C,
- Address("akka", "join-decider-spec-system-selfaware-ipv6", "c", 2552),
+ Address("pekko", "join-decider-spec-system-selfaware-ipv6", "c", 2552),
Set.empty)))
}
diff --git a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapAutostartIntegrationSpec.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapAutostartIntegrationSpec.scala
similarity index 87%
rename from management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapAutostartIntegrationSpec.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapAutostartIntegrationSpec.scala
index 34687c0..ced362e 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapAutostartIntegrationSpec.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapAutostartIntegrationSpec.scala
@@ -11,18 +11,16 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap.contactpoint
-
-import akka.actor.ActorSystem
-import akka.cluster.Cluster
-import akka.cluster.MemberStatus
-import akka.discovery.Lookup
-import akka.discovery.MockDiscovery
-import akka.discovery.ServiceDiscovery.Resolved
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.testkit.SocketUtil
-import akka.testkit.TestKit
-import akka.testkit.TestProbe
+package org.apache.pekko.management.cluster.bootstrap.contactpoint
+
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.cluster.MemberStatus
+import org.apache.pekko.discovery.{ Lookup, MockDiscovery }
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.testkit.SocketUtil
+import org.apache.pekko.testkit.TestKit
+import org.apache.pekko.testkit.TestProbe
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import org.scalatest.concurrent.ScalaFutures
@@ -54,15 +52,15 @@ class ClusterBootstrapAutostartIntegrationSpec extends AnyWordSpecLike with Matc
remotingPorts = remotingPorts.updated(id, remotingPort)
ConfigFactory.parseString(s"""
- akka {
+ pekko {
loglevel = INFO
# trigger autostart by loading the extension through config
- extensions = ["akka.management.cluster.bootstrap.ClusterBootstrap"]
+ extensions = ["org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap"]
cluster.jmx.multi-mbeans-in-same-jvm = on
# this can be referred to in tests to use the mock discovery implementation
- discovery.mock-dns.class = "akka.discovery.MockDiscovery"
+ discovery.mock-dns.class = "org.apache.pekko.discovery.MockDiscovery"
remote.netty.tcp.port = $remotingPort
remote.artery.canonical.port = $remotingPort
@@ -144,8 +142,8 @@ class ClusterBootstrapAutostartIntegrationSpec extends AnyWordSpecLike with Matc
val systemA = ActorSystem(
"System",
ConfigFactory.parseString("""
- akka.remote.netty.tcp.port = 0
- akka.remote.artery.canonical.port = 0
+ pekko.remote.netty.tcp.port = 0
+ pekko.remote.artery.canonical.port = 0
""").withFallback(config("A")))
systemA.whenTerminated.futureValue
}
diff --git a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapBasePathIntegrationSpec.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapBasePathIntegrationSpec.scala
similarity index 79%
rename from management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapBasePathIntegrationSpec.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapBasePathIntegrationSpec.scala
index 35a38f8..e1752c2 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapBasePathIntegrationSpec.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapBasePathIntegrationSpec.scala
@@ -11,27 +11,26 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap.contactpoint
+package org.apache.pekko.management.cluster.bootstrap.contactpoint
-import java.net.InetAddress
-
-import akka.actor.ActorSystem
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent.{ CurrentClusterState, MemberUp }
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.discovery.{ Lookup, MockDiscovery }
-import akka.management.cluster.bootstrap.ClusterBootstrap
-import akka.testkit.{ SocketUtil, TestKit, TestProbe }
import com.typesafe.config.ConfigFactory
-import scala.concurrent.Future
-import scala.concurrent.duration._
-
-import akka.management.scaladsl.AkkaManagement
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.cluster.ClusterEvent.{ CurrentClusterState, MemberUp }
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.discovery.{ Lookup, MockDiscovery }
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.management.scaladsl.PekkoManagement
+import org.apache.pekko.testkit.{ SocketUtil, TestKit, TestProbe }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
+import java.net.InetAddress
+import scala.concurrent.Future
+import scala.concurrent.duration._
+
/**
- * This test ensures that the client and server both respect the base-path setting and thus that the boostrapping
+ * This test ensures that the client and server both respect the base-path setting and thus that the bootstrapping
* process works correctly when this setting is specified.
*/
class ClusterBootstrapBasePathIntegrationSpec extends AnyWordSpecLike with Matchers {
@@ -42,7 +41,7 @@ class ClusterBootstrapBasePathIntegrationSpec extends AnyWordSpecLike with Match
val config =
ConfigFactory.parseString(s"""
- akka {
+ pekko {
loglevel = INFO
cluster.jmx.multi-mbeans-in-same-jvm = on
@@ -51,7 +50,7 @@ class ClusterBootstrapBasePathIntegrationSpec extends AnyWordSpecLike with Match
remote.netty.tcp.port = $remotingPort
remote.artery.canonical.port = $remotingPort
- discovery.mock-dns.class = "akka.discovery.MockDiscovery"
+ discovery.mock-dns.class = "org.apache.pekko.discovery.MockDiscovery"
management {
cluster.bootstrap {
@@ -75,7 +74,7 @@ class ClusterBootstrapBasePathIntegrationSpec extends AnyWordSpecLike with Match
val clusterA = Cluster(systemA)
- val managementA = AkkaManagement(systemA)
+ val managementA = PekkoManagement(systemA)
val bootstrapA = ClusterBootstrap(systemA)
diff --git a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapDiscoveryBackoffIntegrationSpec.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapDiscoveryBackoffIntegrationSpec.scala
similarity index 89%
rename from management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapDiscoveryBackoffIntegrationSpec.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapDiscoveryBackoffIntegrationSpec.scala
index 2e8bca5..3fcf5d9 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapDiscoveryBackoffIntegrationSpec.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapDiscoveryBackoffIntegrationSpec.scala
@@ -11,31 +11,29 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap.contactpoint
+package org.apache.pekko.management.cluster.bootstrap.contactpoint
import java.net.InetAddress
import java.util.concurrent.ConcurrentHashMap
import java.util.function.BiConsumer
import java.util.function.BiFunction
-
import scala.concurrent.Future
import scala.concurrent.duration._
-
-import akka.actor.ActorSystem
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.ClusterEvent.MemberUp
-import akka.discovery.Lookup
-import akka.discovery.MockDiscovery
-import akka.discovery.ServiceDiscovery.Resolved
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.http.scaladsl.Http
-import akka.management.cluster.bootstrap.ClusterBootstrap
-import akka.testkit.SocketUtil
-import akka.testkit.TestKit
-import akka.testkit.TestProbe
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.cluster.ClusterEvent.CurrentClusterState
+import org.apache.pekko.cluster.ClusterEvent.MemberUp
+import org.apache.pekko.discovery.Lookup
+import org.apache.pekko.discovery.MockDiscovery
+import org.apache.pekko.discovery.ServiceDiscovery.Resolved
+import org.apache.pekko.discovery.ServiceDiscovery.ResolvedTarget
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.testkit.SocketUtil
+import org.apache.pekko.testkit.TestKit
+import org.apache.pekko.testkit.TestProbe
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
import org.scalactic.Tolerance
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.matchers.should.Matchers
@@ -66,13 +64,13 @@ class ClusterBootstrapDiscoveryBackoffIntegrationSpec
unreachablePorts = unreachablePorts.updated(id, unreachablePort)
ConfigFactory.parseString(s"""
- akka {
+ pekko {
loglevel = INFO
cluster.jmx.multi-mbeans-in-same-jvm = on
# this can be referred to in tests to use the mock discovery implementation
- discovery.mock-dns.class = "akka.discovery.MockDiscovery"
+ discovery.mock-dns.class = "org.apache.pekko.discovery.MockDiscovery"
remote.netty.tcp.port = $remotingPort
remote.artery.canonical.port = $remotingPort
diff --git a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapExistingSeedNodesSpec.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapExistingSeedNodesSpec.scala
similarity index 89%
rename from management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapExistingSeedNodesSpec.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapExistingSeedNodesSpec.scala
index b31f576..f09d4c8 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapExistingSeedNodesSpec.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapExistingSeedNodesSpec.scala
@@ -11,20 +11,17 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap.contactpoint
+package org.apache.pekko.management.cluster.bootstrap.contactpoint
import scala.concurrent.duration._
-
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.cluster.Cluster
-import akka.discovery.MockDiscovery
-import akka.event.Logging
-import akka.http.scaladsl.Http
-import akka.management.cluster.bootstrap.ClusterBootstrap
-import akka.remote.RARP
-import akka.testkit.SocketUtil
-import akka.testkit.TestKit
+import org.apache.pekko.actor.{ ActorSystem, Address }
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.discovery.MockDiscovery
+import org.apache.pekko.event.Logging
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.remote.RARP
+import org.apache.pekko.testkit.{ SocketUtil, TestKit }
import com.typesafe.config.ConfigFactory
import org.scalatest.BeforeAndAfterAll
import org.scalatest.matchers.should.Matchers
@@ -58,8 +55,8 @@ class ClusterBootstrapExistingSeedNodesSpec(system: ActorSystem)
remotingPorts = remotingPorts.updated(id, remotingPort)
val protocol =
- if (RARP(system).provider.remoteSettings.Artery.Enabled) "akka"
- else "akka.tcp"
+ if (RARP(system).provider.remoteSettings.Artery.Enabled) "pekko"
+ else "pekko.tcp"
val seeds = (seedNodes match {
case JoinYourself => List(s"${protocol}://${systemName}@127.0.0.1:${remotingPort}")
@@ -67,7 +64,7 @@ class ClusterBootstrapExistingSeedNodesSpec(system: ActorSystem)
}).mkString("""["""", """", """", """"] """)
val config = ConfigFactory.parseString(s"""
- akka {
+ pekko {
loglevel = INFO
cluster.jmx.multi-mbeans-in-same-jvm = on
@@ -79,7 +76,7 @@ class ClusterBootstrapExistingSeedNodesSpec(system: ActorSystem)
remote.artery.canonical.port = $remotingPort
# this can be referred to in tests to use the mock discovery implementation
- discovery.mock-dns.class = "akka.discovery.MockDiscovery"
+ discovery.mock-dns.class = "org.apache.pekko.discovery.MockDiscovery"
management {
diff --git a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapIntegrationSpec.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapIntegrationSpec.scala
similarity index 88%
rename from management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapIntegrationSpec.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapIntegrationSpec.scala
index 175e9d3..7d0d66d 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapIntegrationSpec.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapIntegrationSpec.scala
@@ -11,31 +11,24 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap.contactpoint
+package org.apache.pekko.management.cluster.bootstrap.contactpoint
+
+import com.typesafe.config.{ Config, ConfigFactory }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.cluster.ClusterEvent.{ CurrentClusterState, MemberUp }
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.discovery.{ Lookup, MockDiscovery }
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.testkit.{ SocketUtil, TestKit, TestProbe }
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
import java.net.InetAddress
-
import scala.concurrent.Future
import scala.concurrent.duration._
-import akka.actor.ActorSystem
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.ClusterEvent.MemberUp
-import akka.discovery.Lookup
-import akka.discovery.MockDiscovery
-import akka.discovery.ServiceDiscovery.Resolved
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.http.scaladsl.Http
-import akka.management.cluster.bootstrap.ClusterBootstrap
-import akka.testkit.SocketUtil
-import akka.testkit.TestKit
-import akka.testkit.TestProbe
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpecLike
-
class ClusterBootstrapIntegrationSpec extends AnyWordSpecLike with Matchers {
"Cluster Bootstrap" should {
@@ -53,13 +46,13 @@ class ClusterBootstrapIntegrationSpec extends AnyWordSpecLike with Matchers {
remotingPorts = remotingPorts.updated(id, remotingPort)
ConfigFactory.parseString(s"""
- akka {
+ pekko {
loglevel = INFO
cluster.jmx.multi-mbeans-in-same-jvm = on
# this can be referred to in tests to use the mock discovery implementation
- discovery.mock-dns.class = "akka.discovery.MockDiscovery"
+ discovery.mock-dns.class = "org.apache.pekko.discovery.MockDiscovery"
remote.netty.tcp.port = $remotingPort
remote.artery.canonical.port = $remotingPort
diff --git a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapRetryUnreachableContactPointIntegrationSpec.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapRetryUnreachableContactPointIntegrationSpec.scala
similarity index 88%
rename from management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapRetryUnreachableContactPointIntegrationSpec.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapRetryUnreachableContactPointIntegrationSpec.scala
index 21fd080..26b069d 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/ClusterBootstrapRetryUnreachableContactPointIntegrationSpec.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/ClusterBootstrapRetryUnreachableContactPointIntegrationSpec.scala
@@ -11,31 +11,24 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap.contactpoint
+package org.apache.pekko.management.cluster.bootstrap.contactpoint
+
+import com.typesafe.config.{ Config, ConfigFactory }
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.cluster.ClusterEvent.{ CurrentClusterState, MemberUp }
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.discovery.{ Lookup, MockDiscovery }
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap
+import org.apache.pekko.testkit.{ SocketUtil, TestKit, TestProbe }
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
import java.net.InetAddress
-
import scala.concurrent.Future
import scala.concurrent.duration._
-import akka.actor.ActorSystem
-import akka.cluster.Cluster
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.ClusterEvent.MemberUp
-import akka.discovery.Lookup
-import akka.discovery.MockDiscovery
-import akka.discovery.ServiceDiscovery.Resolved
-import akka.discovery.ServiceDiscovery.ResolvedTarget
-import akka.http.scaladsl.Http
-import akka.management.cluster.bootstrap.ClusterBootstrap
-import akka.testkit.SocketUtil
-import akka.testkit.TestKit
-import akka.testkit.TestProbe
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpecLike
-
class ClusterBootstrapRetryUnreachableContactPointIntegrationSpec extends AnyWordSpecLike with Matchers {
"Cluster Bootstrap" should {
@@ -57,13 +50,13 @@ class ClusterBootstrapRetryUnreachableContactPointIntegrationSpec extends AnyWor
unreachablePorts = unreachablePorts.updated(id, unreachablePort)
ConfigFactory.parseString(s"""
- akka {
+ pekko {
loglevel = INFO
cluster.jmx.multi-mbeans-in-same-jvm = on
# this can be referred to in tests to use the mock discovery implementation
- discovery.mock-dns.class = "akka.discovery.MockDiscovery"
+ discovery.mock-dns.class = "org.apache.pekko.discovery.MockDiscovery"
remote.netty.tcp.port = $remotingPort
remote.artery.canonical.port = $remotingPort
diff --git a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/HttpContactPointRoutesSpec.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/HttpContactPointRoutesSpec.scala
similarity index 85%
rename from management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/HttpContactPointRoutesSpec.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/HttpContactPointRoutesSpec.scala
index 0ce9975..bcd77d0 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/contactpoint/HttpContactPointRoutesSpec.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/HttpContactPointRoutesSpec.scala
@@ -11,13 +11,13 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap.contactpoint
+package org.apache.pekko.management.cluster.bootstrap.contactpoint
-import akka.cluster.{ Cluster, ClusterEvent }
-import akka.event.NoLogging
-import akka.http.scaladsl.testkit.ScalatestRouteTest
-import akka.management.cluster.bootstrap.ClusterBootstrapSettings
-import akka.testkit.TestProbe
+import org.apache.pekko.cluster.{ Cluster, ClusterEvent }
+import org.apache.pekko.event.NoLogging
+import org.apache.pekko.http.scaladsl.testkit.ScalatestRouteTest
+import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrapSettings
+import org.apache.pekko.testkit.TestProbe
import org.scalatest.concurrent.Eventually
import org.scalatest.time.{ Millis, Seconds, Span }
import org.scalatest.matchers.should.Matchers
@@ -35,7 +35,7 @@ class HttpContactPointRoutesSpec
override def testConfigSource =
s"""
- akka {
+ pekko {
remote {
netty.tcp {
hostname = "127.0.0.1"
diff --git a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/internal/BootstrapCoordinatorSpec.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/internal/BootstrapCoordinatorSpec.scala
similarity index 91%
rename from management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/internal/BootstrapCoordinatorSpec.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/internal/BootstrapCoordinatorSpec.scala
index cdd93b2..4f42a1b 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/internal/BootstrapCoordinatorSpec.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/internal/BootstrapCoordinatorSpec.scala
@@ -11,17 +11,16 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap.internal
+package org.apache.pekko.management.cluster.bootstrap.internal
import java.util.concurrent.atomic.AtomicReference
-
-import akka.actor.{ ActorRef, ActorSystem, Props }
-import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
-import akka.discovery.{ Lookup, MockDiscovery }
-import akka.http.scaladsl.model.Uri
-import akka.management.cluster.bootstrap.internal.BootstrapCoordinator.Protocol.InitiateBootstrapping
-import akka.management.cluster.bootstrap.{ ClusterBootstrapSettings, LowestAddressJoinDecider }
+import org.apache.pekko.actor.{ ActorRef, ActorSystem, Props }
+import org.apache.pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
+import org.apache.pekko.discovery.{ Lookup, MockDiscovery }
+import org.apache.pekko.http.scaladsl.model.Uri
import com.typesafe.config.ConfigFactory
+import org.apache.pekko.management.cluster.bootstrap.internal.BootstrapCoordinator.Protocol.InitiateBootstrapping
+import org.apache.pekko.management.cluster.bootstrap.{ ClusterBootstrapSettings, LowestAddressJoinDecider }
import org.scalatest.concurrent.Eventually
import org.scalatest.BeforeAndAfterAll
import org.scalatest.time.{ Millis, Seconds, Span }
@@ -37,7 +36,7 @@ class BootstrapCoordinatorSpec extends AnyWordSpec with Matchers with BeforeAndA
val system = ActorSystem(
"test",
ConfigFactory.parseString(s"""
- |akka.management.cluster.bootstrap {
+ |pekko.management.cluster.bootstrap {
| contact-point-discovery.service-name = $serviceName
|}
""".stripMargin).withFallback(ConfigFactory.load()))
@@ -51,7 +50,7 @@ class BootstrapCoordinatorSpec extends AnyWordSpec with Matchers with BeforeAndA
"The bootstrap coordinator, when avoiding named port lookups" should {
- "probe only on the Akka Management port" in {
+ "probe only on the Pekko Management port" in {
MockDiscovery.set(
Lookup(serviceName, portName = None, protocol = Some("tcp")),
diff --git a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/internal/HttpContactPointBootstrapSpec.scala b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrapSpec.scala
similarity index 83%
rename from management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/internal/HttpContactPointBootstrapSpec.scala
rename to management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrapSpec.scala
index aa4c6b2..1a56799 100644
--- a/management-cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/internal/HttpContactPointBootstrapSpec.scala
+++ b/management-cluster-bootstrap/src/test/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrapSpec.scala
@@ -11,11 +11,10 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.bootstrap.internal
-
-import akka.actor.ActorPath
-import akka.http.scaladsl.model.Uri.Host
+package org.apache.pekko.management.cluster.bootstrap.internal
+import org.apache.pekko.actor.ActorPath
+import org.apache.pekko.http.scaladsl.model.Uri.Host
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
diff --git a/management-cluster-http/src/main/java/akka/management/cluster/ClusterReadViewAccess.java b/management-cluster-http/src/main/java/org/apache/pekko/management/cluster/cluster/ClusterReadViewAccess.java
similarity index 79%
rename from management-cluster-http/src/main/java/akka/management/cluster/ClusterReadViewAccess.java
rename to management-cluster-http/src/main/java/org/apache/pekko/management/cluster/cluster/ClusterReadViewAccess.java
index e9fc9f4..ae3885f 100644
--- a/management-cluster-http/src/main/java/akka/management/cluster/ClusterReadViewAccess.java
+++ b/management-cluster-http/src/main/java/org/apache/pekko/management/cluster/cluster/ClusterReadViewAccess.java
@@ -11,11 +11,11 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster;
+package org.apache.pekko.management.cluster.cluster;
-import akka.annotation.InternalApi;
-import akka.cluster.Cluster;
-import akka.cluster.ClusterReadView;
+import org.apache.pekko.annotation.InternalApi;
+import org.apache.pekko.cluster.Cluster;
+import org.apache.pekko.cluster.ClusterReadView;
/** INTERNAL API */
@InternalApi
diff --git a/management-cluster-http/src/main/resources/reference.conf b/management-cluster-http/src/main/resources/reference.conf
index 785a5ac..f394313 100644
--- a/management-cluster-http/src/main/resources/reference.conf
+++ b/management-cluster-http/src/main/resources/reference.conf
@@ -1,15 +1,15 @@
######################################################
-# Akka Management Cluster Reference Config File #
+# Apache Pekko Management Cluster Reference Config File #
######################################################
# This is the reference config file that contains all the default settings.
# Make your edits/overrides in your application.conf.
-akka.management {
+pekko.management {
http.routes {
- # registers http management to be included in akka-management's http endpoint
- cluster-management = "akka.management.cluster.ClusterHttpManagementRouteProvider"
+ # registers http management to be included in pekko-management's http endpoint
+ cluster-management = "org.apache.pekko.management.cluster.ClusterHttpManagementRouteProvider"
}
cluster {
@@ -23,14 +23,14 @@ akka.management {
}
-# registers cluster healthcheck to be included in akka-management's http endpoint
+# registers cluster healthcheck to be included in pekko-management's http endpoint
#health
-akka.management {
+pekko.management {
health-checks {
readiness-checks {
# Default health check for cluster. Overwrite the setting to replace it with
# your implementation or set it to "" (empty string) to disable this check.
- cluster-membership = "akka.management.cluster.scaladsl.ClusterMembershipCheck"
+ cluster-membership = "org.apache.pekko.management.cluster.scaladsl.ClusterMembershipCheck"
}
}
}
diff --git a/management-cluster-http/src/main/scala/akka/management/cluster/ClusterDomainEventServerSentEventEncoder.scala b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterDomainEventServerSentEventEncoder.scala
similarity index 93%
rename from management-cluster-http/src/main/scala/akka/management/cluster/ClusterDomainEventServerSentEventEncoder.scala
rename to management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterDomainEventServerSentEventEncoder.scala
index c995b08..70a4c4b 100644
--- a/management-cluster-http/src/main/scala/akka/management/cluster/ClusterDomainEventServerSentEventEncoder.scala
+++ b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterDomainEventServerSentEventEncoder.scala
@@ -11,12 +11,12 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster
+package org.apache.pekko.management.cluster
-import akka.actor.Address
-import akka.cluster.{ ClusterEvent, Member, MemberStatus, UniqueAddress }
-import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
-import akka.http.scaladsl.model.sse.ServerSentEvent
+import org.apache.pekko.actor.Address
+import org.apache.pekko.cluster.{ ClusterEvent, Member, MemberStatus, UniqueAddress }
+import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
+import org.apache.pekko.http.scaladsl.model.sse.ServerSentEvent
import spray.json.{ DefaultJsonProtocol, JsArray, JsNumber, JsObject, JsString, JsValue }
/**
diff --git a/management-cluster-http/src/main/scala/akka/management/cluster/ClusterHttpManagementHelper.scala b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterHttpManagementHelper.scala
similarity index 84%
rename from management-cluster-http/src/main/scala/akka/management/cluster/ClusterHttpManagementHelper.scala
rename to management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterHttpManagementHelper.scala
index ab4bb61..53278db 100644
--- a/management-cluster-http/src/main/scala/akka/management/cluster/ClusterHttpManagementHelper.scala
+++ b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterHttpManagementHelper.scala
@@ -11,15 +11,15 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster
+package org.apache.pekko.management.cluster
-import akka.cluster.Member
+import org.apache.pekko.cluster.Member
object ClusterHttpManagementHelper {
def memberToClusterMember(m: Member): ClusterMember =
ClusterMember(s"${m.address}", s"${m.uniqueAddress.longUid}", s"${m.status}", m.roles)
- private[akka] def oldestPerRole(thisDcMembers: Seq[Member]): Map[String, String] = {
+ private[pekko] def oldestPerRole(thisDcMembers: Seq[Member]): Map[String, String] = {
val roles: Set[String] = thisDcMembers.flatMap(_.roles).toSet
roles.map(role => (role, oldestForRole(thisDcMembers, role))).toMap
}
diff --git a/management-cluster-http/src/main/scala/akka/management/cluster/ClusterHttpManagementProtocol.scala b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterHttpManagementProtocol.scala
similarity index 79%
rename from management-cluster-http/src/main/scala/akka/management/cluster/ClusterHttpManagementProtocol.scala
rename to management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterHttpManagementProtocol.scala
index c96f12c..0ae1b5c 100644
--- a/management-cluster-http/src/main/scala/akka/management/cluster/ClusterHttpManagementProtocol.scala
+++ b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterHttpManagementProtocol.scala
@@ -11,14 +11,13 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster
+package org.apache.pekko.management.cluster
-import scala.collection.immutable
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
+import spray.json.{ DefaultJsonProtocol, RootJsonFormat }
-import akka.annotation.InternalApi
-import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
-import spray.json.DefaultJsonProtocol
-import spray.json.RootJsonFormat
+import scala.collection.immutable
final case class ClusterUnreachableMember(node: String, observedBy: immutable.Seq[String])
final case class ClusterMember(node: String, nodeUid: String, status: String, roles: Set[String])
@@ -38,19 +37,19 @@ final case class ShardRegionInfo(shardId: String, numEntities: Int)
final case class ShardDetails(regions: immutable.Seq[ShardRegionInfo])
/** INTERNAL API */
-@InternalApi private[akka] sealed trait ClusterHttpManagementMemberOperation
+@InternalApi private[pekko] sealed trait ClusterHttpManagementMemberOperation
/** INTERNAL API */
-@InternalApi private[akka] case object Down extends ClusterHttpManagementMemberOperation
+@InternalApi private[pekko] case object Down extends ClusterHttpManagementMemberOperation
/** INTERNAL API */
-@InternalApi private[akka] case object Leave extends ClusterHttpManagementMemberOperation
+@InternalApi private[pekko] case object Leave extends ClusterHttpManagementMemberOperation
/** INTERNAL API */
-@InternalApi private[akka] case object Join extends ClusterHttpManagementMemberOperation
+@InternalApi private[pekko] case object Join extends ClusterHttpManagementMemberOperation
/** INTERNAL API */
-@InternalApi private[akka] object ClusterHttpManagementMemberOperation {
+@InternalApi private[pekko] object ClusterHttpManagementMemberOperation {
def fromString(value: String): Option[ClusterHttpManagementMemberOperation] =
Vector(Down, Leave, Join).find(_.toString.equalsIgnoreCase(value))
}
diff --git a/management-cluster-http/src/main/scala/akka/management/cluster/ClusterHttpManagementRouteProvider.scala b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterHttpManagementRouteProvider.scala
similarity index 73%
rename from management-cluster-http/src/main/scala/akka/management/cluster/ClusterHttpManagementRouteProvider.scala
rename to management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterHttpManagementRouteProvider.scala
index 7ff9255..7556256 100644
--- a/management-cluster-http/src/main/scala/akka/management/cluster/ClusterHttpManagementRouteProvider.scala
+++ b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterHttpManagementRouteProvider.scala
@@ -11,15 +11,19 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster
-
-import akka.actor.ClassicActorSystemProvider
-import akka.actor.{ ActorSystem, ExtendedActorSystem, ExtensionId, ExtensionIdProvider }
-import akka.cluster.Cluster
-import akka.http.scaladsl.server.Route
-import akka.management.cluster.scaladsl.ClusterHttpManagementRoutes
-import akka.management.scaladsl.ManagementRouteProviderSettings
-import akka.management.scaladsl.ManagementRouteProvider
+package org.apache.pekko.management.cluster
+
+import org.apache.pekko.actor.{
+ ActorSystem,
+ ClassicActorSystemProvider,
+ ExtendedActorSystem,
+ ExtensionId,
+ ExtensionIdProvider
+}
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.http.scaladsl.server.Route
+import org.apache.pekko.management.cluster.scaladsl.ClusterHttpManagementRoutes
+import org.apache.pekko.management.scaladsl.{ ManagementRouteProvider, ManagementRouteProviderSettings }
object ClusterHttpManagementRouteProvider
extends ExtensionId[ClusterHttpManagementRouteProvider]
@@ -36,7 +40,7 @@ object ClusterHttpManagementRouteProvider
}
/**
- * Provides an HTTP management interface for [[akka.cluster.Cluster]].
+ * Provides an HTTP management interface for [[org.apache.pekko.cluster.Cluster]].
*/
final class ClusterHttpManagementRouteProvider(system: ExtendedActorSystem) extends ManagementRouteProvider {
diff --git a/management-cluster-http/src/main/scala/akka/management/cluster/ClusterHttpManagementSettings.scala b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterHttpManagementSettings.scala
similarity index 85%
rename from management-cluster-http/src/main/scala/akka/management/cluster/ClusterHttpManagementSettings.scala
rename to management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterHttpManagementSettings.scala
index ba3448e..893aad9 100644
--- a/management-cluster-http/src/main/scala/akka/management/cluster/ClusterHttpManagementSettings.scala
+++ b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/ClusterHttpManagementSettings.scala
@@ -11,12 +11,12 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster
+package org.apache.pekko.management.cluster
import com.typesafe.config.Config
final class ClusterHttpManagementSettings(val config: Config) {
- config.getConfig("akka.management.cluster")
+ config.getConfig("pekko.management.cluster")
// placeholder for potential future configuration... currently nothing is configured here
}
diff --git a/management-cluster-http/src/main/scala/akka/management/cluster/javadsl/ClusterHttpManagementRoutes.scala b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/javadsl/ClusterHttpManagementRoutes.scala
similarity index 58%
rename from management-cluster-http/src/main/scala/akka/management/cluster/javadsl/ClusterHttpManagementRoutes.scala
rename to management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/javadsl/ClusterHttpManagementRoutes.scala
index 24b9761..1927fd3 100644
--- a/management-cluster-http/src/main/scala/akka/management/cluster/javadsl/ClusterHttpManagementRoutes.scala
+++ b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/javadsl/ClusterHttpManagementRoutes.scala
@@ -11,27 +11,28 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.javadsl
-import akka.cluster.Cluster
-import akka.http.javadsl.server.directives.RouteAdapter
-import akka.management.cluster.scaladsl
+package org.apache.pekko.management.cluster.javadsl
+
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.http.javadsl.server.directives.RouteAdapter
+import org.apache.pekko.management.cluster.scaladsl
object ClusterHttpManagementRoutes {
/**
* Creates an instance of [[ClusterHttpManagementRoutes]] to manage the specified
- * [[akka.cluster.Cluster]] instance. This version does not provide Basic Authentication. It uses
+ * [[org.apache.pekko.cluster.Cluster]] instance. This version does not provide Basic Authentication. It uses
* the specified path `pathPrefixName`.
*/
- def all(cluster: Cluster): akka.http.javadsl.server.Route =
+ def all(cluster: Cluster): org.apache.pekko.http.javadsl.server.Route =
RouteAdapter(scaladsl.ClusterHttpManagementRoutes(cluster))
/**
* Creates an instance of [[ClusterHttpManagementRoutes]] to manage the specified
- * [[akka.cluster.Cluster]] instance. This version does not provide Basic Authentication. It uses
+ * [[org.apache.pekko.cluster.Cluster]] instance. This version does not provide Basic Authentication. It uses
* the specified path `pathPrefixName`.
*/
- def readOnly(cluster: Cluster): akka.http.javadsl.server.Route =
+ def readOnly(cluster: Cluster): org.apache.pekko.http.javadsl.server.Route =
RouteAdapter(scaladsl.ClusterHttpManagementRoutes.readOnly(cluster))
}
diff --git a/management-cluster-http/src/main/scala/akka/management/cluster/javadsl/ClusterMembershipCheck.scala b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/javadsl/ClusterMembershipCheck.scala
similarity index 75%
rename from management-cluster-http/src/main/scala/akka/management/cluster/javadsl/ClusterMembershipCheck.scala
rename to management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/javadsl/ClusterMembershipCheck.scala
index e5c3195..86da5dd 100644
--- a/management-cluster-http/src/main/scala/akka/management/cluster/javadsl/ClusterMembershipCheck.scala
+++ b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/javadsl/ClusterMembershipCheck.scala
@@ -11,15 +11,14 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.javadsl
+package org.apache.pekko.management.cluster.javadsl
import java.util.concurrent.CompletionStage
-import akka.management.cluster.scaladsl.{ ClusterMembershipCheck => ScalaClusterReadinessCheck }
-
import scala.compat.java8.FutureConverters._
-import akka.actor.ActorSystem
-import akka.dispatch.ExecutionContexts
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.dispatch.ExecutionContexts
+import org.apache.pekko.management.cluster.scaladsl.{ ClusterMembershipCheck => ScalaClusterReadinessCheck }
class ClusterMembershipCheck(system: ActorSystem)
extends java.util.function.Supplier[CompletionStage[java.lang.Boolean]] {
diff --git a/management-cluster-http/src/main/scala/akka/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala
similarity index 88%
rename from management-cluster-http/src/main/scala/akka/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala
rename to management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala
index 66ac540..8231d54 100644
--- a/management-cluster-http/src/main/scala/akka/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala
+++ b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala
@@ -11,24 +11,38 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.scaladsl
-import akka.actor.AddressFromURIString
-import akka.cluster.sharding.{ ClusterSharding, ShardRegion }
-import akka.cluster.{ Cluster, Member, MemberStatus }
-import akka.http.scaladsl.model.{ HttpMethod, HttpMethods, StatusCodes, Uri }
+package org.apache.pekko.management.cluster.scaladsl
+
+import org.apache.pekko.actor.AddressFromURIString
+import org.apache.pekko.cluster.sharding.{ ClusterSharding, ShardRegion }
+import org.apache.pekko.cluster.{ Cluster, Member, MemberStatus }
+import org.apache.pekko.http.scaladsl.model.{ HttpMethod, HttpMethods, StatusCodes, Uri }
import Uri.Path
-import akka.http.scaladsl.server.Route
-import akka.management.cluster._
-import akka.pattern.ask
-import akka.pattern.AskTimeoutException
-import akka.util.Timeout
+import org.apache.pekko.http.scaladsl.server.Route
+import org.apache.pekko.management.cluster.{
+ ClusterDomainEventServerSentEventEncoder,
+ ClusterHttpManagementJsonProtocol,
+ ClusterHttpManagementMemberOperation,
+ ClusterHttpManagementMessage,
+ ClusterMembers,
+ ClusterUnreachableMember,
+ Down,
+ Leave,
+ ShardDetails,
+ ShardEntityTypeKeys,
+ ShardRegionInfo
+}
+import org.apache.pekko.management.cluster.cluster.ClusterReadViewAccess
+import org.apache.pekko.pattern.ask
+import org.apache.pekko.pattern.AskTimeoutException
+import org.apache.pekko.util.Timeout
import scala.annotation.tailrec
import scala.concurrent.duration._
object ClusterHttpManagementRoutes extends ClusterHttpManagementJsonProtocol {
- import ClusterHttpManagementHelper._
- import akka.http.scaladsl.server.Directives._
+ import org.apache.pekko.management.cluster.ClusterHttpManagementHelper._
+ import org.apache.pekko.http.scaladsl.server.Directives._
private def routeGetMembers(cluster: Cluster): Route =
get {
@@ -121,12 +135,12 @@ object ClusterHttpManagementRoutes extends ClusterHttpManagementJsonProtocol {
}
private def routeGetClusterDomainEvents(cluster: Cluster) = {
- import akka.actor.ActorRef
- import akka.cluster.ClusterEvent
- import akka.http.scaladsl.marshalling.sse.EventStreamMarshalling._
- import akka.http.scaladsl.model.sse.ServerSentEvent
- import akka.stream.{ Materializer, OverflowStrategy }
- import akka.stream.scaladsl.Source
+ import org.apache.pekko.actor.ActorRef
+ import org.apache.pekko.cluster.ClusterEvent
+ import org.apache.pekko.http.scaladsl.marshalling.sse.EventStreamMarshalling._
+ import org.apache.pekko.http.scaladsl.model.sse.ServerSentEvent
+ import org.apache.pekko.stream.{ Materializer, OverflowStrategy }
+ import org.apache.pekko.stream.scaladsl.Source
import scala.concurrent.{ ExecutionContext, Promise }
val eventClasses: Map[String, Class[_]] = Map(
@@ -254,7 +268,7 @@ object ClusterHttpManagementRoutes extends ClusterHttpManagementJsonProtocol {
/**
* Creates an instance of [[ClusterHttpManagementRoutes]] to manage the specified
- * [[akka.cluster.Cluster]] instance. This version does not provide Basic Authentication.
+ * [[org.apache.pekko.cluster.Cluster]] instance. This version does not provide Basic Authentication.
*/
def apply(cluster: Cluster): Route =
pathPrefix("cluster") {
diff --git a/management-cluster-http/src/main/scala/akka/management/cluster/scaladsl/ClusterMembershipCheck.scala b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterMembershipCheck.scala
similarity index 81%
rename from management-cluster-http/src/main/scala/akka/management/cluster/scaladsl/ClusterMembershipCheck.scala
rename to management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterMembershipCheck.scala
index 5c5d88c..4406a4b 100644
--- a/management-cluster-http/src/main/scala/akka/management/cluster/scaladsl/ClusterMembershipCheck.scala
+++ b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterMembershipCheck.scala
@@ -11,12 +11,12 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.scaladsl
+package org.apache.pekko.management.cluster.scaladsl
-import akka.actor.ActorSystem
-import akka.annotation.InternalApi
-import akka.cluster.{ Cluster, MemberStatus }
-import akka.util.Helpers
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.cluster.{ Cluster, MemberStatus }
+import org.apache.pekko.util.Helpers
import com.typesafe.config.Config
import scala.collection.JavaConverters._
@@ -26,7 +26,7 @@ import scala.concurrent.Future
* Internal API
*/
@InternalApi
-private[akka] object ClusterMembershipCheckSettings {
+private[pekko] object ClusterMembershipCheckSettings {
def memberStatus(status: String): MemberStatus =
Helpers.toRootLowerCase(status) match {
case "weaklyup" => MemberStatus.WeaklyUp
@@ -46,7 +46,7 @@ private[akka] object ClusterMembershipCheckSettings {
final class ClusterMembershipCheckSettings(val readyStates: Set[MemberStatus])
-final class ClusterMembershipCheck @InternalApi private[akka] (
+final class ClusterMembershipCheck @InternalApi private[pekko] (
system: ActorSystem,
selfStatus: () => MemberStatus,
settings: ClusterMembershipCheckSettings)
@@ -56,7 +56,7 @@ final class ClusterMembershipCheck @InternalApi private[akka] (
this(
system,
() => Cluster(system).selfMember.status,
- ClusterMembershipCheckSettings(system.settings.config.getConfig("akka.management.cluster.health-check")))
+ ClusterMembershipCheckSettings(system.settings.config.getConfig("pekko.management.cluster.health-check")))
override def apply(): Future[Boolean] = {
Future.successful(settings.readyStates.contains(selfStatus()))
diff --git a/management-cluster-http/src/test/java/jdoc/akka/cluster/http/management/CompileOnlyTest.java b/management-cluster-http/src/test/java/jdoc/org/apache/pekko/cluster/http/management/CompileOnlyTest.java
similarity index 68%
rename from management-cluster-http/src/test/java/jdoc/akka/cluster/http/management/CompileOnlyTest.java
rename to management-cluster-http/src/test/java/jdoc/org/apache/pekko/cluster/http/management/CompileOnlyTest.java
index 1870592..3e82b0e 100644
--- a/management-cluster-http/src/test/java/jdoc/akka/cluster/http/management/CompileOnlyTest.java
+++ b/management-cluster-http/src/test/java/jdoc/org/apache/pekko/cluster/http/management/CompileOnlyTest.java
@@ -11,21 +11,21 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package jdoc.akka.cluster.http.management;
+package jdoc.org.apache.pekko.cluster.http.management;
-import akka.actor.ActorSystem;
-import akka.management.scaladsl.AkkaManagement;
-import akka.cluster.Cluster;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.management.scaladsl.PekkoManagement;
+import org.apache.pekko.cluster.Cluster;
//#imports
-import akka.http.javadsl.server.Route;
-import akka.management.cluster.javadsl.ClusterHttpManagementRoutes;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.management.cluster.javadsl.ClusterHttpManagementRoutes;
//#imports
public class CompileOnlyTest {
public static void example() {
//#loading
ActorSystem system = ActorSystem.create();
- AkkaManagement.get(system).start();
+ PekkoManagement.get(system).start();
//#loading
diff --git a/management-cluster-http/src/test/java/akka/management/http/ClusterHttpManagementJavaCompileTest.java b/management-cluster-http/src/test/java/org/apache/pekko/management/http/ClusterHttpManagementJavaCompileTest.java
similarity index 80%
rename from management-cluster-http/src/test/java/akka/management/http/ClusterHttpManagementJavaCompileTest.java
rename to management-cluster-http/src/test/java/org/apache/pekko/management/http/ClusterHttpManagementJavaCompileTest.java
index 977f848..b7c6337 100644
--- a/management-cluster-http/src/test/java/akka/management/http/ClusterHttpManagementJavaCompileTest.java
+++ b/management-cluster-http/src/test/java/org/apache/pekko/management/http/ClusterHttpManagementJavaCompileTest.java
@@ -11,10 +11,10 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.http;
+package org.apache.pekko.management.http;
-import akka.actor.ActorSystem;
-import akka.management.cluster.ClusterHttpManagementRouteProvider;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.management.cluster.ClusterHttpManagementRouteProvider;
import org.junit.Test;
public class ClusterHttpManagementJavaCompileTest {
diff --git a/management-cluster-http/src/test/java/akka/management/http/javadsl/ClusterReadinessCheckTest.java b/management-cluster-http/src/test/java/org/apache/pekko/management/http/javadsl/ClusterReadinessCheckTest.java
similarity index 80%
rename from management-cluster-http/src/test/java/akka/management/http/javadsl/ClusterReadinessCheckTest.java
rename to management-cluster-http/src/test/java/org/apache/pekko/management/http/javadsl/ClusterReadinessCheckTest.java
index c30d261..840baca 100644
--- a/management-cluster-http/src/test/java/akka/management/http/javadsl/ClusterReadinessCheckTest.java
+++ b/management-cluster-http/src/test/java/org/apache/pekko/management/http/javadsl/ClusterReadinessCheckTest.java
@@ -11,10 +11,10 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.http.javadsl;
+package org.apache.pekko.management.http.javadsl;
-import akka.actor.ActorSystem;
-import akka.management.cluster.javadsl.ClusterMembershipCheck;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.management.cluster.javadsl.ClusterMembershipCheck;
import java.util.concurrent.CompletionStage;
diff --git a/management-cluster-http/src/test/resources/application.conf b/management-cluster-http/src/test/resources/application.conf
index edae948..e30b2c9 100644
--- a/management-cluster-http/src/test/resources/application.conf
+++ b/management-cluster-http/src/test/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+pekko {
actor {
provider = "cluster"
}
diff --git a/management-cluster-http/src/test/scala/doc/akka/cluster/http/management/CompileOnlySpec.scala b/management-cluster-http/src/test/scala/doc/org/apache/pekko/cluster/http/management/CompileOnlySpec.scala
similarity index 66%
rename from management-cluster-http/src/test/scala/doc/akka/cluster/http/management/CompileOnlySpec.scala
rename to management-cluster-http/src/test/scala/doc/org/apache/pekko/cluster/http/management/CompileOnlySpec.scala
index ecde45e..f126e78 100644
--- a/management-cluster-http/src/test/scala/doc/akka/cluster/http/management/CompileOnlySpec.scala
+++ b/management-cluster-http/src/test/scala/doc/org/apache/pekko/cluster/http/management/CompileOnlySpec.scala
@@ -11,20 +11,20 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package doc.akka.cluster.http.management
+package doc.org.apache.pekko.cluster.http.management
-import akka.actor.ActorSystem
-import akka.cluster.Cluster
-import akka.http.scaladsl.server.Route
-import akka.management.cluster.scaladsl.ClusterHttpManagementRoutes
-import akka.management.scaladsl.AkkaManagement
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.http.scaladsl.server.Route
+import org.apache.pekko.management.cluster.scaladsl.ClusterHttpManagementRoutes
+import org.apache.pekko.management.scaladsl.PekkoManagement
object CompileOnlySpec {
// #loading
val system = ActorSystem()
// Automatically loads Cluster Http Routes
- AkkaManagement(system).start()
+ PekkoManagement(system).start()
// #loading
// #all
diff --git a/management-cluster-http/src/test/scala/akka/cluster/http/management/scaladsl/ClusterHttpManagementRoutesSpec.scala b/management-cluster-http/src/test/scala/org/apache/pekko/cluster/http/management/scaladsl/ClusterHttpManagementRoutesSpec.scala
similarity index 77%
rename from management-cluster-http/src/test/scala/akka/cluster/http/management/scaladsl/ClusterHttpManagementRoutesSpec.scala
rename to management-cluster-http/src/test/scala/org/apache/pekko/cluster/http/management/scaladsl/ClusterHttpManagementRoutesSpec.scala
index 38153f0..9fc83b5 100644
--- a/management-cluster-http/src/test/scala/akka/cluster/http/management/scaladsl/ClusterHttpManagementRoutesSpec.scala
+++ b/management-cluster-http/src/test/scala/org/apache/pekko/cluster/http/management/scaladsl/ClusterHttpManagementRoutesSpec.scala
@@ -11,50 +11,38 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.http.management.scaladsl
+package org.apache.pekko.cluster.http.management.scaladsl
-// TODO has to be in akka.cluster because it touches Reachability which is private[akka.cluster]
+// TODO has to be in pekko.cluster because it touches Reachability which is private[pekko.cluster]
-import scala.collection.immutable._
-import scala.concurrent.Promise
-
-import akka.actor.Actor
-import akka.actor.ActorSystem
-import akka.actor.Address
-import akka.actor.ExtendedActorSystem
-import akka.actor.Props
-import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.InternalClusterAction.LeaderActionsTick
-import akka.cluster.MemberStatus.Joining
-import akka.cluster.MemberStatus.Up
-import akka.cluster._
-import akka.cluster.http.management.scaladsl.ClusterHttpManagementRoutesSpec.TestShardedActor
-import akka.cluster.sharding.ClusterSharding
-import akka.cluster.sharding.ClusterShardingSettings
-import akka.cluster.sharding.ShardRegion
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.testkit.ScalatestRouteTest
-import akka.http.scaladsl.unmarshalling.Unmarshal
-import akka.management.cluster._
-import akka.management.cluster.scaladsl.ClusterHttpManagementRoutes
-import akka.management.scaladsl.ManagementRouteProviderSettings
-import akka.stream.scaladsl.Sink
-import akka.util.ByteString
-import akka.util.Timeout
-import akka.util.Version
import com.typesafe.config.ConfigFactory
+import org.apache.pekko.actor.{ Actor, ActorSystem, Address, ExtendedActorSystem, Props }
+import org.apache.pekko.cluster.ClusterEvent.CurrentClusterState
+import org.apache.pekko.cluster.InternalClusterAction.LeaderActionsTick
+import org.apache.pekko.cluster.MemberStatus.{ Joining, Up }
+import org.apache.pekko.cluster._
+import org.apache.pekko.cluster.http.management.scaladsl.ClusterHttpManagementRoutesSpec.TestShardedActor
+import org.apache.pekko.cluster.sharding.{ ClusterSharding, ClusterShardingSettings, ShardRegion }
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.testkit.ScalatestRouteTest
+import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
+import org.apache.pekko.management.cluster.scaladsl.ClusterHttpManagementRoutes
+import org.apache.pekko.management.cluster._
+import org.apache.pekko.management.scaladsl.ManagementRouteProviderSettings
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.util.{ ByteString, Timeout, Version }
import org.mockito.Matchers._
import org.mockito.Mockito._
-import org.scalatest.concurrent.Eventually
import org.scalatest.concurrent.PatienceConfiguration.{ Timeout => ScalatestTimeout }
-import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.concurrent.{ Eventually, ScalaFutures }
import org.scalatest.matchers.should.Matchers
-import org.scalatest.time.Millis
-import org.scalatest.time.Seconds
-import org.scalatest.time.Span
+import org.scalatest.time.{ Millis, Seconds, Span }
import org.scalatest.wordspec.AnyWordSpecLike
+import scala.collection.immutable._
+import scala.concurrent.Promise
+
class ClusterHttpManagementRoutesSpec
extends AnyWordSpecLike
with Matchers
@@ -72,9 +60,9 @@ class ClusterHttpManagementRoutesSpec
"return list of members with cluster leader and oldest" when {
"calling GET /cluster/members" in {
val dcName = "one"
- val address1 = Address("akka", "Main", "hostname.com", 3311)
- val address2 = Address("akka", "Main", "hostname2.com", 3311)
- val address3 = Address("akka", "Main", "hostname3.com", 3311)
+ val address1 = Address("pekko", "Main", "hostname.com", 3311)
+ val address2 = Address("pekko", "Main", "hostname2.com", 3311)
+ val address3 = Address("pekko", "Main", "hostname3.com", 3311)
val uniqueAddress1 = UniqueAddress(address1, 1L)
val uniqueAddress2 = UniqueAddress(address2, 2L)
@@ -103,11 +91,11 @@ class ClusterHttpManagementRoutesSpec
Get("/cluster/members") ~> ClusterHttpManagementRoutes(mockedCluster) ~> check {
status shouldEqual StatusCodes.OK
val clusterUnreachableMember = ClusterUnreachableMember(
- "akka://Main@hostname3.com:3311",
- Seq("akka://Main@hostname.com:3311", "akka://Main@hostname2.com:3311"))
+ "pekko://Main@hostname3.com:3311",
+ Seq("pekko://Main@hostname.com:3311", "pekko://Main@hostname2.com:3311"))
val clusterMembers = Set(
- ClusterMember("akka://Main@hostname.com:3311", "1", "Up", Set(s"dc-$dcName")),
- ClusterMember("akka://Main@hostname2.com:3311", "2", "Joining", Set(s"dc-$dcName")))
+ ClusterMember("pekko://Main@hostname.com:3311", "1", "Up", Set(s"dc-$dcName")),
+ ClusterMember("pekko://Main@hostname2.com:3311", "2", "Joining", Set(s"dc-$dcName")))
val expected = ClusterMembers(
selfNode = s"$address1",
@@ -131,7 +119,7 @@ class ClusterHttpManagementRoutesSpec
"join a member" when {
"calling POST /cluster/members with form field 'memberAddress'" in {
- val address = "akka.tcp://Main@hostname.com:3311"
+ val address = "pekko.tcp://Main@hostname.com:3311"
val urlEncodedForm = FormData(Map("address" -> address))
val mockedCluster = mock(classOf[Cluster])
@@ -167,18 +155,18 @@ class ClusterHttpManagementRoutesSpec
}
}
- getMember(Address("akka", "Main", "hostname.com", 3311), "/cluster/members/akka://Main@hostname.com:3311")
- getMember(Address("akka", "Main", "hostname.com", 3311), "/cluster/members/Main@hostname.com:3311")
+ getMember(Address("pekko", "Main", "hostname.com", 3311), "/cluster/members/pekko://Main@hostname.com:3311")
+ getMember(Address("pekko", "Main", "hostname.com", 3311), "/cluster/members/Main@hostname.com:3311")
- getMember(Address("akka", "Main", "[::1]", 3311), "/cluster/members/Main@[::1]:3311")
- getMember(Address("akka", "Main", "[::1]", 3311), "/cluster/members/akka://Main@[::1]:3311")
+ getMember(Address("pekko", "Main", "[::1]", 3311), "/cluster/members/Main@[::1]:3311")
+ getMember(Address("pekko", "Main", "[::1]", 3311), "/cluster/members/pekko://Main@[::1]:3311")
}
"execute leave on a member" when {
- "calling DELETE /cluster/members/akka://Main@hostname.com:3311" in {
+ "calling DELETE /cluster/members/pekko://Main@hostname.com:3311" in {
- val address1 = Address("akka", "Main", "hostname.com", 3311)
- val address2 = Address("akka", "Main", "hostname2.com", 3311)
+ val address1 = Address("pekko", "Main", "hostname.com", 3311)
+ val address2 = Address("pekko", "Main", "hostname2.com", 3311)
val uniqueAddress1 = UniqueAddress(address1, 1L)
val uniqueAddress2 = UniqueAddress(address2, 2L)
@@ -194,7 +182,7 @@ class ClusterHttpManagementRoutesSpec
when(mockedClusterReadView.members).thenReturn(members)
doNothing().when(mockedCluster).leave(any[Address])
- Seq("akka://Main@hostname.com:3311", "Main@hostname.com:3311").foreach(address => {
+ Seq("pekko://Main@hostname.com:3311", "Main@hostname.com:3311").foreach(address => {
Delete(s"/cluster/members/$address") ~> ClusterHttpManagementRoutes(mockedCluster) ~> check {
status shouldEqual StatusCodes.OK
responseAs[ClusterHttpManagementMessage] shouldEqual ClusterHttpManagementMessage(s"Leaving $address1")
@@ -202,12 +190,12 @@ class ClusterHttpManagementRoutesSpec
})
}
- "calling PUT /cluster/members/akka://Main@hostname.com:3311 with form field operation LEAVE" in {
+ "calling PUT /cluster/members/pekko://Main@hostname.com:3311 with form field operation LEAVE" in {
val urlEncodedForm = FormData(Map("operation" -> "leave"))
- val address1 = Address("akka", "Main", "hostname.com", 3311)
- val address2 = Address("akka", "Main", "hostname2.com", 3311)
+ val address1 = Address("pekko", "Main", "hostname.com", 3311)
+ val address2 = Address("pekko", "Main", "hostname2.com", 3311)
val uniqueAddress1 = UniqueAddress(address1, 1L)
val uniqueAddress2 = UniqueAddress(address2, 2L)
@@ -223,7 +211,7 @@ class ClusterHttpManagementRoutesSpec
when(mockedClusterReadView.members).thenReturn(members)
doNothing().when(mockedCluster).leave(any[Address])
- Seq("akka://Main@hostname.com:3311", "Main@hostname.com:3311").foreach(address => {
+ Seq("pekko://Main@hostname.com:3311", "Main@hostname.com:3311").foreach(address => {
Put(s"/cluster/members/$address", urlEncodedForm) ~> ClusterHttpManagementRoutes(mockedCluster) ~> check {
status shouldEqual StatusCodes.OK
responseAs[ClusterHttpManagementMessage] shouldEqual ClusterHttpManagementMessage(s"Leaving $address1")
@@ -232,10 +220,10 @@ class ClusterHttpManagementRoutesSpec
}
"does not exist and return Not Found" in {
- val address = "akka://Main2@hostname.com:3311"
+ val address = "pekko://Main2@hostname.com:3311"
val urlEncodedForm = FormData(Map("operation" -> "leave"))
- val address1 = Address("akka", "Main", "hostname.com", 3311)
+ val address1 = Address("pekko", "Main", "hostname.com", 3311)
val uniqueAddress1 = UniqueAddress(address1, 1L)
@@ -258,12 +246,12 @@ class ClusterHttpManagementRoutesSpec
}
"execute down on a member" when {
- "calling PUT /cluster/members/akka://Main@hostname.com:3311 with form field operation DOWN" in {
+ "calling PUT /cluster/members/pekko://Main@hostname.com:3311 with form field operation DOWN" in {
val urlEncodedForm = FormData(Map("operation" -> "down"))
- val address1 = Address("akka", "Main", "hostname.com", 3311)
- val address2 = Address("akka", "Main", "hostname2.com", 3311)
+ val address1 = Address("pekko", "Main", "hostname.com", 3311)
+ val address2 = Address("pekko", "Main", "hostname2.com", 3311)
val uniqueAddress1 = UniqueAddress(address1, 1L)
val uniqueAddress2 = UniqueAddress(address2, 2L)
@@ -279,7 +267,7 @@ class ClusterHttpManagementRoutesSpec
when(mockedClusterReadView.members).thenReturn(members)
doNothing().when(mockedCluster).down(any[Address])
- Seq("akka://Main@hostname.com:3311", "Main@hostname.com:3311").foreach(address => {
+ Seq("pekko://Main@hostname.com:3311", "Main@hostname.com:3311").foreach(address => {
Put(s"/cluster/members/$address", urlEncodedForm) ~> ClusterHttpManagementRoutes(mockedCluster) ~> check {
status shouldEqual StatusCodes.OK
responseAs[ClusterHttpManagementMessage] shouldEqual ClusterHttpManagementMessage(s"Downing $address1")
@@ -291,7 +279,7 @@ class ClusterHttpManagementRoutesSpec
val urlEncodedForm = FormData(Map("operation" -> "down"))
- val address1 = Address("akka", "Main", "hostname.com", 3311)
+ val address1 = Address("pekko", "Main", "hostname.com", 3311)
val uniqueAddress1 = UniqueAddress(address1, 1L)
@@ -305,7 +293,7 @@ class ClusterHttpManagementRoutesSpec
when(mockedClusterReadView.members).thenReturn(members)
doNothing().when(mockedCluster).down(any[Address])
- Seq("akka://Main2@hostname.com:3311", "Main2@hostname.com:3311").foreach(address => {
+ Seq("pekko://Main2@hostname.com:3311", "Main2@hostname.com:3311").foreach(address => {
Put(s"/cluster/members/$address", urlEncodedForm) ~> ClusterHttpManagementRoutes(mockedCluster) ~> check {
status shouldEqual StatusCodes.NotFound
responseAs[ClusterHttpManagementMessage] shouldEqual ClusterHttpManagementMessage(
@@ -316,11 +304,11 @@ class ClusterHttpManagementRoutesSpec
}
"return not found operation" when {
- "calling PUT /cluster/members/akka://Main@hostname.com:3311 with form field operation UNKNOWN" in {
+ "calling PUT /cluster/members/pekko://Main@hostname.com:3311 with form field operation UNKNOWN" in {
val urlEncodedForm = FormData(Map("operation" -> "unknown"))
- val address1 = Address("akka", "Main", "hostname.com", 3311)
+ val address1 = Address("pekko", "Main", "hostname.com", 3311)
val uniqueAddress1 = UniqueAddress(address1, 1L)
@@ -334,7 +322,7 @@ class ClusterHttpManagementRoutesSpec
when(mockedClusterReadView.members).thenReturn(members)
doNothing().when(mockedCluster).down(any[Address])
- Seq("akka://Main@hostname.com:3311", "Main@hostname.com:3311").foreach(address => {
+ Seq("pekko://Main@hostname.com:3311", "Main@hostname.com:3311").foreach(address => {
Put(s"/cluster/members/$address", urlEncodedForm) ~> ClusterHttpManagementRoutes(mockedCluster) ~> check {
status shouldEqual StatusCodes.BadRequest
responseAs[ClusterHttpManagementMessage] shouldEqual ClusterHttpManagementMessage("Operation not supported")
@@ -345,28 +333,28 @@ class ClusterHttpManagementRoutesSpec
"return shard type names" when {
"calling GET /cluster/shards" in {
- import scala.concurrent.duration._
+ import org.apache.pekko.pattern.ask
- import akka.pattern.ask
+ import scala.concurrent.duration._
val config = ConfigFactory.parseString(
"""
- |akka.cluster {
+ |pekko.cluster {
| auto-down-unreachable-after = 0s
| periodic-tasks-initial-delay = 120 seconds // turn off scheduled tasks
| publish-stats-interval = 0 s # always, when it happens
- | failure-detector.implementation-class = akka.cluster.FailureDetectorPuppet
+ | failure-detector.implementation-class = org.apache.pekko.cluster.FailureDetectorPuppet
| sharding.state-store-mode = ddata
|}
- |akka.actor.provider = "cluster"
- |akka.remote.log-remote-lifecycle-events = off
- |akka.remote.netty.tcp.port = 0
- |akka.remote.artery.canonical.port = 0
+ |pekko.actor.provider = "cluster"
+ |pekko.remote.log-remote-lifecycle-events = off
+ |pekko.remote.netty.tcp.port = 0
+ |pekko.remote.artery.canonical.port = 0
""".stripMargin)
val configClusterHttpManager = ConfigFactory.parseString(
"""
- |akka.management.http.hostname = "127.0.0.1"
- |akka.management.http.port = 20100
+ |pekko.management.http.hostname = "127.0.0.1"
+ |pekko.management.http.port = 20100
""".stripMargin)
implicit val system = ActorSystem("test", config.withFallback(configClusterHttpManager))
@@ -407,28 +395,28 @@ class ClusterHttpManagementRoutesSpec
"return shard region details" when {
"calling GET /cluster/shards/{name}" in {
- import scala.concurrent.duration._
+ import org.apache.pekko.pattern.ask
- import akka.pattern.ask
+ import scala.concurrent.duration._
val config = ConfigFactory.parseString(
"""
- |akka.cluster {
+ |pekko.cluster {
| auto-down-unreachable-after = 0s
| periodic-tasks-initial-delay = 120 seconds // turn off scheduled tasks
| publish-stats-interval = 0 s # always, when it happens
- | failure-detector.implementation-class = akka.cluster.FailureDetectorPuppet
+ | failure-detector.implementation-class = org.apache.pekko.cluster.FailureDetectorPuppet
| sharding.state-store-mode = ddata
|}
- |akka.actor.provider = "cluster"
- |akka.remote.log-remote-lifecycle-events = off
- |akka.remote.netty.tcp.port = 0
- |akka.remote.artery.canonical.port = 0
+ |pekko.actor.provider = "cluster"
+ |pekko.remote.log-remote-lifecycle-events = off
+ |pekko.remote.netty.tcp.port = 0
+ |pekko.remote.artery.canonical.port = 0
""".stripMargin)
val configClusterHttpManager = ConfigFactory.parseString(
"""
- |akka.management.http.hostname = "127.0.0.1"
- |akka.management.http.port = 20100
+ |pekko.management.http.hostname = "127.0.0.1"
+ |pekko.management.http.port = 20100
""".stripMargin)
implicit val system = ActorSystem("test", config.withFallback(configClusterHttpManager))
@@ -480,21 +468,21 @@ class ClusterHttpManagementRoutesSpec
val config = ConfigFactory.parseString(
"""
- |akka.cluster {
+ |pekko.cluster {
| auto-down-unreachable-after = 0s
| periodic-tasks-initial-delay = 120 seconds // turn off scheduled tasks
| publish-stats-interval = 0 s # always, when it happens
- | failure-detector.implementation-class = akka.cluster.FailureDetectorPuppet
+ | failure-detector.implementation-class = org.apache.pekko.cluster.FailureDetectorPuppet
|}
- |akka.actor.provider = "cluster"
- |akka.remote.log-remote-lifecycle-events = off
- |akka.remote.netty.tcp.port = 0
- |akka.remote.artery.canonical.port = 0
+ |pekko.actor.provider = "cluster"
+ |pekko.remote.log-remote-lifecycle-events = off
+ |pekko.remote.netty.tcp.port = 0
+ |pekko.remote.artery.canonical.port = 0
""".stripMargin)
val configClusterHttpManager = ConfigFactory.parseString(
"""
- |akka.management.http.hostname = "127.0.0.1"
- |akka.management.http.port = 20100
+ |pekko.management.http.hostname = "127.0.0.1"
+ |pekko.management.http.port = 20100
""".stripMargin)
implicit val system = ActorSystem("test", config.withFallback(configClusterHttpManager))
diff --git a/management-cluster-http/src/test/scala/akka/management/cluster/ClusterHttpManagementHelperSpec.scala b/management-cluster-http/src/test/scala/org/apache/pekko/cluster/management/ClusterHttpManagementHelperSpec.scala
similarity index 74%
rename from management-cluster-http/src/test/scala/akka/management/cluster/ClusterHttpManagementHelperSpec.scala
rename to management-cluster-http/src/test/scala/org/apache/pekko/cluster/management/ClusterHttpManagementHelperSpec.scala
index 558cf14..77354a9 100644
--- a/management-cluster-http/src/test/scala/akka/management/cluster/ClusterHttpManagementHelperSpec.scala
+++ b/management-cluster-http/src/test/scala/org/apache/pekko/cluster/management/ClusterHttpManagementHelperSpec.scala
@@ -11,15 +11,15 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.cluster.management
+package org.apache.pekko.cluster.management
// Accesses private[cluster] so has to be in this package
-import akka.actor.Address
-import akka.cluster.MemberStatus._
-import akka.cluster.{ Member, UniqueAddress }
-import akka.management.cluster.ClusterHttpManagementHelper
-import akka.util.Version
+import org.apache.pekko.actor.Address
+import org.apache.pekko.cluster.MemberStatus._
+import org.apache.pekko.cluster.{ Member, UniqueAddress }
+import org.apache.pekko.management.cluster.ClusterHttpManagementHelper
+import org.apache.pekko.util.Version
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
@@ -28,10 +28,10 @@ class ClusterHttpManagementHelperSpec extends AnyWordSpec with Matchers {
"Oldest nodes per role" must {
"work" in {
val dc = "dc-one"
- val address1 = Address("akka", "Main", "hostname.com", 3311)
- val address2 = Address("akka", "Main", "hostname2.com", 3311)
- val address3 = Address("akka", "Main", "hostname3.com", 3311)
- val address4 = Address("akka", "Main", "hostname4.com", 3311)
+ val address1 = Address("pekko", "Main", "hostname.com", 3311)
+ val address2 = Address("pekko", "Main", "hostname2.com", 3311)
+ val address3 = Address("pekko", "Main", "hostname3.com", 3311)
+ val address4 = Address("pekko", "Main", "hostname4.com", 3311)
val uniqueAddress1 = UniqueAddress(address1, 1L)
val uniqueAddress2 = UniqueAddress(address2, 2L)
diff --git a/management-cluster-http/src/test/scala/akka/management/cluster/ClusterDomainEventServerSentEventEncoderSpec.scala b/management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/ClusterDomainEventServerSentEventEncoderSpec.scala
similarity index 73%
rename from management-cluster-http/src/test/scala/akka/management/cluster/ClusterDomainEventServerSentEventEncoderSpec.scala
rename to management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/ClusterDomainEventServerSentEventEncoderSpec.scala
index 7053f15..468a7ea 100644
--- a/management-cluster-http/src/test/scala/akka/management/cluster/ClusterDomainEventServerSentEventEncoderSpec.scala
+++ b/management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/ClusterDomainEventServerSentEventEncoderSpec.scala
@@ -11,15 +11,15 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-import akka.actor.Address
-import akka.cluster.MemberStatus
-import akka.cluster.{ ClusterEvent, Member, UniqueAddress }
-import akka.http.scaladsl.model.sse.ServerSentEvent
+import org.apache.pekko.actor.Address
+import org.apache.pekko.cluster.MemberStatus
+import org.apache.pekko.cluster.{ ClusterEvent, Member, UniqueAddress }
+import org.apache.pekko.http.scaladsl.model.sse.ServerSentEvent
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
-import akka.util.Version
+import org.apache.pekko.util.Version
-package akka.cluster.management {
+package org.apache.pekko.cluster.management {
// `Member`'s constructor is private[cluster], hence this
object TestHelpers {
@@ -33,15 +33,15 @@ package akka.cluster.management {
}
}
-package akka.management.cluster {
+package org.apache.pekko.management.cluster {
class ClusterDomainEventServerSentEventEncoderSpec extends AnyWordSpec with Matchers {
- import akka.cluster.management.TestHelpers._
+ import org.apache.pekko.cluster.management.TestHelpers._
"Encoder" must {
"work" in {
val dc = "dc-one"
- val address1 = Address("akka", "Main", "hostname.com", 3311)
+ val address1 = Address("pekko", "Main", "hostname.com", 3311)
val uniqueAddress1 = UniqueAddress(address1, 1L)
val appVersion = Version("2.3.4")
@@ -49,42 +49,42 @@ package akka.management.cluster {
ClusterEvent.MemberJoined(
newMember(uniqueAddress1, 1, MemberStatus.Joining, Set("one", "two", dc), appVersion))) shouldEqual Some(
ServerSentEvent(
- """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Joining","uniqueAddress":{"address":"akka://Main@hostname.com:3311","longUid":1}},"type":"MemberJoined"}""",
+ """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Joining","uniqueAddress":{"address":"pekko://Main@hostname.com:3311","longUid":1}},"type":"MemberJoined"}""",
"MemberJoined"))
ClusterDomainEventServerSentEventEncoder.encode(
ClusterEvent.MemberWeaklyUp(
newMember(uniqueAddress1, 1, MemberStatus.WeaklyUp, Set("one", "two", dc), appVersion))) shouldEqual Some(
ServerSentEvent(
- """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"WeaklyUp","uniqueAddress":{"address":"akka://Main@hostname.com:3311","longUid":1}},"type":"MemberWeaklyUp"}""",
+ """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"WeaklyUp","uniqueAddress":{"address":"pekko://Main@hostname.com:3311","longUid":1}},"type":"MemberWeaklyUp"}""",
"MemberWeaklyUp"))
ClusterDomainEventServerSentEventEncoder.encode(
ClusterEvent.MemberUp(newMember(uniqueAddress1, 1, MemberStatus.Up, Set("one", "two", dc),
appVersion))) shouldEqual Some(
ServerSentEvent(
- """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Up","uniqueAddress":{"address":"akka://Main@hostname.com:3311","longUid":1}},"type":"MemberUp"}""",
+ """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Up","uniqueAddress":{"address":"pekko://Main@hostname.com:3311","longUid":1}},"type":"MemberUp"}""",
"MemberUp"))
ClusterDomainEventServerSentEventEncoder.encode(
ClusterEvent.MemberLeft(newMember(uniqueAddress1, 1, MemberStatus.Leaving, Set("one", "two", dc),
appVersion))) shouldEqual Some(
ServerSentEvent(
- """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Leaving","uniqueAddress":{"address":"akka://Main@hostname.com:3311","longUid":1}},"type":"MemberLeft"}""",
+ """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Leaving","uniqueAddress":{"address":"pekko://Main@hostname.com:3311","longUid":1}},"type":"MemberLeft"}""",
"MemberLeft"))
ClusterDomainEventServerSentEventEncoder.encode(
ClusterEvent.MemberExited(
newMember(uniqueAddress1, 1, MemberStatus.Exiting, Set("one", "two", dc), appVersion))) shouldEqual Some(
ServerSentEvent(
- """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Exiting","uniqueAddress":{"address":"akka://Main@hostname.com:3311","longUid":1}},"type":"MemberExited"}""",
+ """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Exiting","uniqueAddress":{"address":"pekko://Main@hostname.com:3311","longUid":1}},"type":"MemberExited"}""",
"MemberExited"))
ClusterDomainEventServerSentEventEncoder.encode(
ClusterEvent.MemberDowned(newMember(uniqueAddress1, 1, MemberStatus.Down, Set("one", "two", dc),
appVersion))) shouldEqual Some(
ServerSentEvent(
- """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Down","uniqueAddress":{"address":"akka://Main@hostname.com:3311","longUid":1}},"type":"MemberDowned"}""",
+ """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Down","uniqueAddress":{"address":"pekko://Main@hostname.com:3311","longUid":1}},"type":"MemberDowned"}""",
"MemberDowned"))
ClusterDomainEventServerSentEventEncoder.encode(
@@ -92,19 +92,19 @@ package akka.management.cluster {
newMember(uniqueAddress1, 1, MemberStatus.Removed, Set("one", "two", dc), appVersion),
MemberStatus.Down)) shouldEqual Some(
ServerSentEvent(
- """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Removed","uniqueAddress":{"address":"akka://Main@hostname.com:3311","longUid":1}},"previousStatus":"Down","type":"MemberRemoved"}""",
+ """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Removed","uniqueAddress":{"address":"pekko://Main@hostname.com:3311","longUid":1}},"previousStatus":"Down","type":"MemberRemoved"}""",
"MemberRemoved"))
ClusterDomainEventServerSentEventEncoder.encode(
ClusterEvent.LeaderChanged(Some(address1))) shouldEqual Some(
ServerSentEvent(
- """{"address":"akka://Main@hostname.com:3311","type":"LeaderChanged"}""",
+ """{"address":"pekko://Main@hostname.com:3311","type":"LeaderChanged"}""",
"LeaderChanged"))
ClusterDomainEventServerSentEventEncoder.encode(
ClusterEvent.RoleLeaderChanged("test-role", Some(address1))) shouldEqual Some(
ServerSentEvent(
- """{"address":"akka://Main@hostname.com:3311","role":"test-role","type":"RoleLeaderChanged"}""",
+ """{"address":"pekko://Main@hostname.com:3311","role":"test-role","type":"RoleLeaderChanged"}""",
"RoleLeaderChanged"))
ClusterDomainEventServerSentEventEncoder.encode(
@@ -117,14 +117,14 @@ package akka.management.cluster {
ClusterEvent.UnreachableMember(
newMember(uniqueAddress1, 1, MemberStatus.Up, Set("one", "two", dc), appVersion))) shouldEqual Some(
ServerSentEvent(
- """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Up","uniqueAddress":{"address":"akka://Main@hostname.com:3311","longUid":1}},"type":"UnreachableMember"}""",
+ """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Up","uniqueAddress":{"address":"pekko://Main@hostname.com:3311","longUid":1}},"type":"UnreachableMember"}""",
"UnreachableMember"))
ClusterDomainEventServerSentEventEncoder.encode(
ClusterEvent.ReachableMember(newMember(uniqueAddress1, 1, MemberStatus.Up, Set("one", "two", dc),
appVersion))) shouldEqual Some(
ServerSentEvent(
- """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Up","uniqueAddress":{"address":"akka://Main@hostname.com:3311","longUid":1}},"type":"ReachableMember"}""",
+ """{"member":{"dataCenter":"one","roles":["one","two","dc-one"],"status":"Up","uniqueAddress":{"address":"pekko://Main@hostname.com:3311","longUid":1}},"type":"ReachableMember"}""",
"ReachableMember"))
ClusterDomainEventServerSentEventEncoder.encode(
diff --git a/management-cluster-http/src/test/scala/akka/management/cluster/ClusterHttpManagementRouteProviderSpec.scala b/management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/ClusterHttpManagementRouteProviderSpec.scala
similarity index 87%
rename from management-cluster-http/src/test/scala/akka/management/cluster/ClusterHttpManagementRouteProviderSpec.scala
rename to management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/ClusterHttpManagementRouteProviderSpec.scala
index 6ff416c..0b36917 100644
--- a/management-cluster-http/src/test/scala/akka/management/cluster/ClusterHttpManagementRouteProviderSpec.scala
+++ b/management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/ClusterHttpManagementRouteProviderSpec.scala
@@ -11,13 +11,13 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster
+package org.apache.pekko.management.cluster
-import akka.actor.ExtendedActorSystem
-import akka.cluster.Cluster
-import akka.http.scaladsl.model.{ StatusCodes, Uri }
-import akka.http.scaladsl.testkit.ScalatestRouteTest
-import akka.management.scaladsl.ManagementRouteProviderSettings
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.cluster.Cluster
+import org.apache.pekko.http.scaladsl.model.{ StatusCodes, Uri }
+import org.apache.pekko.http.scaladsl.testkit.ScalatestRouteTest
+import org.apache.pekko.management.scaladsl.ManagementRouteProviderSettings
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
diff --git a/management-cluster-http/src/test/scala/akka/management/cluster/MultiDcSpec.scala b/management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/MultiDcSpec.scala
similarity index 65%
rename from management-cluster-http/src/test/scala/akka/management/cluster/MultiDcSpec.scala
rename to management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/MultiDcSpec.scala
index 318532d..87738ab 100644
--- a/management-cluster-http/src/test/scala/akka/management/cluster/MultiDcSpec.scala
+++ b/management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/MultiDcSpec.scala
@@ -11,15 +11,15 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster
+package org.apache.pekko.management.cluster
-import akka.actor.ActorSystem
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.{ HttpRequest, StatusCodes }
-import akka.http.scaladsl.unmarshalling.Unmarshal
-import akka.management.scaladsl.ManagementRouteProviderSettings
-import akka.testkit.SocketUtil
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.scaladsl.Http
+import org.apache.pekko.http.scaladsl.model.{ HttpRequest, StatusCodes }
+import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
+import org.apache.pekko.testkit.SocketUtil
import com.typesafe.config.ConfigFactory
+import org.apache.pekko.management.scaladsl.ManagementRouteProviderSettings
import org.scalatest.concurrent.{ Eventually, ScalaFutures }
import org.scalatest.time.{ Millis, Seconds, Span }
import org.scalatest.matchers.should.Matchers
@@ -36,11 +36,11 @@ class MultiDcSpec
val config = ConfigFactory.parseString(
"""
- |akka.actor.provider = "cluster"
- |akka.remote.log-remote-lifecycle-events = off
- |akka.remote.artery.canonical.hostname = "127.0.0.1"
- |akka.remote.artery.enabled = true
- |#akka.loglevel = DEBUG
+ |pekko.actor.provider = "cluster"
+ |pekko.remote.log-remote-lifecycle-events = off
+ |pekko.remote.artery.canonical.hostname = "127.0.0.1"
+ |pekko.remote.artery.enabled = true
+ |#pekko.loglevel = DEBUG
""".stripMargin)
"Http cluster management" must {
@@ -48,18 +48,18 @@ class MultiDcSpec
val Vector(httpPortA, portA, portB) = SocketUtil.temporaryServerAddresses(3, "127.0.0.1").map(_.getPort)
val dcA = ConfigFactory.parseString(
s"""
- |akka.management.http.hostname = "127.0.0.1"
- |akka.management.http.port = $httpPortA
- |akka.cluster.seed-nodes = ["akka://MultiDcSystem@127.0.0.1:$portA"]
- |akka.cluster.multi-data-center.self-data-center = "DC-A"
- |akka.remote.artery.canonical.port = $portA
- |akka.remote.artery.canonical.port = $portA
+ |pekko.management.http.hostname = "127.0.0.1"
+ |pekko.management.http.port = $httpPortA
+ |pekko.cluster.seed-nodes = ["pekko://MultiDcSystem@127.0.0.1:$portA"]
+ |pekko.cluster.multi-data-center.self-data-center = "DC-A"
+ |pekko.remote.artery.canonical.port = $portA
+ |pekko.remote.artery.canonical.port = $portA
| """.stripMargin)
val dcB = ConfigFactory.parseString(
s"""
- |akka.cluster.seed-nodes = ["akka://MultiDcSystem@127.0.0.1:$portA"]
- |akka.cluster.multi-data-center.self-data-center = "DC-B"
- |akka.remote.artery.canonical.port = $portB
+ |pekko.cluster.seed-nodes = ["pekko://MultiDcSystem@127.0.0.1:$portA"]
+ |pekko.cluster.multi-data-center.self-data-center = "DC-B"
+ |pekko.remote.artery.canonical.port = $portB
| """.stripMargin)
implicit val dcASystem = ActorSystem("MultiDcSystem", config.withFallback(dcA))
diff --git a/management-cluster-http/src/test/scala/akka/management/cluster/scaladsl/ClusterMembershipCheckSettingsSpec.scala b/management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/scaladsl/ClusterMembershipCheckSettingsSpec.scala
similarity index 94%
rename from management-cluster-http/src/test/scala/akka/management/cluster/scaladsl/ClusterMembershipCheckSettingsSpec.scala
rename to management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/scaladsl/ClusterMembershipCheckSettingsSpec.scala
index c180bc8..2e6a3f9 100644
--- a/management-cluster-http/src/test/scala/akka/management/cluster/scaladsl/ClusterMembershipCheckSettingsSpec.scala
+++ b/management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/scaladsl/ClusterMembershipCheckSettingsSpec.scala
@@ -11,9 +11,9 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.scaladsl
+package org.apache.pekko.management.cluster.scaladsl
-import akka.cluster.MemberStatus
+import org.apache.pekko.cluster.MemberStatus
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
diff --git a/management-cluster-http/src/test/scala/akka/management/cluster/scaladsl/ClusterMembershipCheckSpec.scala b/management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/scaladsl/ClusterMembershipCheckSpec.scala
similarity index 88%
rename from management-cluster-http/src/test/scala/akka/management/cluster/scaladsl/ClusterMembershipCheckSpec.scala
rename to management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/scaladsl/ClusterMembershipCheckSpec.scala
index 1c494f5..37c77d7 100644
--- a/management-cluster-http/src/test/scala/akka/management/cluster/scaladsl/ClusterMembershipCheckSpec.scala
+++ b/management-cluster-http/src/test/scala/org/apache/pekko/management/cluster/scaladsl/ClusterMembershipCheckSpec.scala
@@ -11,11 +11,11 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.cluster.scaladsl
+package org.apache.pekko.management.cluster.scaladsl
-import akka.actor.ActorSystem
-import akka.cluster.MemberStatus
-import akka.testkit.TestKit
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.cluster.MemberStatus
+import org.apache.pekko.testkit.TestKit
import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.matchers.should.Matchers
diff --git a/management-loglevels-log4j2/src/main/resources/reference.conf b/management-loglevels-log4j2/src/main/resources/reference.conf
index a1e6667..a53a61b 100644
--- a/management-loglevels-log4j2/src/main/resources/reference.conf
+++ b/management-loglevels-log4j2/src/main/resources/reference.conf
@@ -1,3 +1,3 @@
-akka.management.http.routes {
- loglevels-log4j2 = "akka.management.loglevels.log4j2.LogLevelRoutes"
+pekko.management.http.routes {
+ loglevels-log4j2 = "org.apache.pekko.management.loglevels.log4j2.LogLevelRoutes"
}
diff --git a/management-loglevels-log4j2/src/main/scala/akka/management/loglevels/log4j2/LogLevelRoutes.scala b/management-loglevels-log4j2/src/main/scala/org/apache/pekko/management/loglevels/log4j2/LogLevelRoutes.scala
similarity index 83%
rename from management-loglevels-log4j2/src/main/scala/akka/management/loglevels/log4j2/LogLevelRoutes.scala
rename to management-loglevels-log4j2/src/main/scala/org/apache/pekko/management/loglevels/log4j2/LogLevelRoutes.scala
index 2c37c05..9cce789 100644
--- a/management-loglevels-log4j2/src/main/scala/akka/management/loglevels/log4j2/LogLevelRoutes.scala
+++ b/management-loglevels-log4j2/src/main/scala/org/apache/pekko/management/loglevels/log4j2/LogLevelRoutes.scala
@@ -11,18 +11,18 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.loglevels.log4j2
-
-import akka.actor.{ ExtendedActorSystem, Extension, ExtensionId }
-import akka.annotation.InternalApi
-import akka.event.{ Logging => ClassicLogging }
-import akka.http.scaladsl.model.StatusCodes
-import akka.http.scaladsl.server.Directives._
-import akka.http.scaladsl.server.Route
-import akka.http.scaladsl.unmarshalling.Unmarshaller
-import akka.management.scaladsl.{ ManagementRouteProvider, ManagementRouteProviderSettings }
-import org.apache.logging.log4j.{ Level, LogManager }
+package org.apache.pekko.management.loglevels.log4j2
+
import org.apache.logging.log4j.core.LoggerContext
+import org.apache.logging.log4j.{ Level, LogManager }
+import org.apache.pekko.actor.{ ExtendedActorSystem, Extension, ExtensionId }
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.event.{ Logging => ClassicLogging }
+import org.apache.pekko.http.scaladsl.model.StatusCodes
+import org.apache.pekko.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.server.Route
+import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller
+import org.apache.pekko.management.scaladsl.{ ManagementRouteProvider, ManagementRouteProviderSettings }
import org.slf4j.LoggerFactory
object LogLevelRoutes extends ExtensionId[LogLevelRoutes] {
@@ -58,7 +58,7 @@ final class LogLevelRoutes private (system: ExtendedActorSystem) extends Extensi
} else {
log.info(
s"Log level for [${if (logger.equals(LogManager.ROOT_LOGGER_NAME)) "Root"
- else logger}] set to [$level] through Akka Management loglevel endpoint from [$clientIp]")
+ else logger}] set to [$level] through Pekko Management loglevel endpoint from [$clientIp]")
val context = LogManager.getContext(false).asInstanceOf[LoggerContext]
val config = context.getConfiguration
val loggerConfig = config.getLoggerConfig(logger)
@@ -80,7 +80,7 @@ final class LogLevelRoutes private (system: ExtendedActorSystem) extends Extensi
}
}
} ~
- path("akka") {
+ path("pekko") {
get {
complete(classicLogLevelName(system.eventStream.logLevel))
} ~
@@ -90,7 +90,7 @@ final class LogLevelRoutes private (system: ExtendedActorSystem) extends Extensi
else {
parameter("level".as[ClassicLogging.LogLevel]) { level =>
log.info(
- "Akka loglevel set to [{}] through Akka Management loglevel endpoint from [{}]",
+ "Pekko loglevel set to [{}] through Pekko Management loglevel endpoint from [{}]",
Array[Object](classicLogLevelName(level), clientIp): _*)
system.eventStream.setLogLevel(level)
complete(StatusCodes.OK)
@@ -108,7 +108,7 @@ final class LogLevelRoutes private (system: ExtendedActorSystem) extends Extensi
* INTERNAL API
*/
@InternalApi
-private[akka] object LoggingUnmarshallers {
+private[pekko] object LoggingUnmarshallers {
private val validLevels =
Set(Level.ALL, Level.DEBUG, Level.ERROR, Level.INFO, Level.OFF, Level.TRACE, Level.WARN).map(_.toString)
diff --git a/management-loglevels-log4j2/src/test/scala/akka/management/loglevels/log4j2/LogLevelRoutesSpec.scala b/management-loglevels-log4j2/src/test/scala/org/apache/pekko/management/loglevels/log4j2/LogLevelRoutesSpec.scala
similarity index 82%
rename from management-loglevels-log4j2/src/test/scala/akka/management/loglevels/log4j2/LogLevelRoutesSpec.scala
rename to management-loglevels-log4j2/src/test/scala/org/apache/pekko/management/loglevels/log4j2/LogLevelRoutesSpec.scala
index 7fe8d32..d6ee6f8 100644
--- a/management-loglevels-log4j2/src/test/scala/akka/management/loglevels/log4j2/LogLevelRoutesSpec.scala
+++ b/management-loglevels-log4j2/src/test/scala/org/apache/pekko/management/loglevels/log4j2/LogLevelRoutesSpec.scala
@@ -11,14 +11,14 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.loglevels.log4j2
-
-import akka.actor.ExtendedActorSystem
-import akka.event.{ Logging => ClassicLogging }
-import akka.http.javadsl.server.MalformedQueryParamRejection
-import akka.http.scaladsl.model.{ StatusCodes, Uri }
-import akka.http.scaladsl.testkit.ScalatestRouteTest
-import akka.management.scaladsl.ManagementRouteProviderSettings
+package org.apache.pekko.management.loglevels.log4j2
+
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.event.{ Logging => ClassicLogging }
+import org.apache.pekko.http.javadsl.server.MalformedQueryParamRejection
+import org.apache.pekko.http.scaladsl.model.{ StatusCodes, Uri }
+import org.apache.pekko.http.scaladsl.testkit.ScalatestRouteTest
+import org.apache.pekko.management.scaladsl.ManagementRouteProviderSettings
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
import org.slf4j.LoggerFactory
@@ -27,7 +27,7 @@ class LogLevelRoutesSpec extends AnyWordSpec with Matchers with ScalatestRouteTe
override def testConfigSource: String =
"""
- akka.loglevel = INFO
+ pekko.loglevel = INFO
"""
val routes = LogLevelRoutes
@@ -89,15 +89,15 @@ class LogLevelRoutesSpec extends AnyWordSpec with Matchers with ScalatestRouteTe
}
}
- "allow inspecting classic Akka loglevel" in {
- Get("/loglevel/akka") ~> routes ~> check {
+ "allow inspecting classic Pekko loglevel" in {
+ Get("/loglevel/pekko") ~> routes ~> check {
response.status should ===(StatusCodes.OK)
responseAs[String] should ===("INFO")
}
}
- "allow changing classic Akka loglevel" in {
- Put("/loglevel/akka?level=DEBUG") ~> routes ~> check {
+ "allow changing classic Pekko loglevel" in {
+ Put("/loglevel/pekko?level=DEBUG") ~> routes ~> check {
response.status should ===(StatusCodes.OK)
system.eventStream.logLevel should ===(ClassicLogging.DebugLevel)
}
diff --git a/management-loglevels-logback/src/main/resources/reference.conf b/management-loglevels-logback/src/main/resources/reference.conf
index aabbadb..f0dfaeb 100644
--- a/management-loglevels-logback/src/main/resources/reference.conf
+++ b/management-loglevels-logback/src/main/resources/reference.conf
@@ -1,3 +1,3 @@
-akka.management.http.routes {
- loglevels-logback = "akka.management.loglevels.logback.LogLevelRoutes"
+pekko.management.http.routes {
+ loglevels-logback = "org.apache.pekko.management.loglevels.logback.LogLevelRoutes"
}
diff --git a/management-loglevels-logback/src/main/scala/akka/management/loglevels/logback/LogLevelRoutes.scala b/management-loglevels-logback/src/main/scala/org/apache/pekko/management/loglevels/logback/LogLevelRoutes.scala
similarity index 83%
rename from management-loglevels-logback/src/main/scala/akka/management/loglevels/logback/LogLevelRoutes.scala
rename to management-loglevels-logback/src/main/scala/org/apache/pekko/management/loglevels/logback/LogLevelRoutes.scala
index 59c25e6..9a8d25b 100644
--- a/management-loglevels-logback/src/main/scala/akka/management/loglevels/logback/LogLevelRoutes.scala
+++ b/management-loglevels-logback/src/main/scala/org/apache/pekko/management/loglevels/logback/LogLevelRoutes.scala
@@ -11,22 +11,18 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.loglevels.logback
+package org.apache.pekko.management.loglevels.logback
-import akka.actor.ExtendedActorSystem
-import akka.actor.Extension
-import akka.actor.ExtensionId
-import akka.annotation.InternalApi
-import akka.http.scaladsl.model.StatusCodes
-import akka.http.scaladsl.server.Route
-import akka.management.scaladsl.ManagementRouteProvider
-import akka.management.scaladsl.ManagementRouteProviderSettings
-import akka.http.scaladsl.server.Directives._
-import akka.http.scaladsl.unmarshalling.Unmarshaller
-import ch.qos.logback.classic.Level
-import ch.qos.logback.classic.LoggerContext
+import ch.qos.logback.classic.{ Level, LoggerContext }
+import org.apache.pekko.actor.{ ExtendedActorSystem, Extension, ExtensionId }
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.event.{ Logging => ClassicLogging }
+import org.apache.pekko.http.scaladsl.model.StatusCodes
+import org.apache.pekko.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.server.Route
+import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller
+import org.apache.pekko.management.scaladsl.{ ManagementRouteProvider, ManagementRouteProviderSettings }
import org.slf4j.LoggerFactory
-import akka.event.{ Logging => ClassicLogging }
object LogLevelRoutes extends ExtensionId[LogLevelRoutes] {
override def createExtension(system: ExtendedActorSystem): LogLevelRoutes =
@@ -65,7 +61,7 @@ final class LogLevelRoutes private (system: ExtendedActorSystem) extends Extensi
val logger = getLogger(loggerName)
if (logger != null) {
logger.info(
- "Log level for [{}] set to [{}] through Akka Management loglevel endpoint from [{}]",
+ "Log level for [{}] set to [{}] through Pekko Management loglevel endpoint from [{}]",
loggerName,
level,
clientIp)
@@ -88,7 +84,7 @@ final class LogLevelRoutes private (system: ExtendedActorSystem) extends Extensi
})
}
},
- path("akka") {
+ path("pekko") {
concat(
get {
complete(classicLogLevelName(system.eventStream.logLevel))
@@ -100,7 +96,7 @@ final class LogLevelRoutes private (system: ExtendedActorSystem) extends Extensi
parameter("level".as[ClassicLogging.LogLevel]) { level =>
extractClientIP { clientIp =>
logger.info(
- "Akka loglevel set to [{}] through Akka Management loglevel endpoint from [{}]",
+ "Pekko loglevel set to [{}] through Pekko Management loglevel endpoint from [{}]",
Array[Object](classicLogLevelName(level), clientIp): _*)
system.eventStream.setLogLevel(level)
complete(StatusCodes.OK)
@@ -116,7 +112,7 @@ final class LogLevelRoutes private (system: ExtendedActorSystem) extends Extensi
* INTERNAL API
*/
@InternalApi
-private[akka] object LoggingUnmarshallers {
+private[pekko] object LoggingUnmarshallers {
private val validLevels =
Set(Level.ALL, Level.DEBUG, Level.ERROR, Level.INFO, Level.OFF, Level.TRACE, Level.WARN).map(_.toString)
diff --git a/management-loglevels-logback/src/test/scala/akka/management/loglevels/logback/LogLevelRoutesSpec.scala b/management-loglevels-logback/src/test/scala/org/apache/pekko/management/loglevels/logback/LogLevelRoutesSpec.scala
similarity index 76%
rename from management-loglevels-logback/src/test/scala/akka/management/loglevels/logback/LogLevelRoutesSpec.scala
rename to management-loglevels-logback/src/test/scala/org/apache/pekko/management/loglevels/logback/LogLevelRoutesSpec.scala
index 371830c..89a96eb 100644
--- a/management-loglevels-logback/src/test/scala/akka/management/loglevels/logback/LogLevelRoutesSpec.scala
+++ b/management-loglevels-logback/src/test/scala/org/apache/pekko/management/loglevels/logback/LogLevelRoutesSpec.scala
@@ -11,24 +11,23 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.loglevels.logback
+package org.apache.pekko.management.loglevels.logback
-import akka.actor.ExtendedActorSystem
-import akka.http.javadsl.server.MalformedQueryParamRejection
-import akka.http.scaladsl.model.StatusCodes
-import akka.http.scaladsl.model.Uri
-import akka.http.scaladsl.testkit.ScalatestRouteTest
-import akka.management.scaladsl.ManagementRouteProviderSettings
-import org.slf4j.LoggerFactory
-import akka.event.{ Logging => ClassicLogging }
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.event.{ Logging => ClassicLogging }
+import org.apache.pekko.http.javadsl.server.MalformedQueryParamRejection
+import org.apache.pekko.http.scaladsl.model.{ StatusCodes, Uri }
+import org.apache.pekko.http.scaladsl.testkit.ScalatestRouteTest
+import org.apache.pekko.management.scaladsl.ManagementRouteProviderSettings
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
+import org.slf4j.LoggerFactory
class LogLevelRoutesSpec extends AnyWordSpec with Matchers with ScalatestRouteTest {
override def testConfigSource: String =
"""
- akka.loglevel = INFO
+ pekko.loglevel = INFO
"""
val routes = LogLevelRoutes
@@ -65,15 +64,15 @@ class LogLevelRoutesSpec extends AnyWordSpec with Matchers with ScalatestRouteTe
}
}
- "allow inspecting classic Akka loglevel" in {
- Get("/loglevel/akka") ~> routes ~> check {
+ "allow inspecting classic Pekko loglevel" in {
+ Get("/loglevel/pekko") ~> routes ~> check {
response.status should ===(StatusCodes.OK)
responseAs[String] should ===("INFO")
}
}
- "allow changing classic Akka loglevel" in {
- Put("/loglevel/akka?level=DEBUG") ~> routes ~> check {
+ "allow changing classic Pekko loglevel" in {
+ Put("/loglevel/pekko?level=DEBUG") ~> routes ~> check {
response.status should ===(StatusCodes.OK)
system.eventStream.logLevel should ===(ClassicLogging.DebugLevel)
}
diff --git a/management-pki/src/main/scala/akka/pki/kubernetes/PemManagersProvider.scala b/management-pki/src/main/scala/org/apache/pekko/pki/kubernetes/PemManagersProvider.scala
similarity index 84%
rename from management-pki/src/main/scala/akka/pki/kubernetes/PemManagersProvider.scala
rename to management-pki/src/main/scala/org/apache/pekko/pki/kubernetes/PemManagersProvider.scala
index 98e6d66..ddba51c 100644
--- a/management-pki/src/main/scala/akka/pki/kubernetes/PemManagersProvider.scala
+++ b/management-pki/src/main/scala/org/apache/pekko/pki/kubernetes/PemManagersProvider.scala
@@ -11,7 +11,7 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.pki.kubernetes
+package org.apache.pekko.pki.kubernetes
import collection.JavaConverters._
import java.io.ByteArrayInputStream
@@ -23,9 +23,9 @@ import java.security.PrivateKey
import java.security.cert.Certificate
import java.security.cert.CertificateFactory
import scala.concurrent.blocking
-import akka.annotation.InternalApi
-import akka.pki.pem.DERPrivateKeyLoader
-import akka.pki.pem.PEMDecoder
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.pki.pem.DERPrivateKeyLoader
+import org.apache.pekko.pki.pem.PEMDecoder
import javax.net.ssl.TrustManager
import javax.net.ssl.TrustManagerFactory
import scala.util.Random
@@ -34,11 +34,11 @@ import scala.util.Random
* INTERNAL API
* Convenience methods to ease building an SSLContext from k8s-provided PEM files.
*/
-// Duplicate from https://github.com/akka/akka/blob/31f654768f86db68f4c22daa2cbd0bae28fc1fad/akka-remote/src/main/scala/akka/remote/artery/tcp/ssl/PemManagersProvider.scala#L35
-// Eventually that will be a bit more open and we can reuse the class from akka in akka-management.
+// Duplicate from https://github.com/akka/akka/blob/31f654768f86db68f4c22daa2cbd0bae28fc1fad/akka-remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/PemManagersProvider.scala#L35
+// Eventually that will be a bit more open and we can reuse the class from Pekko in pekko-management.
// See also https://github.com/akka/akka-http/issues/3772
@InternalApi
-private[akka] object PemManagersProvider {
+private[pekko] object PemManagersProvider {
/**
* INTERNAL API
diff --git a/management/src/main/resources/reference.conf b/management/src/main/resources/reference.conf
index 4f79104..d682c8b 100644
--- a/management/src/main/resources/reference.conf
+++ b/management/src/main/resources/reference.conf
@@ -1,11 +1,11 @@
######################################################
-# Akka Http Cluster Management Reference Config File #
+# Apache Pekko Http Cluster Management Reference Config File #
######################################################
# This is the reference config file that contains all the default settings.
# Make your edits/overrides in your application.conf.
-akka.management {
+pekko.management {
http {
# The hostname where the HTTP Server for Http Cluster Management will be started.
# This defines the interface to use.
@@ -14,36 +14,36 @@ akka.management {
# The port where the HTTP Server for Http Cluster Management will be bound.
# The value will need to be from 0 to 65535.
- port = 8558 # port pun, it "complements" 2552 which is often used for Akka remoting
+ port = 8558 # port pun, it "complements" 2552 which is often used for Pekko remoting
# Use this setting to bind a network interface to a different hostname or ip
# than the HTTP Server for Http Cluster Management.
# Use "0.0.0.0" to bind to all interfaces.
- # akka.management.http.hostname if empty
+ # pekko.management.http.hostname if empty
bind-hostname = ""
# Use this setting to bind a network interface to a different port
# than the HTTP Server for Http Cluster Management. This may be used
- # when running akka nodes in a separated networks (under NATs or docker containers).
+ # when running Pekko nodes in a separated networks (under NATs or docker containers).
# Use 0 if you want a random available port.
#
- # akka.management.http.port if empty
+ # pekko.management.http.port if empty
bind-port = ""
# path prefix for all management routes, usually best to keep the default value here. If
- # specified, you'll want to use the same value for all nodes that use akka management so
+ # specified, you'll want to use the same value for all nodes that use Pekko management so
# that they can know which path to access each other on.
base-path = ""
# Definition of management route providers which shall contribute routes to the management HTTP endpoint.
- # Management route providers should be regular extensions that aditionally extend the
- # `akka.management.scaladsl.ManagementRoutesProvider` or
- # `akka.management.javadsl.ManagementRoutesProvider` interface.
+ # Management route providers should be regular extensions that additionally extend the
+ # `org.apache.pekko.management.scaladsl.ManagementRoutesProvider` or
+ # `org.apache.pekko.management.javadsl.ManagementRoutesProvider` interface.
#
# Libraries may register routes into the management routes by defining entries to this setting
# the library `reference.conf`:
#
- # akka.management.http.routes {
+ # pekko.management.http.routes {
# name = "FQCN"
# }
#
@@ -52,17 +52,17 @@ akka.management {
#
# The FQCN is the fully qualified class name of the `ManagementRoutesProvider`.
#
- # By default the `akka.management.HealthCheckRoutes` is enabled, see `health-checks` section of how
+ # By default the `org.apache.pekko.management.HealthCheckRoutes` is enabled, see `health-checks` section of how
# configure specific readiness and liveness checks.
#
# Route providers included by a library (from reference.conf) can be excluded by an application
# by using "" or null as the FQCN of the named entry, for example:
#
- # akka.management.http.routes {
+ # pekko.management.http.routes {
# health-checks = ""
# }
routes {
- health-checks = "akka.management.HealthCheckRoutes"
+ health-checks = "org.apache.pekko.management.HealthCheckRoutes"
}
# Should Management route providers only expose read only endpoints? It is up to each route provider
@@ -72,9 +72,9 @@ akka.management {
# Health checks for readiness and liveness
health-checks {
- # When exposting health checks via Akka Management, the path to expost readiness checks on
+ # When exposting health checks via Pekko Management, the path to expost readiness checks on
readiness-path = "ready"
- # When exposting health checks via Akka Management, the path to expost readiness checks on
+ # When exposting health checks via Pekko Management, the path to expost readiness checks on
liveness-path = "alive"
# All readiness checks are executed in parallel and given this long before the check is timed out
check-timeout = 1s
@@ -84,7 +84,7 @@ akka.management {
#
# For example:
#
- # cluster-membership = "akka.management.cluster.scaladsl.ClusterMembershipCheck"
+ # cluster-membership = "org.apache.pekko.management.cluster.scaladsl.ClusterMembershipCheck"
#
# Libraries and frameworks that contribute checks are expected to add their own checks to their reference.conf.
# Applications can add their own checks to application.conf.
diff --git a/management/src/main/scala/akka/management/HealthCheckRoutes.scala b/management/src/main/scala/org/apache/pekko/management/HealthCheckRoutes.scala
similarity index 71%
rename from management/src/main/scala/akka/management/HealthCheckRoutes.scala
rename to management/src/main/scala/org/apache/pekko/management/HealthCheckRoutes.scala
index 2ebad64..5d19831 100644
--- a/management/src/main/scala/akka/management/HealthCheckRoutes.scala
+++ b/management/src/main/scala/org/apache/pekko/management/HealthCheckRoutes.scala
@@ -11,14 +11,14 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management
+package org.apache.pekko.management
-import akka.actor.ExtendedActorSystem
-import akka.annotation.InternalApi
-import akka.http.scaladsl.model._
-import akka.http.scaladsl.server.Directives._
-import akka.http.scaladsl.server.{ PathMatchers, Route }
-import akka.management.scaladsl.{ HealthChecks, ManagementRouteProvider, ManagementRouteProviderSettings }
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.http.scaladsl.model._
+import org.apache.pekko.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.server.{ PathMatchers, Route }
+import org.apache.pekko.management.scaladsl.{ HealthChecks, ManagementRouteProvider, ManagementRouteProviderSettings }
import scala.util.{ Failure, Success, Try }
@@ -29,10 +29,10 @@ import scala.util.{ Failure, Success, Try }
* for ManagementRouteProviders
*/
@InternalApi
-private[akka] class HealthCheckRoutes(system: ExtendedActorSystem) extends ManagementRouteProvider {
+private[pekko] class HealthCheckRoutes(system: ExtendedActorSystem) extends ManagementRouteProvider {
private val settings: HealthCheckSettings = HealthCheckSettings(
- system.settings.config.getConfig("akka.management.health-checks"))
+ system.settings.config.getConfig("pekko.management.health-checks"))
// exposed for testing
protected val healthChecks = HealthChecks(system, settings)
diff --git a/management/src/main/scala/akka/management/HealthCheckSettings.scala b/management/src/main/scala/org/apache/pekko/management/HealthCheckSettings.scala
similarity index 96%
rename from management/src/main/scala/akka/management/HealthCheckSettings.scala
rename to management/src/main/scala/org/apache/pekko/management/HealthCheckSettings.scala
index f409df3..8b23d6f 100644
--- a/management/src/main/scala/akka/management/HealthCheckSettings.scala
+++ b/management/src/main/scala/org/apache/pekko/management/HealthCheckSettings.scala
@@ -11,10 +11,10 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management
+package org.apache.pekko.management
import com.typesafe.config.Config
-import akka.util.JavaDurationConverters._
+import org.apache.pekko.util.JavaDurationConverters._
import scala.collection.JavaConverters._
import scala.collection.immutable
diff --git a/management/src/main/scala/akka/management/InvalidHealthCheckException.scala b/management/src/main/scala/org/apache/pekko/management/InvalidHealthCheckException.scala
similarity index 93%
rename from management/src/main/scala/akka/management/InvalidHealthCheckException.scala
rename to management/src/main/scala/org/apache/pekko/management/InvalidHealthCheckException.scala
index 98b6fb9..6af9295 100644
--- a/management/src/main/scala/akka/management/InvalidHealthCheckException.scala
+++ b/management/src/main/scala/org/apache/pekko/management/InvalidHealthCheckException.scala
@@ -11,7 +11,7 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management
+package org.apache.pekko.management
final class InvalidHealthCheckException(msg: String, c: Throwable) extends RuntimeException(msg, c) {
def this(msg: String) = this(msg, null)
diff --git a/management/src/main/scala/akka/management/ManagementLogMarker.scala b/management/src/main/scala/org/apache/pekko/management/ManagementLogMarker.scala
similarity index 55%
rename from management/src/main/scala/akka/management/ManagementLogMarker.scala
rename to management/src/main/scala/org/apache/pekko/management/ManagementLogMarker.scala
index ff3ff73..2eb7cdc 100644
--- a/management/src/main/scala/akka/management/ManagementLogMarker.scala
+++ b/management/src/main/scala/org/apache/pekko/management/ManagementLogMarker.scala
@@ -11,11 +11,11 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management
+package org.apache.pekko.management
-import akka.annotation.ApiMayChange
-import akka.annotation.InternalApi
-import akka.event.LogMarker
+import org.apache.pekko.annotation.ApiMayChange
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.event.LogMarker
/**
* This is public with the purpose to document the used markers and properties of log events.
@@ -28,27 +28,27 @@ object ManagementLogMarker {
/**
* INTERNAL API
*/
- @InternalApi private[akka] object Properties {
- val HttpAddress = "akkaHttpAddress"
+ @InternalApi private[pekko] object Properties {
+ val HttpAddress = "pekkoHttpAddress"
}
/**
- * Marker "akkaManagementBound" of log event when Akka Management HTPP endpoint has been bound.
- * @param boundAddress The hostname and port of the bound interface. Included as property "akkaHttpAddress".
+ * Marker "pekkoManagementBound" of log event when Pekko Management HTTP endpoint has been bound.
+ * @param boundAddress The hostname and port of the bound interface. Included as property "pekkoHttpAddress".
*/
def boundHttp(boundAddress: String): LogMarker =
- LogMarker("akkaManagementBound", Map(Properties.HttpAddress -> boundAddress))
+ LogMarker("pekkoManagementBound", Map(Properties.HttpAddress -> boundAddress))
/**
- * Marker "readinessCheckFailed" of log event when a readiness check fails.
+ * Marker "pekkoReadinessCheckFailed" of log event when a readiness check fails.
*/
val readinessCheckFailed: LogMarker =
- LogMarker("akkaReadinessCheckFailed")
+ LogMarker("pekkoReadinessCheckFailed")
/**
- * Marker "akkaLivenessCheckFailed" of log event when a readiness check fails.
+ * Marker "pekkoLivenessCheckFailed" of log event when a readiness check fails.
*/
val livenessCheckFailed: LogMarker =
- LogMarker("akkaLivenessCheckFailed")
+ LogMarker("pekkoLivenessCheckFailed")
}
diff --git a/management/src/main/scala/akka/management/AkkaManagementSettings.scala b/management/src/main/scala/org/apache/pekko/management/PekkoManagementSettings.scala
similarity index 86%
rename from management/src/main/scala/akka/management/AkkaManagementSettings.scala
rename to management/src/main/scala/org/apache/pekko/management/PekkoManagementSettings.scala
index 9c5ae61..d8fae9b 100644
--- a/management/src/main/scala/akka/management/AkkaManagementSettings.scala
+++ b/management/src/main/scala/org/apache/pekko/management/PekkoManagementSettings.scala
@@ -11,7 +11,7 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management
+package org.apache.pekko.management
import java.net.InetAddress
import java.util.Optional
@@ -20,11 +20,11 @@ import scala.collection.JavaConverters._
import scala.collection.immutable
import scala.compat.java8.OptionConverters._
-import akka.annotation.InternalApi
+import org.apache.pekko.annotation.InternalApi
import com.typesafe.config.Config
-final class AkkaManagementSettings(val config: Config) {
- private val managementConfig = config.getConfig("akka.management")
+final class PekkoManagementSettings(val config: Config) {
+ private val managementConfig = config.getConfig("pekko.management")
object Http {
private val cc = managementConfig.getConfig("http")
@@ -38,7 +38,7 @@ final class AkkaManagementSettings(val config: Config) {
val Port: Int = {
val p = cc.getInt("port")
- require(0 to 65535 contains p, s"akka.management.http.port must be 0 through 65535 (was ${p})")
+ require(0 to 65535 contains p, s"pekko.management.http.port must be 0 through 65535 (was ${p})")
p
}
@@ -51,7 +51,7 @@ final class AkkaManagementSettings(val config: Config) {
case "" => Port
case value =>
val p = value.toInt
- require(0 to 65535 contains p, s"akka.management.http.bind-port must be 0 through 65535 (was ${p})")
+ require(0 to 65535 contains p, s"pekko.management.http.bind-port must be 0 through 65535 (was ${p})")
p
}
@@ -101,7 +101,7 @@ final class AkkaManagementSettings(val config: Config) {
/**
* INTERNAL API
*/
-@InternalApi private[akka] object AkkaManagementSettings {
+@InternalApi private[pekko] object PekkoManagementSettings {
implicit class HasDefined(val config: Config) {
def hasDefined(key: String): Boolean =
diff --git a/management/src/main/scala/akka/management/internal/HealthChecksImpl.scala b/management/src/main/scala/org/apache/pekko/management/internal/HealthChecksImpl.scala
similarity index 89%
rename from management/src/main/scala/akka/management/internal/HealthChecksImpl.scala
rename to management/src/main/scala/org/apache/pekko/management/internal/HealthChecksImpl.scala
index 6cc8d0d..8cd20ff 100644
--- a/management/src/main/scala/akka/management/internal/HealthChecksImpl.scala
+++ b/management/src/main/scala/org/apache/pekko/management/internal/HealthChecksImpl.scala
@@ -11,30 +11,31 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.internal
+package org.apache.pekko.management.internal
import java.util.concurrent.CompletionStage
import java.util.function.Supplier
import java.util.{ List => JList }
import java.lang.{ Boolean => JBoolean }
+import org.apache.pekko.actor.{ ActorSystem, ExtendedActorSystem }
+import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko.event.Logging
+import org.apache.pekko.management.{
+ HealthCheckSettings,
+ InvalidHealthCheckException,
+ ManagementLogMarker,
+ NamedHealthCheck
+}
+import org.apache.pekko.management.javadsl.{ LivenessCheckSetup => JLivenessCheckSetup }
+import org.apache.pekko.management.javadsl.{ ReadinessCheckSetup => JReadinessCheckSetup }
+import org.apache.pekko.management.scaladsl.{ HealthChecks, LivenessCheckSetup, ReadinessCheckSetup }
-import akka.actor.{ ActorSystem, ExtendedActorSystem }
-import akka.annotation.InternalApi
-import akka.event.Logging
-import akka.management.{ HealthCheckSettings, InvalidHealthCheckException, NamedHealthCheck }
-import akka.management.scaladsl.HealthChecks
import scala.collection.immutable
import scala.collection.JavaConverters._
import scala.compat.java8.FutureConverters._
import scala.concurrent.Future
import scala.util.{ Failure, Success, Try }
-import akka.management.ManagementLogMarker
-import akka.management.scaladsl.LivenessCheckSetup
-import akka.management.scaladsl.ReadinessCheckSetup
-import akka.management.javadsl.{ LivenessCheckSetup => JLivenessCheckSetup }
-import akka.management.javadsl.{ ReadinessCheckSetup => JReadinessCheckSetup }
-
final case class CheckFailedException(msg: String, cause: Throwable) extends RuntimeException(msg, cause)
final case class CheckTimeoutException(msg: String) extends RuntimeException(msg)
@@ -43,7 +44,7 @@ final case class CheckTimeoutException(msg: String) extends RuntimeException(msg
* INTERNAL API
*/
@InternalApi
-final private[akka] class HealthChecksImpl(system: ExtendedActorSystem, settings: HealthCheckSettings)
+final private[pekko] class HealthChecksImpl(system: ExtendedActorSystem, settings: HealthCheckSettings)
extends HealthChecks {
import HealthChecks._
import system.dispatcher
@@ -180,7 +181,7 @@ final private[akka] class HealthChecksImpl(system: ExtendedActorSystem, settings
}
private def check(checks: immutable.Seq[HealthCheck]): Future[Either[String, Unit]] = {
- val timeout = akka.pattern.after(settings.checkTimeout, system.scheduler)(
+ val timeout = org.apache.pekko.pattern.after(settings.checkTimeout, system.scheduler)(
Future.failed(new RuntimeException) // will be enriched with which check timed out below
)
diff --git a/management/src/main/scala/akka/management/javadsl/HealthChecks.scala b/management/src/main/scala/org/apache/pekko/management/javadsl/HealthChecks.scala
similarity index 90%
rename from management/src/main/scala/akka/management/javadsl/HealthChecks.scala
rename to management/src/main/scala/org/apache/pekko/management/javadsl/HealthChecks.scala
index e110adb..8b14bed 100644
--- a/management/src/main/scala/akka/management/javadsl/HealthChecks.scala
+++ b/management/src/main/scala/org/apache/pekko/management/javadsl/HealthChecks.scala
@@ -11,25 +11,24 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.javadsl
+package org.apache.pekko.management.javadsl
import java.util.concurrent.CompletionStage
import java.util.function.Supplier
import java.util.function.{ Function => JFunction }
import java.util.{ List => JList, Optional }
-
import scala.compat.java8.FunctionConverters._
import scala.compat.java8.FutureConverters._
-import akka.actor.ActorSystem
-import akka.actor.ExtendedActorSystem
-import akka.actor.setup.Setup
-import akka.management.HealthCheckSettings
-import akka.management.internal.HealthChecksImpl
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.actor.setup.Setup
+import org.apache.pekko.management.HealthCheckSettings
+import org.apache.pekko.management.internal.HealthChecksImpl
/**
* Can be used to instantiate health checks directly rather than rely on the
* automatic management route. Useful if want to host the health check via
- * a protocol other than HTTP or not in the Akka Management HTTP server
+ * a protocol other than HTTP or not in the Pekko Management HTTP server
*/
final class HealthChecks(system: ExtendedActorSystem, settings: HealthCheckSettings) {
diff --git a/management/src/main/scala/akka/management/javadsl/ManagementRouteProvider.scala b/management/src/main/scala/org/apache/pekko/management/javadsl/ManagementRouteProvider.scala
similarity index 75%
rename from management/src/main/scala/akka/management/javadsl/ManagementRouteProvider.scala
rename to management/src/main/scala/org/apache/pekko/management/javadsl/ManagementRouteProvider.scala
index 12ccf31..b1c2b5c 100644
--- a/management/src/main/scala/akka/management/javadsl/ManagementRouteProvider.scala
+++ b/management/src/main/scala/org/apache/pekko/management/javadsl/ManagementRouteProvider.scala
@@ -11,12 +11,12 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.javadsl
+package org.apache.pekko.management.javadsl
-import akka.actor.Extension
-import akka.http.javadsl.server.Route
+import org.apache.pekko.actor.Extension
+import org.apache.pekko.http.javadsl.server.Route
-/** Extend this trait in your extension in order to allow it to contribute routes to Akka Management starts its HTTP endpoint */
+/** Extend this trait in your extension in order to allow it to contribute routes to Pekko Management starts its HTTP endpoint */
trait ManagementRouteProvider extends Extension {
/** Routes to be exposed by Akka cluster management */
diff --git a/management/src/main/scala/akka/management/javadsl/ManagementRouteProviderSettings.scala b/management/src/main/scala/org/apache/pekko/management/javadsl/ManagementRouteProviderSettings.scala
similarity index 77%
rename from management/src/main/scala/akka/management/javadsl/ManagementRouteProviderSettings.scala
rename to management/src/main/scala/org/apache/pekko/management/javadsl/ManagementRouteProviderSettings.scala
index 0e71362..63d93df 100644
--- a/management/src/main/scala/akka/management/javadsl/ManagementRouteProviderSettings.scala
+++ b/management/src/main/scala/org/apache/pekko/management/javadsl/ManagementRouteProviderSettings.scala
@@ -11,19 +11,19 @@
* Copyright (C) 2017-2021 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.management.javadsl
+package org.apache.pekko.management.javadsl
... 1461 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org