Merge pull request #2 from JoshVanL/merge-microsoft

Merge microsoft

Author: cicoyle

.github/workflows/build-validation.yml

@@ -20,8 +20,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-      with:
-        submodules: true
 
     - name: Set up JDK 11
       uses: actions/setup-java@v2
@@ -44,40 +42,84 @@ jobs:
       uses: gradle/gradle-build-action@v2
 
     - name: Build with Gradle
-      run: ./gradlew build
+      run: ./gradlew build -x test
+    
+    - name: Run SpotBugs
+      run: ./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
+        ./gradlew clean test || echo "UNIT_TEST_FAILED=true" >> $GITHUB_ENV
+      continue-on-error: true
+
+    - name: Upload test reports if tests failed
+      if: env.UNIT_TEST_FAILED == 'true'
+      uses: actions/upload-artifact@v4
+      with:
+        name: Unit Test Reports
+        path: '**/build/reports/tests/test'
+        if-no-files-found: ignore  # Prevents errors if no reports exist
+    
+    - name: Fail the job if unit tests failed
+      if: env.UNIT_TEST_FAILED == 'true'
+      run: exit 1
 
       # TODO: Move the sidecar into a central image repository
     - name: Initialize Durable Task Sidecar
-      run: docker run --name durabletask-sidecar -p 4001:4001 --env 'DURABLETASK_SIDECAR_LOGLEVEL=Debug' -d kaibocai/durabletask-sidecar:latest start --backend Emulator
+      run: docker run --name durabletask-sidecar -p 4001:4001 --env 'DURABLETASK_SIDECAR_LOGLEVEL=Debug' -d peterstone2019/durabletask-sidecar:latest start --backend Emulator
+
+    - name: Display Durable Task Sidecar Logs
+      run: nohup docker logs --since=0 durabletask-sidecar > durabletask-sidecar.log 2>&1 &
 
       # wait for 10 seconds, so sidecar container can be fully up, this will avoid intermittent failing issues for integration tests causing by failed to connect to sidecar
     - name: Wait for 10 seconds
       run: sleep 10
 
     - name: Integration Tests with Gradle
-      run: ./gradlew integrationTest
+      run: ./gradlew integrationTest || echo "TEST_FAILED=true" >> $GITHUB_ENV
+      continue-on-error: true
+
+    - name: Kill Durable Task Sidecar
+      run: docker kill durabletask-sidecar
+    
+    - name: Upload Durable Task Sidecar Logs
+      uses: actions/upload-artifact@v4
+      with:
+        name: Durable Task Sidecar Logs
+        path: durabletask-sidecar.log
 
     - name: Archive test report
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Integration test report
         path: client/build/reports/tests/integrationTest
 
     - name: Upload JAR output
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Package
         path: client/build/libs
 
+    - name: Fail the job if tests failed
+      if: env.TEST_FAILED == 'true'
+      run: exit 1
+
   functions-e2e-tests:
 
     needs: build
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
-        with:
-          submodules: true
 
       - name: Set up JDK 8
         uses: actions/setup-java@v2
@@ -89,7 +131,7 @@ jobs:
         uses: gradle/gradle-build-action@v2
 
       - name: Publish to local
-        run: ./gradlew publishToMavenLocal -x sign
+        run: ./gradlew publishToMavenLocal -PskipSigning
 
       - name: Build azure functions sample
         run: ./gradlew azureFunctionsPackage
@@ -105,7 +147,7 @@ jobs:
           arguments: endToEndTest
 
       - name: Archive test report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Integration test report
           path: client/build/reports/tests/endToEndTest
@@ -117,8 +159,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-        with:
-          submodules: true
 
       - name: Set up JDK 8
         uses: actions/setup-java@v2
@@ -130,7 +170,7 @@ jobs:
         uses: gradle/gradle-build-action@v2
 
       - name: Publish to local
-        run: ./gradlew publishToMavenLocal -x sign
+        run: ./gradlew publishToMavenLocal -PskipSigning
 
       - name: Build azure functions sample
         run: ./gradlew azureFunctionsPackage
@@ -146,7 +186,7 @@ jobs:
           arguments: sampleTest
 
       - name: Archive test report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Integration test report
           path: client/build/reports/tests/endToEndTest

.gitignore

@@ -6,4 +6,7 @@ build/
 .project
 .settings
 .classpath
-repo/
+repo/
+
+# Ignore sample application properties or any other properties files used for sample
+samples/src/main/resources/*.properties

.gitmodules

@@ -1,4 +1,9 @@
-## placeholder
+## v1.5.1
+* Improve logging for unexpected connection failures in DurableTaskGrpcWorker ([#216](https://github.com/microsoft/durabletask-java/pull/216/files))
+* Add User-Agent Header to gRPC Metadata ([#213](https://github.com/microsoft/durabletask-java/pull/213))
+* Update protobuf definitions to include new properties in OrchestratorRequest and update source commit hash ([#214](https://github.com/microsoft/durabletask-java/pull/214))
+* DTS Support ([#201](https://github.com/microsoft/durabletask-java/pull/201))
+* Add automatic proto file download and commit hash tracking during build ([#207](https://github.com/microsoft/durabletask-java/pull/207))
 * Fix infinite loop when use continueasnew after wait external event ([#183](https://github.com/microsoft/durabletask-java/pull/183))
 * Fix the issue "Deserialize Exception got swallowed when use anyOf with external event." ([#185](https://github.com/microsoft/durabletask-java/pull/185))
 

CHANGELOG.md

@@ -6,7 +6,6 @@
 #
 
 #
-# AZURE FUNCTIONS TEAM
 # For all file changes, github would automatically include the following people in the PRs.
 #
-* @cgillum @kaibocai @shreyas-gopalakrishna
+* @microsoft/durabletask

CODEOWNERS

@@ -10,7 +10,6 @@ pool:
 
 steps:
 - checkout: self
-  submodules: true
 
 - task: Gradle@3
   inputs:

azdevops-pipeline/build-release-artifacts.yml

@@ -2,10 +2,11 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'signing'
+    id 'com.github.spotbugs' version '5.2.1'
 }
 
 group 'com.microsoft'
-version = '1.5.0'
+version = '1.5.1'
 archivesBaseName = 'durabletask-azure-functions'
 
 def protocVersion = '3.12.0'
@@ -76,12 +77,44 @@ publishing {
     }
 }
 
-// TODO: manual signing temporarily disabled, in favor of 1ES signing utils
-//signing {
-//    sign publishing.publications.mavenJava
-//}
+signing {
+   required = !project.hasProperty("skipSigning")
+   sign publishing.publications.mavenJava
+}
 
 java {
     withSourcesJar()
     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
+        }
+    }
+}

azurefunctions/build.gradle

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FindBugsFilter>
+    <!-- Exclude test classes -->
+    <Match>
+        <Class name="~.*Test"/>
+    </Match>
+    
+    <!-- Exclude common false positives -->
+    <Match>
+        <BugPattern name="DM_CONVERT_CASE"/>
+    </Match>
+    
+    <!-- Exclude serialization related warnings -->
+    <Match>
+        <BugPattern name="SE_NO_SERIALVERSIONID"/>
+    </Match>
+</FindBugsFilter>