-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Introduced usage of kotlin-kafka #121
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
53b649d
Introduced usage of kotlin-kafka
kfh 6008a43
Added explicit return type
kfh 914c4bf
Added producer record return type
kfh ea97a7f
Fixed test
kfh 55b5ef4
Removed redundant code
kfh a8a5d50
Removed unused import
kfh 8f3798a
Made functions public
kfh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
2 changes: 0 additions & 2 deletions
2
ebms-provider/src/main/kotlin/no/nav/emottak/ebms/configuration/Config.kt
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
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
60 changes: 12 additions & 48 deletions
60
emottak-utils/src/main/kotlin/no/nav/emottak/utils/kafka/KafkaPublisherClient.kt
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,57 +1,21 @@ | ||
| package no.nav.emottak.utils.kafka | ||
|
|
||
| import io.github.nomisRev.kafka.publisher.KafkaPublisher | ||
| import no.nav.emottak.utils.config.Kafka | ||
| import no.nav.emottak.utils.config.toProperties | ||
| import org.apache.kafka.clients.producer.KafkaProducer | ||
| import org.apache.kafka.clients.producer.ProducerConfig | ||
| import no.nav.emottak.utils.config.toKafkaPublisherSettings | ||
| import org.apache.kafka.clients.producer.ProducerRecord | ||
| import org.apache.kafka.common.serialization.ByteArraySerializer | ||
| import org.apache.kafka.common.serialization.StringSerializer | ||
| import org.apache.kafka.clients.producer.RecordMetadata | ||
|
|
||
| class KafkaPublisherClient(val topic: String, val config: Kafka) : AutoCloseable { | ||
| // private val log = LoggerFactory.getLogger(this.javaClass) | ||
| class KafkaPublisherClient( | ||
ivanskodje marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| private val config: Kafka | ||
| ) { | ||
| private val kafkaPublisher = KafkaPublisher(config.toKafkaPublisherSettings()) | ||
|
|
||
| companion object { | ||
| private var producer: KafkaProducer<String, ByteArray>? = null | ||
| } | ||
|
|
||
| suspend fun send(key: String, value: ByteArray) { | ||
| try { | ||
| getProducer().send( | ||
| ProducerRecord(topic, key, value) | ||
| ) | ||
| getProducer().flush() | ||
| // log.debug("Message ($key) sent successfully to topic ($topic)") | ||
| } catch (e: Exception) { | ||
| // log.error("Exception while writing message ($key) to queue ($topic)", e) | ||
| } | ||
| } | ||
|
|
||
| private fun getProducer(): KafkaProducer<String, ByteArray> { | ||
| if (producer == null) { | ||
| producer = createPublisher() | ||
| } | ||
| return producer!! | ||
| } | ||
|
|
||
| private fun createPublisher(): KafkaProducer<String, ByteArray> { | ||
| val properties = config.toProperties().apply { | ||
| put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, config.bootstrapServers) | ||
| put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer::class.java.name) | ||
| put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, ByteArraySerializer::class.java.name) | ||
| put(ProducerConfig.ACKS_CONFIG, "all") | ||
| // Performance | ||
| put(ProducerConfig.BUFFER_MEMORY_CONFIG, "16777216") | ||
| put(ProducerConfig.BATCH_SIZE_CONFIG, "8192") | ||
| put(ProducerConfig.RETRIES_CONFIG, "3") | ||
| put(ProducerConfig.REQUEST_TIMEOUT_MS_CONFIG, "30000") | ||
| suspend fun publishMessage(value: ByteArray): Result<RecordMetadata> = | ||
| kafkaPublisher.publishScope { | ||
| publishCatching(toProducerRecord(config.topic, value)) | ||
| } | ||
| return KafkaProducer(properties) | ||
| } | ||
|
|
||
| override fun close() { | ||
| try { | ||
| getProducer().close() | ||
| } catch (_: Exception) {} | ||
| } | ||
| private fun toProducerRecord(topic: String, content: ByteArray): ProducerRecord<String, ByteArray> = | ||
| ProducerRecord<String, ByteArray>(topic, content) | ||
| } | ||
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Synes egentlig at dette feltet burde hete
eventTopici og med at denneKafka-klassen er tenkt gjenbrukt i alle moduler som benytter Kafka, og som da gjerne har andre topics i tillegg til topic for hendelser.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Har vi Kafka-topics som ikke er events? 🤔 Hvis vi følger samme tankegang, burde vi da kanskje også bruke navn som eventGroupId, eventTruststoreType, osv.?
Tenker at det allerede er tydelig at en topic er Kafka-relatert, siden den ligger i dataklassen Kafka.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dette
Kafka-configobjektet medbootstrapServers,securityProtocolosv, ogtopicligger iemottak-utilsfordi dette er felles config som er mer eller mindre statisk (det samme i alle moduler). Det som skiller seg ut, er hvilke topics den enkelte modul skal skrive til.Det jeg mente, var at vi f.eks. i
smtp-transporthar et eget config-objektKafkaTopicssom inneholderpayloadInTopic,signalInTopic,payloadOutTopicogsignalOutTopic. Disse navnene er jo ganske tydelige på hva de er, mensKafka.topicer utydelig på hvilken kø den er.Tanken her er altså at
Kafkasintopicer den ene felles-topic'en som vi har: Køen for hendelser (events). I allefall slik jeg har oppfattet det. Og da burde feltet også hete eventTopic.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Jeg merger denne nå så vi får koden ut. Jeg har tatt på meg å flytte hele repoet ut av
ebxml-processortil eget repo. Mindre oppgaver som dette kan vi løfte over til nytt repo. Ser for meg litt andre endringer også siden det nå blir et helt selvsetendig repo.