Enable Integrated Mode

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v5.1.0
         with:
-          dotnet-version: 8.0.x
+          global-json-file: global.json
       - name: Set up Node.js
         uses: actions/setup-node@v6.2.0
         with:

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v5.1.0
         with:
-          dotnet-version: 7.0.x
+          global-json-file: global.json
       - name: Set up Node.js
         uses: actions/setup-node@v6.2.0
         with:
@@ -82,7 +82,7 @@ jobs:
           $nugetsCount =  (Get-ChildItem -Recurse -File nugets).Count
 
           $expectedAssetsCount = 1
-          $expectedNugetsCount = 1
+          $expectedNugetsCount = 2
 
           if ($assetsCount -ne $expectedAssetsCount)
           {
@@ -95,6 +95,9 @@ jobs:
               Write-Host Nugets: Expected $expectedNugetsCount but found $nugetsCount
               exit -1
           }
+      - name: Push packages to testing feed
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        run: dotnet nuget push nugets\*.nupkg --api-key ${{ secrets.FEEDZIO_PUBLISH_API_KEY }} --source "${{ vars.PARTICULAR_TESTING_FEED_URL }}"
       # Deploy to Octopus
       - name: Deploy
         if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
@@ -170,7 +173,7 @@ jobs:
             org.opencontainers.image.created=${{ steps.date.outputs.date }}
             org.opencontainers.image.title=ServicePulse
             org.opencontainers.image.description=ServicePulse provides real-time production monitoring for distributed applications. It monitors the health of a system's endpoints, detects processing errors, sends failed messages for reprocessing, and ensures the specific environment's needs are met, all in one consolidated dashboard.
-            org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/aspnet:8.0-noble-chiseled-composite
+            org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/aspnet:10.0-noble-chiseled-composite
           annotations: |
             index:org.opencontainers.image.source=https://github.com/Particular/ServicePulse/tree/${{ github.sha }}
             index:org.opencontainers.image.authors="Particular Software"
@@ -182,7 +185,7 @@ jobs:
             index:org.opencontainers.image.created=${{ steps.date.outputs.date }}
             index:org.opencontainers.image.title=ServicePulse
             index:org.opencontainers.image.description=ServicePulse provides real-time production monitoring for distributed applications. It monitors the health of a system's endpoints, detects processing errors, sends failed messages for reprocessing, and ensures the specific environment's needs are met, all in one consolidated dashboard.
-            index:org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/aspnet:8.0-noble-chiseled-composite
+            index:org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/aspnet:10.0-noble-chiseled-composite
           file: src/ServicePulse/Dockerfile
           tags: ghcr.io/particular/servicepulse:${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || env.MinVerVersion }}
 

global.json

@@ -1,6 +1,7 @@
 {
   "sdk": {
-    "version": "8.0.400",
+    "version": "10.0.0",
+    "allowPrerelease": false,
     "rollForward": "latestFeature"
   }
 }

src/Frontend/env.d.ts

@@ -10,6 +10,7 @@ declare global {
       service_control_url: string;
       monitoring_urls: string[];
       showPendingRetry: boolean;
+      isIntegrated?: boolean;
     };
   }
 }

src/Frontend/public/js/app.constants.js

@@ -4,4 +4,5 @@ window.defaultConfig = {
   service_control_url: 'http://localhost:33333/api/',
   monitoring_urls: ['http://localhost:33633/'],
   showPendingRetry: false,
+  isIntegrated: false,
 };

src/Frontend/src/components/PageFooter.vue

@@ -21,6 +21,7 @@ const environment = environmentAndVersionsStore.environment;
 const licenseStore = useLicenseStore();
 const { licenseStatus, license } = licenseStore;
 const isMonitoringEnabled = monitoringClient.isMonitoringEnabled;
