From ed72b846f0486967526ea59dc1c7b91737e7379c Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Thu, 5 Dec 2024 15:39:17 +0000 Subject: [PATCH] Skip format on Windows due to flakiness --- .github/workflows/test-linux.yml | 1 - .github/workflows/test-windows.yml | 29 ++++++++++------------- src/Elastic.Apm/Report/PayloadSenderV2.cs | 2 +- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index e5d20411f..c69ca4766 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -65,7 +65,6 @@ jobs: runs-on: ubuntu-latest needs: [ 'format' ] timeout-minutes: 30 - steps: - uses: actions/checkout@v4 - name: Bootstrap Action Workspace diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 145e86bbf..bcd6e3c49 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -36,21 +36,19 @@ env: jobs: - format: - runs-on: windows-2022 - steps: - - uses: actions/checkout@v4 - - name: Bootstrap Action Workspace - uses: ./.github/workflows/bootstrap - - name: Format - run: ./build.bat format + # format: + # runs-on: windows-2022 + # steps: + # - uses: actions/checkout@v4 + # - name: Bootstrap Action Workspace + # uses: ./.github/workflows/bootstrap + # - name: Format + # run: ./build.bat format #required step tests: runs-on: windows-2022 - needs: [ 'format' ] timeout-minutes: 30 - steps: - uses: actions/checkout@v4 - name: Bootstrap Action Workspace @@ -61,9 +59,9 @@ jobs: - name: 'Tests: Unit' run: ./build.bat test --test-suite unit - integrations-tests: + integration-tests: runs-on: windows-2022 - needs: [ 'format', 'tests' ] + needs: [ 'tests' ] steps: - uses: actions/checkout@v4 - name: Bootstrap Action Workspace @@ -84,7 +82,7 @@ jobs: startup-hook-tests: runs-on: windows-2022 - needs: [ 'format', 'tests' ] + needs: [ 'tests' ] steps: - uses: actions/checkout@v4 - name: Bootstrap Action Workspace @@ -95,7 +93,7 @@ jobs: profiler-tests: runs-on: windows-2022 - needs: [ 'format', 'tests' ] + needs: [ 'tests' ] steps: - uses: actions/checkout@v4 - name: Bootstrap Action Workspace @@ -109,8 +107,7 @@ jobs: test-iis: runs-on: windows-latest - needs: [ 'format', 'tests' ] - + needs: [ 'tests' ] steps: - uses: actions/checkout@v4 - name: Bootstrap Action Workspace diff --git a/src/Elastic.Apm/Report/PayloadSenderV2.cs b/src/Elastic.Apm/Report/PayloadSenderV2.cs index f358a33ab..6df27cdf7 100644 --- a/src/Elastic.Apm/Report/PayloadSenderV2.cs +++ b/src/Elastic.Apm/Report/PayloadSenderV2.cs @@ -396,7 +396,7 @@ private void ProcessQueueItems(object[] queueItems) if (_logger.IsEnabled(LogLevel.Trace)) - stream.Position = 0; + stream.Position = 0; using (var content = new StreamContent(stream)) { content.Headers.ContentType = MediaTypeHeaderValue;