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.

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

Update scalafmt-core to 3.5.3 #113

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.5.2"
version = "3.5.3"

runner.dialect = scala213

Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ lazy val commonSettings = Seq(
Compile / compile / javacOptions ++= Seq("-source", "1.8", "-target", "1.8"),
libraryDependencies ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, _)) =>
case Some(2, _) =>
Seq(compilerPlugin(Dependencies.kindProjector), compilerPlugin(Dependencies.betterMonadicFor))
case _ => Seq.empty
}
},
scalacOptions += {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, _)) => "-Wconf:any:wv"
case Some(2, _) => "-Wconf:any:wv"
case _ => "-Wconf:any:v"
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class JaegerSpanExporterSpec extends BaseJaegerSpec {
batch.spans.map(span =>
span.copy(
serviceName = process.serviceName,
attributes = (process.attributes ++ span.attributes) -- excludedTagKeys,
attributes = process.attributes ++ span.attributes -- excludedTagKeys,
start = Instant.now(),
end = Instant.now()
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ object JaegerHttpSpanExporter {
Uri.fromString(s"$protocol://$host:$port/api/traces").liftTo[F].flatMap(uri => apply(client, process, uri))

def apply[F[_]: Async, G[_]: Foldable](client: Client[F], process: TraceProcess, uri: Uri): F[SpanExporter[F, G]] =
Async[F].catchNonFatal(new TSerializer()).map { implicit serializer: TSerializer =>
Async[F].catchNonFatal(new TSerializer).map { implicit serializer: TSerializer =>
val jprocess = JaegerSpan.convert(process)
HttpSpanExporter[F, G, JaegerBatch](client, uri, (batch: Batch[G]) => makeBatch[G](jprocess, batch), thriftBinary)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class JaegerHttpSpanExporterSpec extends BaseJaegerSpec {
batch.spans.map(span =>
span.copy(
serviceName = process.serviceName,
attributes = (process.attributes ++ span.attributes) -- excludedTagKeys,
attributes = process.attributes ++ span.attributes -- excludedTagKeys,
start = Instant.now(),
end = Instant.now()
)
Expand Down