Skip to content

Commit 843500f

Browse files
authored
Merge pull request #892 from typelevel/update/scalafmt-core-3.8.5
[no ci] Update scalafmt-core to 3.8.5
2 parents ce63cbe + aa66af2 commit 843500f

File tree

6 files changed

+4
-15
lines changed

6 files changed

+4
-15
lines changed

.git-blame-ignore-revs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Reformat with maxColumn = 120
2-
0afcd5d8cef3c3698c1f10471d4593e22f7c8eb4
2+
0afcd5d8cef3c3698c1f10471d4593e22f7c8eb4
3+
# Scala Steward: Reformat with scalafmt 3.8.5
4+
fd9b3858cfbfe088cc95d333850ac232fefa763f

.scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.8.3
1+
version = 3.8.5
22
runner.dialect = scala213
33
maxColumn = 120
44

core/trace/src/main/scala/org/typelevel/otel4s/trace/TraceState.scala

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import scala.collection.immutable.SeqMap
2828
*
2929
* - Key is opaque string up to 256 characters printable. It MUST begin with a lowercase letter, and can only contain
3030
* lowercase letters a-z, digits 0-9, underscores _, dashes -, asterisks *, and forward slashes /.
31-
*
3231
* - Value is opaque string up to 256 characters printable ASCII RFC0020 characters (i.e., the range 0x20 to 0x7E)
3332
* except comma , and =.
3433
*

sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/TelemetryResource.scala

-3
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,8 @@ sealed trait TelemetryResource {
4747
*
4848
* Schema URL merge outcomes:
4949
* - if `this` resource's schema URL is empty then the `other` resource's schema URL will be selected
50-
*
5150
* - if `other` resource's schema URL is empty then `this` resource's schema URL will be selected
52-
*
5351
* - if `this` and `other` resources have the same non-empty schema URL then this schema URL will be selected
54-
*
5552
* - if `this` and `other` resources have different non-empty schema URLs then the result will be a merge error
5653
*
5754
* @note

sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/autoconfigure/Config.scala

-4
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ sealed trait Config {
4040
*
4141
* @return
4242
* - `Left(ConfigurationError)` - when the key exists in the config but cannot be decoded as `A`
43-
*
4443
* - `Right(None)` - when the key does not exist in the config
45-
*
4644
* - `Right(Some(a))` - when the key exists in the config and successfully decoded as `A`
4745
*/
4846
def get[A: Config.Reader](key: String): Either[ConfigurationError, Option[A]]
@@ -74,9 +72,7 @@ sealed trait Config {
7472
*
7573
* @return
7674
* - `Left(ConfigurationError)` - when the key exists in the config but cannot be decoded as `A`
77-
*
7875
* - `Right(None)` - when the key does not exist in the config
79-
*
8076
* - `Right(Some(a))` - when the key exists in the config and successfully decoded as `A`
8177
*/
8278
final def get[A: Config.Reader](

sdk/trace/src/main/scala/org/typelevel/otel4s/sdk/trace/autoconfigure/SamplerAutoConfigure.scala

-5
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,10 @@ private[sdk] object SamplerAutoConfigure {
139139
*
140140
* The following options for `otel.traces.sampler` are supported out of the box:
141141
* - `always_on` - [[Sampler.alwaysOn]]
142-
*
143142
* - `always_off` - [[Sampler.alwaysOff]]
144-
*
145143
* - `traceidratio` - [[Sampler.traceIdRatioBased]], where `otel.traces.sampler.arg` sets the ratio
146-
*
147144
* - `parentbased_always_on` - [[Sampler.parentBased]] with [[Sampler.alwaysOn]]
148-
*
149145
* - `parentbased_always_off` - [[Sampler.parentBased]] with [[Sampler.alwaysOff]]
150-
*
151146
* - `parentbased_traceidratio`- [[Sampler.parentBased]] with [[Sampler.traceIdRatioBased]], where
152147
* `otel.traces.sampler.arg` sets the ratio
153148
*

0 commit comments

Comments
 (0)