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

Updating kinesis library versions to fix cross account latency issue #85

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Updating kinesis library versions to fix cross account latency issue #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
629891d
Updating kinesis library versions to fix cross account latency issue
Apr 9, 2020
110bf4d
Updating kinesis client version to fix cross account latency issue
Apr 9, 2020
e51c6bf
Updating kinesis client version to fix cross account latency issue
Apr 11, 2020
32bc5ce
Updating kinesis client version to fix cross account latency issue
Apr 11, 2020
3ca298f
Updating kinesis client version to fix cross account latency issue
Apr 11, 2020
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
4 changes: 2 additions & 2 deletions kinesis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<packaging>jar</packaging>

<properties>
<kinesis.client.version>1.7.5</kinesis.client.version>
<kinesis.client.version>1.13.2</kinesis.client.version>
<kinesis.producer.version>0.12.3</kinesis.producer.version>
<aws-sdk.version>1.11.128</aws-sdk.version>
<aws-sdk.version>1.11.670</aws-sdk.version>
<mainClass>com.expedia.www.haystack.kinesis.span.collector.App</mainClass>
<finalName>${project.artifactId}-${project.version}</finalName>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion ...cala/com/expedia/www/haystack/kinesis/span/collector/integration/LocalKafkaConsumer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ trait LocalKafkaConsumer {
}
}

if(records.size < minExpectedCount) throw new RuntimeException("Fail to read the expected records from kafka")
if(records.size < minExpectedCount) throw new RuntimeException(s"Fail to read the expected records (${records.size}) from kafka")

records.toList
}
Expand Down
8 changes: 4 additions & 4 deletions ...edia/www/haystack/kinesis/span/collector/integration/tests/KinesisSpanCollectorSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class KinesisSpanCollectorSpec extends IntegrationTestSpec {
produceRecordsToKinesis(List(spanBytes, spanBytes))

Then("it should be pushed to kafka")
readRecordsFromKafka(0, 1.second).headOption
readRecordsFromKafka(0, 10.second).headOption
}

"read valid spans from kinesis and store individual spans in kafka" in {
Expand All @@ -63,7 +63,7 @@ class KinesisSpanCollectorSpec extends IntegrationTestSpec {
produceRecordsToKinesis(List(span_1, span_2, span_3, span_4))

Then("it should be pushed to kafka with partition key as its trace id")
val records = readRecordsFromKafka(4, 5.seconds)
val records = readRecordsFromKafka(4, 10.seconds)
val externalrecords = readRecordsFromExternalKafka(0, 10.seconds)
externalrecords.size shouldEqual 0
records.size shouldEqual 4
Expand Down Expand Up @@ -97,7 +97,7 @@ class KinesisSpanCollectorSpec extends IntegrationTestSpec {
produceRecordsToKinesis(List(span_1, span_2, span_3, span_4))

Then("it should be pushed to default kafka and external kafka with partition key as its trace id")
val records = readRecordsFromKafka(4, 5.seconds)
val records = readRecordsFromKafka(4, 10.seconds)
val numConsumers = ProjectConfiguration.externalKafkaConfig().size
val externalrecords = readRecordsFromExternalKafka(4 * numConsumers, (10 * numConsumers).seconds)
externalrecords.size should equal(4)
Expand All @@ -121,7 +121,7 @@ class KinesisSpanCollectorSpec extends IntegrationTestSpec {
produceRecordsToKinesis(List(span_1))

Then("the appropriate span decorator plugin should be loaded using spi")
val records = readRecordsFromKafka(1, 5.seconds)
val records = readRecordsFromKafka(1, 10.seconds)
records should not be empty

val spans = records.map(Span.parseFrom)
Expand Down