Merge branch 'main' into opamp-client-implementation

# Conflicts:
#	dependencyManagement/build.gradle.kts

Author: LikeTheSalad

.github/scripts/.lychee-relative.toml

@@ -6,21 +6,21 @@ export MSYS_NO_PATHCONV=1 # for Git Bash on Windows
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ROOT_DIR="$SCRIPT_DIR/../.."
-DEPENDENCIES_DOCKERFILE="$SCRIPT_DIR/dependencies.dockerfile"
+DEPENDENCIES_DOCKERFILE="$SCRIPT_DIR/dependencies.Dockerfile"
 
 # Parse command line arguments
-RELATIVE_ONLY=false
-MODIFIED_FILES=""
+LOCAL_LINKS_ONLY=false
+TARGET=""
 
 while [[ $# -gt 0 ]]; do
     case $1 in
-        --relative-only)
-            RELATIVE_ONLY=true
+        --local-links-only)
+            LOCAL_LINKS_ONLY=true
             shift
             ;;
         *)
             # Treat any other arguments as file paths
-            MODIFIED_FILES="$MODIFIED_FILES $1"
+            TARGET="$TARGET $1"
             shift
             ;;
     esac
@@ -29,26 +29,24 @@ done
 # Extract lychee version from dependencies.dockerfile
 LYCHEE_VERSION=$(grep "FROM lycheeverse/lychee:" "$DEPENDENCIES_DOCKERFILE" | sed 's/.*FROM lycheeverse\/lychee:\([^ ]*\).*/\1/')
 
-# Determine target files/directories and config file
-TARGET="."
-LYCHEE_CONFIG=".github/scripts/.lychee.toml"
-
-if [[ "$RELATIVE_ONLY" == "true" ]]; then
-    LYCHEE_CONFIG=".github/scripts/.lychee-relative.toml"
-fi
-
-if [[ -n "$MODIFIED_FILES" ]]; then
-    TARGET="$MODIFIED_FILES"
+if [[ -z "$TARGET" ]]; then
+    TARGET="."
 fi
 
 # Build the lychee command with optional GitHub token
-CMD="lycheeverse/lychee:$LYCHEE_VERSION --verbose --config $LYCHEE_CONFIG"
+CMD="lycheeverse/lychee:$LYCHEE_VERSION --verbose --root-dir /data"
 
 # Add GitHub token if available
 if [[ -n "$GITHUB_TOKEN" ]]; then
     CMD="$CMD --github-token $GITHUB_TOKEN"
 fi
 
+if [[ "$LOCAL_LINKS_ONLY" == "true" ]]; then
+    CMD="$CMD --scheme file --include-fragments"
+else
+    CMD="$CMD --config .github/scripts/lychee-config.toml"
+fi
+
 CMD="$CMD $TARGET"
 
 # Determine if we should allocate a TTY

.github/scripts/dependencies.dockerfile renamed to .github/scripts/dependencies.Dockerfile

@@ -18,7 +18,7 @@ jobs:
         if: github.event_name == 'pull_request'
         env:
           GITHUB_TOKEN: ${{ github.token }}
-        run: ./.github/scripts/link-check.sh --relative-only
+        run: ./.github/scripts/link-check.sh --local-links-only
 
       - name: Get modified files
         if: github.event_name == 'pull_request'

.github/scripts/link-check.sh

@@ -1,7 +1,7 @@
 plugins {
   `kotlin-dsl`
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "7.0.4"
+  id("com.diffplug.spotless") version "7.1.0"
 }
 
 repositories {
@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.1.0")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
   implementation("org.owasp:dependency-check-gradle:12.1.3")

.github/scripts/.lychee.toml renamed to .github/scripts/lychee-config.toml

@@ -27,8 +27,8 @@ dependencies {
     api("com.google.auto.service:auto-service-annotations:1.1.1")
     api("com.google.auto.value:auto-value:1.11.0")
     api("com.google.auto.value:auto-value-annotations:1.11.0")
-    api("com.google.errorprone:error_prone_annotations:2.39.0")
-    api("com.google.errorprone:error_prone_core:2.39.0")
+    api("com.google.errorprone:error_prone_annotations:2.40.0")
+    api("com.google.errorprone:error_prone_core:2.40.0")
     api("io.github.netmikey.logunit:logunit-jul:2.0.0")
     api("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
     api("io.prometheus:simpleclient:0.16.0")

.github/workflows/reusable-link-check.yml

@@ -20,14 +20,14 @@ dependencies {
   annotationProcessor("com.google.auto.value:auto-value")
   compileOnly("com.google.auto.value:auto-value-annotations")
 
-  testImplementation("io.micrometer:micrometer-core:1.15.1")
+  testImplementation("io.micrometer:micrometer-core:1.15.2")
 }
 
 testing {
   suites {
     val integrationTest by registering(JvmTestSuite::class) {
       dependencies {
-        implementation("io.micrometer:micrometer-registry-prometheus:1.15.1")
+        implementation("io.micrometer:micrometer-registry-prometheus:1.15.2")
       }
     }
   }