Skip to content

Commit 575d0f1

Browse files
niemyjskiniemyjski
authored
Merge branch 'main' into dependabot/npm_and_yarn/src/Exceptionless.Web/ClientApp.angular/ip-1.1.9
2 parents e092dda + 56a9ff5 commit 575d0f1

File tree

182 files changed

+3290
-1366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+3290
-1366
lines changed

‎.github/workflows/build-arm64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
3434
- name: Build Version
3535
run: |
36-
dotnet tool install --global minver-cli --version 4.3.0
36+
dotnet tool install --global minver-cli --version 5.0.0
3737
version=$(minver --tag-prefix v)
3838
echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV
3939
echo "VERSION=$version" >> $GITHUB_ENV

‎.github/workflows/build.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Version
3939
id: version
4040
run: |
41-
dotnet tool install --global minver-cli --version 4.3.0
41+
dotnet tool install --global minver-cli --version 5.0.0
4242
version=$(minver --tag-prefix v)
4343
echo "version=$version" >> $GITHUB_OUTPUT
4444
echo "### $version" >> $GITHUB_STEP_SUMMARY
@@ -121,17 +121,10 @@ jobs:
121121
with:
122122
fetch-depth: 0
123123

124-
- name: Setup .NET Core
125-
uses: actions/setup-dotnet@v4
126-
with:
127-
dotnet-version: 8.0.*
128-
#dotnet-quality: preview
129-
130124
- name: Cache node_modules
131125
uses: actions/cache@v4
132126
with:
133-
path: |
134-
node_modules
127+
path: node_modules
135128
key: node-modules-${{ hashFiles('package-lock.json') }}
136129

137130
- name: Setup Node.js environment

‎.github/workflows/elasticsearch-docker-7.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
2727
- name: Build Version
2828
run: |
29-
dotnet tool install --global minver-cli --version 4.3.0
29+
dotnet tool install --global minver-cli --version 5.0.0
3030
version=$(minver --tag-prefix v)
3131
echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV
3232
echo "VERSION=$version" >> $GITHUB_ENV

‎.github/workflows/elasticsearch-docker-8.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
2727
- name: Build Version
2828
run: |
29-
dotnet tool install --global minver-cli --version 4.3.0
29+
dotnet tool install --global minver-cli --version 5.0.0
3030
version=$(minver --tag-prefix v)
3131
echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV
3232
echo "VERSION=$version" >> $GITHUB_ENV

‎src/Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Product>Exceptionless</Product>
66
<MinVerSkip Condition="'$(Configuration)' == 'Debug'">true</MinVerSkip>
77
<MinVerTagPrefix>v</MinVerTagPrefix>
8-
<Copyright>Copyright (c) 2023 Exceptionless. All rights reserved.</Copyright>
8+
<Copyright>Copyright (c) 2024 Exceptionless. All rights reserved.</Copyright>
99
<RepositoryUrl>https://github.com/exceptionless/exceptionless</RepositoryUrl>
1010
<Authors>Exceptionless</Authors>
1111
<NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -15,13 +15,13 @@
1515
<EmbedUntrackedSources>true</EmbedUntrackedSources>
1616
<ReferenceFoundatioSource>false</ReferenceFoundatioSource>
1717
<ReferenceFoundatioRepositoriesSource>false</ReferenceFoundatioRepositoriesSource>
18-
<FoundatioVersion>10.7.0</FoundatioVersion>
18+
<FoundatioVersion>10.7.1</FoundatioVersion>
1919
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
2020
</PropertyGroup>
2121

2222
<ItemGroup>
2323
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
2424
<PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
25-
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
25+
<PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="All" />
2626
</ItemGroup>
2727
</Project>

