diff --git a/.trivyignore b/.trivyignore index e69de29bb..30675bb53 100644 --- a/.trivyignore +++ b/.trivyignore @@ -0,0 +1,2 @@ +# libssl3 +CVE-2023-5678 exp:2023-12-31 \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ea5c94dc0..ab859f541 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] hypertrace-entity-service = "0.8.78" hypertrace-config-service = "0.1.54" -hypertrace-grpc-utils = "0.12.4" +hypertrace-grpc-utils = "0.12.6" hypertrace-serviceFramework = "0.1.62" hypertrace-kafkaStreams = "0.4.3" -hypertrace-view-generator = "0.4.20" +hypertrace-view-generator = "0.4.21" grpc = "1.57.2" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..7f93135c4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac0b842f1..d11cdd907 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c78733..0adc8e1a5 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f93..6689b85be 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/hypertrace-trace-enricher/enriched-span-constants/build.gradle.kts b/hypertrace-trace-enricher/enriched-span-constants/build.gradle.kts index c5881d443..430b0fd50 100644 --- a/hypertrace-trace-enricher/enriched-span-constants/build.gradle.kts +++ b/hypertrace-trace-enricher/enriched-span-constants/build.gradle.kts @@ -1,67 +1,31 @@ -import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.id -import com.google.protobuf.gradle.ofSourceSet -import com.google.protobuf.gradle.plugins -import com.google.protobuf.gradle.protobuf -import com.google.protobuf.gradle.protoc plugins { `java-library` jacoco id("org.hypertrace.jacoco-report-plugin") - id("com.google.protobuf") version "0.8.15" + id("com.google.protobuf") version "0.9.2" id("org.hypertrace.publish-plugin") } -val generateLocalGoGrpcFiles = false - protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.21.1" - } - plugins { - id("grpc_java") { - artifact = "io.grpc:protoc-gen-grpc-java:1.57.2" - } - - if (generateLocalGoGrpcFiles) { - id("grpc_go") { - path = "/bin/protoc-gen-go" - } - } - } - generateProtoTasks { - ofSourceSet("main").forEach { - it.plugins { - // Apply the "grpc" plugin whose spec is defined above, without options. - id("grpc_java") - - if (generateLocalGoGrpcFiles) { - id("grpc_go") - } - } - it.builtins { - java - if (generateLocalGoGrpcFiles) { - id("go") - } - } - } + artifact = "com.google.protobuf:protoc:3.21.12" } } -tasks.test { - useJUnitPlatform() -} - sourceSets { main { java { - srcDirs("src/main/java", "build/generated/source/proto/main/java", "build/generated/source/proto/main/grpc_java") + srcDirs("build/generated/source/proto/main/java") } } } +tasks.test { + useJUnitPlatform() +} + dependencies { api(libs.google.protobuf.java) diff --git a/raw-spans-grouper/raw-spans-grouper/build.gradle.kts b/raw-spans-grouper/raw-spans-grouper/build.gradle.kts index e3f795799..86fbca3b9 100644 --- a/raw-spans-grouper/raw-spans-grouper/build.gradle.kts +++ b/raw-spans-grouper/raw-spans-grouper/build.gradle.kts @@ -36,6 +36,7 @@ dependencies { implementation(libs.hypertrace.data.model) implementation(libs.hypertrace.serviceFramework.framework) implementation(libs.hypertrace.serviceFramework.metrics) + implementation(libs.hypertrace.grpc.client.utils) implementation(libs.hypertrace.kafkaStreams.framework) implementation(libs.hypertrace.kafkaStreams.weightedGroupPartitioners) diff --git a/settings.gradle.kts b/settings.gradle.kts index 24a2d5115..ef4a050be 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,8 +12,6 @@ plugins { rootProject.name = "hypertrace-ingester-root" -enableFeaturePreview("VERSION_CATALOGS") - // trace-enricher include("hypertrace-trace-enricher:enriched-span-constants") include("hypertrace-trace-enricher:hypertrace-trace-visualizer") diff --git a/span-normalizer/raw-span-constants/build.gradle.kts b/span-normalizer/raw-span-constants/build.gradle.kts index a97046f3f..5019a1a75 100644 --- a/span-normalizer/raw-span-constants/build.gradle.kts +++ b/span-normalizer/raw-span-constants/build.gradle.kts @@ -1,61 +1,29 @@ -import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.id -import com.google.protobuf.gradle.ofSourceSet -import com.google.protobuf.gradle.plugins -import com.google.protobuf.gradle.protobuf -import com.google.protobuf.gradle.protoc plugins { `java-library` - id("com.google.protobuf") version "0.8.15" + id("com.google.protobuf") version "0.9.2" id("org.hypertrace.publish-plugin") } -val generateLocalGoGrpcFiles = false - protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.21.1" - } - plugins { - id("grpc_java") { - artifact = "io.grpc:protoc-gen-grpc-java:1.57.2" - } - - if (generateLocalGoGrpcFiles) { - id("grpc_go") { - path = "/bin/protoc-gen-go" - } - } - } - generateProtoTasks { - ofSourceSet("main").forEach { - it.plugins { - // Apply the "grpc" plugin whose spec is defined above, without options. - id("grpc_java") - - if (generateLocalGoGrpcFiles) { - id("grpc_go") - } - } - it.builtins { - java - if (generateLocalGoGrpcFiles) { - id("go") - } - } - } + artifact = "com.google.protobuf:protoc:3.21.12" } } sourceSets { main { java { - srcDirs("src/main/java", "build/generated/source/proto/main/java", "build/generated/source/proto/main/grpc_java") + srcDirs("build/generated/source/proto/main/java") } } } +tasks.test { + useJUnitPlatform() +} + dependencies { api("com.google.protobuf:protobuf-java-util:3.23.3") constraints { diff --git a/span-normalizer/span-normalizer-api/build.gradle.kts b/span-normalizer/span-normalizer-api/build.gradle.kts index 0c22f1c99..e7e3c607b 100644 --- a/span-normalizer/span-normalizer-api/build.gradle.kts +++ b/span-normalizer/span-normalizer-api/build.gradle.kts @@ -1,60 +1,30 @@ -import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.id -import com.google.protobuf.gradle.ofSourceSet -import com.google.protobuf.gradle.plugins -import com.google.protobuf.gradle.protobuf -import com.google.protobuf.gradle.protoc plugins { `java-library` - id("com.google.protobuf") version "0.8.15" + id("com.google.protobuf") version "0.9.2" id("org.hypertrace.publish-plugin") id("org.hypertrace.avro-plugin") } -val generateLocalGoGrpcFiles = false - protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.21.1" - } - plugins { - id("grpc_java") { - artifact = "io.grpc:protoc-gen-grpc-java:1.57.2" - } - - if (generateLocalGoGrpcFiles) { - id("grpc_go") { - path = "/bin/protoc-gen-go" - } - } - } - generateProtoTasks { - ofSourceSet("main").forEach { - it.plugins { - // Apply the "grpc" plugin whose spec is defined above, without options. - id("grpc_java") - - if (generateLocalGoGrpcFiles) { - id("grpc_go") - } - } - it.builtins { - java - if (generateLocalGoGrpcFiles) { - id("go") - } - } - } + artifact = "com.google.protobuf:protoc:3.21.12" } } + sourceSets { main { java { - srcDirs("src/main/java", "build/generated/source/proto/main/java", "build/generated/source/proto/main/grpc_java") + srcDirs("build/generated/source/proto/main/java") } } } + +tasks.test { + useJUnitPlatform() +} + dependencies { api("com.google.api.grpc:proto-google-common-protos:2.14.1") api("org.apache.avro:avro:1.11.3")