Merge branch 'main' into otel-integration-package

rabbitmq · May 10, 2024 · 904cfc9 · 904cfc9
2 parents 4da85c8 + b79c261
commit 904cfc9
Show file tree

Hide file tree

Showing 82 changed files with 3,366 additions and 1,950 deletions.
diff --git a/.ci/ubuntu/gha-setup.sh b/.ci/ubuntu/gha-setup.sh
@@ -31,6 +31,13 @@ else
     readonly run_toxiproxy='false'
 fi
 
+if [[ $2 == 'pull' ]]
+then
+    readonly docker_pull_args='--pull always'
+else
+    readonly docker_pull_args=''
+fi
+
 set -o nounset
 
 declare -r rabbitmq_docker_name="$docker_name_prefix-rabbitmq"
@@ -43,13 +50,14 @@ function start_toxiproxy
         # sudo ss -4nlp
         echo "[INFO] starting Toxiproxy server docker container"
         docker rm --force "$toxiproxy_docker_name" 2>/dev/null || echo "[INFO] $toxiproxy_docker_name was not running"
-        docker run --pull always --detach \
+        # shellcheck disable=SC2086
+        docker run --detach $docker_pull_args \
             --name "$toxiproxy_docker_name" \
             --hostname "$toxiproxy_docker_name" \
             --publish 8474:8474 \
-            --publish 55672:55672 \
+            --publish 55670-55680:55670-55680 \
             --network "$docker_network_name" \
-            'ghcr.io/shopify/toxiproxy:2.7.0'
+            'ghcr.io/shopify/toxiproxy:latest'
     fi
 }
 
@@ -58,17 +66,19 @@ function start_rabbitmq
     echo "[INFO] starting RabbitMQ server docker container"
     chmod 0777 "$GITHUB_WORKSPACE/.ci/ubuntu/log"
     docker rm --force "$rabbitmq_docker_name" 2>/dev/null || echo "[INFO] $rabbitmq_docker_name was not running"
-    docker run --pull always --detach \
+    # shellcheck disable=SC2086
+    docker run --detach $docker_pull_args \
         --name "$rabbitmq_docker_name" \
         --hostname "$rabbitmq_docker_name" \
         --publish 5671:5671 \
         --publish 5672:5672 \
+        --publish 15672:15672 \
         --network "$docker_network_name" \
         --volume "$GITHUB_WORKSPACE/.ci/ubuntu/enabled_plugins:/etc/rabbitmq/enabled_plugins" \
         --volume "$GITHUB_WORKSPACE/.ci/ubuntu/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf:ro" \
         --volume "$GITHUB_WORKSPACE/.ci/certs:/etc/rabbitmq/certs:ro" \
         --volume "$GITHUB_WORKSPACE/.ci/ubuntu/log:/var/log/rabbitmq" \
-        rabbitmq:latest
+        rabbitmq:management
 }
 
 function wait_rabbitmq
