Skip to content
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

Dependency update OpenTelemetry ver. 1.11.0-rc.1 #22

Merged
merged 1 commit into from
Jan 8, 2025
Merged

Dependency update OpenTelemetry ver. 1.11.0-rc.1 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Benchmark/Benchmark.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net48;net6.0</TargetFrameworks>
<TargetFrameworks>net48;net8.0</TargetFrameworks>
<LangVersion>Latest</LangVersion>
<Configurations>Debug;Release;Test;Test</Configurations>
</PropertyGroup>
Expand Down
28 changes: 14 additions & 14 deletions NLog.Targets.OpenTelemetryProtocol.Test/NLog.Targets.OpenTelemetryProtocol.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>Latest</LangVersion>
<Configurations>Debug;Release;Test;Test</Configurations>
</PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>Latest</LangVersion>
<Configurations>Debug;Release;Test</Configurations>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\NLog.Targets.OpenTelemetryProtocol\NLog.Targets.OpenTelemetryProtocol.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NLog.Targets.OpenTelemetryProtocol\NLog.Targets.OpenTelemetryProtocol.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="nlog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Update="nlog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
2 changes: 2 additions & 0 deletions NLog.Targets.OpenTelemetryProtocol.Test/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ public static void Main()

var message = "testing";

using var currentActivity = new System.Diagnostics.Activity("Hello World").Start();

logger.Fatal("message: {messageField}", message);

Thread.Sleep(10000);
Expand Down
2 changes: 1 addition & 1 deletion NLog.Targets.OpenTelemetryProtocol/NLog.Targets.OpenTelemetryProtocol.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<ItemGroup>
<PackageReference Include="NLog" Version="5.0.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0-beta.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.0-rc.1" />
</ItemGroup>

<ItemGroup Condition=" '$(Configuration)' == 'Test' ">
Expand Down
2 changes: 1 addition & 1 deletion NLog.Targets.OpenTelemetryProtocol/OpenTelemetryEventListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
}
}

private void WriteEvent(EventLevel eventLevel, string? eventMessage, IReadOnlyList<object> payload)
private void WriteEvent(EventLevel eventLevel, string eventMessage, IReadOnlyList<object> payload)
{
switch (eventLevel)
{
Expand Down
2 changes: 1 addition & 1 deletion NLog.Targets.OpenTelemetryProtocol/OtlpTarget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ private static LogRecordSeverity ResolveSeverity(LogLevel logLevel)

private OpenTelemetry.Logs.Logger GetLogger(string name)
{
if (!_loggers.TryGetValue(name, out OpenTelemetry.Logs.Logger? logger))
if (!_loggers.TryGetValue(name, out OpenTelemetry.Logs.Logger logger))
{
lock (_sync)
{
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ This target can export logs in the format defined in the OpenTelemetry specifica
For an explanation of the log data model, see https://opentelemetry.io/docs/specs/otel/logs/data-model/. <br>
For an example, see https://opentelemetry.io/docs/specs/otel/protocol/file-exporter/#examples.

**Note that the OpenTelemetry logging API is still unfinished, which means that it is internal in stable releases and public in prelease versions of the OpenTelemetry package.
This package has a reference to OpenTelemetry version 1.9.0-alpha.1. If your project has a reference to a stable version higher than that,
**Note that the OpenTelemetry logging API is still unfinished, which means that it is internal in stable releases and public in pre-release versions of the OpenTelemetry package.
This package has a reference to pre-release version of the OpenTelemetry-nuget-package. If your project has a reference to a stable version higher than that,
you will get a runtime error.**

## Configuration
Expand All @@ -29,7 +29,7 @@ Example XML config:
scheduledDelayMilliseconds="1000"
useDefaultResources="false"
includeFormattedMessage="true"
onlyIncldueParameters="correlationId,messageId">
onlyIncludeProperties="correlationId,messageId">
<attribute name="thread.id" layout="${threadid}" />
<resource name="process.name" layout="${processname}" />
<resource name="process.id" layout="${processid}" />
Expand Down
2 changes: 1 addition & 1 deletion TestWebApp/TestWebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.8" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
</ItemGroup>

<ItemGroup>
Expand Down
72 changes: 36 additions & 36 deletions UnitTests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>

<SignAssembly>True</SignAssembly>

<AssemblyOriginatorKeyFile>debug.snk</AssemblyOriginatorKeyFile>

<Configurations>Debug;Release;Test;Test</Configurations>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NLog.Targets.OpenTelemetryProtocol\NLog.Targets.OpenTelemetryProtocol.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="nlog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>

<SignAssembly>True</SignAssembly>

<AssemblyOriginatorKeyFile>debug.snk</AssemblyOriginatorKeyFile>

<Configurations>Debug;Release;Test</Configurations>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NLog.Targets.OpenTelemetryProtocol\NLog.Targets.OpenTelemetryProtocol.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="nlog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>