Merge branch 'main' into dependabot/npm_and_yarn/src/Exceptionless.We…

…b/ClientApp.angular/ip-1.1.9
exceptionless · Apr 6, 2024 · 575d0f1 · 575d0f1
2 parents e092dda + 56a9ff5
commit 575d0f1
Show file tree

Hide file tree

Showing 182 changed files with 3,290 additions and 1,366 deletions.
diff --git a/.github/workflows/build-arm64.yml b/.github/workflows/build-arm64.yml
@@ -33,7 +33,7 @@ jobs:
         run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
       - name: Build Version
         run: |
-          dotnet tool install --global minver-cli --version 4.3.0
+          dotnet tool install --global minver-cli --version 5.0.0
           version=$(minver --tag-prefix v)
           echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV
           echo "VERSION=$version" >> $GITHUB_ENV

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -38,7 +38,7 @@ jobs:
       - name: Version
         id: version
         run: |
-          dotnet tool install --global minver-cli --version 4.3.0
+          dotnet tool install --global minver-cli --version 5.0.0
           version=$(minver --tag-prefix v)
           echo "version=$version" >> $GITHUB_OUTPUT
           echo "### $version" >> $GITHUB_STEP_SUMMARY
@@ -121,17 +121,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 8.0.*
-          #dotnet-quality: preview
-
       - name: Cache node_modules
         uses: actions/cache@v4
         with:
-          path: |
-            node_modules
+          path: node_modules
           key: node-modules-${{ hashFiles('package-lock.json') }}
 
       - name: Setup Node.js environment

diff --git a/.github/workflows/elasticsearch-docker-7.yml b/.github/workflows/elasticsearch-docker-7.yml
@@ -26,7 +26,7 @@ jobs:
       run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
     - name: Build Version
       run: |
-        dotnet tool install --global minver-cli --version 4.3.0
+        dotnet tool install --global minver-cli --version 5.0.0
         version=$(minver --tag-prefix v)
         echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV
         echo "VERSION=$version" >> $GITHUB_ENV

diff --git a/.github/workflows/elasticsearch-docker-8.yml b/.github/workflows/elasticsearch-docker-8.yml
@@ -26,7 +26,7 @@ jobs:
       run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
     - name: Build Version
       run: |
-        dotnet tool install --global minver-cli --version 4.3.0
+        dotnet tool install --global minver-cli --version 5.0.0
         version=$(minver --tag-prefix v)
         echo "MINVERVERSIONOVERRIDE=$version" >> $GITHUB_ENV
         echo "VERSION=$version" >> $GITHUB_ENV

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -5,7 +5,7 @@
     <Product>Exceptionless</Product>
     <MinVerSkip Condition="'$(Configuration)' == 'Debug'">true</MinVerSkip>
     <MinVerTagPrefix>v</MinVerTagPrefix>
-    <Copyright>Copyright (c) 2023 Exceptionless.  All rights reserved.</Copyright>
+    <Copyright>Copyright (c) 2024 Exceptionless.  All rights reserved.</Copyright>
     <RepositoryUrl>https://github.com/exceptionless/exceptionless</RepositoryUrl>
     <Authors>Exceptionless</Authors>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -15,13 +15,13 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <ReferenceFoundatioSource>false</ReferenceFoundatioSource>
     <ReferenceFoundatioRepositoriesSource>false</ReferenceFoundatioRepositoriesSource>
-    <FoundatioVersion>10.7.0</FoundatioVersion>
+    <FoundatioVersion>10.7.1</FoundatioVersion>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     <PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
-    <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/Exceptionless.Core/Exceptionless.Core.csproj b/src/Exceptionless.Core/Exceptionless.Core.csproj
@@ -25,16 +25,16 @@
     <PackageReference Include="Foundatio.Extensions.Hosting" Version="$(FoundatioVersion)" />
     <PackageReference Include="Foundatio.JsonNet" Version="$(FoundatioVersion)" />
     <PackageReference Include="NEST.JsonNetSerializer" Version="7.17.5" />
-    <PackageReference Include="Handlebars.Net" Version="2.1.4" />
+    <PackageReference Include="Handlebars.Net" Version="2.1.6" />
     <PackageReference Include="McSherry.SemanticVersioning" Version="1.4.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.3" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Stripe.net" Version="43.15.0" />
+    <PackageReference Include="Stripe.net" Version="43.22.0" />
     <PackageReference Include="System.DirectoryServices" Version="8.0.0" />
     <PackageReference Include="UAParser" Version="3.1.47" />
 
