Skip to content

Commit 3e40461

Browse files
karl-runkarl-run
committed
chore: remove trace spammy logging
1 parent 90f3d2c commit 3e40461

File tree

2 files changed

+28
-70
lines changed

2 files changed

+28
-70
lines changed

‎src/main/kotlin/no/nav/syfo/application/BlockingApplicationRunner.kt

+28-63
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class BlockingApplicationRunner(
9393
private val pdlPersonService: PdlPersonService,
9494
private val bucketUploadService: BucketUploadService,
9595
private val kafkaproducerreceivedSykmelding:
96-
KafkaProducer<String, ReceivedSykmeldingWithValidation>,
96+
KafkaProducer<String, ReceivedSykmeldingWithValidation>,
9797
private val kafkaproducervalidationResult: KafkaProducer<String, ValidationResult>,
9898
private val kafkaManuelTaskProducer: KafkaProducer<String, OpprettOppgaveKafkaMessage>,
9999
private val kafkaproducerApprec: KafkaProducer<String, Apprec>,
@@ -109,11 +109,7 @@ class BlockingApplicationRunner(
109109
) {
110110
wrapExceptions {
111111
loop@ while (applicationState.ready) {
112-
val randomUuid = UUID.randomUUID().toString()
113-
logger.info("TRACE_DEBUG: Polling for message, trace id: $randomUuid")
114112
val message = inputconsumer.receive(1000)
115-
logger.info("TRACE_DEBUG: Received message, trace id: $randomUuid")
116-
117113
var loggingMeta: LoggingMeta? = null
118114
if (message == null) {
119115
delay(100)
@@ -133,19 +129,16 @@ class BlockingApplicationRunner(
133129
val requestLatency = REQUEST_TIME.startTimer()
134130
val fellesformat = safeUnmarshal(inputMessageText)
135131

136-
logger.info("TRACE_DEBUG: Before vedlegg, trace id: $randomUuid")
137132
val vedlegg = getVedlegg(fellesformat)
138133
if (vedlegg.isNotEmpty()) {
139134
SYKMELDING_VEDLEGG_COUNTER.inc()
140135
removeVedleggFromFellesformat(fellesformat)
141136
}
142-
logger.info("TRACE_DEBUG: After vedlegg, trace id: $randomUuid")
143137
val fellesformatText =
144138
when (vedlegg.isNotEmpty()) {
145139
true -> fellesformatMarshaller.toString(fellesformat)
146140
false -> inputMessageText
147141
}
148-
logger.info("TRACE_DEBUG: AFter fellesformat, trace id: $randomUuid")
149142
val receiverBlock = fellesformat.get<XMLMottakenhetBlokk>()
150143
val msgHead = fellesformat.get<XMLMsgHead>()
151144
val legekontorOrgNr =
@@ -159,25 +152,22 @@ class BlockingApplicationRunner(
159152
orgNr = legekontorOrgNr,
160153
msgId = msgHead.msgInfo.msgId,
161154
)
162-
logger.info("TRACE_DEBUG: Received message, trace id: $randomUuid")
163155
logger.info("Received message, {}", StructuredArguments.fields(loggingMeta))
164156

165157
val healthInformation = extractHelseOpplysningerArbeidsuforhet(fellesformat)
166158
val ediLoggId = receiverBlock.ediLoggId
167159
val sha256String = sha256hashstring(healthInformation)
168160
val msgId = msgHead.msgInfo.msgId
169161

170-
logger.info("TRACE_DEBUG: After health information, trace id: $randomUuid")
171162

172163
val legekontorHerId = extractOrganisationHerNumberFromSender(fellesformat)?.id
173164
val legekontorReshId = extractOrganisationRashNumberFromSender(fellesformat)?.id
174165
val legekontorOrgName =
175166
msgHead.msgInfo.sender.organisation.organisationName.replace(
176167
"[^\\p{ASCII}]".toRegex(),
177-
""
168+
"",
178169
)
179170

180-
logger.info("TRACE_DEBUG: After legekontorstuff, trace id: $randomUuid")
181171

182172
val partnerReferanse = receiverBlock.partnerReferanse
183173

@@ -193,7 +183,6 @@ class BlockingApplicationRunner(
193183

194184
val avsenderSystem = healthInformation.avsenderSystem.toAvsenderSystem()
195185

196-
logger.info("TRACE_DEBUG: Before sykmelding stuff, trace id: $randomUuid")
197186
val sykmeldingId = UUID.randomUUID().toString()
198187

199188
val rulesetVersion = healthInformation.regelSettVersjon
@@ -211,7 +200,6 @@ class BlockingApplicationRunner(
211200
rulesetVersion,
212201
)
213202

214-
logger.info("TRACE_DEBUG: Before extract, trace id: $randomUuid")
215203
logger.info(
216204
"Extracted data, ready to make sync calls to get more data, {}",
217205
StructuredArguments.fields(loggingMeta),
@@ -230,7 +218,6 @@ class BlockingApplicationRunner(
230218
)
231219
}
232220

233-
logger.info("TRACE_DEBUG: Before signatur, trace id: $randomUuid")
234221
val signaturFnr =
235222
if (erVirksomhetSykmelding) {
236223
logger.info(
@@ -279,27 +266,21 @@ class BlockingApplicationRunner(
279266
} else {
280267
receiverBlock.avsenderFnrFraDigSignatur
281268
}
282-
logger.info("TRACE_DEBUG: After signatur, trace id: $randomUuid")
283269

284-
logger.info("TRACE_DEBUG: before PDL, trace id: $randomUuid")
285270
val identer =
286271
pdlPersonService.getIdenter(
287272
listOf(signaturFnr, originaltPasientFnr),
288273
loggingMeta,
289274
)
290-
logger.info("TRACE_DEBUG: After PDL, trace id: $randomUuid")
291275

292-
logger.info("TRACE_DEBUG: Before TSSID, trace id: $randomUuid")
293276
val tssIdEmottak =
294277
smtssClient.findBestTssIdEmottak(
295278
signaturFnr,
296279
legekontorOrgName,
297280
loggingMeta,
298281
sykmeldingId,
299282
)
300-
logger.info("TRACE_DEBUG: After TSSID, trace id: $randomUuid")
301283

302-
logger.info("TRACE_DEBUG: Before TSSID INFOTOAST, trace id: $randomUuid")
303284
val tssIdInfotrygd =
304285
if (!tssIdEmottak.isNullOrEmpty()) {
305286
tssIdEmottak
@@ -311,7 +292,6 @@ class BlockingApplicationRunner(
311292
sykmeldingId,
312293
)
313294
}
314-
logger.info("TRACE_DEBUG: After TTSID INFOTOAST, trace id: $randomUuid")
315295

316296
logger.info(
317297
"tssIdEmottak is $tssIdEmottak {}",
@@ -322,7 +302,6 @@ class BlockingApplicationRunner(
322302
StructuredArguments.fields(loggingMeta),
323303
)
324304

325-
logger.info("TRACE_DEBUG: Before emottak sub, trace id: $randomUuid")
326305
handleEmottakSubscription(
327306
tssIdEmottak,
328307
emottakSubscriptionClient,
@@ -331,17 +310,13 @@ class BlockingApplicationRunner(
331310
partnerReferanse,
332311
loggingMeta,
333312
)
334-
logger.info("TRACE_DEBUG: After emottak sub, trace id: $randomUuid")
335313

336314

337-
logger.info("TRACE_DEBUG: Before dup check, trace id: $randomUuid")
338315
// HERE IS THE WRON GCODE
339316
val duplicationCheckSha256String =
340317
duplicationService.getDuplicationCheck(sha256String, ediLoggId)
341-
logger.info("TRACE_DEBUG: After dup check, trace id: $randomUuid")
342318

343319
if (duplicationCheckSha256String != null) {
344-
logger.info("TRACE_DEBUG: Inside dup check not null, trace id: $randomUuid")
345320
val duplicate =
346321
Duplicate(
347322
sykmeldingId,
@@ -366,10 +341,8 @@ class BlockingApplicationRunner(
366341
duplicationService,
367342
duplicate,
368343
)
369-
logger.info("TRACE_DEBUG: After dup check not null, trace id: $randomUuid")
370344
continue@loop
371345
} else {
372-
logger.info("TRACE_DEBUG: Inside dup check IS! null, trace id: $randomUuid")
373346
val pasient = identer[originaltPasientFnr]
374347
val behandler = identer[signaturFnr]
375348

@@ -390,23 +363,20 @@ class BlockingApplicationRunner(
390363
duplicateCheck,
391364
)
392365
) {
393-
logger.info("TRACE_DEBUG: Inside dup check skipping??, trace id: $randomUuid")
394366
continue@loop
395367
}
396368

397-
logger.info("TRACE_DEBUG: Inside dup check before behandler, trace id: $randomUuid")
398369
val signerendeBehandler =
399370
norskHelsenettClient.getByFnr(
400371
fnr = signaturFnr,
401372
loggingMeta = loggingMeta,
402373
)
403-
logger.info("TRACE_DEBUG: Inside dup check after behandler, trace id: $randomUuid")
404374

405375
val behandlenedeBehandler =
406376
if (
407377
extractFnrDnrFraBehandler(healthInformation) != null ||
408-
padHpr(extractHpr(fellesformat)?.id?.trim()) != null ||
409-
padHpr(extractHprBehandler(healthInformation)?.trim()) != null
378+
padHpr(extractHpr(fellesformat)?.id?.trim()) != null ||
379+
padHpr(extractHprBehandler(healthInformation)?.trim()) != null
410380
) {
411381
getBehandlenedeBehandler(
412382
padHpr(extractHprBehandler(healthInformation)?.trim()),
@@ -418,27 +388,23 @@ class BlockingApplicationRunner(
418388
null
419389
}
420390

421-
logger.info("TRACE_DEBUG: Inside dup check before behandlene behandler, trace id: $randomUuid")
422391
val behandlenedeBehandlerFnr =
423392
extractFnrDnrFraBehandler(healthInformation)
424393
?: getBehandlerFnr(
425394
avsenderHpr = padHpr(extractHpr(fellesformat)?.id?.trim()),
426395
signerendeBehandler = signerendeBehandler,
427396
behandlenedeBehandler = behandlenedeBehandler,
428397
)
429-
?: signaturFnr
430-
logger.info("TRACE_DEBUG: Inside dup check after behandlene behandler, trace id: $randomUuid")
398+
?: signaturFnr
431399

432-
logger.info("TRACE_DEBUG: Inside dup check before behandlene behandler (HPR), trace id: $randomUuid")
433400
val behandlenedeBehandlerhprNummer =
434401
padHpr(extractHpr(fellesformat)?.id?.trim())
435402
?: getBehandlerHprNr(
436403
behandlerHpr =
437-
padHpr(extractHprBehandler(healthInformation)?.trim()),
404+
padHpr(extractHprBehandler(healthInformation)?.trim()),
438405
avsenderHpr = padHpr(extractHpr(fellesformat)?.id?.trim()),
439406
behandlenedeBehandler = behandlenedeBehandler,
440407
)
441-
logger.info("TRACE_DEBUG: Inside dup check after behandlene behandler (HPR), trace id: $randomUuid")
442408

443409
val sykmelding =
444410
healthInformation.toSykmelding(
@@ -464,12 +430,11 @@ class BlockingApplicationRunner(
464430
)
465431
}
466432

467-
logger.info("TRACE_DEBUG: Inside dup check before vedlegg, trace id: $randomUuid")
468433
if (vedlegg.isNotEmpty()) {
469434
val vedleggOver300MegaByte =
470435
vedlegg.filter {
471436
fileSizeLagerThan300MegaBytes(
472-
Base64.getMimeDecoder().decode(it.content.content)
437+
Base64.getMimeDecoder().decode(it.content.content),
473438
)
474439
}
475440

@@ -503,7 +468,6 @@ class BlockingApplicationRunner(
503468
continue@loop
504469
}
505470
}
506-
logger.info("TRACE_DEBUG: Inside dup check after vedlegg, trace id: $randomUuid")
507471

508472

509473
if (sykmelding.signaturDato.isAfter(LocalDateTime.now())) {
@@ -521,47 +485,45 @@ class BlockingApplicationRunner(
521485
continue@loop
522486
}
523487

524-
logger.info("TRACE_DEBUG: Inside dup check before vedlegg LISTE, trace id: $randomUuid")
525488
val vedleggListe: List<String> =
526489
if (vedlegg.isNotEmpty()) {
527490
bucketUploadService.lastOppVedlegg(
528491
vedlegg = vedlegg,
529492
msgId = msgId,
530493
personNrPasient = pasient.fnr!!,
531494
behandlerInfo =
532-
BehandlerInfo(
533-
fornavn = sykmelding.behandler.fornavn,
534-
etternavn = sykmelding.behandler.etternavn,
535-
fnr = signaturFnr,
536-
),
495+
BehandlerInfo(
496+
fornavn = sykmelding.behandler.fornavn,
497+
etternavn = sykmelding.behandler.etternavn,
498+
fnr = signaturFnr,
499+
),
537500
pasientAktoerId = sykmelding.pasientAktoerId,
538501
sykmeldingId = sykmelding.id,
539502
loggingMeta = loggingMeta,
540503
)
541504
} else {
542505
emptyList()
543506
}
544-
logger.info("TRACE_DEBUG: Inside dup check after vedlegg LISTE, trace id: $randomUuid")
545507

546508
// ASSUMED OK HER
547509
val receivedSykmelding =
548510
ReceivedSykmelding(
549511
sykmelding = sykmelding,
550512
personNrPasient = pasient.fnr!!,
551513
tlfPasient =
552-
extractTlfFromKontaktInfo(
553-
healthInformation.pasient.kontaktInfo,
554-
),
514+
extractTlfFromKontaktInfo(
515+
healthInformation.pasient.kontaktInfo,
516+
),
555517
personNrLege = signaturFnr,
556518
navLogId = ediLoggId,
557519
msgId = msgId,
558520
legeHprNr = signerendeBehandler?.hprNummer,
559521
legeHelsepersonellkategori =
560-
signerendeBehandler?.godkjenninger?.let {
561-
getHelsepersonellKategori(
562-
it,
563-
)
564-
},
522+
signerendeBehandler?.godkjenninger?.let {
523+
getHelsepersonellKategori(
524+
it,
525+
)
526+
},
565527
legekontorOrgNr = legekontorOrgNr,
566528
legekontorOrgName = legekontorOrgName,
567529
legekontorHerId = legekontorHerId,
@@ -593,7 +555,6 @@ class BlockingApplicationRunner(
593555
loggingMeta,
594556
)
595557

596-
logger.info("TRACE_DEBUG: Inside dup check before WHEN, trace id: $randomUuid")
597558
when (validationResult.status) {
598559
Status.OK ->
599560
handleStatusOK(
@@ -607,8 +568,9 @@ class BlockingApplicationRunner(
607568
okSykmeldingTopic = env.okSykmeldingTopic,
608569
receivedSykmelding = receivedSykmelding,
609570
kafkaproducerreceivedSykmelding =
610-
kafkaproducerreceivedSykmelding,
571+
kafkaproducerreceivedSykmelding,
611572
)
573+
612574
Status.MANUAL_PROCESSING ->
613575
handleStatusMANUALPROCESSING(
614576
receivedSykmelding = receivedSykmelding,
@@ -622,20 +584,21 @@ class BlockingApplicationRunner(
622584
validationResult = validationResult,
623585
kafkaManuelTaskProducer = kafkaManuelTaskProducer,
624586
kafkaproducerreceivedSykmelding =
625-
kafkaproducerreceivedSykmelding,
587+
kafkaproducerreceivedSykmelding,
626588
manuellBehandlingSykmeldingTopic =
627-
env.manuellBehandlingSykmeldingTopic,
589+
env.manuellBehandlingSykmeldingTopic,
628590
kafkaproducervalidationResult = kafkaproducervalidationResult,
629591
behandlingsUtfallTopic = env.behandlingsUtfallTopic,
630592
kafkaproducerManuellOppgave = kafkaproducerManuellOppgave,
631593
syfoSmManuellTopic = env.syfoSmManuellTopic,
632594
produserOppgaveTopic = env.produserOppgaveTopic,
633595
)
596+
634597
Status.INVALID ->
635598
handleStatusINVALID(
636599
validationResult = validationResult,
637600
kafkaproducerreceivedSykmelding =
638-
kafkaproducerreceivedSykmelding,
601+
kafkaproducerreceivedSykmelding,
639602
kafkaproducervalidationResult = kafkaproducervalidationResult,
640603
avvistSykmeldingTopic = env.avvistSykmeldingTopic,
641604
receivedSykmelding = receivedSykmelding,
@@ -714,9 +677,11 @@ class BlockingApplicationRunner(
714677
null -> {
715678
null
716679
}
680+
717681
signerendeBehandler?.hprNummer -> {
718682
signerendeBehandler.fnr
719683
}
684+
720685
else -> {
721686
behandlenedeBehandler?.fnr
722687
}

0 commit comments

Comments
 (0)