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.8.4 #890

Closed
wants to merge 3 commits into from
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
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.4
29f42007f979eec110127208e357f0412126e567
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.4
runner.dialect = scala213
maxColumn = 120

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ sealed trait Attributes
/** Invariant overload of [[scala.collection.IterableOps.concat `IterableOps#concat`]] that returns `Attributes`
* rather than `Iterable`.
*
* If multiple [[`Attribute`]]s in `this` and/or `that` have the same key, only the final one (according to `that`'s
* If multiple [[`Attribute`]]s in `this` and/or `that` have the same key, only the final one (according to `that` 's
* iterator) will be retained in the resulting `Attributes`.
*/
def concat(that: IterableOnce[Attribute[_]]): Attributes =
Expand All @@ -80,7 +80,7 @@ sealed trait Attributes
/** Invariant overload of [[scala.collection.IterableOps.++ `IterableOps#++`]] that returns `Attributes` rather than
* `Iterable`.
*
* If multiple [[`Attribute`]]s in `this` and/or `that` have the same key, only the final one (according to `that`'s
* If multiple [[`Attribute`]]s in `this` and/or `that` have the same key, only the final one (according to `that` 's
* iterator) will be retained in the resulting `Attributes`.
*/
final def ++(that: IterableOnce[Attribute[_]]): Attributes =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ trait KindTransformer[F[_], G[_]] {
/** A higher-kinded function that lifts the kind `F` into a `G`.
*
* @note
* This method is usually best implemented by a `liftK` method on `G`'s companion object.
* This method is usually best implemented by a `liftK` method on `G` 's companion object.
*/
val liftK: F ~> G

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 @@ -34,7 +34,7 @@ import java.{util => ju}
import scala.collection.immutable
import scala.jdk.CollectionConverters._

/** This object provides extension methods that convert between Scala and Java `AttributeKey`s and `Attributes` using
/** This object provides extension methods that convert between Scala and Java `AttributeKey` s and `Attributes` using
* `toScala` and `toJava` extension methods, as well as a `toJavaAttributes` extension method that converts
* `immutable.Iterable[Attribute[_]]` to Java `Attributes`.
*
Expand Down Expand Up @@ -70,7 +70,7 @@ object AttributeConverters {
private val attributes: immutable.Iterable[Attribute[_]]
) extends AnyVal {

/** Converts an immutable collection of Scala `Attribute`s to Java `Attributes`.
/** Converts an immutable collection of Scala `Attribute` s to Java `Attributes`.
*/
def toJavaAttributes: JAttributes = Explicit.toJavaAttributes(attributes)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import org.typelevel.otel4s.context.propagation.TextMapPropagator

import scala.{unchecked => uc}

/** This object provides `asScala` and `asJava` extension methods that convert between Scala and Java `TextMapGetter`s,
* `TextMapPropagator`s, and `ContextPropagators`.
/** This object provides `asScala` and `asJava` extension methods that convert between Scala and Java `TextMapGetter` s,
* `TextMapPropagator` s, and `ContextPropagators`.
*
* {{{
* import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator
Expand Down Expand Up @@ -84,7 +84,7 @@ object PropagatorConverters {

/** Converts a Scala `TextMapPropagator` to a Java `TextMapPropagator`.
*
* The returned Java `TextMapPropagator` is backed by the provided Scala `TextMapPropagator`unless the Scala
* The returned Java `TextMapPropagator` is backed by the provided Scala `TextMapPropagator` unless the Scala
* `TextMapPropagator` was previously obtained from an implicit or explicit call of `asScala`, in which case the
* original Java `TextMapPropagator` will be returned.
*/
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,16 +139,11 @@ 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
* - `parentbased_traceidratio` - [[Sampler.parentBased]] with [[Sampler.traceIdRatioBased]], where
* `otel.traces.sampler.arg` sets the ratio
*
* @see
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ object AwsExperimentalAttributes {
val AwsS3Bucket: AttributeKey[String] =
AttributeKey("aws.s3.bucket")

/** The source object (in the form `bucket`/`key`) for the copy operation. <p>
/** The source object (in the form `bucket` /`key`) for the copy operation. <p>
* @note
* <p> The `copy_source` attribute applies to S3 copy operations and corresponds to the `--copy-source` parameter
* of the <a href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object operation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ object DbExperimentalAttributes {
/** The database query being executed. <p>
* @note
* <p> For sanitization see <a
* href="../../docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of `db.query.text`</a>.
* href="../../docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of `db.query.text` </a>.
* For batch operations, if the individual operations are known to have the same query text then that query text
* SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some
* other database system specific separator if more applicable. Even though parameterized query text can
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1438,14 +1438,14 @@ object DbExperimentalMetrics {
/** The database query being executed. <p>
* @note
* <p> For sanitization see <a
* href="../../docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of
* `db.query.text`</a>. For batch operations, if the individual operations are known to have the same query
* text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated
* with separator `; ` or some other database system specific separator if more applicable. Even though
* parameterized query text can potentially have sensitive data, by using a parameterized query the user is
* giving a strong signal that any sensitive data will be passed as parameter values, and the benefit to
* observability of capturing the static part of the query text by default outweighs the risk. This attribute
* has stability level RELEASE CANDIDATE.
* href="../../docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of `db.query.text`
* </a>. For batch operations, if the individual operations are known to have the same query text then that
* query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator
* `; ` or some other database system specific separator if more applicable. Even though parameterized query
* text can potentially have sensitive data, by using a parameterized query the user is giving a strong signal
* that any sensitive data will be passed as parameter values, and the benefit to observability of capturing
* the static part of the query text by default outweighs the risk. This attribute has stability level RELEASE
* CANDIDATE.
*/
val dbQueryText: AttributeSpec[String] =
AttributeSpec(
Expand Down Expand Up @@ -1708,14 +1708,14 @@ object DbExperimentalMetrics {
/** The database query being executed. <p>
* @note
* <p> For sanitization see <a
* href="../../docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of
* `db.query.text`</a>. For batch operations, if the individual operations are known to have the same query
* text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated
* with separator `; ` or some other database system specific separator if more applicable. Even though
* parameterized query text can potentially have sensitive data, by using a parameterized query the user is
* giving a strong signal that any sensitive data will be passed as parameter values, and the benefit to
* observability of capturing the static part of the query text by default outweighs the risk. This attribute
* has stability level RELEASE CANDIDATE.
* href="../../docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of `db.query.text`
* </a>. For batch operations, if the individual operations are known to have the same query text then that
* query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator
* `; ` or some other database system specific separator if more applicable. Even though parameterized query
* text can potentially have sensitive data, by using a parameterized query the user is giving a strong signal
* that any sensitive data will be passed as parameter values, and the benefit to observability of capturing
* the static part of the query text by default outweighs the risk. This attribute has stability level RELEASE
* CANDIDATE.
*/
val dbQueryText: AttributeSpec[String] =
AttributeSpec(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ object DnsExperimentalMetrics {

/** Describes the error the DNS lookup failed with. <p>
* @note
* <p> Instrumentations SHOULD use error code such as one of errors reported by `getaddrinfo`(<a
* <p> Instrumentations SHOULD use error code such as one of errors reported by `getaddrinfo` (<a
* href="https://man7.org/linux/man-pages/man3/getaddrinfo.3.html">Linux or other POSIX systems</a> / <a
* href="https://learn.microsoft.com/windows/win32/api/ws2tcpip/nf-ws2tcpip-getaddrinfo">Windows</a>) or one
* reported by the runtime or client library. If error code is not available, the full name of exception type
Expand Down
Loading