‎src/Exceptionless.Core/Exceptionless.Core.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
<PackageReference Include="Foundatio.Extensions.Hosting" Version="$(FoundatioVersion)" />
2626
<PackageReference Include="Foundatio.JsonNet" Version="$(FoundatioVersion)" />
2727
<PackageReference Include="NEST.JsonNetSerializer" Version="7.17.5" />
28-
<PackageReference Include="Handlebars.Net" Version="2.1.4" />
28+
<PackageReference Include="Handlebars.Net" Version="2.1.6" />
2929
<PackageReference Include="McSherry.SemanticVersioning" Version="1.4.1" />
3030
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
31-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.2" />
31+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.3" />
3232
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
33-
<PackageReference Include="Stripe.net" Version="43.15.0" />
33+
<PackageReference Include="Stripe.net" Version="43.22.0" />
3434
<PackageReference Include="System.DirectoryServices" Version="8.0.0" />
3535
<PackageReference Include="UAParser" Version="3.1.47" />
3636

37-
<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.7" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
37+
<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.8" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
3838
<ProjectReference Include="..\..\..\..\Foundatio\Foundatio.Repositories\src\Foundatio.Repositories.Elasticsearch\Foundatio.Repositories.Elasticsearch.csproj" Condition="'$(ReferenceFoundatioRepositoriesSource)' == 'true'" />
3939
</ItemGroup>
4040
</Project>

