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

Jump to bottom

15805 version in azure events #15902

Merged
merged 5 commits into from
Sep 24, 2024
Merged

15805 version in azure events #15902

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
d42e956
small refactor of version file task
jack-h-wang Sep 17, 2024
660192d
Revert unrelated changes
jack-h-wang Sep 18, 2024
454b6b4
fix
jack-h-wang Sep 19, 2024
2d49377
implement generated version object and add to azure report event
jack-h-wang Sep 19, 2024
db7a7f9
add todo note
jack-h-wang Sep 24, 2024
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
42 changes: 35 additions & 7 deletions prime-router/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ plugins {
id("io.swagger.core.v3.swagger-gradle-plugin") version "2.2.23"
}

// retrieve the current commit hash
val commitId by lazy {
val stdout = ByteArrayOutputStream()
exec {
commandLine("git", "rev-parse", "--short", "HEAD")
standardOutput = stdout
}
stdout.toString(StandardCharsets.UTF_8).trim()
}

jack-h-wang marked this conversation as resolved.
Show resolved Hide resolved
group = "gov.cdc.prime.reportstream"
version = "0.2-SNAPSHOT"
description = "prime-router"
Expand Down Expand Up @@ -261,6 +271,9 @@ sourceSets.create("testIntegration") {
runtimeClasspath += sourceSets["main"].output
}

// Add generated version object
sourceSets["main"].java.srcDir("$buildDir/generated-src/version")

val compileTestIntegrationKotlin: KotlinCompile by tasks
compileTestIntegrationKotlin.kotlinOptions.jvmTarget = appJvmTarget

Expand Down Expand Up @@ -340,6 +353,7 @@ tasks.withType<Test>().configureEach {
}

