Merge pull request #554 from iExecBlockchainComputing/release/8.2.0

Release/8.2.0

Author: jbern0rd

CHANGELOG.md

@@ -2,6 +2,37 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[8.2.0]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v8.2.0) 2023-09-29
+
+### New Features
+- Check result files name length before zipping. (#538)
+### Bug fixes
+- Implement thread-safe login on scheduler. (#541)
+- Fix and harmonize `Dockerfile entrypoint` in all Spring Boot applications. (#548)
+- Remove potential `NullPointerException` and add `isStatusValidOnChainAfterPendingReceipt` in `IexecHubService`. (#550)
+### Quality
+- Remove `nexus.intra.iex.ec` repository. (#539)
+- Remove `Graylog` support. Fetch logs with a sidecar to push them to your log infrastructure. (#540)
+- Rename scontain registry to `registry.scontain.com`. (#542)
+- Upgrade to Gradle 8.2.1 with up-to-date plugins. (#545)
+- Fix log format in `LasService`. (#546)
+- Do not retry calls to fetch replicate from a scheduler, those calls are already scheduled. (#547)
+- Remove dead code in `IexecHubService`. (#550)
+- Remove `VersionService#isSnapshot`. (#552)
+### Dependency Upgrades
+- Upgrade to `iexec-common` 8.2.1-NEXT-SNAPSHOT. (#538)
+- Remove `logstash-gelf` dependency. (#540)
+- Upgrade to `eclipse-temurin` 11.0.20. (#543)
+- Upgrade to Spring Boot 2.7.14. (#544)
+- Upgrade to Spring Dependency Management Plugin 1.1.3. (#544)
+- Upgrade to `jenkins-library` 2.7.3. (#549)
+- Upgrade to `iexec-commons-poco` 3.1.0. (#551)
+- Upgrade to `iexec-common` 8.3.0. (#551)
+- Upgrade to `iexec-commons-containers` 1.1.2. (#551 #552)
+- Upgrade to `iexec-blockchain-adapter-api-library` 8.2.0. (#553)
+- Upgrade to `iexec-result-proxy-library` 8.2.0. (#553)
+- Upgrade to `iexec-sms-library` 8.3.0. (#553)
+
 ## [[8.1.4]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v8.1.4) 2023-06-27
 
 ### Dependency Upgrades

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.18_10-jre
+FROM eclipse-temurin:11.0.20_8-jre-focal
 
 ARG jar
 
@@ -10,4 +10,4 @@ RUN apt-get update \
 
 COPY $jar iexec-worker.jar
 
-ENTRYPOINT [ "/bin/sh", "-c", "exec java -Djava.security.egd=file:/dev/./urandom -jar iexec-worker.jar" ]
+ENTRYPOINT [ "java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "iexec-worker.jar" ]

Jenkinsfile

@@ -1,11 +1,7 @@
-@Library('global-jenkins-library@2.4.0') _
+@Library('global-jenkins-library@2.7.3') _
 buildJavaProject(
         buildInfo: getBuildInfo(),
         integrationTestsEnvVars: [],
         shouldPublishJars: true,
         shouldPublishDockerImages: true,
-        dockerfileDir: '.',
-        preDevelopVisibility: 'iex.ec',
-        developVisibility: 'iex.ec',
-        preProductionVisibility: 'docker.io',
-        productionVisibility: 'docker.io')
+        dockerfileDir: '.')

README.md

@@ -47,8 +47,6 @@ You can configure the _iExec Worker_ with the following properties:
 | `IEXEC_WORKER_SCONTAIN_REGISTRY_USERNAME` | Username to connect to the Scontain registry. | String | |
 | `IEXEC_WORKER_SCONTAIN_REGISTRY_PASSWORD` | Password to connect to the Scontain registry. | String | |
 | `IEXEC_LAS_PORT` | Port the LAS should be started on. | Positive integer | `18766` |
-| `IEXEC_CORE_GRAYLOG_HOST` | Graylog server host. | String | `localhost` |
-| `IEXEC_CORE_GRAYLOG_PORT` | Graylog server port. | Positive integer | `12201` |
 | `IEXEC_WORKER_SGX_DRIVER_MODE` | Intel® SGX driver that should be used. | { NONE, LEGACY, NATIVE } | `NONE` |
 
 ## Health checks

build.gradle

@@ -1,17 +1,17 @@
 plugins {
     id 'java'
-    id 'io.freefair.lombok' version '6.6.1'
-    id 'org.springframework.boot' version '2.6.14'
-    id 'io.spring.dependency-management' version '1.1.0'
+    id 'io.freefair.lombok' version '8.2.2'
+    id 'org.springframework.boot' version '2.7.14'
+    id 'io.spring.dependency-management' version '1.1.3'
     id 'jacoco'
-    id 'org.sonarqube' version '3.3'
+    id 'org.sonarqube' version '4.2.1.3168'
     id 'maven-publish'
 }
 
 group = 'com.iexec.worker'
 
 ext {
-    springCloudVersion = '2021.0.5'
+    springCloudVersion = '2021.0.8'
     dockerJavaVersion = '3.2.12'
     lombokVersion = '1.18.2'
 }
@@ -34,22 +34,11 @@ repositories {
             password nexusPassword
         }
     }
-    maven {
-        url "https://nexus.intra.iex.ec/repository/maven-public/"
-    }
     maven {
         url "https://jitpack.io"
     }
 }
 
-configurations {
-    all {
-        // Exclude JUnit 4. Only JUnit 5 is used
-        exclude group: 'junit', module: 'junit'
-        exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
-    }
-}
-
 dependencyManagement {
     imports {
         mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
@@ -66,28 +55,18 @@ dependencies {
     implementation "com.iexec.sms:iexec-sms-library:$iexecSmsVersion"
 
     // spring
-    implementation("org.springframework.boot:spring-boot-starter") {
-        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging' //required for Graylog
-    }
+    implementation "org.springframework.boot:spring-boot-starter"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-websocket"
     implementation "org.springframework.cloud:spring-cloud-starter"
     implementation "org.springframework.cloud:spring-cloud-starter-openfeign"
     implementation "org.springframework.retry:spring-retry"
-    testImplementation "org.springframework.boot:spring-boot-starter-test"
-    testImplementation "org.mockito:mockito-inline:4.8.0" // activates mocking final classes/methods
 
     // apache commons.lang3
     implementation 'org.apache.commons:commons-lang3'
 
-    // Web3j issues, see core build.gradle
-    // NoSuchMethodError: 'okhttp3.RequestBody okhttp3.RequestBody.create(java.lang.String, okhttp3.MediaType)'
-    // Spring Boot dependencies BOM enforces okhttp3 3.14.9 in 2.6.X
-    // It is required to define the dependency version required by web3j until migration to at least Spring Boot 2.7.X
-    implementation 'com.squareup.okhttp3:okhttp:4.9.0' // Web3j issue: https://github.com/web3j/web3j/issues/1180
-
     // Required for com.iexec.worker.feign.config.RestTemplateConfig
     implementation 'org.apache.httpcomponents:httpclient'
 
@@ -98,9 +77,6 @@ dependencies {
     // Removes 'warning: unknown enum constant When.MAYBE'
     implementation 'com.google.code.findbugs:annotations:3.0.1'
 
-    //graylog
-    implementation 'biz.paluch.logging:logstash-gelf:1.5.1'
-
     // observability
     runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
 
@@ -110,6 +86,11 @@ dependencies {
     // expiring map
     implementation 'net.jodah:expiringmap:0.5.10'
 
+    // tests
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    testImplementation "org.mockito:mockito-inline" // activates mocking final classes/methods
+
     // awaitility
     testImplementation "org.awaitility:awaitility"
 }
@@ -120,14 +101,6 @@ java {
     }
 }
 
-// ./gradlew build -Pdev
-def isDev = project.hasProperty('dev')
-
-jar {
-    enabled true
-    archiveClassifier.set('library')
-}
-
 springBoot {
     buildInfo()
 }
@@ -140,22 +113,14 @@ tasks.named("bootJar") {
 }
 
 test {
-    useJUnitPlatform {
-        // Ignore slow tests in development
-        if (isDev) {
-            excludeTags 'slow'
-        }
-    }
+    useJUnitPlatform()
 }
 
-task itest {
+tasks.register('itest') {
     group 'Verification'
     description 'Runs the integration tests.'
 }
 
-jacoco {
-    toolVersion = "0.8.7"
-}
 // sonarqube code coverage requires jacoco XML report
 jacocoTestReport {
     reports {
@@ -187,7 +152,7 @@ ext.jarPathForOCI  = relativePath(tasks.bootJar.outputs.files.singleFile)
 ext.gitShortCommit = 'git rev-parse --short=8 HEAD'.execute().text.trim()
 ext.ociImageName   = 'local/' + ['bash', '-c', 'basename $(git config --get remote.origin.url) .git'].execute().text.trim()
 
-task buildImage(type: Exec) {
+tasks.register('buildImage', Exec) {
     group       'Build'
     description 'Builds an OCI image from a Dockerfile.'
     dependsOn    bootJar

gradle.properties

@@ -1,10 +1,10 @@
-version=8.1.4
-iexecCommonVersion=8.2.1
-iexecCommonsContainersVersion=1.0.3
-iexecCommonsPocoVersion=3.0.5
-iexecBlockchainAdapterVersion=8.1.1
-iexecResultVersion=8.1.1
-iexecSmsVersion=8.1.1
+version=8.2.0
+iexecCommonVersion=8.3.0
+iexecCommonsContainersVersion=1.1.2
+iexecCommonsPocoVersion=3.1.0
+iexecBlockchainAdapterVersion=8.2.0
+iexecResultVersion=8.2.0
+iexecSmsVersion=8.3.0
 
 nexusUser
 nexusPassword

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# 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"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -133,26 +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 
+        # 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 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,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

gradlew

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,10 +80,10 @@ void pingScheduler() {
         try {
             sessionId = coreClient.ping(loginService.getToken());
         } catch (FeignException e) {
+            log.warn("The worker cannot ping the core [status:{}]", e.status());
             if (e instanceof FeignException.Unauthorized) {
                 loginService.login();
             }
-            log.warn("The worker cannot ping the core [status:{}]", e.status());
             return;
         }