Skip to content

Fix packaging of PowerShell module #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevejgordon merged 3 commits into from
Sep 2, 2025
Merged

Fix packaging of PowerShell module #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b264e6
Fix packaging of PowerShell module
stevejgordon Sep 1, 2025
8265c61
Prevent `InvalidOperationException` in LoggingTests
stevejgordon Sep 1, 2025
e0c82b9
Fix packaging scripts
stevejgordon Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build/scripts/Packaging.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ let stageInstallationBashScript () =
(File.ReadAllText staged.FullName)
.Replace("/open-telemetry/opentelemetry-dotnet-instrumentation/", "/elastic/elastic-otel-dotnet/")
.Replace("opentelemetry-dotnet-instrumentation", "elastic-dotnet-instrumentation")
.Replace("v" + Software.OpenTelemetryAutoInstrumentationVersion.AsString, Software.Version.NormalizeToShorter())
.Replace("v" + Software.OpenTelemetryAutoInstrumentationVersion.AsString, Software.Version.Normalize())

let elasticInstall = distroFile installScript
File.WriteAllText(elasticInstall.FullName, contents)
Expand All @@ -160,8 +160,8 @@ let stageInstallationPsScript () =
(File.ReadAllText staged.FullName)
.Replace("/open-telemetry/opentelemetry-dotnet-instrumentation/", "/elastic/elastic-otel-dotnet/")
.Replace("opentelemetry-dotnet-instrumentation", "elastic-dotnet-instrumentation")
.Replace("OpenTelemetry .NET Automatic Instrumentation", "Elastic Distribution for OpenTelemetry .NET")
.Replace("OpenTelemetry.Dotnet.Auto", "Elastic.OpenTelemetry.DotNet")
.Replace("OpenTelemetry .NET Automatic Instrumentation", "Elastic Distribution of OpenTelemetry (EDOT) .NET")
.Replace("OpenTelemetry.DotNet.Auto", "Elastic.OpenTelemetry.DotNet")
.Replace(envMarker,
[
envMarker
Expand All @@ -170,7 +170,7 @@ let stageInstallationPsScript () =
]
|> String.concat "\r\n "
)
.Replace("v" + Software.OpenTelemetryAutoInstrumentationVersion.AsString, Software.Version.NormalizeToShorter())
.Replace("v" + Software.OpenTelemetryAutoInstrumentationVersion.AsString, Software.Version.Normalize())
let elasticInstall = distroFile installScript
//ensure we write our new module name
File.WriteAllText(elasticInstall.FullName.Replace("elastic.DotNet.Auto", "Elastic.OpenTelemetry.DotNet"), contents);
Expand Down
4 changes: 2 additions & 2 deletions tests/Elastic.OpenTelemetry.Tests/Diagnostics/LoggingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void LoggingIsEnabled_WhenConfiguredViaTracerProviderBuilder()
.WithElasticDefaults(options)
.Build();

Assert.Single(logger.Messages, m => EdotPreamble().IsMatch(m));
Assert.Single(logger.Messages.ToArray(), m => EdotPreamble().IsMatch(m));
}

[Fact]
Expand All @@ -42,7 +42,7 @@ public void LoggingIsEnabled_WhenConfiguredViaMeterProviderBuilder()
.WithElasticDefaults(options)
.Build();

Assert.Single(logger.Messages, m => EdotPreamble().IsMatch(m));
Assert.Single(logger.Messages.ToArray(), m => EdotPreamble().IsMatch(m));
}

[Fact]
Expand Down
Loading