tasks.processResources {
dependsOn("generateVersionObject")
// Set the proper build values in the build.properties file
filesMatching("build.properties") {
val dateFormatter = DateTimeFormatter.ofPattern("yyyyMMdd")
Expand Down Expand Up @@ -500,18 +514,32 @@ tasks.azureFunctionsPackage {
finalizedBy("copyAzureScripts")
}

// TODO: remove after implementation of health check endpoint
tasks.register("generateVersionFile") {
jack-h-wang marked this conversation as resolved.
Show resolved Hide resolved
doLast {
val stdout = ByteArrayOutputStream()
exec {
commandLine("git", "rev-parse", "--short", "HEAD")
standardOutput = stdout
}
val currentCommit = stdout.toString(StandardCharsets.UTF_8).trim()
File(buildDir, "$azureFunctionsDir/$azureAppName/version.json").writeText("{\"commitId\": \"$currentCommit\"}")
file("$buildDir/$azureFunctionsDir/$azureAppName/version.json").writeText("{\"commitId\": \"$commitId\"}")
}
}

tasks.register("generateVersionObject") {
val sourceDir = file("$buildDir/generated-src/version")
val sourceFile = file("$sourceDir/Version.kt")
sourceDir.mkdirs()
sourceFile.writeText(
"""
package gov.cdc.prime.router.version

/**
* Supplies information for the current build.
* This file is generated via Gradle task prior to compile time and should always contain the current commit hash.
*/
object Version {
const val commitId = "$commitId"
}
""".trimIndent()
jack-h-wang marked this conversation as resolved.
Show resolved Hide resolved
)
}

val azureResourcesTmpDir = File(buildDir, "$azureFunctionsDir-resources/$azureAppName")
val azureResourcesFinalDir = File(buildDir, "$azureFunctionsDir/$azureAppName")
tasks.register<Copy>("gatherAzureResources") {
Expand Down
1 change: 1 addition & 0 deletions prime-router/src/main/kotlin/azure/observability/event/ReportStreamEventData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ data class ReportEventData(
val blobUrl: String,
val pipelineStepName: TaskAction,
val timestamp: OffsetDateTime,
val commitId: String,
)

/**
Expand Down
4 changes: 3 additions & 1 deletion prime-router/src/main/kotlin/azure/observability/event/ReportStreamEventService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import gov.cdc.prime.router.azure.DatabaseAccess
import gov.cdc.prime.router.azure.db.enums.TaskAction
import gov.cdc.prime.router.azure.db.tables.pojos.ReportFile
import gov.cdc.prime.router.report.ReportService
import gov.cdc.prime.router.version.Version
import java.time.OffsetDateTime
import java.util.UUID

Expand Down Expand Up @@ -412,7 +413,8 @@ class ReportStreamEventService(
topic,
childBodyUrl,
pipelineStepName,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
)
}

Expand Down
9 changes: 6 additions & 3 deletions prime-router/src/test/kotlin/azure/ActionHistoryTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,8 @@ class ActionHistoryTests {
Topic.TEST,
"http://blobUrl",
TaskAction.send,
OffsetDateTime.now()
OffsetDateTime.now(),
""
jack-h-wang marked this conversation as resolved.
Show resolved Hide resolved
)
every {
mockReportEventService.sendReportEvent(any(), any<ReportFile>(), any(), any())
Expand Down Expand Up @@ -452,7 +453,8 @@ class ActionHistoryTests {
Topic.TEST,
"http://blobUrl",
TaskAction.send,
OffsetDateTime.now()
OffsetDateTime.now(),
""
)
mockkObject(BlobAccess.Companion)
mockkObject(BlobUtils)
Expand Down Expand Up @@ -692,7 +694,8 @@ class ActionHistoryTests {
Topic.TEST,
"http://blobUrl",
TaskAction.send,
OffsetDateTime.now()
OffsetDateTime.now(),
""
)
mockkObject(BlobAccess.Companion)
mockkObject(BlobUtils)
Expand Down
6 changes: 4 additions & 2 deletions prime-router/src/test/kotlin/azure/observability/context/MDCUtilsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ class MDCUtilsTest {
Topic.FULL_ELR,
"",
TaskAction.send,
OffsetDateTime.now()
OffsetDateTime.now(),
""
),
mapOf(
ReportStreamEventProperties.FILENAME to "filename"
Expand All @@ -121,7 +122,8 @@ class MDCUtilsTest {
Topic.FULL_ELR,
"",
TaskAction.send,
OffsetDateTime.now()
OffsetDateTime.now(),
""
),
ItemEventData(
1,
Expand Down
7 changes: 5 additions & 2 deletions prime-router/src/test/kotlin/azure/observability/event/ReportEventServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import gov.cdc.prime.router.db.ReportStreamTestDatabaseContainer
import gov.cdc.prime.router.db.ReportStreamTestDatabaseSetupExtension
import gov.cdc.prime.router.history.db.ReportGraph
import gov.cdc.prime.router.report.ReportService
import gov.cdc.prime.router.version.Version
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith
import org.testcontainers.junit.jupiter.Testcontainers
Expand Down Expand Up @@ -93,7 +94,8 @@ class ReportEventServiceTest {
Topic.FULL_ELR,
"",
TaskAction.send,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand Down Expand Up @@ -136,7 +138,8 @@ class ReportEventServiceTest {
Topic.FULL_ELR,
"",
TaskAction.send,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand Down
10 changes: 7 additions & 3 deletions prime-router/src/test/kotlin/fhirengine/azure/FHIRConverterIntegrationTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import gov.cdc.prime.router.history.DetailedActionLog
import gov.cdc.prime.router.metadata.LookupTable
import gov.cdc.prime.router.metadata.ObservationMappingConstants
import gov.cdc.prime.router.unittest.UnitTestUtils
import gov.cdc.prime.router.version.Version
import io.mockk.every
import io.mockk.mockkConstructor
import io.mockk.mockkObject
Expand Down Expand Up @@ -357,7 +358,8 @@ class FHIRConverterIntegrationTests {
Topic.FULL_ELR,
routedReports[1].bodyUrl,
TaskAction.convert,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand Down Expand Up @@ -529,7 +531,8 @@ class FHIRConverterIntegrationTests {
Topic.FULL_ELR,
routedReports[1].bodyUrl,
TaskAction.convert,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand Down Expand Up @@ -664,7 +667,8 @@ class FHIRConverterIntegrationTests {
Topic.MARS_OTC_ELR,
"",
TaskAction.convert,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand Down
7 changes: 5 additions & 2 deletions prime-router/src/test/kotlin/fhirengine/azure/FHIRDestinationFilterIntegrationTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import gov.cdc.prime.router.history.db.ReportGraph
import gov.cdc.prime.router.metadata.LookupTable
import gov.cdc.prime.router.report.ReportService
import gov.cdc.prime.router.unittest.UnitTestUtils
import gov.cdc.prime.router.version.Version
import io.mockk.every
import io.mockk.mockkConstructor
import io.mockk.mockkObject
Expand Down Expand Up @@ -349,7 +350,8 @@ class FHIRDestinationFilterIntegrationTests : Logging {
Topic.FULL_ELR,
routedReport.bodyUrl,
TaskAction.destination_filter,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand Down Expand Up @@ -450,7 +452,8 @@ class FHIRDestinationFilterIntegrationTests : Logging {
Topic.FULL_ELR,
"",
TaskAction.destination_filter,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp,
ReportEventData::childReportId
Expand Down
16 changes: 11 additions & 5 deletions prime-router/src/test/kotlin/fhirengine/azure/FHIRReceiverFilterIntegrationTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import gov.cdc.prime.router.metadata.LookupTable
import gov.cdc.prime.router.metadata.ObservationMappingConstants
import gov.cdc.prime.router.report.ReportService
import gov.cdc.prime.router.unittest.UnitTestUtils
import gov.cdc.prime.router.version.Version
import io.mockk.every
import io.mockk.mockkConstructor
import io.mockk.mockkObject
Expand Down Expand Up @@ -388,7 +389,8 @@ class FHIRReceiverFilterIntegrationTests : Logging {
Topic.FULL_ELR,
"",
TaskAction.receiver_filter,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp,
)
Expand Down Expand Up @@ -562,7 +564,8 @@ class FHIRReceiverFilterIntegrationTests : Logging {
Topic.FULL_ELR,
"",
TaskAction.receiver_filter,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp,
)
Expand Down Expand Up @@ -749,7 +752,8 @@ class FHIRReceiverFilterIntegrationTests : Logging {
Topic.FULL_ELR,
"",
TaskAction.receiver_filter,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp,
)
Expand Down Expand Up @@ -880,7 +884,8 @@ class FHIRReceiverFilterIntegrationTests : Logging {
Topic.FULL_ELR,
"",
TaskAction.receiver_filter,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp,
)
Expand Down Expand Up @@ -1163,7 +1168,8 @@ class FHIRReceiverFilterIntegrationTests : Logging {
Topic.FULL_ELR,
"",
TaskAction.receiver_filter,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp,
)
Expand Down
25 changes: 17 additions & 8 deletions prime-router/src/test/kotlin/fhirengine/azure/FHIRReceiverIntegrationTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import gov.cdc.prime.router.fhirengine.engine.FHIRReceiver
import gov.cdc.prime.router.history.DetailedActionLog
import gov.cdc.prime.router.history.DetailedReport
import gov.cdc.prime.router.unittest.UnitTestUtils
import gov.cdc.prime.router.version.Version
import io.mockk.clearAllMocks
import io.mockk.every
import io.mockk.mockkObject
Expand Down Expand Up @@ -228,7 +229,8 @@ class FHIRReceiverIntegrationTests {
Topic.FULL_ELR,
receiveBlobUrl,
TaskAction.receive,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand All @@ -254,7 +256,8 @@ class FHIRReceiverIntegrationTests {
Topic.FULL_ELR,
receiveBlobUrl,
TaskAction.receive,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand Down Expand Up @@ -339,7 +342,8 @@ class FHIRReceiverIntegrationTests {
null,
submissionBlobUrl,
TaskAction.receive,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand Down Expand Up @@ -441,7 +445,8 @@ class FHIRReceiverIntegrationTests {
Topic.FULL_ELR,
receiveBlobUrl,
TaskAction.receive,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand Down Expand Up @@ -544,7 +549,8 @@ class FHIRReceiverIntegrationTests {
Topic.FULL_ELR,
receiveBlobUrl,
TaskAction.receive,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand Down Expand Up @@ -649,7 +655,8 @@ class FHIRReceiverIntegrationTests {
Topic.FULL_ELR,
receiveBlobUrl,
TaskAction.receive,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand Down Expand Up @@ -753,7 +760,8 @@ class FHIRReceiverIntegrationTests {
Topic.FULL_ELR,
receiveBlobUrl,
TaskAction.receive,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand Down Expand Up @@ -854,7 +862,8 @@ class FHIRReceiverIntegrationTests {
null,
receiveBlobUrl,
TaskAction.receive,
OffsetDateTime.now()
OffsetDateTime.now(),
Version.commitId
),
ReportEventData::timestamp
)
Expand Down
Loading