@@ -100,7 +110,8 @@ function wait_rabbitmq
 
 function get_rabbitmq_id
 {
-    local rabbitmq_docker_id="$(docker inspect --format='{{.Id}}' "$rabbitmq_docker_name")"
+    local rabbitmq_docker_id
+    rabbitmq_docker_id="$(docker inspect --format='{{.Id}}' "$rabbitmq_docker_name")"
     echo "[INFO] '$rabbitmq_docker_name' docker id is '$rabbitmq_docker_id'"
     if [[ -v GITHUB_OUTPUT ]]
     then

diff --git a/.editorconfig b/.editorconfig
@@ -169,6 +169,8 @@ dotnet_diagnostic.RS0036.severity = none
 dotnet_diagnostic.RS0041.severity = none
 dotnet_diagnostic.RS0051.severity = error
 
+dotnet_diagnostic.CA2007.severity = error
+
 # C++ Files
 [*.{cpp,h,in}]
 curly_bracket_next_line = true

diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   build-win32:
-    runs-on: windows-2019
+    runs-on: windows-latest
     # https://github.com/NuGet/Home/issues/11548
     env:
       NUGET_CERT_REVOCATION_MODE: offline
@@ -42,7 +42,7 @@ jobs:
             projects/RabbitMQ.*/bin
   integration-win32:
     needs: build-win32
-    runs-on: windows-2019
+    runs-on: windows-latest
     # https://github.com/NuGet/Home/issues/11548
     env:
       NUGET_CERT_REVOCATION_MODE: offline
@@ -57,7 +57,7 @@ jobs:
           # Note: the cache path is relative to the workspace directory
           # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#using-the-cache-action
           path: ~/installers
-          key: ${{ runner.os }}-v0-${{ hashFiles('.ci/versions.json') }}
+          key: ${{ runner.os }}-v0-${{ hashFiles('.ci/windows/versions.json') }}
       - name: Download Build (Debug)
         uses: actions/download-artifact@v4
         with:
@@ -73,8 +73,8 @@ jobs:
           Receive-Job -Job $tx; `
           & "${{ github.workspace }}\.ci\windows\toxiproxy\toxiproxy-cli.exe" list; `
           dotnet test `
-            --environment "RABBITMQ_RABBITMQCTL_PATH=${{ steps.install-start-rabbitmq.outputs.path }}" `
             --environment 'RABBITMQ_LONG_RUNNING_TESTS=true' `
+            --environment "RABBITMQ_RABBITMQCTL_PATH=${{ steps.install-start-rabbitmq.outputs.path }}" `
             --environment 'RABBITMQ_TOXIPROXY_TESTS=true' `
             --environment 'PASSWORD=grapefruit' `
             --environment SSL_CERTS_DIR="${{ github.workspace }}\.ci\certs" `
@@ -89,7 +89,7 @@ jobs:
           path: ~/AppData/Roaming/RabbitMQ/log/
   sequential-integration-win32:
     needs: build-win32
-    runs-on: windows-2019
+    runs-on: windows-latest
     # https://github.com/NuGet/Home/issues/11548
     env:
       NUGET_CERT_REVOCATION_MODE: offline
@@ -104,7 +104,7 @@ jobs:
           # Note: the cache path is relative to the workspace directory
           # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#using-the-cache-action
           path: ~/installers
-          key: ${{ runner.os }}-v0-${{ hashFiles('.ci/versions.json') }}
+          key: ${{ runner.os }}-v0-${{ hashFiles('.ci/windows/versions.json') }}
       - name: Download Build (Debug)
         uses: actions/download-artifact@v4
         with:
@@ -114,7 +114,12 @@ jobs:
         id: install-start-rabbitmq
         run: ${{ github.workspace }}\.ci\windows\gha-setup.ps1
       - name: Sequential Integration Tests
-        run: dotnet test --environment "RABBITMQ_RABBITMQCTL_PATH=${{ steps.install-start-rabbitmq.outputs.path }}" "${{ github.workspace }}\projects\Test\SequentialIntegration\SequentialIntegration.csproj" --no-restore --no-build --logger 'console;verbosity=detailed'
+        run: dotnet test `
+            --environment 'RABBITMQ_LONG_RUNNING_TESTS=true' `
+            --environment "RABBITMQ_RABBITMQCTL_PATH=${{ steps.install-start-rabbitmq.outputs.path }}" `
+            --environment 'PASSWORD=grapefruit' `
+            --environment SSL_CERTS_DIR="${{ github.workspace }}\.ci\certs" `
+            "${{ github.workspace }}\projects\Test\SequentialIntegration\SequentialIntegration.csproj" --no-restore --no-build --logger 'console;verbosity=detailed'
       - name: Maybe upload RabbitMQ logs
         if: failure()
         uses: actions/upload-artifact@v4
@@ -182,14 +187,17 @@ jobs:
       - name: Integration Tests
         run: |
             dotnet test \
-                --environment "RABBITMQ_RABBITMQCTL_PATH=DOCKER:${{ steps.start-rabbitmq.outputs.id }}" \
                 --environment 'RABBITMQ_LONG_RUNNING_TESTS=true' \
+                --environment "RABBITMQ_RABBITMQCTL_PATH=DOCKER:${{ steps.start-rabbitmq.outputs.id }}" \
                 --environment 'RABBITMQ_TOXIPROXY_TESTS=true' \
                 --environment 'PASSWORD=grapefruit' \
                 --environment SSL_CERTS_DIR="${{ github.workspace }}/.ci/certs" \
                 "${{ github.workspace }}/projects/Test/Integration/Integration.csproj" --no-restore --no-build --logger 'console;verbosity=detailed'
       - name: Check for errors in RabbitMQ logs
         run: ${{ github.workspace}}/.ci/ubuntu/gha-log-check.sh
+      - name: Maybe collect toxiproxy logs
+        if: failure()
+        run: docker logs rabbitmq-dotnet-client-toxiproxy > ${{ github.workspace }}/.ci/ubuntu/log/toxiproxy.log
       - name: Maybe upload RabbitMQ logs
         if: failure()
         uses: actions/upload-artifact@v4
@@ -219,7 +227,10 @@ jobs:
       - name: Sequential Integration Tests
         run: |
             dotnet test \
+                --environment 'RABBITMQ_LONG_RUNNING_TESTS=true' \
                 --environment "RABBITMQ_RABBITMQCTL_PATH=DOCKER:${{ steps.start-rabbitmq.outputs.id }}" \
+                --environment 'PASSWORD=grapefruit' \
+                --environment SSL_CERTS_DIR="${{ github.workspace }}/.ci/certs" \
                 "${{ github.workspace }}/projects/Test/SequentialIntegration/SequentialIntegration.csproj" --no-restore --no-build --logger 'console;verbosity=detailed'
       - name: Maybe upload RabbitMQ logs
         if: failure()

diff --git a/Makefile b/Makefile
@@ -6,15 +6,32 @@ RABBITMQ_DOCKER_NAME ?= rabbitmq-dotnet-client-rabbitmq
 build:
 	dotnet build $(CURDIR)/Build.csproj
 
+# Note:
+#
+# --environment 'GITHUB_ACTIONS=true'
+#
+# The above argument is passed to `dotnet test` because it's assumed you
+# use this command to set up your local environment on Linux:
+#
+# ./.ci/ubuntu/gha-setup.sh toxiproxy
+#
+# The gha-setup.sh command has been tested on Ubuntu 22 and Arch Linux
+# and should work on any Linux system with a recent docker.
+#
 test:
 	dotnet test $(CURDIR)/projects/Test/Unit/Unit.csproj --logger 'console;verbosity=detailed'
-	dotnet test --environment "RABBITMQ_RABBITMQCTL_PATH=DOCKER:$$(docker inspect --format='{{.Id}}' $(RABBITMQ_DOCKER_NAME))" \
-		--environment 'RABBITMQ_LONG_RUNNING_TESTS=true' $(CURDIR)/projects/Test/Integration/Integration.csproj --logger 'console;verbosity=detailed'
+	dotnet test --environment 'GITHUB_ACTIONS=true' \
+		--environment 'RABBITMQ_LONG_RUNNING_TESTS=true' \
+		--environment "RABBITMQ_RABBITMQCTL_PATH=DOCKER:$$(docker inspect --format='{{.Id}}' $(RABBITMQ_DOCKER_NAME))" \
 		--environment 'RABBITMQ_TOXIPROXY_TESTS=true' \
 		--environment 'PASSWORD=grapefruit' \
 		--environment SSL_CERTS_DIR="$(CURDIR)/.ci/certs" \
 		"$(CURDIR)/projects/Test/Integration/Integration.csproj" --logger 'console;verbosity=detailed'
-	dotnet test --environment "RABBITMQ_RABBITMQCTL_PATH=DOCKER:$$(docker inspect --format='{{.Id}}' $(RABBITMQ_DOCKER_NAME))" $(CURDIR)/projects/Test/SequentialIntegration/SequentialIntegration.csproj --logger 'console;verbosity=detailed'
+	dotnet test --environment 'RABBITMQ_LONG_RUNNING_TESTS=true' \
+		--environment "RABBITMQ_RABBITMQCTL_PATH=DOCKER:$$(docker inspect --format='{{.Id}}' $(RABBITMQ_DOCKER_NAME))" \
+		--environment 'PASSWORD=grapefruit' \
+		--environment SSL_CERTS_DIR="$(CURDIR)/.ci/certs" \
+		$(CURDIR)/projects/Test/SequentialIntegration/SequentialIntegration.csproj --logger 'console;verbosity=detailed'
 
 # Note:
 # You must have the expected OAuth2 environment set up for this target

diff --git a/projects/Benchmarks/Benchmarks.csproj b/projects/Benchmarks/Benchmarks.csproj
@@ -2,10 +2,14 @@
 
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
     <TargetFrameworks>net6.0;net472</TargetFrameworks>
+    <NoWarn>$(NoWarn);CA2007</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
     <TargetFramework>net6.0</TargetFramework>
+    <NoWarn>$(NoWarn);CA2007</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup>