Skip to content

Commit

Permalink
Allow to reset event metrics indexing at startup (#5101)
Browse files Browse the repository at this point in the history 
* Allow to reset event metrics indexing at startup

---------

Co-authored-by: Simon Dumas <[email protected]>
  • Loading branch information
@imsdu
imsdu and Simon Dumas authored Aug 14, 2024
1 parent a8a05d1 commit 0e0eb5b
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 22 deletions.
2 changes: 2 additions & 0 deletions ...scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchPluginModule.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,15 @@ class ElasticSearchPluginModule(priority: Int) extends ModuleDef {
metricEncoders: Set[ScopedEventMetricEncoder[_]],
xas: Transactors,
supervisor: Supervisor,
projections: Projections,
client: ElasticSearchClient,
config: ElasticSearchViewsConfig,
files: ElasticSearchFiles
) =>
EventMetricsProjection(
metricEncoders,
supervisor,
projections,
client,
xas,
config.batch,
Expand Down
17 changes: 16 additions & 1 deletion ...in/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/EventMetricsProjection.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch

import cats.data.NonEmptyChain
import cats.effect.IO
import cats.effect.std.Env
import ch.epfl.bluebrain.nexus.delta.kernel.Logger
import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.client.ElasticSearchClient.Refresh
import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.client.{ElasticSearchClient, IndexLabel}
import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.indexing.ElasticSearchSink
Expand All @@ -12,6 +14,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.config.{BatchConfig, QueryConfig}
import ch.epfl.bluebrain.nexus.delta.sourcing.event.EventStreaming
import ch.epfl.bluebrain.nexus.delta.sourcing.model.SuccessElemStream
import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset
import ch.epfl.bluebrain.nexus.delta.sourcing.projections.Projections
import ch.epfl.bluebrain.nexus.delta.sourcing.stream.Operation.Sink
import ch.epfl.bluebrain.nexus.delta.sourcing.stream._
import ch.epfl.bluebrain.nexus.delta.sourcing.stream.pipes.AsJson
Expand All @@ -20,6 +23,8 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.{MultiDecoder, Scope, Transactors}
trait EventMetricsProjection

object EventMetricsProjection {
private val logger = Logger[EventMetricsProjection]

val projectionMetadata: ProjectionMetadata = ProjectionMetadata("system", "event-metrics", None, None)
val eventMetricsIndex: String => IndexLabel = prefix => IndexLabel.unsafe(s"${prefix}_project_metrics")

Expand Down Expand Up @@ -49,6 +54,7 @@ object EventMetricsProjection {
def apply(
metricEncoders: Set[ScopedEventMetricEncoder[_]],
supervisor: Supervisor,
projections: Projections,
client: ElasticSearchClient,
xas: Transactors,
batchConfig: BatchConfig,
Expand All @@ -73,7 +79,16 @@ object EventMetricsProjection {

val createIndex = client.createIndex(index, Some(metricMappings.value), Some(metricsSettings.value)).void

apply(sink, supervisor, metrics, createIndex)
for {
shouldRestart <- Env[IO].get("RESET_EVENT_METRICS").map(_.getOrElse("false").toBoolean)
_ <- IO.whenA(shouldRestart)(
logger.warn("Resetting event metrics as the env RESET_EVENT_METRICS is set") >> projections.reset(
projectionMetadata.name
)
)
metricsProjection <- apply(sink, supervisor, metrics, createIndex)
} yield (metricsProjection)

} else IO.pure(dummy)

/**
Expand Down
42 changes: 21 additions & 21 deletions tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/SearchConfigIndexingSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ class SearchConfigIndexingSpec extends BaseIntegrationSpec {
private val projId1 = genId()
private val id1 = s"$orgId/$projId1"

private val neuronMorphologyId = "https://bbp.epfl.ch/data/neuron-morphology"
private val simulationReadyNeuronMorphologyId = "https://bbp.epfl.ch/data/simulation-ready-neuron-morphology"
private val neuronDensityId = "https://bbp.epfl.ch/data/neuron-density"
private val traceId = "https://bbp.epfl.ch/data/trace"
private val curatedTraceId = "https://bbp.epfl.ch/data/curated-trace"
private val unassessedTraceId = "https://bbp.epfl.ch/data/unassessed-trace"
private val layerThicknessId = "https://bbp.epfl.ch/data/layer-thickness"
private val boutonDensityId = "https://bbp.epfl.ch/data/bouton-density"
private val simulationCampaignId = "https://bbp.epfl.ch/data/simulation-campaign"
private val simulationId = "https://bbp.epfl.ch/data/simulation"
private val synapseId = "https://bbp.epfl.ch/data/synapse"
private val synapseTwoPathwaysId = "https://bbp.epfl.ch/data/synapse-two-pathways"
private val detailedCircuitId = "https://bbp.epfl.ch/data/detailed-circuit"
private val emodelId = "https://bbp.epfl.ch/data/emodel"
private val memodelId = "https://bbp.epfl.ch/data/memodel"
private val analysisSuitablememodelId = "https://bbp.epfl.ch/data/analysis-suitable-memodel"
private val singleNeuronSimulationId = "https://bbp.epfl.ch/data/synapse/single-neuron-simulation"
private val neuronMorphologyId = "https://bbp.epfl.ch/data/neuron-morphology"
private val simulationReadyNeuronMorphologyId = "https://bbp.epfl.ch/data/simulation-ready-neuron-morphology"
private val neuronDensityId = "https://bbp.epfl.ch/data/neuron-density"
private val traceId = "https://bbp.epfl.ch/data/trace"
private val curatedTraceId = "https://bbp.epfl.ch/data/curated-trace"
private val unassessedTraceId = "https://bbp.epfl.ch/data/unassessed-trace"
private val layerThicknessId = "https://bbp.epfl.ch/data/layer-thickness"
private val boutonDensityId = "https://bbp.epfl.ch/data/bouton-density"
private val simulationCampaignId = "https://bbp.epfl.ch/data/simulation-campaign"
private val simulationId = "https://bbp.epfl.ch/data/simulation"
private val synapseId = "https://bbp.epfl.ch/data/synapse"
private val synapseTwoPathwaysId = "https://bbp.epfl.ch/data/synapse-two-pathways"
private val detailedCircuitId = "https://bbp.epfl.ch/data/detailed-circuit"
private val emodelId = "https://bbp.epfl.ch/data/emodel"
private val memodelId = "https://bbp.epfl.ch/data/memodel"
private val analysisSuitablememodelId = "https://bbp.epfl.ch/data/analysis-suitable-memodel"
private val singleNeuronSimulationId = "https://bbp.epfl.ch/data/synapse/single-neuron-simulation"

// the resources that should appear in the search index
private val mainResources = List(
Expand Down Expand Up @@ -398,12 +398,12 @@ class SearchConfigIndexingSpec extends BaseIntegrationSpec {
}

"have simulationReady field true if annotation is present" in {
val query = queryField(simulationReadyNeuronMorphologyId, "simulationReady")
val query = queryField(simulationReadyNeuronMorphologyId, "simulationReady")

assertOneSource(query) { json =>
json shouldBe json"""{ "simulationReady": true }"""
assertOneSource(query) { json =>
json shouldBe json"""{ "simulationReady": true }"""
}
}
}

"have the correct mType property" in {
val query = queryField(traceId, "mType")
Expand Down

0 comments on commit 0e0eb5b

Please sign in to comment.