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

Faster metadata - Ian's amendments #905

Open
wants to merge 1 commit into
base: feature/faster-metadata
Choose a base branch
from
Open

Faster metadata - Ian's amendments #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions ...mon-fs2/src/main/scala/com/snowplowanalytics/snowplow/enrich/common/fs2/Environment.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ object Environment {
igluClient <- IgluCirceClient.parseDefault[F](parsedConfigs.igluJson).resource
remoteAdaptersEnabled = file.remoteAdapters.configs.nonEmpty
metrics <- Resource.eval(Metrics.build[F](file.monitoring.metrics, remoteAdaptersEnabled, incomplete.isDefined))
metadata <- Resource.eval(metadataReporter[F](file, processor.artifact, http4s))
metadata <- metadataReporter[F](file, processor.artifact, http4s)
assets = parsedConfigs.enrichmentConfigs.flatMap(_.filesToCache)
remoteAdapters <- prepareRemoteAdapters[F](file.remoteAdapters, metrics)
adapterRegistry = new AdapterRegistry(remoteAdapters, file.adaptersSchemas)
Expand Down Expand Up @@ -275,11 +275,16 @@ object Environment {
config: ConfigFile,
appName: String,
httpClient: Http4sClient[F]
): F[Metadata[F]] =
config.experimental
.flatMap(_.metadata)
.map(metadataConfig => Metadata.build[F](metadataConfig, Metadata.HttpMetadataReporter[F](metadataConfig, appName, httpClient)))
.getOrElse(Metadata.noop[F].pure[F])
): Resource[F, Metadata[F]] =
config.experimental.flatMap(_.metadata) match {
case Some(metadataConfig) =>
for {
reporter <- Metadata.HttpMetadataReporter.resource(metadataConfig, appName, httpClient)
metadata <- Resource.eval(Metadata.build(metadataConfig, reporter))
} yield metadata
case None =>
Resource.pure(Metadata.noop[F])
}

private implicit class EitherTOps[F[_], E: Show, A](eitherT: EitherT[F, E, A]) {
def resource(implicit F: Sync[F]): Resource[F, A] = {
Expand Down
59 changes: 29 additions & 30 deletions ...ain/scala/com/snowplowanalytics/snowplow/enrich/common/fs2/io/experimental/Metadata.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ object Metadata {
case (event, entitiesAndCount) =>
reporter.report(snapshot.periodStart, snapshot.periodEnd, event, entitiesAndCount)
}
_ <- reporter.flush
_ <- reporter.flush()
} yield ()

trait MetadataReporter[F[_]] {
Expand All @@ -117,17 +117,35 @@ object Metadata {
def flush(): F[Unit]
}

case class HttpMetadataReporter[F[_]: Async](
case class HttpMetadataReporter[F[_]: Sync](
config: MetadataConfig,
appName: String,
client: Client[F]
tracker: Tracker[F]
) extends MetadataReporter[F] {
// Probably shouldn't do this?
// Should this still be a resource?
// How would I release the resource automatically?
val tracker: Resource[F, Tracker[F]] = initTracker(config, appName, client)

def initTracker(
def report(
periodStart: Instant,
periodEnd: Instant,
event: MetadataEvent,
entitiesAndCount: EntitiesAndCount
): F[Unit] =
Logger[F].debug(s"Tracking observed event ${event.schema.toSchemaUri}") >>
tracker.trackSelfDescribingEvent(
mkWebhookEvent(config.organizationId, config.pipelineId, periodStart, periodEnd, event, entitiesAndCount.count),
mkWebhookContexts(entitiesAndCount.entities).toSeq
)

def flush(): F[Unit] = tracker.flushEmitters()
}

object HttpMetadataReporter {
def resource[F[_]: Async](
config: MetadataConfig,
appName: String,
client: Client[F]
): Resource[F, HttpMetadataReporter[F]] =
initTracker(config, appName, client).map(t => HttpMetadataReporter(config, t))

private def initTracker[F[_]: Async](
config: MetadataConfig,
appName: String,
client: Client[F]
Expand All @@ -143,30 +161,11 @@ object Metadata {
client,
bufferConfig = Emitter.BufferConfig.PayloadSize(100000),
retryPolicy = Emitter.RetryPolicy.MaxAttempts(10),
callback = Some(emitterCallback _)
callback = Some(emitterCallback[F](_, _, _))
)
} yield new Tracker(NonEmptyList.of(emitter), "tracker-metadata", appName)

def report(
periodStart: Instant,
periodEnd: Instant,
event: MetadataEvent,
entitiesAndCount: EntitiesAndCount
): F[Unit] =
tracker.allocated.flatMap { case (t, _) =>
Logger[F].debug(s"Tracking observed event ${event.schema.toSchemaUri}") >>
t.trackSelfDescribingEvent(
mkWebhookEvent(config.organizationId, config.pipelineId, periodStart, periodEnd, event, entitiesAndCount.count),
mkWebhookContexts(entitiesAndCount.entities).toSeq
)
}

def flush(): F[Unit] =
tracker.allocated.flatMap { case (t, _) =>
t.flushEmitters()
}

private def emitterCallback(
private def emitterCallback[F[_]: Sync](
params: Emitter.EndpointParams,
req: Emitter.Request,
res: Emitter.Result
Expand Down
Loading