+const isIntegrated = window.defaultConfig.isIntegrated;
 
 const scAddressTooltip = computed(() => {
   return `ServiceControl URL ${serviceControlClient.url}`;
@@ -44,11 +45,14 @@ const { configuration } = storeToRefs(configurationStore);
             <RouterLink :to="routeLinks.configuration.endpointConnection.link">Connect new endpoint</RouterLink>
           </span>
 
-          <span v-if="!newVersions.newSPVersion.newspversion && environment.sp_version"> ServicePulse v{{ environment.sp_version }} </span>
-          <span v-if="newVersions.newSPVersion.newspversion && environment.sp_version">
-            ServicePulse v{{ environment.sp_version }} (<FAIcon v-if="newVersions.newSPVersion.newspversionnumber" class="footer-icon fake-link" :icon="faArrowTurnUp" />
-            <a :href="newVersions.newSPVersion.newspversionlink" target="_blank">v{{ newVersions.newSPVersion.newspversionnumber }} available</a>)
-          </span>
+          <span v-if="isIntegrated"> Integrated ServicePulse </span>
+          <template v-else-if="environment.sp_version">
+            <span v-if="!newVersions.newSPVersion.newspversion"> ServicePulse v{{ environment.sp_version }} </span>
+            <span v-else>
+              ServicePulse v{{ environment.sp_version }} (<FAIcon v-if="newVersions.newSPVersion.newspversionnumber" class="footer-icon fake-link" :icon="faArrowTurnUp" />
+              <a :href="newVersions.newSPVersion.newspversionlink" target="_blank">v{{ newVersions.newSPVersion.newspversionnumber }} available</a>)
+            </span>
+          </template>
           <span :title="scAddressTooltip">
             Service Control:
             <span class="connected-status" v-if="connectionState.connected && !connectionState.connecting">

src/Frontend/src/components/configuration/PlatformConnections.vue

@@ -20,6 +20,7 @@ const serviceControlValid = ref<boolean | null>(null);
 const testingMonitoring = ref(false);
 const monitoringValid = ref<boolean | null>(null);
 const connectionSaved = ref<boolean | null>(null);
+const isIntegrated = window.defaultConfig.isIntegrated;
 
 async function testServiceControlUrl() {
   if (localServiceControlUrl.value) {
@@ -64,10 +65,15 @@ function saveConnections() {
 }
 
 function updateServiceControlUrls() {
-  if (!localServiceControlUrl.value) {
-    throw new Error("ServiceControl URL is mandatory");
-  } else if (!localServiceControlUrl.value.endsWith("/")) {
-    localServiceControlUrl.value += "/";
+  const params = new URLSearchParams();
+
+  if (!isIntegrated) {
+    if (!localServiceControlUrl.value) {
+      throw new Error("ServiceControl URL is mandatory");
+    } else if (!localServiceControlUrl.value.endsWith("/")) {
+      localServiceControlUrl.value += "/";
+    }
+    params.set("scu", localServiceControlUrl.value);
   }
 
   if (!localMonitoringUrl.value) {
@@ -76,8 +82,6 @@ function updateServiceControlUrls() {
     localMonitoringUrl.value += "/";
   }
 
-  const params = new URLSearchParams();
-  params.set("scu", localServiceControlUrl.value);
   params.set("mu", localMonitoringUrl.value);
   window.location.search = `?${params.toString()}`;
 }
@@ -94,11 +98,14 @@ function updateServiceControlUrls() {
               <div class="col-7 form-group">
                 <label for="serviceControlUrl">
                   CONNECTION URL
+                  <template v-if="isIntegrated">
+                    <span>(INTEGRATED)</span>
+                  </template>
                   <template v-if="connectionState.unableToConnect">
                     <span class="failed-validation"><FAIcon :icon="faExclamationTriangle" /> Unable to connect </span>
                   </template>
                 </label>
-                <input type="text" id="serviceControlUrl" name="serviceControlUrl" v-model="localServiceControlUrl" class="form-control" style="color: #000" required />
+                <input type="text" id="serviceControlUrl" name="serviceControlUrl" v-model="localServiceControlUrl" class="form-control" style="color: #000" required :disabled="isIntegrated" />
               </div>
 
               <div class="col-5 no-side-padding">

src/Frontend/src/components/serviceControlClient.ts

@@ -96,6 +96,10 @@ class ServiceControlClient {
   }
 
   private getUrl() {
+    if (window.defaultConfig?.isIntegrated && window.defaultConfig.service_control_url?.length) {
+      return window.defaultConfig.service_control_url;
+    }
+
     const searchParams = new URLSearchParams(window.location.search);
     const scu = searchParams.get("scu");
     const existingScu = window.localStorage.getItem("scu");

src/Frontend/test/specs/monitoring/sorting-endpoints.spec.ts

@@ -1,5 +1,6 @@
 import { expect } from "vitest";
 import { test, describe } from "../../drivers/vitest/driver";
+import { waitFor } from "@testing-library/vue";
 import { groupEndpointsBy } from "./actions/groupEndpointsBy";
 import { endpointGroupNames } from "./questions/endpointGroupNames";
 import { endpointGroup } from "./questions/endpointGroup";
@@ -68,10 +69,12 @@ describe("FEATURE: Endpoint sorting", () => {
       await sortEndpointsBy({ column: columnName.ENDPOINTNAME });
 
       //Assert
-      expect(endpointGroupNames()).toEqual(["Universe.Solarsystem.Venus", "Universe.Solarsystem.Mercury", "Universe.Solarsystem.Earth"]);
-      expect(endpointGroup("Universe.Solarsystem.Venus").Endpoints).toEqual(["Endpoint4", "Endpoint3"]);
-      expect(endpointGroup("Universe.Solarsystem.Mercury").Endpoints).toEqual(["Endpoint2", "Endpoint1"]);
-      expect(endpointGroup("Universe.Solarsystem.Earth").Endpoints).toEqual(["Endpoint6", "Endpoint5"]);
+      await waitFor(() => {
+        expect(endpointGroupNames()).toEqual(["Universe.Solarsystem.Venus", "Universe.Solarsystem.Mercury", "Universe.Solarsystem.Earth"]);
+        expect(endpointGroup("Universe.Solarsystem.Venus").Endpoints).toEqual(["Endpoint4", "Endpoint3"]);
+        expect(endpointGroup("Universe.Solarsystem.Mercury").Endpoints).toEqual(["Endpoint2", "Endpoint1"]);
+        expect(endpointGroup("Universe.Solarsystem.Earth").Endpoints).toEqual(["Endpoint6", "Endpoint5"]);
+      });
     });
 
     test("EXAMPLE: Endpoints inside of the groups and group names should be sorted in ascending order when clicking twice on the endpoint name column title", async ({ driver }) => {
@@ -95,10 +98,12 @@ describe("FEATURE: Endpoint sorting", () => {
       await sortEndpointsBy({ column: columnName.ENDPOINTNAME }); //Click the column title again for ascending
 
       //Assert
-      expect(endpointGroupNames()).toEqual(["Universe.Solarsystem.Earth", "Universe.Solarsystem.Mercury", "Universe.Solarsystem.Venus"]);
-      expect(endpointGroup("Universe.Solarsystem.Earth").Endpoints).toEqual(["Endpoint5", "Endpoint6"]);
-      expect(endpointGroup("Universe.Solarsystem.Mercury").Endpoints).toEqual(["Endpoint1", "Endpoint2"]);
-      expect(endpointGroup("Universe.Solarsystem.Venus").Endpoints).toEqual(["Endpoint3", "Endpoint4"]);
+      await waitFor(() => {
+        expect(endpointGroupNames()).toEqual(["Universe.Solarsystem.Earth", "Universe.Solarsystem.Mercury", "Universe.Solarsystem.Venus"]);
+        expect(endpointGroup("Universe.Solarsystem.Earth").Endpoints).toEqual(["Endpoint5", "Endpoint6"]);
+        expect(endpointGroup("Universe.Solarsystem.Mercury").Endpoints).toEqual(["Endpoint1", "Endpoint2"]);
+        expect(endpointGroup("Universe.Solarsystem.Venus").Endpoints).toEqual(["Endpoint3", "Endpoint4"]);
+      });
     });
   });
 

src/Particular.PlatformSample.ServicePulse/Particular.PlatformSample.ServicePulse.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <Description>Particular ServicePulse binaries for use by Particular.PlatformSample. Not intended for use outside of Particular.PlatformSample.</Description>

src/Particular.ServicePulse.Core/ConstantsFile.cs

@@ -0,0 +1,30 @@
+namespace ServicePulse;
+
+using System.Reflection;
+
+class ConstantsFile
+{
+    public static string GetContent(ServicePulseSettings settings)
+    {
+        var version = GetVersionInformation();
+
+        var constantsFile = $$"""
+window.defaultConfig = {
+  default_route: '{{settings.DefaultRoute}}',
+  version: '{{version}}',
+  service_control_url: '{{settings.ServiceControlUrl}}',
+  monitoring_urls: ['{{settings.MonitoringUrl ?? "!"}}'],
+  showPendingRetry: {{settings.ShowPendingRetry.ToString().ToLower()}},
+  isIntegrated: {{settings.IsIntegrated.ToString().ToLower()}}
+}
+""";
+
+        return constantsFile;
+    }
+
+    static string GetVersionInformation()
+        => typeof(ConstantsFile).Assembly
+            .GetCustomAttributes<AssemblyMetadataAttribute>()
+            .SingleOrDefault(attribute => attribute.Key == "MajorMinorPatch")
+            ?.Value ?? "0.0.0";
+}

src/Particular.ServicePulse.Core/Particular.ServicePulse.Core.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Description>Particular ServicePulse binaries for use by integrated ServicePulse. Not intended for use outside of ServiceControl.</Description>
+    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.3" AutomaticVersionRange="false" />
+    <PackageReference Include="Particular.Packaging" Version="4.5.0" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="..\Frontend\dist\**\*" Exclude="..\Frontend\dist\js\**\*" LinkBase="wwwroot" />
+  </ItemGroup>
+
+</Project>

src/Particular.ServicePulse.Core/ServicePulseHostingExtensions.cs

@@ -0,0 +1,37 @@
+namespace ServicePulse;
+
+using System.Net.Mime;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.FileProviders;
+
+/// <summary>
+/// Extensions for hosting ServicePulse within a WebApplication.
+/// </summary>
+public static class ServicePulseHostingExtensions
+{
+    /// <summary>
+    /// Adds ServicePulse static file serving and configuration endpoint to the WebApplication.
+    /// </summary>
+    public static void UseServicePulse(this WebApplication app, ServicePulseSettings settings, IFileProvider? overrideFileProvider = null)
+    {
+        var manifestEmbeddedFileProvider = new ManifestEmbeddedFileProvider(typeof(ServicePulseHostingExtensions).Assembly, "wwwroot");
+        IFileProvider fileProvider = overrideFileProvider is null
+            ? manifestEmbeddedFileProvider
+            : new CompositeFileProvider(overrideFileProvider, manifestEmbeddedFileProvider);
+
+        var defaultFilesOptions = new DefaultFilesOptions { FileProvider = fileProvider };
+        app.UseDefaultFiles(defaultFilesOptions);
+
+        var staticFileOptions = new StaticFileOptions { FileProvider = fileProvider };
+        app.UseStaticFiles(staticFileOptions);
+
+        var constantsFile = ConstantsFile.GetContent(settings);
+
+        app.MapGet("/js/app.constants.js", (HttpContext context) =>
+        {
+            context.Response.ContentType = MediaTypeNames.Text.JavaScript;
+            return constantsFile;
+        }).AllowAnonymous();
+    }
+}