Skip to content

chore: upgrade to observability v3.0 #427

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
merged 2 commits into from
Jan 26, 2024
Merged

chore: upgrade to observability v3.0 #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c79ac6b
chore: upgrade to observability v3.0
stijnmoreels Jan 22, 2024
e18a2c8
Merge branch 'main' into chore/upgrade-observability-v3
fgheysels Jan 23, 2024
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
4 changes: 2 additions & 2 deletions build/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ stages:
parameters:
dotnetSdkVersion: '$(DotNet.Sdk.Version)'
versionSuffix: '$(packageVersion)'
includePreviewVersions: true
includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
- task: CopyFiles@2
displayName: 'Copy build artifacts'
inputs:
Expand Down Expand Up @@ -89,7 +89,7 @@ stages:
parameters:
dotnetSdkVersion: '$(DotNet.Sdk.Version)'
projectName: '$(Project).Tests.Unit'
includePreviewVersions: true
includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)

- stage: IntegrationTests
displayName: Integration Tests
Expand Down
4 changes: 2 additions & 2 deletions build/nuget-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ stages:
parameters:
dotnetSdkVersion: '$(DotNet.Sdk.Version)'
version: $(Build.BuildNumber)
includePreviewVersions: true
includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
- task: CopyFiles@2
displayName: 'Copy build artifacts'
inputs:
Expand Down Expand Up @@ -75,7 +75,7 @@ stages:
parameters:
dotnetSdkVersion: '$(DotNet.Sdk.Version)'
projectName: '$(Project).Tests.Unit'
includePreviewVersions: true
includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)

- stage: IntegrationTests
displayName: Integration Tests
Expand Down
4 changes: 2 additions & 2 deletions build/templates/run-integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ steps:
inputs:
packageType: 'sdk'
version: '$(DotNet.Sdk.VersionBC)'
includePreviewVersions: true
includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
- task: Docker@1
displayName: 'Build Docker image from ${{ parameters.dockerProjectName }}'
inputs:
Expand All @@ -33,7 +33,7 @@ steps:
parameters:
dotnetSdkVersion: '$(DotNet.Sdk.Version)'
projectName: '$(Project).Tests.Integration'
includePreviewVersions: true
includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
- task: Bash@3
inputs:
targetType: 'inline'
Expand Down
1 change: 1 addition & 0 deletions build/variables/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ variables:
DotNet.Sdk.Version: '8.0.x'
# Backwards compatible .NET SDK version
DotNet.Sdk.VersionBC: '6.0.100'
DotNet.Sdk.IncludePreviewVersions: false
Project: 'Arcus.Security'
Vm.Image: 'ubuntu-latest'
7 changes: 1 addition & 6 deletions src/Arcus.Security.Core/Arcus.Security.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,14 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<PropertyGroup>
<!-- Allows (for now) preview packages, as we are referencing Arcus' preview .NET 8 package. -->
<NoWarn>NU5104</NoWarn>
</PropertyGroup>

<ItemGroup>
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
<None Include="..\..\LICENSE" Pack="true" PackagePath="\" />
<None Include="..\..\docs\static\img\icon.png" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Arcus.Observability.Telemetry.Core" Version="[3.0.0-preview-1-net8.0,4.0.0)" />
<PackageReference Include="Arcus.Observability.Telemetry.Core" Version="[3.0.0,4.0.0)" />
<PackageReference Include="Guard.Net" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Arcus.Security.Tests.Integration/Arcus.Security.Tests.Integration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="2.4.0" />
<PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="3.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="3.1.0" />
<PackageReference Include="Vault" Version="0.9.1.3" />
Expand Down
2 changes: 1 addition & 1 deletion src/Arcus.Security.Tests.Integration/IntegrationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public IntegrationTest(ITestOutputHelper testOutput)
var configuration = new LoggerConfiguration()
.WriteTo.XunitTestLogging(testOutput)
.WriteTo.Sink(InMemoryLogSink)
.WriteTo.AzureApplicationInsights(Configuration.GetValue<string>("Arcus:ApplicationInsights:InstrumentationKey"));
.WriteTo.AzureApplicationInsightsWithInstrumentationKey(Configuration.GetValue<string>("Arcus:ApplicationInsights:InstrumentationKey"));

Logger = configuration.CreateLogger();
}
Expand Down