Skip to content

Commit b3a8d93

Browse files
committed
Switch the image syntax
1 parent ef21d6b commit b3a8d93

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector/OpenTelemetryCollectorExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static IResourceBuilder<OpenTelemetryCollectorResource> AddOpenTelemetryC
3939

4040
var resource = new OpenTelemetryCollectorResource(name);
4141
var resourceBuilder = builder.AddResource(resource)
42-
.WithImage(settings.CollectorImage, settings.CollectorVersion)
42+
.WithImage(settings.CollectorImage, settings.CollectorTag)
4343
.WithEnvironment("ASPIRE_ENDPOINT", dashboardOtlpEndpoint)
4444
.WithEnvironment("ASPIRE_API_KEY", builder.Configuration[DashboardOtlpApiKeyVariableName]);
4545

src/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector/OpenTelemetryCollectorSettings.cs

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,24 @@ namespace Aspire.Hosting;
66
public class OpenTelemetryCollectorSettings
77
{
88
/// <summary>
9-
/// The version of the collector, defaults to latest
9+
/// The Tag to use for the collector
1010
/// </summary>
11-
public string CollectorVersion { get; set; } = "latest";
11+
public string CollectorTag { get; set; } = "latest";
12+
13+
/// <summary>
14+
/// The registry for the image
15+
/// </summary>
16+
public string Registry { get; set; } = "ghcr.io";
17+
18+
/// <summary>
19+
/// The collector image path
20+
/// </summary>
21+
public string Image { get; set; } = "open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib";
1222

1323
/// <summary>
1424
/// The image of the collector, defaults to ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib
1525
/// </summary>
16-
public string CollectorImage { get; set; } = "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib";
26+
public string CollectorImage { get => $"{Registry}/{Image}"; }
1727

1828
/// <summary>
1929
/// Force the default OTLP receivers in the collector to use HTTP even if Aspire is set to HTTPS

0 commit comments

Comments
 (0)