Skip to content

Commit fe2fa1a

Browse files
brharringtonbrharrington
authored
migrate from akka to pekko (#1531)
Akka license changed in newer versions. Switch to Pekko which is a fork that maintains the ApacheV2 license.
1 parent 7a66d3b commit fe2fa1a

File tree

138 files changed

+919
-920
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+919
-920
lines changed

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ jobs:
3131
PGP_PASSPHRASE: ${{ secrets.ORG_SIGNING_PASSWORD }}
3232
run: |
3333
git fetch --unshallow --tags
34-
cat /dev/null | project/sbt clean test +publishSigned
34+
cat /dev/null | project/sbt ++2.13.11 clean test +publishSigned
3535
cat /dev/null | project/sbt sonatypeBundleRelease

‎.github/workflows/snapshot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ jobs:
3131
PGP_PASSPHRASE: ${{ secrets.ORG_SIGNING_PASSWORD }}
3232
run: |
3333
git fetch --unshallow --tags
34-
cat /dev/null | project/sbt clean test +publishSigned
34+
cat /dev/null | project/sbt ++2.13.11 clean test +publishSigned

‎atlas-akka/src/main/resources/metered-mailbox.conf

-6
This file was deleted.

‎atlas-akka/src/test/resources/application.conf

-5
This file was deleted.

‎atlas-core/src/main/scala/com/netflix/atlas/core/model/Datapoint.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ case class Datapoint(
4040
require(tags != null, "tags cannot be null")
4141
require(timestamp >= 0L, s"invalid timestamp: $timestamp")
4242

43-
lazy val id: ItemId = TaggedItem.computeId(tags)
43+
def id: ItemId = TaggedItem.computeId(tags)
4444

4545
def label: String = TimeSeries.toLabel(tags)
4646

‎atlas-core/src/test/scala/com/netflix/atlas/core/db/TimeSeriesBufferSuite.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -505,11 +505,11 @@ class TimeSeriesBufferSuite extends FunSuite {
505505
val s2 = new ArrayTimeSeq(DsType.Gauge, 5 * step, step, Array(1.0, 2.0))
506506

507507
// Lazy val for id under 2.13.x will have two fields in the class file, `id`
508-
// and `bitmap$0`. Under 3.x the fields changed to `id$lzy1` and `0bitmap$1`.
508+
// and `bitmap$0`. Under 3.3.x the field changed to `id$lzy1`.
509509
val lazyIdFields =
510510
try {
511-
classOf[TimeSeriesBuffer].getField("id$lzy1")
512-
Array("id$lzy1", "0bitmap$1")
511+
classOf[TimeSeriesBuffer].getDeclaredField("id$lzy1")
512+
Array("id$lzy1")
513513
} catch {
514514
case _: Exception => Array("id", "bitmap$0")
515515
}

‎atlas-eval/src/main/scala/com/netflix/atlas/eval/graph/DefaultSettings.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ package com.netflix.atlas.eval.graph
1717

1818
import java.util.concurrent.TimeUnit
1919
import java.util.regex.Pattern
20-
import akka.http.scaladsl.model.ContentType
20+
21+
import org.apache.pekko.http.scaladsl.model.ContentType
2122
import com.netflix.atlas.chart.GraphEngine
2223
import com.netflix.atlas.core.model.CustomVocabulary
2324
import com.netflix.atlas.core.stacklang.Interpreter

‎atlas-eval/src/main/scala/com/netflix/atlas/eval/graph/GraphConfig.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package com.netflix.atlas.eval.graph
1717

1818
import java.time.Instant
1919
import java.time.ZoneId
20-
import akka.http.scaladsl.model.ContentType
20+
import org.apache.pekko.http.scaladsl.model.ContentType
2121
import com.netflix.atlas.chart.GraphEngine
2222
import com.netflix.atlas.chart.model.GraphDef
2323
import com.netflix.atlas.chart.model.LegendType

‎atlas-eval/src/main/scala/com/netflix/atlas/eval/graph/Grapher.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ package com.netflix.atlas.eval.graph
1818
import java.awt.Color
1919
import java.io.ByteArrayOutputStream
2020
import java.time.Duration
21-
import akka.http.scaladsl.model.HttpRequest
22-
import akka.http.scaladsl.model.Uri
23-
import com.netflix.atlas.akka.Cors
21+
import org.apache.pekko.http.scaladsl.model.HttpRequest
22+
import org.apache.pekko.http.scaladsl.model.Uri
2423
import com.netflix.atlas.chart.Colors
2524
import com.netflix.atlas.chart.model.GraphDef
2625
import com.netflix.atlas.chart.model.Layout
@@ -43,6 +42,7 @@ import com.netflix.atlas.core.util.Features
4342
import com.netflix.atlas.core.util.Strings
4443
import com.netflix.atlas.core.util.UnitPrefix
4544
import com.netflix.atlas.eval.util.IdParamSanitizer
45+
import com.netflix.atlas.pekko.Cors
4646
import com.typesafe.config.Config
4747

4848
import java.util.Locale

‎atlas-eval/src/main/scala/com/netflix/atlas/eval/model/LwcDiagnosticMessage.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package com.netflix.atlas.eval.model
1717

18-
import com.netflix.atlas.akka.DiagnosticMessage
1918
import com.netflix.atlas.json.JsonSupport
19+
import com.netflix.atlas.pekko.DiagnosticMessage
2020

2121
/**
2222
* Diagnostic message for a particular expression.

‎atlas-eval/src/main/scala/com/netflix/atlas/eval/model/LwcMessages.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
*/
1616
package com.netflix.atlas.eval.model
1717

18-
import akka.util.ByteString
18+
import org.apache.pekko.util.ByteString
1919
import com.fasterxml.jackson.core.JsonParser
2020
import com.fasterxml.jackson.core.JsonToken
21-
import com.netflix.atlas.akka.ByteStringInputStream
22-
import com.netflix.atlas.akka.DiagnosticMessage
2321
import com.netflix.atlas.core.util.SmallHashMap
2422
import com.netflix.atlas.core.util.SortedTagMap
2523
import com.netflix.atlas.json.Json
2624
import com.netflix.atlas.json.JsonParserHelper.*
25+
import com.netflix.atlas.pekko.ByteStringInputStream
26+
import com.netflix.atlas.pekko.DiagnosticMessage
2727

2828
import java.io.ByteArrayOutputStream
2929

‎atlas-eval/src/main/scala/com/netflix/atlas/eval/stream/EurekaGroupsLookup.scala

+12-12
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
*/
1616
package com.netflix.atlas.eval.stream
1717

18-
import akka.NotUsed
19-
import akka.http.scaladsl.model.Uri
20-
import akka.stream.Attributes
21-
import akka.stream.FlowShape
22-
import akka.stream.Inlet
23-
import akka.stream.Outlet
24-
import akka.stream.scaladsl.Source
25-
import akka.stream.stage.GraphStage
26-
import akka.stream.stage.GraphStageLogic
27-
import akka.stream.stage.InHandler
28-
import akka.stream.stage.OutHandler
29-
import com.netflix.atlas.akka.DiagnosticMessage
18+
import org.apache.pekko.NotUsed
19+
import org.apache.pekko.http.scaladsl.model.Uri
20+
import org.apache.pekko.stream.Attributes
21+
import org.apache.pekko.stream.FlowShape
22+
import org.apache.pekko.stream.Inlet
23+
import org.apache.pekko.stream.Outlet
24+
import org.apache.pekko.stream.scaladsl.Source
25+
import org.apache.pekko.stream.stage.GraphStage
26+
import org.apache.pekko.stream.stage.GraphStageLogic
27+
import org.apache.pekko.stream.stage.InHandler
28+
import org.apache.pekko.stream.stage.OutHandler
3029
import com.netflix.atlas.eval.stream.EurekaSource.GroupResponse
3130
import com.netflix.atlas.eval.stream.EurekaSource.Groups
3231
import com.netflix.atlas.eval.stream.Evaluator.DataSources
32+
import com.netflix.atlas.pekko.DiagnosticMessage
3333
import com.typesafe.scalalogging.StrictLogging
3434

3535
import scala.concurrent.duration.FiniteDuration

‎atlas-eval/src/main/scala/com/netflix/atlas/eval/stream/EurekaSource.scala

+12-12
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
*/
1616
package com.netflix.atlas.eval.stream
1717

18-
import akka.NotUsed
19-
import akka.http.scaladsl.model.HttpMethods
20-
import akka.http.scaladsl.model.HttpRequest
21-
import akka.http.scaladsl.model.HttpResponse
22-
import akka.http.scaladsl.model.MediaTypes
23-
import akka.http.scaladsl.model.StatusCodes
24-
import akka.http.scaladsl.model.headers.*
25-
import akka.stream.scaladsl.Compression
26-
import akka.stream.scaladsl.Flow
27-
import akka.stream.scaladsl.Source
28-
import akka.util.ByteString
18+
import org.apache.pekko.NotUsed
19+
import org.apache.pekko.http.scaladsl.model.HttpMethods
20+
import org.apache.pekko.http.scaladsl.model.HttpRequest
21+
import org.apache.pekko.http.scaladsl.model.HttpResponse
22+
import org.apache.pekko.http.scaladsl.model.MediaTypes
23+
import org.apache.pekko.http.scaladsl.model.StatusCodes
24+
import org.apache.pekko.http.scaladsl.model.headers.*
25+
import org.apache.pekko.stream.scaladsl.Compression
26+
import org.apache.pekko.stream.scaladsl.Flow
27+
import org.apache.pekko.stream.scaladsl.Source
28+
import org.apache.pekko.util.ByteString
2929
import com.fasterxml.jackson.annotation.JsonProperty
30-
import com.netflix.atlas.akka.ByteStringInputStream
3130
import com.netflix.atlas.json.Json
31+
import com.netflix.atlas.pekko.ByteStringInputStream
3232
import com.typesafe.scalalogging.StrictLogging
3333

3434
import scala.util.Failure

‎atlas-eval/src/main/scala/com/netflix/atlas/eval/stream/EvaluationFlows.scala

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
*/
1616
package com.netflix.atlas.eval.stream
1717

18-
import akka.Done
19-
import akka.NotUsed
20-
import akka.stream.KillSwitches
21-
import akka.stream.Materializer
22-
import akka.stream.ThrottleMode
23-
import akka.stream.scaladsl.Flow
24-
import akka.stream.scaladsl.Framing
25-
import akka.stream.scaladsl.Keep
26-
import akka.stream.scaladsl.Sink
27-
import akka.stream.scaladsl.Source
28-
import akka.util.ByteString
18+
import org.apache.pekko.Done
19+
import org.apache.pekko.NotUsed
20+
import org.apache.pekko.stream.KillSwitches
21+
import org.apache.pekko.stream.Materializer
22+
import org.apache.pekko.stream.ThrottleMode
23+
import org.apache.pekko.stream.scaladsl.Flow
24+
import org.apache.pekko.stream.scaladsl.Framing
25+
import org.apache.pekko.stream.scaladsl.Keep
26+
import org.apache.pekko.stream.scaladsl.Sink
27+
import org.apache.pekko.stream.scaladsl.Source
28+
import org.apache.pekko.util.ByteString
2929
import com.netflix.spectator.api.Counter
3030

3131
import scala.concurrent.Promise

‎atlas-eval/src/main/scala/com/netflix/atlas/eval/stream/Evaluator.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
*/
1616
package com.netflix.atlas.eval.stream;
1717

18-
import akka.actor.ActorSystem;
19-
import akka.http.javadsl.model.Uri;
20-
import akka.stream.Materializer;
21-
import akka.stream.ThrottleMode;
22-
import akka.stream.javadsl.Flow;
23-
import akka.stream.javadsl.Framing;
24-
import akka.stream.javadsl.Source;
25-
import akka.stream.javadsl.StreamConverters;
26-
import akka.util.ByteString;
18+
import org.apache.pekko.actor.ActorSystem;
19+
import org.apache.pekko.http.javadsl.model.Uri;
20+
import org.apache.pekko.stream.Materializer;
21+
import org.apache.pekko.stream.ThrottleMode;
22+
import org.apache.pekko.stream.javadsl.Flow;
23+
import org.apache.pekko.stream.javadsl.Framing;
24+
import org.apache.pekko.stream.javadsl.Source;
25+
import org.apache.pekko.stream.javadsl.StreamConverters;
26+
import org.apache.pekko.util.ByteString;
2727
import com.fasterxml.jackson.annotation.JsonCreator;
2828
import com.fasterxml.jackson.annotation.JsonIgnore;
2929
import com.fasterxml.jackson.annotation.JsonProperty;

‎atlas-eval/src/main/scala/com/netflix/atlas/eval/stream/EvaluatorImpl.scala

+25-25
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,27 @@ import java.time.Duration
2222
import java.util.UUID
2323
import java.util.concurrent.TimeUnit
2424
import java.util.concurrent.TimeoutException
25-
import akka.NotUsed
26-
import akka.actor.ActorSystem
27-
import akka.http.scaladsl.Http
28-
import akka.http.scaladsl.model.Uri
29-
import akka.http.scaladsl.model.ws.BinaryMessage
30-
import akka.http.scaladsl.model.ws.TextMessage
31-
import akka.http.scaladsl.model.ws.WebSocketRequest
32-
import akka.stream.FlowShape
33-
import akka.stream.Materializer
34-
import akka.stream.OverflowStrategy
35-
import akka.stream.ThrottleMode
36-
import akka.stream.scaladsl.Broadcast
37-
import akka.stream.scaladsl.BroadcastHub
38-
import akka.stream.scaladsl.FileIO
39-
import akka.stream.scaladsl.Flow
40-
import akka.stream.scaladsl.GraphDSL
41-
import akka.stream.scaladsl.Keep
42-
import akka.stream.scaladsl.Merge
43-
import akka.stream.scaladsl.Sink
44-
import akka.stream.scaladsl.Source
45-
import akka.util.ByteString
46-
import com.netflix.atlas.akka.ClusterOps
47-
import com.netflix.atlas.akka.StreamOps
48-
import com.netflix.atlas.akka.ThreadPools
25+
import org.apache.pekko.NotUsed
26+
import org.apache.pekko.actor.ActorSystem
27+
import org.apache.pekko.http.scaladsl.Http
28+
import org.apache.pekko.http.scaladsl.model.Uri
29+
import org.apache.pekko.http.scaladsl.model.ws.BinaryMessage
30+
import org.apache.pekko.http.scaladsl.model.ws.TextMessage
31+
import org.apache.pekko.http.scaladsl.model.ws.WebSocketRequest
32+
import org.apache.pekko.stream.FlowShape
33+
import org.apache.pekko.stream.Materializer
34+
import org.apache.pekko.stream.OverflowStrategy
35+
import org.apache.pekko.stream.ThrottleMode
36+
import org.apache.pekko.stream.scaladsl.Broadcast
37+
import org.apache.pekko.stream.scaladsl.BroadcastHub
38+
import org.apache.pekko.stream.scaladsl.FileIO
39+
import org.apache.pekko.stream.scaladsl.Flow
40+
import org.apache.pekko.stream.scaladsl.GraphDSL
41+
import org.apache.pekko.stream.scaladsl.Keep
42+
import org.apache.pekko.stream.scaladsl.Merge
43+
import org.apache.pekko.stream.scaladsl.Sink
44+
import org.apache.pekko.stream.scaladsl.Source
45+
import org.apache.pekko.util.ByteString
4946
import com.netflix.atlas.core.model.DataExpr
5047
import com.netflix.atlas.core.model.Query
5148
import com.netflix.atlas.eval.model.AggrDatapoint
@@ -61,6 +58,9 @@ import com.netflix.atlas.eval.stream.Evaluator.DatapointGroup
6158
import com.netflix.atlas.eval.stream.Evaluator.MessageEnvelope
6259
import com.netflix.atlas.json.Json
6360
import com.netflix.atlas.json.JsonSupport
61+
import com.netflix.atlas.pekko.ClusterOps
62+
import com.netflix.atlas.pekko.StreamOps
63+
import com.netflix.atlas.pekko.ThreadPools
6464
import com.netflix.spectator.api.Registry
6565
import com.typesafe.config.Config
6666
import org.reactivestreams.Processor
@@ -124,7 +124,7 @@ private[stream] abstract class EvaluatorImpl(
124124

125125
protected def writeInputToFileImpl(uri: Uri, file: Path, duration: FiniteDuration): Unit = {
126126
// Explicit type needed in 2.5.2, but not 2.5.0. Likely related to:
127-
// https://github.com/akka/akka/issues/22666
127+
// https://github.com/pekko/pekko/issues/22666
128128
val options = Set[OpenOption](
129129
StandardOpenOption.WRITE,
130130
StandardOpenOption.CREATE,

‎atlas-eval/src/main/scala/com/netflix/atlas/eval/stream/ExprInterpreter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.netflix.atlas.eval.stream
1717

18-
import akka.http.scaladsl.model.Uri
18+
import org.apache.pekko.http.scaladsl.model.Uri
1919
import com.netflix.atlas.core.model.CustomVocabulary
2020
import com.netflix.atlas.core.model.DataExpr
2121
import com.netflix.atlas.core.model.Expr

‎atlas-eval/src/main/scala/com/netflix/atlas/eval/stream/FillRemovedKeysWith.scala

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616
package com.netflix.atlas.eval.stream
1717

18-
import akka.stream.Attributes
19-
import akka.stream.FlowShape
20-
import akka.stream.Inlet
21-
import akka.stream.Outlet
22-
import akka.stream.stage.GraphStage
23-
import akka.stream.stage.GraphStageLogic
24-
import akka.stream.stage.InHandler
25-
import akka.stream.stage.OutHandler
18+
import org.apache.pekko.stream.Attributes
19+
import org.apache.pekko.stream.FlowShape
20+
import org.apache.pekko.stream.Inlet
21+
import org.apache.pekko.stream.Outlet
22+
import org.apache.pekko.stream.stage.GraphStage
23+
import org.apache.pekko.stream.stage.GraphStageLogic
24+
import org.apache.pekko.stream.stage.InHandler
25+
import org.apache.pekko.stream.stage.OutHandler
2626

2727
import scala.collection.Map
2828

0 commit comments

Comments
 (0)