-
Notifications
You must be signed in to change notification settings - Fork 122
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4360 from guardian/an/kcl-akka-stream-sonatype
migrate kcl-akka-stream 2.1.0=>4.1.1, kcl 1.8.10=>2.6.0
- Loading branch information
Showing
7 changed files
with
62 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| sbt.version=1.10.1 | ||
| sbt.version=1.10.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1,46 @@ | ||
| package lib.kinesis | ||
|
|
||
| import com.contxt.kinesis.ConsumerConfig | ||
| import com.gu.mediaservice.lib.logging.GridLogging | ||
| import lib.KinesisReceiverConfig | ||
| import software.amazon.kinesis.common.{InitialPositionInStream, InitialPositionInStreamExtended} | ||
| import software.amazon.kinesis.metrics.MetricsConfig | ||
| import software.amazon.kinesis.retrieval.RetrievalConfig | ||
| import software.amazon.kinesis.retrieval.polling.PollingConfig | ||
|
|
||
| import java.net.InetAddress | ||
| import java.util.UUID | ||
|
|
||
| import com.amazonaws.services.kinesis.clientlibrary.lib.worker.{InitialPositionInStream, KinesisClientLibConfiguration} | ||
| import com.amazonaws.services.kinesis.metrics.interfaces.MetricsLevel | ||
| import com.gu.mediaservice.lib.logging.GridLogging | ||
| import lib.KinesisReceiverConfig | ||
| import org.joda.time.DateTime | ||
| object KinesisConfig extends GridLogging { | ||
| private val workerId = InetAddress.getLocalHost.getCanonicalHostName + ":" + UUID.randomUUID() | ||
|
|
||
| def kinesisConfig(config: KinesisReceiverConfig): KinesisClientLibConfiguration = { | ||
| val clientConfig = kinesisClientLibConfig( | ||
| kinesisAppName = config.streamName, | ||
| streamName = config.streamName, | ||
| config, | ||
| from = config.rewindFrom, | ||
| config.metricsLevel | ||
| ) | ||
|
|
||
| config.awsLocalEndpoint.map(endpoint => { | ||
| logger.info(s"creating kinesis consumer with endpoint=$endpoint") | ||
| clientConfig.withKinesisEndpoint(endpoint).withDynamoDBEndpoint(endpoint) | ||
| }).getOrElse(clientConfig) | ||
| } | ||
|
|
||
| private def kinesisClientLibConfig(kinesisAppName: String, streamName: String, config: KinesisReceiverConfig, from: Option[DateTime], metricsLevel: MetricsLevel): KinesisClientLibConfiguration = { | ||
| val credentialsProvider = config.awsCredentials | ||
| def kinesisConfig(config: KinesisReceiverConfig): ConsumerConfig = { | ||
| val initialPosition = config.rewindFrom match { | ||
| case None => InitialPositionInStreamExtended.newInitialPosition(InitialPositionInStream.TRIM_HORIZON) | ||
| case Some(position) => InitialPositionInStreamExtended.newInitialPositionAtTimestamp(position.toDate) | ||
| } | ||
| val pollingConfig = new PollingConfig(config.streamName, config.kinesisClient) | ||
| .maxRecords(100) | ||
| .idleTimeBetweenReadsInMillis(250) | ||
| val retrievalConfig = new RetrievalConfig(config.kinesisClient, config.streamName, config.streamName) | ||
| .retrievalSpecificConfig(pollingConfig) | ||
|
|
||
| val kinesisConfig = new KinesisClientLibConfiguration( | ||
| kinesisAppName, | ||
| streamName, | ||
| credentialsProvider, | ||
| credentialsProvider, | ||
| credentialsProvider, | ||
| workerId | ||
| ).withRegionName(config.awsRegion). | ||
| withMaxRecords(100). | ||
| withIdleMillisBetweenCalls(1000). | ||
| withIdleTimeBetweenReadsInMillis(250). | ||
| withCallProcessRecordsEvenForEmptyRecordList(true). | ||
| withMetricsLevel(metricsLevel) | ||
| val metricsConfig = new MetricsConfig(config.cloudwatchClient, config.streamName) | ||
| .metricsLevel(config.metricsLevel) | ||
|
|
||
| from.fold( | ||
| kinesisConfig.withInitialPositionInStream(InitialPositionInStream.TRIM_HORIZON) | ||
| ){ f => | ||
| kinesisConfig.withTimestampAtInitialPositionInStream(f.toDate) | ||
| } | ||
| val clientConfig = ConsumerConfig( | ||
| streamName = config.streamName, | ||
| appName = config.streamName, | ||
| workerId = workerId, | ||
| kinesisClient = config.kinesisClient, | ||
| dynamoClient = config.dynamoClient, | ||
| cloudwatchClient = config.cloudwatchClient, | ||
| initialPositionInStreamExtended = initialPosition, | ||
| coordinatorConfig = None, | ||
| leaseManagementConfig = None, | ||
| metricsConfig = Some(metricsConfig), | ||
| retrievalConfig = Some(retrievalConfig) | ||
| ) | ||
| clientConfig | ||
| } | ||
| } |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters