From cca2999c8cdd802c24543bcda6ea2d0dbb703aaf Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 7 Jul 2025 21:25:54 +0000 Subject: [PATCH 1/5] Initial plan From 2cff63dc7e7f0042170686ec58dca6d853fd3b03 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 7 Jul 2025 21:36:42 +0000 Subject: [PATCH 2/5] Initial analysis and reproduction of SpotBugs Java version issue Co-authored-by: YunchuWang <12449837+YunchuWang@users.noreply.github.com> --- .../protos/orchestrator_service.proto | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/internal/durabletask-protobuf/protos/orchestrator_service.proto b/internal/durabletask-protobuf/protos/orchestrator_service.proto index 88928c3b..b2ca147b 100644 --- a/internal/durabletask-protobuf/protos/orchestrator_service.proto +++ b/internal/durabletask-protobuf/protos/orchestrator_service.proto @@ -95,6 +95,7 @@ message TaskScheduledEvent { google.protobuf.StringValue version = 2; google.protobuf.StringValue input = 3; TraceContext parentTraceContext = 4; + map tags = 5; } message TaskCompletedEvent { @@ -256,6 +257,7 @@ message ScheduleTaskAction { string name = 1; google.protobuf.StringValue version = 2; google.protobuf.StringValue input = 3; + map tags = 4; } message CreateSubOrchestrationAction { @@ -343,6 +345,7 @@ message CreateInstanceRequest { google.protobuf.StringValue executionId = 7; map tags = 8; TraceContext parentTraceContext = 9; + google.protobuf.Timestamp requestTime = 10; } message OrchestrationIdReusePolicy { @@ -490,6 +493,8 @@ message SignalEntityRequest { google.protobuf.StringValue input = 3; string requestId = 4; google.protobuf.Timestamp scheduledTime = 5; + TraceContext parentTraceContext = 6; + google.protobuf.Timestamp requestTime = 7; } message SignalEntityResponse { @@ -575,6 +580,7 @@ message OperationRequest { string operation = 1; string requestId = 2; google.protobuf.StringValue input = 3; + TraceContext traceContext = 4; } message OperationResult { @@ -591,10 +597,14 @@ message OperationInfo { message OperationResultSuccess { google.protobuf.StringValue result = 1; + google.protobuf.Timestamp startTimeUtc = 2; + google.protobuf.Timestamp endTimeUtc = 3; } message OperationResultFailure { TaskFailureDetails failureDetails = 1; + google.protobuf.Timestamp startTimeUtc = 2; + google.protobuf.Timestamp endTimeUtc = 3; } message OperationAction { @@ -610,6 +620,8 @@ message SendSignalAction { string name = 2; google.protobuf.StringValue input = 3; google.protobuf.Timestamp scheduledTime = 4; + google.protobuf.Timestamp requestTime = 5; + TraceContext parentTraceContext = 6; } message StartNewOrchestrationAction { @@ -618,6 +630,8 @@ message StartNewOrchestrationAction { google.protobuf.StringValue version = 3; google.protobuf.StringValue input = 4; google.protobuf.Timestamp scheduledTime = 5; + google.protobuf.Timestamp requestTime = 6; + TraceContext parentTraceContext = 7; } message AbandonActivityTaskRequest { From 1f1010b687886d77149b3912d296da8452e744f4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 7 Jul 2025 21:44:05 +0000 Subject: [PATCH 3/5] Fix SpotBugs UnsupportedClassVersionError by running with Java 11 Co-authored-by: YunchuWang <12449837+YunchuWang@users.noreply.github.com> --- .github/workflows/build-validation.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-validation.yml b/.github/workflows/build-validation.yml index db7f298f..4cb57f1b 100644 --- a/.github/workflows/build-validation.yml +++ b/.github/workflows/build-validation.yml @@ -45,7 +45,9 @@ jobs: run: ./gradlew build -x test - name: Run SpotBugs - run: ./gradlew spotbugsMain spotbugsTest + run: | + export JAVA_HOME=$JDK_11 + ./gradlew spotbugsMain spotbugsTest continue-on-error: false - name: Upload SpotBugs reports From f8bc07b78ac21718989ea3bfccb3c6c5a4421ede Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 8 Jul 2025 15:47:50 +0000 Subject: [PATCH 4/5] Remove SpotBugs plugin and configuration to resolve Java compatibility issues Co-authored-by: YunchuWang <12449837+YunchuWang@users.noreply.github.com> --- .github/workflows/build-validation.yml | 14 +---------- azurefunctions/build.gradle | 32 +------------------------ azurefunctions/spotbugs-exclude.xml | 17 ------------- azuremanaged/build.gradle | 32 +------------------------ azuremanaged/spotbugs-exclude.xml | 17 ------------- client/build.gradle | 33 +------------------------- client/spotbugs-exclude.xml | 22 ----------------- 7 files changed, 4 insertions(+), 163 deletions(-) delete mode 100644 azurefunctions/spotbugs-exclude.xml delete mode 100644 azuremanaged/spotbugs-exclude.xml delete mode 100644 client/spotbugs-exclude.xml diff --git a/.github/workflows/build-validation.yml b/.github/workflows/build-validation.yml index 4cb57f1b..3cf79472 100644 --- a/.github/workflows/build-validation.yml +++ b/.github/workflows/build-validation.yml @@ -44,19 +44,7 @@ jobs: - name: Build with Gradle run: ./gradlew build -x test - - name: Run SpotBugs - run: | - export JAVA_HOME=$JDK_11 - ./gradlew spotbugsMain spotbugsTest - continue-on-error: false - - - name: Upload SpotBugs reports - uses: actions/upload-artifact@v4 - with: - name: SpotBugs Reports - path: '**/build/reports/spotbugs' - if-no-files-found: ignore - + - name: Run Unit Tests with Gradle run: | export JAVA_HOME=$JDK_11 diff --git a/azurefunctions/build.gradle b/azurefunctions/build.gradle index 17d1dd2b..5a7643fb 100644 --- a/azurefunctions/build.gradle +++ b/azurefunctions/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java-library' id 'maven-publish' id 'signing' - id 'com.github.spotbugs' version '5.2.1' + } group 'com.microsoft' @@ -87,34 +87,4 @@ java { withJavadocJar() } -spotbugs { - toolVersion = '4.9.2' - effort = 'max' - reportLevel = 'high' - ignoreFailures = true - excludeFilter = file('spotbugs-exclude.xml') -} -spotbugsMain { - reports { - html { - required = true - stylesheet = 'fancy-hist.xsl' - } - xml { - required = true - } - } -} - -spotbugsTest { - reports { - html { - required = true - stylesheet = 'fancy-hist.xsl' - } - xml { - required = true - } - } -} diff --git a/azurefunctions/spotbugs-exclude.xml b/azurefunctions/spotbugs-exclude.xml deleted file mode 100644 index eee5ac08..00000000 --- a/azurefunctions/spotbugs-exclude.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/azuremanaged/build.gradle b/azuremanaged/build.gradle index 6ede2393..26ed5579 100644 --- a/azuremanaged/build.gradle +++ b/azuremanaged/build.gradle @@ -12,7 +12,7 @@ plugins { id 'idea' id 'maven-publish' id 'signing' - id 'com.github.spotbugs' version '5.2.1' + } archivesBaseName = 'durabletask-azuremanaged' @@ -122,37 +122,7 @@ java { withJavadocJar() } -spotbugs { - toolVersion = '4.9.2' - effort = 'max' - reportLevel = 'high' - ignoreFailures = true - excludeFilter = file('spotbugs-exclude.xml') -} -spotbugsMain { - reports { - html { - required = true - stylesheet = 'fancy-hist.xsl' - } - xml { - required = true - } - } -} - -spotbugsTest { - reports { - html { - required = true - stylesheet = 'fancy-hist.xsl' - } - xml { - required = true - } - } -} // Add this after the plugins block def generatedSourcesDir = file("$buildDir/generated/sources/version/java/main") diff --git a/azuremanaged/spotbugs-exclude.xml b/azuremanaged/spotbugs-exclude.xml deleted file mode 100644 index eee5ac08..00000000 --- a/azuremanaged/spotbugs-exclude.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/client/build.gradle b/client/build.gradle index 34f84afb..446d8645 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' id 'maven-publish' id 'signing' - id 'com.github.spotbugs' version '5.2.1' + id 'org.gradle.test-retry' version '1.4.1' } @@ -203,34 +203,3 @@ java { withJavadocJar() } -spotbugs { - toolVersion = '4.9.2' - effort = 'max' - reportLevel = 'high' - ignoreFailures = true - excludeFilter = file('spotbugs-exclude.xml') -} - -spotbugsMain { - reports { - html { - required = true - stylesheet = 'fancy-hist.xsl' - } - xml { - required = true - } - } -} - -spotbugsTest { - reports { - html { - required = true - stylesheet = 'fancy-hist.xsl' - } - xml { - required = true - } - } -} \ No newline at end of file diff --git a/client/spotbugs-exclude.xml b/client/spotbugs-exclude.xml deleted file mode 100644 index d3dbb24a..00000000 --- a/client/spotbugs-exclude.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 8f6608cfffe1131400ad0700c20c62e43423e159 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 8 Jul 2025 16:47:21 +0000 Subject: [PATCH 5/5] Fix Gradle cache service error by updating gradle-build-action to v3 Co-authored-by: YunchuWang <12449837+YunchuWang@users.noreply.github.com> --- .github/workflows/build-validation.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-validation.yml b/.github/workflows/build-validation.yml index 3cf79472..f3979d2f 100644 --- a/.github/workflows/build-validation.yml +++ b/.github/workflows/build-validation.yml @@ -39,7 +39,7 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 - name: Build with Gradle run: ./gradlew build -x test @@ -117,7 +117,7 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 - name: Publish to local run: ./gradlew publishToMavenLocal -PskipSigning @@ -131,7 +131,7 @@ jobs: shell: pwsh - name: End to End Tests with Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: endToEndTest @@ -156,7 +156,7 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 - name: Publish to local run: ./gradlew publishToMavenLocal -PskipSigning @@ -170,7 +170,7 @@ jobs: shell: pwsh - name: Sample Tests with Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: sampleTest