From ba5574cc12569d77ab518c6f4a9961c4c0c3605f Mon Sep 17 00:00:00 2001
From: Gino Canessa <gino.canessa@microsoft.com>
Date: Wed, 4 Sep 2024 17:31:07 -0500
Subject: [PATCH 1/2] Fix: CI Core builds should use their branch names instead
 of master.

---
 src/fhir-candle/_ForPackages/FhirCiClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fhir-candle/_ForPackages/FhirCiClient.cs b/src/fhir-candle/_ForPackages/FhirCiClient.cs
index c13fc23..8f83868 100644
--- a/src/fhir-candle/_ForPackages/FhirCiClient.cs
+++ b/src/fhir-candle/_ForPackages/FhirCiClient.cs
@@ -316,7 +316,7 @@ private async Task<List<FhirCiQaRecord>> downloadCoreQAs()
                         BuildDate = ciBuildDate,
                         BuildDateIso = ciBuildDate,
                         FhirVersion = ciFhirVersion,
-                        RepositoryUrl = "HL7/fhir/branches/master/qa.json"
+                        RepositoryUrl = $"HL7/fhir/branches/{ciBranchRec.Name}/qa.json"
                     });
                 }
             }

From 0eecba6b2c750d941df3e72c5d3874e58ba8f4b7 Mon Sep 17 00:00:00 2001
From: Gino Canessa <gino.canessa@microsoft.com>
Date: Thu, 5 Sep 2024 13:23:59 -0500
Subject: [PATCH 2/2] Modify OpenTelemetry single URL to allow 'v1' in
 configuration.

---
 src/fhir-candle/Program.cs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/fhir-candle/Program.cs b/src/fhir-candle/Program.cs
index 18c21d3..d2edd9f 100644
--- a/src/fhir-candle/Program.cs
+++ b/src/fhir-candle/Program.cs
@@ -374,12 +374,22 @@ public static async Task<int> RunServer(
                 return general;
             }
 
-            if (general.EndsWith('/'))
+            if (general.EndsWith("v1/"))
             {
                 return general + relative;
             }
 
-            return general + "/" + relative;
+            if (general.EndsWith("v1"))
+            {
+                return general + "/" + relative;
+            }
+
+            if (general.EndsWith('/'))
+            {
+                return general + "v1/" + relative;
+            }
+
+            return general + "/v1/" + relative;
         }
 
         return null;
@@ -403,19 +413,19 @@ private static void ConfigureOpenTelemetry(CandleConfig config, WebApplicationBu
         string? traceEndpoint = getTelemetryUrl(
             config.OpenTelemetryTracesEndpoint,
             config.OpenTelemetryEndpoint,
-            "v1/traces",
+            "traces",
             protocol);
 
         string? metricsEndpoint = getTelemetryUrl(
             config.OpenTelemetryMetricsEndpoint,
             config.OpenTelemetryEndpoint,
-            "v1/metrics",
+            "metrics",
             protocol);
 
         string? logsEndpoint = getTelemetryUrl(
             config.OpenTelemetryLogsEndpoint,
             config.OpenTelemetryEndpoint,
-            "v1/logs",
+            "logs",
             protocol);
 
         if (logsEndpoint != null)