diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 944b07e1..63e4784e 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,7 +1,7 @@ { $schema: 'https://docs.renovatebot.com/renovate-schema.json', extends: [ - "github>grafana/flint#v0.22.12", + "github>grafana/flint#v0.22.14", 'config:best-practices', 'helpers:pinGitHubActionDigestsToSemver', 'customManagers:githubActionsVersions', diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 84c50cfb..ac572a40 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -10,7 +10,7 @@ repositories { dependencies { implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:7.4.0") - implementation("com.diffplug.spotless:spotless-plugin-gradle:8.10.2") + implementation("com.diffplug.spotless:spotless-plugin-gradle:8.10.3") implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1") implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6") // Needed for japicmp but not automatically brought in for some reason. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 760c4596..1eca32e7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a -distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip +distributionSha256Sum=bafd5ce9cfaea0fbccfdc8439a1ac42fbd4cd9c89dc9a988228d8a2639a58e6c +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/mise.toml b/mise.toml index 7784cf4f..16c75a58 100644 --- a/mise.toml +++ b/mise.toml @@ -1,7 +1,7 @@ [tools] # Linters -"aqua:grafana/flint" = "0.22.12" +"aqua:grafana/flint" = "0.22.14" lychee = "0.24.2" [tasks.lint] diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DeviceIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DeviceIncubatingAttributes.java index 7c5d9663..92322a3e 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DeviceIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DeviceIncubatingAttributes.java @@ -28,7 +28,6 @@ public final class DeviceIncubatingAttributes { * guide. * *
- * * [!WARNING] * *

This attribute may contain sensitive (PII) information. Caution should be taken when storing @@ -43,7 +42,6 @@ public final class DeviceIncubatingAttributes { * *

See {@code * app.installation.id} for a more privacy-preserving alternative. - * *

*/ public static final AttributeKey DEVICE_ID = stringKey("device.id"); diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/EnduserIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/EnduserIncubatingAttributes.java index 45f611c5..cb7ab808 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/EnduserIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/EnduserIncubatingAttributes.java @@ -22,9 +22,7 @@ public final class EnduserIncubatingAttributes { *

Unique identifier of an end user in the system. * *

- * * [!Warning] This field contains sensitive (PII) information. - * *
*/ public static final AttributeKey ENDUSER_ID = stringKey("enduser.id"); @@ -38,9 +36,7 @@ public final class EnduserIncubatingAttributes { *

Pseudonymous identifier of an end user. * *

- * * [!Warning] This field contains sensitive (linkable PII) information. - * *
*/ public static final AttributeKey ENDUSER_PSEUDO_ID = stringKey("enduser.pseudo.id"); diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ExceptionIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ExceptionIncubatingAttributes.java index 85e58218..a686ca60 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ExceptionIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ExceptionIncubatingAttributes.java @@ -19,11 +19,9 @@ public final class ExceptionIncubatingAttributes { *

Notes: * *

- * * [!WARNING] * *

This attribute may contain sensitive information. - * *

* * @deprecated deprecated in favor of stable {@link diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingAttributes.java index 9f400577..632a972a 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingAttributes.java @@ -485,9 +485,7 @@ public final class GenAiIncubatingAttributes { *

Notes: * *

- * * [!Warning] This attribute may contain sensitive information. - * *
* * @deprecated Moved to the . Which states: * *
- * * If generated according to one of the mechanisms defined in Rec. ITU-T X.667 | ISO/IEC 9834-8, a * UUID is either guaranteed to be different from all other UUIDs generated before 3603 A.D., or * is extremely likely to be different (depending on the mechanism chosen). - * *
* *

Therefore, UIDs between clusters should be extremely unlikely to conflict. diff --git a/semconv/src/main/java/io/opentelemetry/semconv/ExceptionAttributes.java b/semconv/src/main/java/io/opentelemetry/semconv/ExceptionAttributes.java index 2f612ba9..ad0a6a54 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/ExceptionAttributes.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/ExceptionAttributes.java @@ -19,11 +19,9 @@ public final class ExceptionAttributes { *

Notes: * *

- * * [!WARNING] * *

This attribute may contain sensitive information. - * *

*/ public static final AttributeKey EXCEPTION_MESSAGE = stringKey("exception.message"); diff --git a/semconv/src/main/java/io/opentelemetry/semconv/K8sAttributes.java b/semconv/src/main/java/io/opentelemetry/semconv/K8sAttributes.java index 80235144..db9fbb23 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/K8sAttributes.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/K8sAttributes.java @@ -36,11 +36,9 @@ public final class K8sAttributes { * 9834-8 and ITU-T X.667. Which states: * *
- * * If generated according to one of the mechanisms defined in Rec. ITU-T X.667 | ISO/IEC 9834-8, a * UUID is either guaranteed to be different from all other UUIDs generated before 3603 A.D., or * is extremely likely to be different (depending on the mechanism chosen). - * *
* *

Therefore, UIDs between clusters should be extremely unlikely to conflict. diff --git a/settings.gradle.kts b/settings.gradle.kts index babb8662..7422ed53 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,7 +2,7 @@ pluginManagement { plugins { id("de.undercouch.download") version "5.7.0" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" - id("com.gradle.develocity") version "4.5.1" + id("com.gradle.develocity") version "4.6.0" id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } }