refactor: bom (#201)

* refactor: bom

* ci: update suppression file

* build: submodule ref merged

.github/workflows/update-locks.yml

@@ -0,0 +1,31 @@
+name: Update Locks
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '12 12 * * 5'
+jobs:
+  update-versions:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+      - name: Calculate simple repository name
+        id: repo-basename
+        shell: bash
+        run: |
+          echo "value=`basename ${{ github.repository }}`" >> $GITHUB_OUTPUT
+      - name: Get Token from Github App
+        uses: tibdex/github-app-token@v2
+        id: generate-token
+        with:
+          app_id: ${{ secrets.GH_CI_APP_ID }}
+          private_key: ${{ secrets.GH_CI_APP_PRIVATE_KEY }}
+          repositories: >-
+            [${{ toJson(steps.repo-basename.outputs.value) }}]
+      - name: Update locks if needed
+        uses: hypertrace/github-actions/raise-lock-pr@main
+        with:
+          token: ${{ steps.generate-token.outputs.token }}

build.gradle.kts

@@ -1,34 +1,19 @@
 plugins {
-  id("org.hypertrace.repository-plugin") version "0.4.2"
-  id("org.hypertrace.ci-utils-plugin") version "0.3.2"
-  id("org.hypertrace.jacoco-report-plugin") version "0.2.1" apply false
-  id("org.hypertrace.docker-java-application-plugin") version "0.9.9" apply false
-  id("org.hypertrace.docker-publish-plugin") version "0.9.9" apply false
-  id("org.hypertrace.code-style-plugin") version "1.2.0" apply false
-  id("org.owasp.dependencycheck") version "8.2.1"
+  alias(commonLibs.plugins.hypertrace.ciutils)
+  alias(commonLibs.plugins.hypertrace.codestyle) apply false
+  alias(commonLibs.plugins.owasp.dependencycheck)
 }
 
 subprojects {
   group = "org.hypertrace.graphql"
 
   pluginManager.withPlugin("java") {
-    apply(plugin = "org.hypertrace.code-style-plugin")
+    apply(plugin = commonLibs.plugins.hypertrace.codestyle.get().pluginId)
     configure<JavaPluginExtension> {
       sourceCompatibility = JavaVersion.VERSION_11
       targetCompatibility = JavaVersion.VERSION_11
     }
   }
-
-  pluginManager.withPlugin("java-library") {
-    dependencies {
-      "api"(platform(project(":hypertrace-graphql-platform")))
-      "annotationProcessor"(platform(project(":hypertrace-graphql-platform")))
-      "testAnnotationProcessor"(platform(project(":hypertrace-graphql-platform")))
-      "testImplementation"(platform("org.hypertrace.core.graphql:hypertrace-core-graphql-test-platform"))
-      "compileOnly"(platform(project(":hypertrace-graphql-platform")))
-      "testCompileOnly"(platform(project(":hypertrace-graphql-platform")))
-    }
-  }
 }
 
 dependencyCheck {

gradle/libs.versions.toml

@@ -0,0 +1,20 @@
+[libraries]
+graphql-annotations = { module = "io.github.graphql-java:graphql-java-annotations", version = "9.1" }
+graphql-servlet = { module = "com.graphql-java-kickstart:graphql-java-servlet", version = "14.0.0" }
+
+core-attribute-constants = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-attribute-scope-constants" }
+core-schema-common = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-common-schema" }
+core-schema-utils = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-schema-utils" }
+core-schema-registry = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-schema-registry" }
+core-schema-metadata = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-metadata-schema" }
+core-schema-spans = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-span-schema" }
+core-schema-logevents = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-log-event-schema" }
+core-schema-traces = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-trace-schema" }
+core-attribute-store = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-attribute-store" }
+core-spi = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-spi" }
+core-grpc = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-grpc-utils" }
+core-context = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-context" }
+core-deserialization = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-deserialization" }
+core-rxutils = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-rx-utils" }
+core-request-transformation = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-request-transformation" }
+core-gateway-utils = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-gateway-service-utils" }

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.4-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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=SC2039,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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# 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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         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.

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

hypertrace-graphql-attribute-scope/build.gradle.kts

@@ -3,9 +3,9 @@ plugins {
 }
 
 dependencies {
-  api("com.google.inject:guice")
-  api("io.reactivex.rxjava3:rxjava")
-  api("org.hypertrace.core.graphql:hypertrace-core-graphql-attribute-scope-constants")
-  api("org.hypertrace.core.graphql:hypertrace-core-graphql-common-schema")
-  implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-attribute-store")
+  api(commonLibs.guice)
+  api(commonLibs.rxjava3)
+  api(localLibs.core.attribute.constants)
+  api(localLibs.core.schema.common)
+  implementation(localLibs.core.attribute.store)
 }

hypertrace-graphql-attribute-scope/gradle.lockfile

@@ -0,0 +1,58 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath
+com.auth0:java-jwt:4.4.0=runtimeClasspath
+com.auth0:jwks-rsa:0.22.0=runtimeClasspath
+com.fasterxml.jackson.core:jackson-annotations:2.15.2=compileClasspath,runtimeClasspath
+com.fasterxml.jackson.core:jackson-core:2.15.2=compileClasspath,runtimeClasspath
+com.fasterxml.jackson.core:jackson-databind:2.15.2=compileClasspath,runtimeClasspath
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=runtimeClasspath
+com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath
+com.google.android:annotations:4.1.1.4=runtimeClasspath
+com.google.api.grpc:proto-google-common-protos:2.17.0=runtimeClasspath
+com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath
+com.google.code.gson:gson:2.10.1=runtimeClasspath
+com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath
+com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath
+com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath
+com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath
+com.google.inject:guice:6.0.0=compileClasspath,runtimeClasspath
+com.google.j2objc:j2objc-annotations:2.8=compileClasspath
+com.google.protobuf:protobuf-java:3.24.1=runtimeClasspath
+com.graphql-java-kickstart:graphql-java-kickstart:14.0.0=compileClasspath,runtimeClasspath
+com.graphql-java-kickstart:graphql-java-servlet:14.0.0=compileClasspath,runtimeClasspath
+com.graphql-java:graphql-java-extended-scalars:17.0=compileClasspath,runtimeClasspath
+com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath
+com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath
+io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath
+io.grpc:grpc-api:1.57.2=runtimeClasspath
+io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath
+io.grpc:grpc-context:1.57.2=runtimeClasspath
+io.grpc:grpc-core:1.57.2=runtimeClasspath
+io.grpc:grpc-protobuf-lite:1.57.2=runtimeClasspath
+io.grpc:grpc-protobuf:1.57.2=runtimeClasspath
+io.grpc:grpc-stub:1.57.2=runtimeClasspath
+io.netty:netty-bom:4.1.100.Final=runtimeClasspath
+io.perfmark:perfmark-api:0.26.0=runtimeClasspath
+io.reactivex.rxjava3:rxjava:3.1.7=compileClasspath,runtimeClasspath
+jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath
+javax.annotation:javax.annotation-api:1.3.2=runtimeClasspath
+javax.inject:javax.inject:1=compileClasspath,runtimeClasspath
+javax.servlet:javax.servlet-api:4.0.1=compileClasspath,runtimeClasspath
+javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
+javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath
+org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
+org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.2.11=compileClasspath,runtimeClasspath
+org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
+org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
+org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=runtimeClasspath
+org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=runtimeClasspath
+org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=runtimeClasspath
+org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath
+org.reactivestreams:reactive-streams:1.0.4=compileClasspath,runtimeClasspath
+org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath
+empty=annotationProcessor

hypertrace-graphql-entity-schema/build.gradle.kts

@@ -1,43 +1,41 @@
 plugins {
   `java-library`
   jacoco
-  id("org.hypertrace.jacoco-report-plugin")
+  alias(commonLibs.plugins.hypertrace.jacoco)
 }
 
 dependencies {
-  api("com.google.inject:guice")
-  api("com.graphql-java:graphql-java")
-  api("org.hypertrace.core.graphql:hypertrace-core-graphql-spi")
-  api("io.github.graphql-java:graphql-java-annotations")
-  api(project(":hypertrace-graphql-metric-schema"))
-  api("org.hypertrace.core.graphql:hypertrace-core-graphql-common-schema")
-
-  annotationProcessor("org.projectlombok:lombok")
-  compileOnly("org.projectlombok:lombok")
-  compileOnly(project(":hypertrace-graphql-attribute-scope"))
-
-  implementation("org.slf4j:slf4j-api")
-  implementation("io.reactivex.rxjava3:rxjava")
-  implementation("org.hypertrace.gateway.service:gateway-service-api")
-  implementation("com.google.protobuf:protobuf-java-util")
-  implementation("com.google.guava:guava")
-
-  implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-context")
-  implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-grpc-utils")
-  implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-schema-utils")
-  implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-attribute-store")
-  implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-deserialization")
-  implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-rx-utils")
-
-  implementation("org.hypertrace.core.grpcutils:grpc-client-utils")
-
-  implementation(project(":hypertrace-graphql-labels-schema-api"))
-
-  testImplementation("org.junit.jupiter:junit-jupiter")
-  testImplementation("org.mockito:mockito-core")
-  testImplementation("org.mockito:mockito-junit-jupiter")
-  testAnnotationProcessor("org.projectlombok:lombok")
-  testCompileOnly("org.projectlombok:lombok")
+  api(commonLibs.guice)
+  api(commonLibs.graphql.java)
+  api(localLibs.core.spi)
+  api(localLibs.graphql.annotations)
+  api(projects.hypertraceGraphqlMetricSchema)
+  api(localLibs.core.schema.common)
+
+  annotationProcessor(commonLibs.lombok)
+  compileOnly(commonLibs.lombok)
+  compileOnly(projects.hypertraceGraphqlAttributeScope)
+
+  implementation(commonLibs.slf4j2.api)
+  implementation(commonLibs.rxjava3)
+  implementation(commonLibs.hypertrace.gatewayservice.api)
+  implementation(commonLibs.protobuf.javautil)
+  implementation(commonLibs.guava)
+  implementation(commonLibs.hypertrace.grpcutils.client)
+  implementation(projects.hypertraceGraphqlLabelsSchemaApi)
+
+  implementation(localLibs.core.context)
+  implementation(localLibs.core.grpc)
+  implementation(localLibs.core.schema.utils)
+  implementation(localLibs.core.attribute.store)
+  implementation(localLibs.core.deserialization)
+  implementation(localLibs.core.rxutils)
+
+  testImplementation(commonLibs.junit.jupiter)
+  testImplementation(commonLibs.mockito.core)
+  testImplementation(commonLibs.mockito.junit)
+  testAnnotationProcessor(commonLibs.lombok)
+  testCompileOnly(commonLibs.lombok)
 }
 
 tasks.test {