Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…

…y-proto-java into update-codeowners

build.gradle.kts

@@ -1,6 +1,7 @@
 import com.google.protobuf.gradle.*
 import de.undercouch.gradle.tasks.download.Download
-import nebula.plugin.release.git.opinion.Strategies
+import nebula.plugin.release.git.base.TagStrategy
+import nebula.plugin.release.git.semver.NearestVersionLocator
 import java.time.Duration
 
 plugins {
@@ -14,7 +15,6 @@ plugins {
 }
 
 release {
-  defaultVersionStrategy = Strategies.getSNAPSHOT()
 }
 
 tasks {
@@ -25,8 +25,15 @@ tasks {
 
 description = "Java Bindings for the OpenTelemetry Protocol (OTLP)"
 
-val grpcVersion = "1.44.0"
-val protobufVersion = "3.19.4"
+// Project version is set from -Prelease.version or inferred from the latest tag
+if (properties.contains("release.version")) {
+  version = properties.get("release.version") as String
+} else {
+  version = NearestVersionLocator(TagStrategy()).locate(release.grgit).any.toString()
+}
+
+val grpcVersion = "1.56.1"
+val protobufVersion = "3.23.4"
 
 repositories {
   mavenCentral()
@@ -64,7 +71,7 @@ protobuf {
   }
 }
 
-val protoVersion = version.toString().removeSuffix("-SNAPSHOT").removeSuffix("-alpha")
+val protoVersion = version
 val protoArchive = file("$buildDir/archives/opentelemetry-proto-$protoVersion.zip")
 
 tasks {

buildSrc/build.gradle.kts

@@ -9,6 +9,5 @@ repositories {
 }
 
 dependencies {
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:5.16.0")
-  implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.17")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.20.0")
 }

buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts

@@ -22,24 +22,54 @@ spotless {
   }
   plugins.withId("org.jetbrains.kotlin.jvm") {
     kotlin {
-      ktlint().userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
+      ktlint().editorConfigOverride(mapOf(
+        "indent_size" to "2",
+        "continuation_indent_size" to "2",
+        "max_line_length" to "160",
+        "insert_final_newline" to "true",
+        "ktlint_standard_no-wildcard-imports" to "disabled",
+        // ktlint does not break up long lines, it just fails on them
+        "ktlint_standard_max-line-length" to "disabled",
+        // ktlint makes it *very* hard to locate where this actually happened
+        "ktlint_standard_trailing-comma-on-call-site" to "disabled",
+        // depends on ktlint_standard_wrapping
+        "ktlint_standard_trailing-comma-on-declaration-site" to "disabled",
+        // also very hard to find out where this happens
+        "ktlint_standard_wrapping" to "disabled"
+      ))
       licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|class|// Includes work from:)")
     }
   }
   kotlinGradle {
-    ktlint().userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
+    ktlint().editorConfigOverride(mapOf(
+      "indent_size" to "2",
+      "continuation_indent_size" to "2",
+      "max_line_length" to "160",
+      "insert_final_newline" to "true",
+      "ktlint_standard_no-wildcard-imports" to "disabled",
+      // ktlint does not break up long lines, it just fails on them
+      "ktlint_standard_max-line-length" to "disabled",
+      // ktlint makes it *very* hard to locate where this actually happened
+      "ktlint_standard_trailing-comma-on-call-site" to "disabled",
+      // depends on ktlint_standard_wrapping
+      "ktlint_standard_trailing-comma-on-declaration-site" to "disabled",
+      // also very hard to find out where this happens
+      "ktlint_standard_wrapping" to "disabled"
+    ))
   }
   format("misc") {
     // not using "**/..." to help keep spotless fast
     target(
+      ".gitignore",
       ".gitattributes",
       ".gitconfig",
       ".editorconfig",
       "*.md",
       "src/**/*.md",
       "docs/**/*.md",
       "*.sh",
-      "src/**/*.properties")
+      "src/**/*.properties",
+    )
     indentWithSpaces()
     trimTrailingWhitespace()
     endWithNewline()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd

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,10 @@ 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"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +130,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 +197,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 +213,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.

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

settings.gradle.kts

@@ -1,9 +1,9 @@
 pluginManagement {
   plugins {
-    id("com.google.protobuf") version "0.8.17"
-    id("de.undercouch.download") version "4.1.2"
-    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
-    id("nebula.release") version "16.0.0"
+    id("com.google.protobuf") version "0.9.4"
+    id("de.undercouch.download") version "5.4.0"
+    id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
+    id("nebula.release") version "17.2.2"
   }
 }