Skip to content

Commit

Permalink
Merge 843c2bd into f5e0822
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjayprateek
mjayprateek committed Apr 13, 2021
2 parents f5e0822 + 843c2bd commit 885d647
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 72 deletions.
6 changes: 3 additions & 3 deletions project.clj
View file
Expand Up @@ -29,7 +29,7 @@
[io.opentracing.contrib/opentracing-kafka-client "0.1.15" :exclusions [org.lz4/lz4-java com.github.luben/zstd-jni org.slf4j/slf4j-api org.xerial.snappy/snappy-java]]
[io.opentracing.contrib/opentracing-rabbitmq-client "0.1.5" :exclusions [com.rabbitmq/amqp-client]]
[org.apache.httpcomponents/fluent-hc "4.5.4"]
[org.apache.kafka/kafka-streams "2.5.0" :exclusions [org.slf4j/slf4j-log4j12 log4j]]
[org.apache.kafka/kafka-streams "2.6.1" :exclusions [org.slf4j/slf4j-log4j12 log4j]]
[org.apache.logging.log4j/log4j-core "2.12.1"]
[org.apache.logging.log4j/log4j-slf4j-impl "2.12.1"]
[org.clojure/clojure "1.10.0"]
Expand Down Expand Up @@ -73,8 +73,8 @@
:dependencies [[com.google.protobuf/protobuf-java "3.5.1"]
[junit/junit "4.12"]
[org.hamcrest/hamcrest-core "2.2"]
[org.apache.kafka/kafka-streams "2.5.0" :classifier "test" :exclusions [org.slf4j/slf4j-log4j12 log4j]]
[org.apache.kafka/kafka-clients "2.5.0" :classifier "test"]
[org.apache.kafka/kafka-streams "2.6.1" :classifier "test" :exclusions [org.slf4j/slf4j-log4j12 log4j]]
[org.apache.kafka/kafka-clients "2.6.1" :classifier "test"]
[org.clojure/test.check "0.10.0"]]
:plugins [[lein-cloverage "1.0.13" :exclusions [org.clojure/clojure]]]
:repositories [["confluent-repo" "https://packages.confluent.io/maven/"]]}
Expand Down
40 changes: 19 additions & 21 deletions resources/config.test.ci.edn
View file
Expand Up @@ -37,7 +37,6 @@
:bootstrap-servers "localhost:9092"
:stream-threads-count [1 :int]
:origin-topic "topic"
:upgrade-from "1.1"
:changelog-topic-replication-factor [1 :int]
:channels {:channel-1 {:worker-count [10 :int]
:retry {:type [:linear :keyword]
Expand All @@ -59,29 +58,28 @@
:key-deserializer-encoding "UTF8"
:value-deserializer-encoding "UTF8"
:deserializer-encoding "UTF8"
:upgrade-from "1.1"
:channels {:channel-1 {:worker-count [10 :int]
:retry {:count [5 :int]
:enabled [true :bool]}}}}}
:batch-routes {:consumer-1 {:consumer-group-id "test-consumer-1002"
:bootstrap-servers "localhost:9092"
:max-poll-records [1000 :int]
:origin-topic "topic"
:commit-interval-ms [5000 :int]
:poll-timeout-ms-config [1000 :int]
:thread-count [2 :int]
:session-timeout-ms-config [60000 :int]
:key-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"
:value-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"}
:consumer-2 {:consumer-group-id "test-consumer-2002"
:bootstrap-servers "localhost:9092"
:max-poll-records [2000 :int]
:origin-topic "topic"
:poll-timeout-ms-config [1000 :int]
:thread-count [4 :int]
:session-timeout-ms-config [60000 :int]
:key-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"
:value-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"}}
:batch-routes {:consumer-1 {:consumer-group-id "test-consumer-1002"
:bootstrap-servers "localhost:9092"
:max-poll-records [1000 :int]
:origin-topic "topic"
:commit-interval-ms [5000 :int]
:poll-timeout-ms-config [1000 :int]
:thread-count [2 :int]
:session-timeout-ms-config [60000 :int]
:key-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"
:value-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"}
:consumer-2 {:consumer-group-id "test-consumer-2002"
:bootstrap-servers "localhost:9092"
:max-poll-records [2000 :int]
:origin-topic "topic"
:poll-timeout-ms-config [1000 :int]
:thread-count [4 :int]
:session-timeout-ms-config [60000 :int]
:key-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"
:value-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"}}
:tracer {:enabled [true :bool]
:custom-provider ""}
:new-relic {:report-errors false}}}
40 changes: 19 additions & 21 deletions resources/config.test.cluster.ci.edn
View file
Expand Up @@ -37,7 +37,6 @@
:bootstrap-servers "localhost:9091,localhost:9092,localhost:9093"
:stream-threads-count [1 :int]
:origin-topic "topic"
:upgrade-from "1.1"
:changelog-topic-replication-factor [1 :int]
:channels {:channel-1 {:worker-count [10 :int]
:retry {:type [:linear :keyword]
Expand All @@ -59,29 +58,28 @@
:key-deserializer-encoding "UTF8"
:value-deserializer-encoding "UTF8"
:deserializer-encoding "UTF8"
:upgrade-from "1.1"
:channels {:channel-1 {:worker-count [10 :int]
:retry {:count [5 :int]
:enabled [true :bool]}}}}}
:batch-routes {:consumer-1 {:consumer-group-id "test-consumer-1002"
:bootstrap-servers "localhost:9091,localhost:9092,localhost:9093"
:max-poll-records [1000 :int]
:origin-topic "topic"
:commit-interval-ms [5000 :int]
:poll-timeout-ms-config [1000 :int]
:thread-count [2 :int]
:session-timeout-ms-config [60000 :int]
:key-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"
:value-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"}
:consumer-2 {:consumer-group-id "test-consumer-2002"
:bootstrap-servers "localhost:9091,localhost:9092,localhost:9093"
:max-poll-records [2000 :int]
:origin-topic "topic"
:poll-timeout-ms-config [1000 :int]
:thread-count [4 :int]
:session-timeout-ms-config [60000 :int]
:key-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"
:value-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"}}
:batch-routes {:consumer-1 {:consumer-group-id "test-consumer-1002"
:bootstrap-servers "localhost:9091,localhost:9092,localhost:9093"
:max-poll-records [1000 :int]
:origin-topic "topic"
:commit-interval-ms [5000 :int]
:poll-timeout-ms-config [1000 :int]
:thread-count [2 :int]
:session-timeout-ms-config [60000 :int]
:key-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"
:value-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"}
:consumer-2 {:consumer-group-id "test-consumer-2002"
:bootstrap-servers "localhost:9091,localhost:9092,localhost:9093"
:max-poll-records [2000 :int]
:origin-topic "topic"
:poll-timeout-ms-config [1000 :int]
:thread-count [4 :int]
:session-timeout-ms-config [60000 :int]
:key-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"
:value-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"}}
:tracer {:enabled [true :bool]
:custom-provider ""}
:new-relic {:report-errors false}}}
40 changes: 19 additions & 21 deletions resources/config.test.cluster.edn
View file
Expand Up @@ -37,7 +37,6 @@
:bootstrap-servers "localhost:9091,localhost:9092,localhost:9093"
:stream-threads-count [1 :int]
:origin-topic "topic"
:upgrade-from "1.1"
:changelog-topic-replication-factor [1 :int]
:channels {:channel-1 {:worker-count [10 :int]
:retry {:type [:linear :keyword]
Expand All @@ -59,29 +58,28 @@
:key-deserializer-encoding "UTF8"
:value-deserializer-encoding "UTF8"
:deserializer-encoding "UTF8"
:upgrade-from "1.1"
:channels {:channel-1 {:worker-count [10 :int]
:retry {:count [5 :int]
:enabled [true :bool]}}}}}
:batch-routes {:consumer-1 {:consumer-group-id "test-consumer-1002"
:bootstrap-servers "localhost:9091,localhost:9092,localhost:9093"
:max-poll-records [1000 :int]
:origin-topic "topic"
:commit-interval-ms [5000 :int]
:poll-timeout-ms-config [1000 :int]
:thread-count [2 :int]
:session-timeout-ms-config [60000 :int]
:key-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"
:value-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"}
:consumer-2 {:consumer-group-id "test-consumer-2002"
:bootstrap-servers "localhost:9091,localhost:9092,localhost:9093"
:max-poll-records [2000 :int]
:origin-topic "topic"
:poll-timeout-ms-config [1000 :int]
:thread-count [4 :int]
:session-timeout-ms-config [60000 :int]
:key-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"
:value-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"}}
:batch-routes {:consumer-1 {:consumer-group-id "test-consumer-1002"
:bootstrap-servers "localhost:9091,localhost:9092,localhost:9093"
:max-poll-records [1000 :int]
:origin-topic "topic"
:commit-interval-ms [5000 :int]
:poll-timeout-ms-config [1000 :int]
:thread-count [2 :int]
:session-timeout-ms-config [60000 :int]
:key-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"
:value-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"}
:consumer-2 {:consumer-group-id "test-consumer-2002"
:bootstrap-servers "localhost:9091,localhost:9092,localhost:9093"
:max-poll-records [2000 :int]
:origin-topic "topic"
:poll-timeout-ms-config [1000 :int]
:thread-count [4 :int]
:session-timeout-ms-config [60000 :int]
:key-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"
:value-deserializer-class-config "org.apache.kafka.common.serialization.ByteArrayDeserializer"}}
:tracer {:enabled [true :bool]
:custom-provider ""}
:new-relic {:report-errors false}}}

0 comments on commit 885d647

Please sign in to comment.