Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion mise.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tools]

# Linters
"aqua:grafana/flint" = "0.22.12"
"aqua:grafana/flint" = "0.22.14"
lychee = "0.24.2"

[tasks.lint]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public final class DeviceIncubatingAttributes {
* guide</a>.
*
* <blockquote>
*
* [!WARNING]
*
* <p>This attribute may contain sensitive (PII) information. Caution should be taken when storing
Expand All @@ -43,7 +42,6 @@ public final class DeviceIncubatingAttributes {
*
* <p>See <a href="/docs/registry/attributes/app.md#app-installation-id">{@code
* app.installation.id}</a> for a more privacy-preserving alternative.
*
* </blockquote>
*/
public static final AttributeKey<String> DEVICE_ID = stringKey("device.id");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ public final class EnduserIncubatingAttributes {
* <p>Unique identifier of an end user in the system.
*
* <blockquote>
*
* [!Warning] This field contains sensitive (PII) information.
*
* </blockquote>
*/
public static final AttributeKey<String> ENDUSER_ID = stringKey("enduser.id");
Expand All @@ -38,9 +36,7 @@ public final class EnduserIncubatingAttributes {
* <p>Pseudonymous identifier of an end user.
*
* <blockquote>
*
* [!Warning] This field contains sensitive (linkable PII) information.
*
* </blockquote>
*/
public static final AttributeKey<String> ENDUSER_PSEUDO_ID = stringKey("enduser.pseudo.id");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ public final class ExceptionIncubatingAttributes {
* <p>Notes:
*
* <blockquote>
*
* [!WARNING]
*
* <p>This attribute may contain sensitive information.
*
* </blockquote>
*
* @deprecated deprecated in favor of stable {@link
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -485,9 +485,7 @@ public final class GenAiIncubatingAttributes {
* <p>Notes:
*
* <blockquote>
*
* [!Warning] This attribute may contain sensitive information.
*
* </blockquote>
*
* @deprecated Moved to the <a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,9 @@ public final class K8sIncubatingAttributes {
* 9834-8 and ITU-T X.667</a>. Which states:
*
* <blockquote>
*
* 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).
*
* </blockquote>
*
* <p>Therefore, UIDs between clusters should be extremely unlikely to conflict.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ public final class ExceptionAttributes {
* <p>Notes:
*
* <blockquote>
*
* [!WARNING]
*
* <p>This attribute may contain sensitive information.
*
* </blockquote>
*/
public static final AttributeKey<String> EXCEPTION_MESSAGE = stringKey("exception.message");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,9 @@ public final class K8sAttributes {
* 9834-8 and ITU-T X.667</a>. Which states:
*
* <blockquote>
*
* 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).
*
* </blockquote>
*
* <p>Therefore, UIDs between clusters should be extremely unlikely to conflict.
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
Loading