‎src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public CheckForRegressionAction(IStackRepository stackRepository, SemanticVersio
2323
public override async Task ProcessBatchAsync(ICollection<EventContext> contexts)
2424
{
2525
var stacks = contexts
26-
.Where(c => c.Stack is not null && c.Stack.Status != StackStatus.Regressed && c.Stack.DateFixed.HasValue)
26+
.Where(c => c.Stack is { Status: StackStatus.Fixed, DateFixed: not null })
2727
.OrderBy(c => c.Event.Date)
2828
.GroupBy(c => c.Event.StackId);
2929

@@ -52,7 +52,16 @@ public override async Task ProcessBatchAsync(ICollection<EventContext> contexts)
5252
{
5353
var version = _semanticVersionParser.Parse(versionGroup.Key, versionCache) ?? _semanticVersionParser.Default;
5454
if (version < fixedInVersion)
55+
{
56+
foreach (var ctx in stackGroup.Where(s => s.Organization.HasPremiumFeatures))
57+
{
58+
_logger.LogDebug("Discarding fixed stack event: Version {Version} is older than fixed in version {FixedInVersion}", version, fixedInVersion);
59+
ctx.IsDiscarded = true;
60+
ctx.IsCancelled = true;
61+
}
62+
5563
continue;
64+
}
5665

5766
regressedVersion = version;
5867
regressedContext = versionGroup.First();
@@ -63,7 +72,7 @@ public override async Task ProcessBatchAsync(ICollection<EventContext> contexts)
6372
if (regressedContext is null)
6473
return;
6574

66-
_logger.LogTrace("Marking stack and events as regressed in version: {Version}", regressedVersion);
75+
_logger.LogDebug("Marking stack and events as regressed in version: {Version}", regressedVersion);
6776
stack.Status = StackStatus.Regressed;
6877
await _stackRepository.MarkAsRegressedAsync(stack.Id);
6978

@@ -79,7 +88,10 @@ public override async Task ProcessBatchAsync(ICollection<EventContext> contexts)
7988
{
8089
cont = HandleError(ex, context);
8190
}
82-
catch { }
91+
catch (Exception hex)
92+
{
93+
_logger.LogError(hex, "Error calling HandleError: {Message}", ex.Message);
94+
}
8395

8496
if (!cont)
8597
context.SetError(ex.Message, ex);

‎src/Exceptionless.Insulation/Exceptionless.Insulation.csproj

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,26 @@
22
<ItemGroup>
33
<PackageReference Include="Geocoding.Google" Version="4.0.1" />
44
<PackageReference Include="MaxMind.GeoIP2" Version="5.2.0" />
5-
<PackageReference Include="Foundatio.Aliyun" Version="10.7.0" />
6-
<PackageReference Include="Foundatio.AWS" Version="10.7.0" />
7-
<PackageReference Include="Foundatio.AzureStorage" Version="10.7.0" />
8-
<PackageReference Include="Foundatio.Extensions.Hosting" Version="$(FoundatioVersion)" />
9-
<PackageReference Include="Foundatio.Minio" Version="10.7.0" />
10-
<PackageReference Include="Foundatio.RabbitMQ" Version="10.7.0" />
11-
<PackageReference Include="Foundatio.Redis" Version="10.7.0" />
5+
<PackageReference Include="Foundatio.Aliyun" Version="10.7.1" />
6+
<PackageReference Include="Foundatio.AWS" Version="10.7.1" />
7+
<PackageReference Include="Foundatio.AzureStorage" Version="10.7.1" />
8+
<PackageReference Include="Foundatio.Minio" Version="10.7.1" />
9+
<PackageReference Include="Foundatio.RabbitMQ" Version="10.7.1" />
10+
<PackageReference Include="Foundatio.Redis" Version="10.7.1" />
1211
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
1312
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
1413
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
1514
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
1716
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
18-
<PackageReference Include="MailKit" Version="4.3.0" />
17+
<PackageReference Include="MailKit" Version="4.4.0" />
1918
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
2019
<PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
2120
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
2221
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
2322
<PackageReference Include="Serilog.Sinks.ExceptionLess" Version="4.0.0" />
24-
<PackageReference Include="StackExchange.Redis" Version="2.7.17" />
25-
<PackageReference Include="YamlDotNet" Version="15.1.1" />
23+
<PackageReference Include="StackExchange.Redis" Version="2.7.33" />
24+
<PackageReference Include="YamlDotNet" Version="15.1.2" />
2625
</ItemGroup>
2726
<ItemGroup>
2827
<ProjectReference Include="..\Exceptionless.Core\Exceptionless.Core.csproj" />

‎src/Exceptionless.Job/Exceptionless.Job.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
</ItemGroup>
55

66
<ItemGroup>
7-
<PackageReference Include="Exceptionless.AspNetCore" Version="6.0.3" />
8-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.2" />
7+
<PackageReference Include="Exceptionless.AspNetCore" Version="6.0.4" />
8+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.3" />
99
<PackageReference Include="App.Metrics.AspNetCore" Version="4.3.0" />
1010
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
1111
<PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
1212
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
1313

14-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
15-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
16-
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.7.0-rc.1" />
17-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
19-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
20-
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.13" />
14+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.0" />
15+
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.8.0" />
16+
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.8.0-rc.1" />
17+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.0" />
19+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.0" />
20+
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.14" />
2121
<PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.0.0-beta.5" />
22-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
22+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src/Exceptionless.Web/ClientApp.angular/app/app.tpl.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
></a>
3131
</span>
3232
<span class="visible-xs">
33-
&copy; 2023 <a href="https://exceptionless.com" target="_blank">Exceptionless</a>
33+
&copy; 2024 <a href="https://exceptionless.com" target="_blank">Exceptionless</a>
3434
<a
3535
href="https://exceptionless.com/privacy/"
3636
target="_blank"
@@ -43,7 +43,7 @@
4343
>
4444
</span>
4545
<span class="hidden-xs">
46-
&copy; 2023 <a href="https://exceptionless.com" target="_blank">Exceptionless</a>
46+
&copy; 2024 <a href="https://exceptionless.com" target="_blank">Exceptionless</a>
4747
<a href="https://exceptionless.com/news/" target="_blank" class="m-l-sm text-muted">News</a>
4848
<a href="https://exceptionless.com/privacy/" target="_blank" class="m-l-sm text-muted">Privacy Policy</a>
4949
<a href="https://exceptionless.com/terms/" target="_blank" class="m-l-sm text-muted">Terms of Use</a>

0 commit comments

Comments
 (0)