Don't create release version of C3D.Extensions.SystemWeb.OpenTelemetry.Application

Author: CZEMacLeod

samples/WaitForOutput/AspireWaitForConsoleOutput.AppHost/Program.cs

@@ -20,6 +20,7 @@ private static void Main(string[] args)
                                   .WaitFor(sqldb!)
             )
             .WithOutputWatcher(GetMagic(), true, "magic")
+            .CreateReferenceExpression("magic", out var magicNumber)
             .OnMatched((o, c) =>
             {
                 var logger = o.ServiceProvider.GetRequiredService<ILogger<Program>>();
@@ -38,9 +39,10 @@ private static void Main(string[] args)
 
         // The GetMagic Regex will capture the magic number from the console app output and store it as a property
         // The output string will be of the format "{number} is the magic number!"
-        // Once it is detected, we can store it in a ReferenceExpression to be used as an environment variable in the next project
+        // Once it is detected, we can retrieve it using a ReferenceExpression, as an environment variable in the next project
 
-        var magicNumber = console.GetReferenceExpression("magic");
+        // The fluent CreateReferenceExpression method above is just a shortcut for 
+        // var magicNumber = console.GetReferenceExpression("magic");
 
         // webapp won't start until console has output the message "Ready Now..."
         // Note that 'console' does not have to exit, it just has to output the message

src/C3D/Extensions/Aspire/OutputWatcher/Annotations/OutputWatcherRegExAnnotation.cs

@@ -18,22 +18,37 @@ public OutputWatcherRegExAnnotation(
 
     public override string PredicateName => matcher.ToString();
 
-    public Func<OutputWatcherRegExAnnotation, ValueTask<string?>> ValueFunc { get; set; } = 
-        static async (annotation) =>
+    public Func<OutputWatcherRegExAnnotation, ValueTask<string?>> ValueFunc { get; set; } =
+        static async annotation =>
             await Task.FromResult(annotation.properties["Match"]?.ToString());
 
     public async ValueTask<string?> GetValueAsync(CancellationToken cancellationToken = default) => await ValueFunc(this);
 
+    public Func<Group, KeyValuePair<string, object>?> GroupValueFunc { get; set; } =
+        static group => new(group.Name, group.Value);
+
     public override bool IsMatch(string message)
     {
-        if (matcher.IsMatch(message))
+        var match = matcher.Match(message);
+        if (match.Success)
         {
-            properties["Match"] = matcher.Match(message).Value;
-            foreach (var groupName in matcher.GetGroupNames())
+            properties["Match"] = match.Value;
+            foreach (Group group in match.Groups)
             {
-                properties[groupName] = matcher.Match(message).Groups[groupName].Value;
+                var kvp = GroupValueFunc(group);
+                if (kvp is not null)
+                {
+                    if (kvp.Value.Value is null)
+                    {
+                        properties.Remove(kvp.Value.Key);
+                    }
+                    else
+                    {
+                        properties[kvp.Value.Key] = kvp.Value.Value;
+                    }
+                }
             }
         }
-        return matcher.IsMatch(message);
+        return match.Success;
     }
 }

src/C3D/Extensions/Aspire/OutputWatcher/Extensions/OutputWatcherExtensions.cs

@@ -106,6 +106,18 @@ public static ReferenceExpression GetReferenceExpression<TResource, TAnnotation>
         where TAnnotation : OutputWatcherRegExAnnotation
             => ReferenceExpression.Create($"{builder.GetValueProvider(property, formatter)}");
 
+    public static OutputWatcherBuilder<TResource, TAnnotation> CreateReferenceExpression<TResource, TAnnotation>(this
+        OutputWatcherBuilder<TResource, TAnnotation> builder,
+        string property,
+        out ReferenceExpression referenceExpression,
+        Func<object?, ValueTask<string?>>? formatter = null)
+        where TResource : IResource
+        where TAnnotation : OutputWatcherRegExAnnotation
+    {
+        referenceExpression = builder.GetReferenceExpression(property, formatter);
+        return builder;
+    }
+
     public static OutputWatcherBuilder<TResource, TAnnotation> OnMatched<TResource, TAnnotation>(this
         OutputWatcherBuilder<TResource, TAnnotation> builder,
         Func<OutputMatchedEvent, CancellationToken, Task> matchedAction)

src/C3D/Extensions/SystemWeb/OpenTelemetry/Application/C3D.Extensions.SystemWeb.OpenTelemetry.Application.csproj

@@ -6,17 +6,22 @@
     <AssemblyTitle>$(AssemblyTitle) System.Web OpenTelemetry HttpApplication</AssemblyTitle>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <OpenTelemetryVersion>1.12.0</OpenTelemetryVersion>
+    <OpenTelemetryBetaVersion>1.12.0-beta.1</OpenTelemetryBetaVersion>
+  </PropertyGroup>
+  
   <ItemGroup Label="OpenTelemetry">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
 
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryVersion)" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryVersion)" />
 
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="$(OpenTelemetryVersion)" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryVersion)" />
 
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.11.0-beta.2" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule" Version="1.11.0-beta.2" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="$(OpenTelemetryBetaVersion)" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule" Version="$(OpenTelemetryBetaVersion)" />
   </ItemGroup>
 
   <PropertyGroup>

src/C3D/Extensions/SystemWeb/OpenTelemetry/Application/version.json

@@ -6,10 +6,10 @@
     "../Directory.Build.props",
     "../Directory.Build.targets"
   ],
-  "publicReleaseRefSpec": [
-    "^refs/heads/main$", // we release out of main
-    "^refs/heads/rel/v\\d+\\.\\d+" // we also release tags starting with rel/N.N
-  ],
+  //"publicReleaseRefSpec": [
+  //  "^refs/heads/main$", // we release out of main
+  //  "^refs/heads/rel/v\\d+\\.\\d+" // we also release tags starting with rel/N.N
+  //],
   "nugetPackageVersion": {
     "semVer": 2
   },