Skip to content

Commit 215e1ea

Browse files
committed
Skip format on Windows due to flakiness
1 parent b47e2a1 commit 215e1ea

File tree

5 files changed

+20
-26
lines changed

5 files changed

+20
-26
lines changed

.github/workflows/test-linux.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565
runs-on: ubuntu-latest
6666
needs: [ 'format' ]
6767
timeout-minutes: 30
68-
6968
steps:
7069
- uses: actions/checkout@v4
7170
- name: Bootstrap Action Workspace

.github/workflows/test-windows.yml

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,19 @@ env:
3636

3737
jobs:
3838

39-
format:
40-
runs-on: windows-2022
41-
steps:
42-
- uses: actions/checkout@v4
43-
- name: Bootstrap Action Workspace
44-
uses: ./.github/workflows/bootstrap
45-
- name: Format
46-
run: ./build.bat format
39+
# format:
40+
# runs-on: windows-2022
41+
# steps:
42+
# - uses: actions/checkout@v4
43+
# - name: Bootstrap Action Workspace
44+
# uses: ./.github/workflows/bootstrap
45+
# - name: Format
46+
# run: ./build.bat format
4747

4848
#required step
4949
tests:
5050
runs-on: windows-2022
51-
needs: [ 'format' ]
5251
timeout-minutes: 30
53-
5452
steps:
5553
- uses: actions/checkout@v4
5654
- name: Bootstrap Action Workspace
@@ -61,9 +59,9 @@ jobs:
6159
- name: 'Tests: Unit'
6260
run: ./build.bat test --test-suite unit
6361

64-
integrations-tests:
62+
integration-tests:
6563
runs-on: windows-2022
66-
needs: [ 'format', 'tests' ]
64+
needs: [ 'tests' ]
6765
steps:
6866
- uses: actions/checkout@v4
6967
- name: Bootstrap Action Workspace
@@ -84,7 +82,7 @@ jobs:
8482
8583
startup-hook-tests:
8684
runs-on: windows-2022
87-
needs: [ 'format', 'tests' ]
85+
needs: [ 'tests' ]
8886
steps:
8987
- uses: actions/checkout@v4
9088
- name: Bootstrap Action Workspace
@@ -95,7 +93,7 @@ jobs:
9593

9694
profiler-tests:
9795
runs-on: windows-2022
98-
needs: [ 'format', 'tests' ]
96+
needs: [ 'tests' ]
9997
steps:
10098
- uses: actions/checkout@v4
10199
- name: Bootstrap Action Workspace
@@ -109,8 +107,7 @@ jobs:
109107

110108
test-iis:
111109
runs-on: windows-latest
112-
needs: [ 'format', 'tests' ]
113-
110+
needs: [ 'tests' ]
114111
steps:
115112
- uses: actions/checkout@v4
116113
- name: Bootstrap Action Workspace

src/Elastic.Apm/Report/PayloadSenderV2.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,6 @@ private void ProcessQueueItems(object[] queueItems)
393393
}
394394
}
395395

396-
if (_logger.IsEnabled(LogLevel.Trace))
397-
398-
399396
stream.Position = 0;
400397
using (var content = new StreamContent(stream))
401398
{

test/Elastic.Apm.Tests/BackendCommTests/ServiceActivationTests.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,19 @@ public class ServiceActivationTests : LoggingTestBase
3131
public ServiceActivationTests(ITestOutputHelper xUnitOutputHelper) : base(xUnitOutputHelper /*, LogLevel.Debug */) =>
3232
_logger = LoggerBase.Scoped(ThisClassName);
3333

34-
3534
[Fact]
3635
public void ShouldNotSendActivationMethodOnceBadVersionIsDiscovered()
3736
{
3837
var requests = FakeServerInformationCallAndEnqueue("8.7.0");
39-
requests.Count.Should().Be(3);
40-
38+
requests.Should().HaveCount(3);
4139
requests.Last().Should().NotContain("activation_method");
4240
}
4341

4442
[Fact]
4543
public void ShouldSendActivationMethodOtherVersions()
4644
{
4745
var requests = FakeServerInformationCallAndEnqueue("8.7.1");
48-
requests.Count.Should().Be(3);
49-
46+
requests.Should().HaveCount(3);
5047
requests.Last().Should().Contain("activation_method");
5148
}
5249

@@ -108,6 +105,10 @@ private List<string> FakeServerInformationCallAndEnqueue(string version)
108105
agent.PayloadSender.QueueTransaction(new Transaction(agent, "TestName", "TestType"));
109106

110107
waitHandle.WaitHandle.WaitOne(TimeSpan.FromSeconds(5));
108+
109+
foreach (var request in requests)
110+
LoggerBase?.Info()?.Log("Request: {Request}", request);
111+
111112
return requests;
112113
}
113114
}

test/profiler/Elastic.Apm.Profiler.Managed.Tests/RabbitMq/RabbitMqTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public RabbitMqTests(RabbitMqFixture fixture, ITestOutputHelper output)
3232
[InlineData("net8.0")]
3333
public async Task CaptureAutoInstrumentedSpans(string targetFramework)
3434
{
35-
var apmLogger = new InMemoryBlockingLogger(Logging.LogLevel.Warning);
35+
var apmLogger = new InMemoryBlockingLogger(Logging.LogLevel.Error);
3636
var apmServer = new MockApmServer(apmLogger, nameof(CaptureAutoInstrumentedSpans));
3737
var port = apmServer.FindAvailablePortToListen();
3838
apmServer.RunInBackground(port);

0 commit comments

Comments
 (0)