-    <PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.7" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
+    <PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.8" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
     <ProjectReference Include="..\..\..\..\Foundatio\Foundatio.Repositories\src\Foundatio.Repositories.Elasticsearch\Foundatio.Repositories.Elasticsearch.csproj" Condition="'$(ReferenceFoundatioRepositoriesSource)' == 'true'" />
   </ItemGroup>
 </Project>
diff --git a/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs b/src/Exceptionless.Core/Pipeline/030_CheckForRegressionAction.cs
@@ -23,7 +23,7 @@ public CheckForRegressionAction(IStackRepository stackRepository, SemanticVersio
     public override async Task ProcessBatchAsync(ICollection<EventContext> contexts)
     {
         var stacks = contexts
-            .Where(c => c.Stack is not null && c.Stack.Status != StackStatus.Regressed && c.Stack.DateFixed.HasValue)
+            .Where(c => c.Stack is { Status: StackStatus.Fixed, DateFixed: not null })
             .OrderBy(c => c.Event.Date)
             .GroupBy(c => c.Event.StackId);
 
@@ -52,7 +52,16 @@ public override async Task ProcessBatchAsync(ICollection<EventContext> contexts)
                     {
                         var version = _semanticVersionParser.Parse(versionGroup.Key, versionCache) ?? _semanticVersionParser.Default;
                         if (version < fixedInVersion)
+                        {
+                            foreach (var ctx in stackGroup.Where(s => s.Organization.HasPremiumFeatures))
+                            {
+                                _logger.LogDebug("Discarding fixed stack event: Version {Version} is older than fixed in version {FixedInVersion}", version, fixedInVersion);
+                                ctx.IsDiscarded = true;
+                                ctx.IsCancelled = true;
+                            }
+
                             continue;
+                        }
 
                         regressedVersion = version;
                         regressedContext = versionGroup.First();
@@ -63,7 +72,7 @@ public override async Task ProcessBatchAsync(ICollection<EventContext> contexts)
                 if (regressedContext is null)
                     return;
 
-                _logger.LogTrace("Marking stack and events as regressed in version: {Version}", regressedVersion);
+                _logger.LogDebug("Marking stack and events as regressed in version: {Version}", regressedVersion);
                 stack.Status = StackStatus.Regressed;
                 await _stackRepository.MarkAsRegressedAsync(stack.Id);
 
@@ -79,7 +88,10 @@ public override async Task ProcessBatchAsync(ICollection<EventContext> contexts)
                     {
                         cont = HandleError(ex, context);
                     }
-                    catch { }
+                    catch (Exception hex)
+                    {
+                        _logger.LogError(hex, "Error calling HandleError: {Message}", ex.Message);
+                    }
 
                     if (!cont)
                         context.SetError(ex.Message, ex);

diff --git a/src/Exceptionless.Insulation/Exceptionless.Insulation.csproj b/src/Exceptionless.Insulation/Exceptionless.Insulation.csproj
@@ -2,27 +2,26 @@
   <ItemGroup>
     <PackageReference Include="Geocoding.Google" Version="4.0.1" />
     <PackageReference Include="MaxMind.GeoIP2" Version="5.2.0" />
-    <PackageReference Include="Foundatio.Aliyun" Version="10.7.0" />
-    <PackageReference Include="Foundatio.AWS" Version="10.7.0" />
-    <PackageReference Include="Foundatio.AzureStorage" Version="10.7.0" />
-    <PackageReference Include="Foundatio.Extensions.Hosting" Version="$(FoundatioVersion)" />
-    <PackageReference Include="Foundatio.Minio" Version="10.7.0" />
-    <PackageReference Include="Foundatio.RabbitMQ" Version="10.7.0" />
-    <PackageReference Include="Foundatio.Redis" Version="10.7.0" />
+    <PackageReference Include="Foundatio.Aliyun" Version="10.7.1" />
+    <PackageReference Include="Foundatio.AWS" Version="10.7.1" />
+    <PackageReference Include="Foundatio.AzureStorage" Version="10.7.1" />
+    <PackageReference Include="Foundatio.Minio" Version="10.7.1" />
+    <PackageReference Include="Foundatio.RabbitMQ" Version="10.7.1" />
+    <PackageReference Include="Foundatio.Redis" Version="10.7.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="MailKit" Version="4.3.0" />
+    <PackageReference Include="MailKit" Version="4.4.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
     <PackageReference Include="Serilog.Sinks.ExceptionLess" Version="4.0.0" />
-    <PackageReference Include="StackExchange.Redis" Version="2.7.17" />
-    <PackageReference Include="YamlDotNet" Version="15.1.1" />
+    <PackageReference Include="StackExchange.Redis" Version="2.7.33" />
+    <PackageReference Include="YamlDotNet" Version="15.1.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Exceptionless.Core\Exceptionless.Core.csproj" />

diff --git a/src/Exceptionless.Job/Exceptionless.Job.csproj b/src/Exceptionless.Job/Exceptionless.Job.csproj
@@ -4,22 +4,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Exceptionless.AspNetCore" Version="6.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.2" />
+    <PackageReference Include="Exceptionless.AspNetCore" Version="6.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.3" />
     <PackageReference Include="App.Metrics.AspNetCore" Version="4.3.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
 
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.7.0-rc.1" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.13" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.8.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.8.0-rc.1" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.14" />
     <PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.0.0-beta.5" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Exceptionless.Web/ClientApp.angular/app/app.tpl.html b/src/Exceptionless.Web/ClientApp.angular/app/app.tpl.html
@@ -30,7 +30,7 @@
             ></a>
         </span>
         <span class="visible-xs">
-            &copy; 2023 <a href="https://exceptionless.com" target="_blank">Exceptionless</a>
+            &copy; 2024 <a href="https://exceptionless.com" target="_blank">Exceptionless</a>
             <a
                 href="https://exceptionless.com/privacy/"
                 target="_blank"
@@ -43,7 +43,7 @@
             >
         </span>
         <span class="hidden-xs">
-            &copy; 2023 <a href="https://exceptionless.com" target="_blank">Exceptionless</a>
+            &copy; 2024 <a href="https://exceptionless.com" target="_blank">Exceptionless</a>
             <a href="https://exceptionless.com/news/" target="_blank" class="m-l-sm text-muted">News</a>
             <a href="https://exceptionless.com/privacy/" target="_blank" class="m-l-sm text-muted">Privacy Policy</a>
             <a href="https://exceptionless.com/terms/" target="_blank" class="m-l-sm text-muted">Terms of Use</a>

diff --git a/src/Exceptionless.Web/ClientApp.angular/app/auth/signup-controller.js b/src/Exceptionless.Web/ClientApp.angular/app/auth/signup-controller.js
@@ -148,7 +148,7 @@
 
                 this.$onInit = function $onInit() {
                     vm._source = "app.auth.Signup";
-                    vm._canSignup = !!ENABLE_ACCOUNT_CREATION;
+                    vm._canSignup = !!ENABLE_ACCOUNT_CREATION || !!$stateParams.token;
                     vm.authenticate = authenticate;
                     vm.isExternalLoginEnabled = isExternalLoginEnabled;
                     vm.signup = signup;

diff --git a/src/Exceptionless.Web/ClientApp/.vscode/extensions.json b/src/Exceptionless.Web/ClientApp/.vscode/extensions.json
@@ -2,10 +2,9 @@
     "recommendations": [
         "svelte.svelte-vscode",
         "bradlc.vscode-tailwindcss",
-        "digitalbrainstem.javascript-ejs-support",
         "dbaeumer.vscode-eslint",
         "esbenp.prettier-vscode",
         "selemondev.vscode-shadcn-svelte",
-        "zixuanchen.vitest-explorer"
+        "vitest.explorer"
     ]
 }
diff --git a/src/Exceptionless.Web/ClientApp/.vscode/settings.json b/src/Exceptionless.Web/ClientApp/.vscode/settings.json
@@ -2,7 +2,10 @@
     "debug.allowBreakpointsEverywhere": true,
     "cSpell.words": [
         "clsx",
+        "cmdk",
         "colour",
+        "echarts",
+        "formsnap",
         "haserror",
         "iconify",
         "keyof",
@@ -16,6 +19,8 @@
         "satellizer",
         "sessionend",
         "shadcn",
+        "sonner",
+        "superforms",
         "tailwindcss",
         "tanstack"
     ],
@@ -43,5 +48,10 @@
     "tailwindCSS.includeLanguages": {
         "svelte": "html"
     },
-    "typescript.tsdk": "node_modules\\typescript\\lib"
+    "typescript.tsdk": "node_modules\\typescript\\lib",
+    "workbench.editor.customLabels.patterns": {
+        "**/routes/**/+page.svelte": "${dirname(1)}/${dirname}",
+        "**/routes/**/+layout.svelte": "${dirname}/+layout.svelte",
+        "**/lib/**/index.ts": "${dirname}/index.ts"
+    }
 }