Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow throttling SQS #53

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow throttling SQS #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions config/config.reference.hocon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
randomFactor: 0.1
maxRetries: 5
maxRetriesWithin: 1 minute

# Optional, allows throttling sqs
throttle {
elements = 10
per = 2 seconds
}
}

"output": {
Expand Down
8 changes: 7 additions & 1 deletion src/main/scala/com.snowplowanalytics/sqs2kinesis/EventsStreamModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,13 @@ object EventsStreamModule {
val goodSink = sink(config.output.good, config.input, kinesisClient)
val badSink = sink(config.output.bad, config.input, kinesisClient)

sqsSource(config.input)
val source = config
.input
.throttle
.map(t => sqsSource(config.input).throttle(t.elements, t.per))
.getOrElse(sqsSource(config.input))

source
.via(sqsMsg2kinesisMsg(config.input))
.alsoTo(Flow[Either[ParsedMsg, ParsedMsg]].mapConcat(_.toSeq).to(goodSink))
.alsoTo(Flow[Either[ParsedMsg, ParsedMsg]].mapConcat(_.left.toSeq).to(badSink))
Expand Down
11 changes: 10 additions & 1 deletion src/main/scala/com.snowplowanalytics/sqs2kinesis/config/Sqs2KinesisConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ object Sqs2KinesisConfig {
maxBackoff: FiniteDuration,
randomFactor: Double,
maxRetries: Int,
maxRetriesWithin: FiniteDuration
maxRetriesWithin: FiniteDuration,
throttle: Option[ThrottleConfig]
)

case class ThrottleConfig(
elements: Int,
per: FiniteDuration
)

/** Configure the output kinesis stream
Expand Down Expand Up @@ -83,6 +89,9 @@ object Sqs2KinesisConfig {
implicit val finiteDurationEncoder: Encoder[FiniteDuration] =
implicitly[Encoder[String]].contramap(_.toString)

implicit val throttleDecoder: Decoder[ThrottleConfig] = deriveDecoder[ThrottleConfig]
implicit val throttleEncoder: Encoder[ThrottleConfig] = deriveEncoder[ThrottleConfig]

implicit val sqsDecoder: Decoder[SqsConfig] = deriveDecoder[SqsConfig]
implicit val sqsEncoder: Encoder[SqsConfig] = deriveEncoder[SqsConfig]

Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/com.snowplowanalytics.sqs2kinesis/EventsStreamModuleSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ object EventsStreamModuleSpec {
val messageId: String = "b73f2c49-874e-47c4-9a76-09751e3dc3e2"

val config: Sqs2KinesisConfig.SqsConfig =
Sqs2KinesisConfig.SqsConfig("myqueue", "kinesisKey", 1.second, 1.second, 1.0, 1, 1.minute)
Sqs2KinesisConfig.SqsConfig("myqueue", "kinesisKey", 1.second, 1.second, 1.0, 1, 1.minute, None)

def buildMessage(body: String): Message = {
val keyAttribute = MessageAttributeValue.builder.dataType("String").stringValue(kinesisKey).build
Expand Down
6 changes: 4 additions & 2 deletions src/test/scala/com.snowplowanalytics.sqs2kinesis/config/CliConfigSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ class CliConfigSpec extends Specification {
5.second,
0.1,
5,
1.minute
1.minute,
None
),
Output(
KinesisConfig("test-stream-payloads", 5000000, 500, 1.second, 500.millis, 1.second, 0.1, 5),
Expand All @@ -52,7 +53,8 @@ class CliConfigSpec extends Specification {
5.second,
0.1,
5,
1.minute
1.minute,
Some(ThrottleConfig(10, 2.seconds))
),
Output(
KinesisConfig("test-stream-payloads", 5000000, 500, 1.second, 500.millis, 1.second, 0.1, 5),
Expand Down