Merge branch 'bug/fix-openmetrics-suffixes' of https://github.com/rob…

…ertcoltheart/opentelemetry-dotnet into bug/fix-openmetrics-suffixes
open-telemetry · May 24, 2024 · 1eaa880 · 1eaa880
2 parents 2f1eef7 + c1c70c2
commit 1eaa880
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 1 deletion.
diff --git a/build/scripts/test-aot-compatibility.ps1 b/build/scripts/test-aot-compatibility.ps1
@@ -44,7 +44,7 @@ $testPassed = 0
 if ($actualWarningCount -ne $expectedWarningCount)
 {
     $testPassed = 1
-    Write-Host "Actual warning count:", actualWarningCount, "is not as expected. Expected warning count is:", $expectedWarningCount
+    Write-Host "Actual warning count:", $actualWarningCount, "is not as expected. Expected warning count is:", $expectedWarningCount
 }
 
 Exit $testPassed
diff --git a/docs/metrics/exemplars/docker-compose.yaml → examples/AspNetCore/docker-compose.yaml b/docs/metrics/exemplars/docker-compose.yaml → examples/AspNetCore/docker-compose.yaml
diff --git a/...etrics/exemplars/grafana-datasources.yaml → examples/AspNetCore/grafana-datasources.yaml b/...etrics/exemplars/grafana-datasources.yaml → examples/AspNetCore/grafana-datasources.yaml
diff --git a/docs/metrics/exemplars/otel-collector.yaml → examples/AspNetCore/otel-collector.yaml b/docs/metrics/exemplars/otel-collector.yaml → examples/AspNetCore/otel-collector.yaml
diff --git a/docs/metrics/exemplars/prometheus.yaml → examples/AspNetCore/prometheus.yaml b/docs/metrics/exemplars/prometheus.yaml → examples/AspNetCore/prometheus.yaml
diff --git a/docs/metrics/exemplars/tempo.yaml → examples/AspNetCore/tempo.yaml b/docs/metrics/exemplars/tempo.yaml → examples/AspNetCore/tempo.yaml