From becf466bb63edabf19f60252d939e4ce29ab11eb Mon Sep 17 00:00:00 2001 From: afscrome Date: Wed, 17 Dec 2025 22:23:06 +0000 Subject: [PATCH] Set Image and Registry Seperately Rather than fudge the registry into the image name, set the registry property explicitly. --- .../OpenTelemetryCollectorExtensions.cs | 3 ++- .../ResourceCreationTests.cs | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector/OpenTelemetryCollectorExtensions.cs b/src/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector/OpenTelemetryCollectorExtensions.cs index 11344a7c7..e81c3c3dd 100644 --- a/src/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector/OpenTelemetryCollectorExtensions.cs +++ b/src/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector/OpenTelemetryCollectorExtensions.cs @@ -38,7 +38,8 @@ public static IResourceBuilder AddOpenTelemetryC var resource = new OpenTelemetryCollectorResource(name); var resourceBuilder = builder.AddResource(resource) - .WithImage(settings.CollectorImage, settings.CollectorTag) + .WithImage(settings.Image, settings.CollectorTag) + .WithImageRegistry(settings.Registry) .WithEnvironment("ASPIRE_ENDPOINT", new HostUrl(url)) .WithEnvironment("ASPIRE_API_KEY", builder.Configuration[DashboardOtlpApiKeyVariableName]) .WithIconName("DesktopPulse"); diff --git a/tests/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.Tests/ResourceCreationTests.cs b/tests/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.Tests/ResourceCreationTests.cs index b259b6448..23155361e 100644 --- a/tests/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.Tests/ResourceCreationTests.cs +++ b/tests/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.Tests/ResourceCreationTests.cs @@ -231,9 +231,8 @@ public void CollectorUsesCustomImageAndTag() Assert.True(collectorResource.TryGetLastAnnotation(out ContainerImageAnnotation? imageAnnotations)); Assert.NotNull(imageAnnotations); Assert.Equal("mytag", imageAnnotations.Tag); - Assert.Equal("myregistry.io/myorg/mycollector", imageAnnotations.Image); - // Registry is likely set to null/empty when the full path is provided as image - Assert.Null(imageAnnotations.Registry); + Assert.Equal("myorg/mycollector", imageAnnotations.Image); + Assert.Equal("myregistry.io", imageAnnotations.Registry); } [Fact]