From 1c77c9eb91874eee4e1566039adc672bf4f51e83 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2025 00:26:25 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.5 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 01c5f9ccf..9f4f9e65c 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.3 +version = 3.8.5 runner.dialect = scala213 maxColumn = 120 From fd9b3858cfbfe088cc95d333850ac232fefa763f Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2025 00:26:38 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.5 Executed command: scalafmt --non-interactive --- .../main/scala/org/typelevel/otel4s/trace/TraceState.scala | 1 - .../scala/org/typelevel/otel4s/sdk/TelemetryResource.scala | 3 --- .../org/typelevel/otel4s/sdk/autoconfigure/Config.scala | 4 ---- .../sdk/trace/autoconfigure/SamplerAutoConfigure.scala | 5 ----- 4 files changed, 13 deletions(-) diff --git a/core/trace/src/main/scala/org/typelevel/otel4s/trace/TraceState.scala b/core/trace/src/main/scala/org/typelevel/otel4s/trace/TraceState.scala index a54ac5066..b8bba7b6d 100644 --- a/core/trace/src/main/scala/org/typelevel/otel4s/trace/TraceState.scala +++ b/core/trace/src/main/scala/org/typelevel/otel4s/trace/TraceState.scala @@ -28,7 +28,6 @@ import scala.collection.immutable.SeqMap * * - Key is opaque string up to 256 characters printable. It MUST begin with a lowercase letter, and can only contain * lowercase letters a-z, digits 0-9, underscores _, dashes -, asterisks *, and forward slashes /. - * * - Value is opaque string up to 256 characters printable ASCII RFC0020 characters (i.e., the range 0x20 to 0x7E) * except comma , and =. * diff --git a/sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/TelemetryResource.scala b/sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/TelemetryResource.scala index 2826746ad..9658f3a65 100644 --- a/sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/TelemetryResource.scala +++ b/sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/TelemetryResource.scala @@ -47,11 +47,8 @@ sealed trait TelemetryResource { * * Schema URL merge outcomes: * - if `this` resource's schema URL is empty then the `other` resource's schema URL will be selected - * * - if `other` resource's schema URL is empty then `this` resource's schema URL will be selected - * * - if `this` and `other` resources have the same non-empty schema URL then this schema URL will be selected - * * - if `this` and `other` resources have different non-empty schema URLs then the result will be a merge error * * @note diff --git a/sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/autoconfigure/Config.scala b/sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/autoconfigure/Config.scala index f1eae39f5..14e93dd02 100644 --- a/sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/autoconfigure/Config.scala +++ b/sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/autoconfigure/Config.scala @@ -40,9 +40,7 @@ sealed trait Config { * * @return * - `Left(ConfigurationError)` - when the key exists in the config but cannot be decoded as `A` - * * - `Right(None)` - when the key does not exist in the config - * * - `Right(Some(a))` - when the key exists in the config and successfully decoded as `A` */ def get[A: Config.Reader](key: String): Either[ConfigurationError, Option[A]] @@ -74,9 +72,7 @@ sealed trait Config { * * @return * - `Left(ConfigurationError)` - when the key exists in the config but cannot be decoded as `A` - * * - `Right(None)` - when the key does not exist in the config - * * - `Right(Some(a))` - when the key exists in the config and successfully decoded as `A` */ final def get[A: Config.Reader]( diff --git a/sdk/trace/src/main/scala/org/typelevel/otel4s/sdk/trace/autoconfigure/SamplerAutoConfigure.scala b/sdk/trace/src/main/scala/org/typelevel/otel4s/sdk/trace/autoconfigure/SamplerAutoConfigure.scala index 0da582cd9..62b6c8b6e 100644 --- a/sdk/trace/src/main/scala/org/typelevel/otel4s/sdk/trace/autoconfigure/SamplerAutoConfigure.scala +++ b/sdk/trace/src/main/scala/org/typelevel/otel4s/sdk/trace/autoconfigure/SamplerAutoConfigure.scala @@ -139,15 +139,10 @@ private[sdk] object SamplerAutoConfigure { * * The following options for `otel.traces.sampler` are supported out of the box: * - `always_on` - [[Sampler.alwaysOn]] - * * - `always_off` - [[Sampler.alwaysOff]] - * * - `traceidratio` - [[Sampler.traceIdRatioBased]], where `otel.traces.sampler.arg` sets the ratio - * * - `parentbased_always_on` - [[Sampler.parentBased]] with [[Sampler.alwaysOn]] - * * - `parentbased_always_off` - [[Sampler.parentBased]] with [[Sampler.alwaysOff]] - * * - `parentbased_traceidratio`- [[Sampler.parentBased]] with [[Sampler.traceIdRatioBased]], where * `otel.traces.sampler.arg` sets the ratio * From aa66af22ee26799d498d9655da527c5340e17ef5 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2025 00:26:38 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.5' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index e3cfae13b..d82310bbe 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,4 @@ # Reformat with maxColumn = 120 -0afcd5d8cef3c3698c1f10471d4593e22f7c8eb4 \ No newline at end of file +0afcd5d8cef3c3698c1f10471d4593e22f7c8eb4 +# Scala Steward: Reformat with scalafmt 3.8.5 +fd9b3858cfbfe088cc95d333850ac232fefa763f