tweak the name of Span.Default.spanCreationPolicy to make its intent …

…more clear
typelevel · Jan 12, 2023 · 4320de5 · 4320de5
1 parent 2786c52
commit 4320de5
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 14 deletions.
diff --git a/modules/core/shared/src/main/scala/Span.scala b/modules/core/shared/src/main/scala/Span.scala
@@ -90,10 +90,10 @@ trait Span[F[_]] {
 object Span {
 
  abstract class Default[F[_]: Applicative] extends Span[F] {
- protected val spanCreationPolicy: Options.SpanCreationPolicy
+ protected val spanCreationPolicyOverride: Options.SpanCreationPolicy
 
- def span(name: String, options: Options): Resource[F, Span[F]] =
- spanCreationPolicy match {
+ override final def span(name: String, options: Options): Resource[F, Span[F]] =
+ spanCreationPolicyOverride match {
  case Options.SpanCreationPolicy.Suppress => Resource.pure(Span.noop[F])
  case Options.SpanCreationPolicy.Coalesce => Resource.pure(this)
  case Options.SpanCreationPolicy.Default => makeSpan(name, options)

diff --git a/modules/core/shared/src/test/scala/InMemory.scala b/modules/core/shared/src/test/scala/InMemory.scala
@@ -20,7 +20,7 @@ object InMemory {
  ref: Ref[IO, Chain[(Lineage, NatchezCommand)]],
  val options: Options
  ) extends natchez.Span.Default[IO] {
- override protected val spanCreationPolicy: Options.SpanCreationPolicy =
+ override protected val spanCreationPolicyOverride: Options.SpanCreationPolicy =
  options.spanCreationPolicy
 
  def put(fields: (String, natchez.TraceValue)*): IO[Unit] =

diff --git a/modules/datadog/src/main/scala/DDSpan.scala b/modules/datadog/src/main/scala/DDSpan.scala
@@ -28,7 +28,8 @@ final case class DDSpan[F[_]: Sync](
  uriPrefix: Option[URI],
  options: Span.Options
 ) extends Span.Default[F] {
- override protected val spanCreationPolicy: Options.SpanCreationPolicy = options.spanCreationPolicy
+ override protected val spanCreationPolicyOverride: Options.SpanCreationPolicy =
+ options.spanCreationPolicy
 
  def kernel: F[Kernel] =
  Sync[F].delay {

diff --git a/modules/honeycomb/src/main/scala/HoneycombSpan.scala b/modules/honeycomb/src/main/scala/HoneycombSpan.scala
@@ -29,7 +29,8 @@ private[honeycomb] final case class HoneycombSpan[F[_]: Sync](
 ) extends Span.Default[F] {
  import HoneycombSpan._
 
- override protected val spanCreationPolicy: Options.SpanCreationPolicy = options.spanCreationPolicy
+ override protected val spanCreationPolicyOverride: Options.SpanCreationPolicy =
+ options.spanCreationPolicy
 
  def get(key: String): F[Option[TraceValue]] =
  fields.get.map(_.get(key))

diff --git a/modules/jaeger/src/main/scala/JaegerSpan.scala b/modules/jaeger/src/main/scala/JaegerSpan.scala
@@ -23,7 +23,7 @@ private[jaeger] final case class JaegerSpan[F[_]: Sync](
  tracer: ot.Tracer,
  span: ot.Span,
  prefix: Option[URI],
- spanCreationPolicy: Span.Options.SpanCreationPolicy
+ spanCreationPolicyOverride: Span.Options.SpanCreationPolicy
 ) extends Span.Default[F] {
  import TraceValue._
 

diff --git a/modules/lightstep/src/main/scala/LightstepSpan.scala b/modules/lightstep/src/main/scala/LightstepSpan.scala
@@ -24,7 +24,8 @@ private[lightstep] final case class LightstepSpan[F[_]: Sync](
 ) extends Span.Default[F] {
  import TraceValue._
 
- override protected val spanCreationPolicy: Options.SpanCreationPolicy = options.spanCreationPolicy
+ override protected val spanCreationPolicyOverride: Options.SpanCreationPolicy =
+ options.spanCreationPolicy
 
  override def kernel: F[Kernel] =
  Sync[F].delay {

diff --git a/modules/log-odin/src/main/scala/LogSpan.scala b/modules/log-odin/src/main/scala/LogSpan.scala
@@ -35,7 +35,8 @@ private[logodin] final case class LogSpan[F[_]: Sync: Logger](
 ) extends Span.Default[F] {
  import LogSpan._
 
- override protected val spanCreationPolicy: Options.SpanCreationPolicy = options.spanCreationPolicy
+ override protected val spanCreationPolicyOverride: Options.SpanCreationPolicy =
+ options.spanCreationPolicy
 
  def spanId: F[Option[String]] =
  sid.toString.some.pure[F]

diff --git a/modules/log/shared/src/main/scala/LogSpan.scala b/modules/log/shared/src/main/scala/LogSpan.scala
@@ -37,7 +37,8 @@ private[log] final case class LogSpan[F[_]: Sync: Logger](
 ) extends Span.Default[F] {
  import LogSpan._
 
- override protected val spanCreationPolicy: Options.SpanCreationPolicy = options.spanCreationPolicy
+ override protected val spanCreationPolicyOverride: Options.SpanCreationPolicy =
+ options.spanCreationPolicy
 
  def parentId: Option[String] =
  parent.map(_.fold(identity, _.sid))

diff --git a/modules/newrelic/src/main/scala/natchez/newrelic/NewrelicSpan.scala b/modules/newrelic/src/main/scala/natchez/newrelic/NewrelicSpan.scala
@@ -30,7 +30,7 @@ private[newrelic] final case class NewrelicSpan[F[_]: Sync](
  sender: SpanBatchSender,
  options: natchez.Span.Options
 ) extends natchez.Span.Default[F] {
- override protected val spanCreationPolicy: natchez.Span.Options.SpanCreationPolicy =
+ override protected val spanCreationPolicyOverride: natchez.Span.Options.SpanCreationPolicy =
  options.spanCreationPolicy
 
  override def kernel: F[Kernel] =

diff --git a/modules/opencensus/src/main/scala/OpenCensusSpan.scala b/modules/opencensus/src/main/scala/OpenCensusSpan.scala
@@ -29,7 +29,8 @@ private[opencensus] final case class OpenCensusSpan[F[_]: Sync](
 
  import OpenCensusSpan._
 
- override protected val spanCreationPolicy: Options.SpanCreationPolicy = options.spanCreationPolicy
+ override protected val spanCreationPolicyOverride: Options.SpanCreationPolicy =
+ options.spanCreationPolicy
 
  private def traceToAttribute(value: TraceValue): AttributeValue = value match {
  case StringValue(v) =>

diff --git a/modules/opentelemetry/src/main/scala/natchez/opentelemetry/OpenTelemetrySpan.scala b/modules/opentelemetry/src/main/scala/natchez/opentelemetry/OpenTelemetrySpan.scala
@@ -36,7 +36,7 @@ private[opentelemetry] final case class OpenTelemetrySpan[F[_]: Sync](
  tracer: Tracer,
  span: TSpan,
  prefix: Option[URI],
- spanCreationPolicy: Span.Options.SpanCreationPolicy
+ spanCreationPolicyOverride: Span.Options.SpanCreationPolicy
 ) extends Span.Default[F] {
 
  import OpenTelemetrySpan._

diff --git a/modules/xray/src/main/scala/natchez/xray/XRaySpan.scala b/modules/xray/src/main/scala/natchez/xray/XRaySpan.scala
@@ -36,7 +36,8 @@ private[xray] final case class XRaySpan[F[_]: Concurrent: Clock: Random](
 ) extends Span.Default[F] {
  import XRaySpan._
 
- override protected val spanCreationPolicy: Options.SpanCreationPolicy = options.spanCreationPolicy
+ override protected val spanCreationPolicyOverride: Options.SpanCreationPolicy =
+ options.spanCreationPolicy
 
  def put(fields: (String, TraceValue)*): F[Unit] = {
  val fieldsToAdd = fields.map { case (k, v) => k -> v.asJson }