Add more options

src/dotnet/aspire-session-host/Connection.cs

@@ -16,9 +16,7 @@ internal sealed class Connection : IDisposable
 
     internal Connection(ConfigurationManager configuration)
     {
-        var connectionOptions = configuration
-            .GetSection(ConnectionOptions.SectionName)
-            .Get<ConnectionOptions>();
+        var connectionOptions = configuration.GetSection(ConnectionOptions.SectionName).Get<ConnectionOptions>();
         if (connectionOptions?.RdPort == null)
             throw new ApplicationException("Unable to find RD port environment variable");
 

src/dotnet/aspire-session-host/EnvironmentVariables.cs

@@ -1,31 +1,16 @@
-using System.Globalization;
-
-namespace AspireSessionHost;
+namespace AspireSessionHost;
 
 internal static class EnvironmentVariables
 {
     //This variable is used to configure the endpoint to interact with DCP to create, delete session, etc.
     internal const string AspNetCoreUrls = "ASPNETCORE_URLS";
     internal static Uri? GetAspNetCoreUrls() => GetUrlFromEnvironment(AspNetCoreUrls);
 
-    //This variable is used to configure OpenTelemetry Protocol gRPC endpoint to receive telemetry data from the child
-    //projects.
-    private const string OtlpServerPort = "RIDER_OTLP_SERVER_PORT";
-    internal static int? GetOtlpServerPort() => GetPortFromEnvironment(OtlpServerPort);
-
     private static Uri? GetUrlFromEnvironment(string variableName)
     {
         var variable = Environment.GetEnvironmentVariable(variableName);
         if (string.IsNullOrEmpty(variable)) return null;
         Uri.TryCreate(variable, UriKind.Absolute, out var url);
         return url;
     }
-
-    private static int? GetPortFromEnvironment(string variableName)
-    {
-        var variable = Environment.GetEnvironmentVariable(variableName);
-        if (string.IsNullOrEmpty(variable)) return null;
-        if (!int.TryParse(variable, CultureInfo.InvariantCulture, out var port)) return null;
-        return port;
-    }
 }

src/dotnet/aspire-session-host/OTel/OTelServiceOptions.cs

@@ -5,6 +5,7 @@ namespace AspireSessionHost.OTel;
 public class OTelServiceOptions
 {
     public string? EndpointUrl { get; set; }
+    public int? ServerPort { get; set; }
 }
 
 internal sealed class ConfigureOTelServiceOptions(IConfiguration configuration) : IConfigureOptions<OTelServiceOptions>

src/dotnet/aspire-session-host/Program.cs

@@ -6,12 +6,10 @@
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using static AspireSessionHost.EnvironmentVariables;
 
-ParentProcessWatchdog.StartNewIfAvailable();
-
 var aspNetCoreUrl = GetAspNetCoreUrls();
 if (aspNetCoreUrl is null) throw new ApplicationException($"Unable to find {AspNetCoreUrls} variable");
 
-var otlpServerPort = GetOtlpServerPort();
+ParentProcessWatchdog.StartNewIfAvailable();
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -33,15 +31,15 @@
     it.SerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower;
 });
 
+var otelServiceOptions =
+    builder.Configuration.GetSection(ConfigureOTelServiceOptions.SectionName).Get<OTelServiceOptions>();
+var otlpServerPort = otelServiceOptions?.ServerPort;
 builder.WebHost.ConfigureKestrel(it =>
 {
     it.ListenLocalhost(aspNetCoreUrl.Port);
-    if (otlpServerPort.HasValue && otlpServerPort != 0)
+    if (otlpServerPort != null && otlpServerPort != 0)
     {
-        it.ListenLocalhost(otlpServerPort.Value, options =>
-        {
-            options.Protocols = HttpProtocols.Http2;
-        });
+        it.ListenLocalhost(otlpServerPort.Value, options => { options.Protocols = HttpProtocols.Http2; });
     }
 });
 

src/main/kotlin/me/rafaelldi/aspire/sessionHost/AspireSessionHostLauncher.kt

@@ -32,11 +32,11 @@ class AspireSessionHostLauncher(private val project: Project) {
         private val LOG = logger<AspireSessionHostLauncher>()
 
         private const val ASPNETCORE_URLS = "ASPNETCORE_URLS"
-        private const val RIDER_RD_PORT = "Rider_Connection__RdPort"
         private const val RIDER_PARENT_PROCESS_ID = "RIDER_PARENT_PROCESS_ID"
+        private const val RIDER_RD_PORT = "Rider_Connection__RdPort"
         private const val RIDER_RESOURCE_SERVICE_ENDPOINT_URL = "Rider_ResourceService__EndpointUrl"
         private const val RIDER_RESOURCE_SERVICE_API_KEY = "Rider_ResourceService__ApiKey"
-        private const val RIDER_OTLP_SERVER_PORT = "RIDER_OTLP_SERVER_PORT"
+        private const val RIDER_OTEL_SERVICE_SERVER_PORT = "Rider_OtelService__ServerPort"
         private const val RIDER_OTEL_SERVICE_ENDPOINT_URL = "Rider_OtelService__EndpointUrl"
     }
 
@@ -111,7 +111,7 @@ class AspireSessionHostLauncher(private val project: Project) {
                     if (aspireHostConfig.resourceServiceApiKey != null)
                         put(RIDER_RESOURCE_SERVICE_API_KEY, aspireHostConfig.resourceServiceApiKey)
                     if (settings.collectTelemetry && aspireHostConfig.openTelemetryProtocolEndpointUrl != null) {
-                        put(RIDER_OTLP_SERVER_PORT, aspireHostConfig.openTelemetryProtocolServerPort.toString())
+                        put(RIDER_OTEL_SERVICE_SERVER_PORT, aspireHostConfig.openTelemetryProtocolServerPort.toString())
                         put(RIDER_OTEL_SERVICE_ENDPOINT_URL, aspireHostConfig.openTelemetryProtocolEndpointUrl)
                     }
                 }