Skip to content

Update sentry to 3.0.0 #335

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

Merged
merged 2 commits into from
Oct 2, 2020
Merged

Update sentry to 3.0.0 #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
843b48c
Update sentry to 3.0.0
scala-steward Oct 1, 2020
08285d4
refactor: Update SentryModule to work with new major version of Sentry
jakubjanecek Oct 2, 2020
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
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ object Dependencies {
val scalafixScaluzzi = "com.github.vovapolu" %% "scaluzzi" % "0.1.14"
val scalafixSortImports = "com.nequissimus" %% "sort-imports" % "0.5.4"
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.2"
val sentry = "io.sentry" % "sentry" % "1.7.30"
val sentry = "io.sentry" % "sentry" % "3.0.0"
val silencer = "com.github.ghik" % "silencer-plugin" % Versions.silencer cross CrossVersion.full
val silencerLib = "com.github.ghik" % "silencer-lib" % Versions.silencer % Provided cross CrossVersion.full
val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.30"
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/scala/com/avast/sst/sentry/SentryConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ final case class SentryConfig(
environment: Option[String] = None,
distribution: Option[String] = None,
serverName: Option[String] = None,
tags: Map[String, String] = Map.empty,
stacktraceAppPackages: List[String] = List.empty
)
20 changes: 10 additions & 10 deletions sentry/src/main/scala/com/avast/sst/sentry/SentryModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.avast.sst.sentry

import cats.effect.{Resource, Sync}
import io.sentry.{SentryClient, SentryClientFactory}
import io.sentry.{SentryClient, SentryOptions}

import scala.jdk.CollectionConverters._
import scala.reflect.ClassTag

object SentryModule {
Expand All @@ -14,15 +13,16 @@ object SentryModule {
Sync[F].delay {
val dsnCustomizations = s"${config.stacktraceAppPackages.mkString("stacktrace.app.packages=", ",", "")}"
val finalDsn = if (dsnCustomizations.nonEmpty) s"${config.dsn}?$dsnCustomizations" else config.dsn
val sentryClient = SentryClientFactory.sentryClient(finalDsn)
config.release.foreach(sentryClient.setRelease)
config.environment.foreach(sentryClient.setEnvironment)
config.distribution.foreach(sentryClient.setDist)
config.serverName.foreach(sentryClient.setServerName)
sentryClient.setTags(config.tags.asJava)
sentryClient
val options = new SentryOptions()
options.setDsn(finalDsn)
config.release.foreach(options.setRelease)
config.environment.foreach(options.setEnvironment)
config.distribution.foreach(options.setDist)
config.serverName.foreach(options.setServerName)

new SentryClient(options, null)
}
}(sentry => Sync[F].delay(sentry.closeConnection()))
}(sentry => Sync[F].delay(sentry.close()))
}

/** Makes [[io.sentry.SentryClient]] initialized with the given config and overrides the `release` property
Expand Down