Skip to content

Commit

Permalink
Merge pull request #892 from typelevel/update/scalafmt-core-3.8.5
Browse files Browse the repository at this point in the history
[no ci] Update scalafmt-core to 3.8.5
  • Loading branch information
iRevive authored Jan 22, 2025
2 parents ce63cbe + aa66af2 commit 843500f
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 15 deletions.
4 changes: 3 additions & 1 deletion .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# Reformat with maxColumn = 120
0afcd5d8cef3c3698c1f10471d4593e22f7c8eb4
0afcd5d8cef3c3698c1f10471d4593e22f7c8eb4
# Scala Steward: Reformat with scalafmt 3.8.5
fd9b3858cfbfe088cc95d333850ac232fefa763f
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.3
version = 3.8.5
runner.dialect = scala213
maxColumn = 120

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 =.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down Expand Up @@ -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](
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down

0 comments on commit 843500f

Please sign in to comment.