forked from open-telemetry/opentelemetry-dotnet
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Clean up logging work (open-telemetry#1341)
* clean up logging work * update the main readme file * fix broken link
- Loading branch information
Showing
13 changed files
with
169 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| // <copyright file="Program.cs" company="OpenTelemetry Authors"> | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // </copyright> | ||
|
|
||
| using System.Collections.Generic; | ||
| #if NETCOREAPP2_1 | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| #endif | ||
| using Microsoft.Extensions.Logging; | ||
| using OpenTelemetry; | ||
| using OpenTelemetry.Logs; | ||
|
|
||
| public class Program | ||
| { | ||
| public static void Main() | ||
| { | ||
| #if NETCOREAPP2_1 | ||
| var serviceCollection = new ServiceCollection().AddLogging(builder => | ||
| #else | ||
| using var loggerFactory = LoggerFactory.Create(builder => | ||
| #endif | ||
| { | ||
| builder.AddOpenTelemetry(options => options | ||
| .AddProcessor(new MyProcessor("ProcessorA")) | ||
| .AddProcessor(new MyProcessor("ProcessorB")) | ||
| .AddProcessor(new SimpleExportProcessor<LogRecord>(new MyExporter("ExporterX"))) | ||
| .AddMyExporter()); | ||
| }); | ||
|
|
||
| #if NETCOREAPP2_1 | ||
| using var serviceProvider = serviceCollection.BuildServiceProvider(); | ||
| var logger = serviceProvider.GetRequiredService<ILogger<Program>>(); | ||
| #else | ||
| var logger = loggerFactory.CreateLogger<Program>(); | ||
| #endif | ||
|
|
||
| // unstructured log | ||
| logger.LogInformation("Hello, World!"); | ||
|
|
||
| // unstructured log with string interpolation | ||
| logger.LogInformation($"Hello from potato {0.99}."); | ||
|
|
||
| // structured log with template | ||
| logger.LogInformation("Hello from {name} {price}.", "tomato", 2.99); | ||
|
|
||
| // structured log with strong type | ||
| logger.LogInformation("{food}", new Food { Name = "artichoke", Price = 3.99 }); | ||
|
|
||
| // structured log with anonymous type | ||
| logger.LogInformation("{food}", new { Name = "pumpkin", Price = 5.99 }); | ||
|
|
||
| // structured log with general type | ||
| logger.LogInformation("{food}", new Dictionary<string, object> | ||
| { | ||
| ["Name"] = "truffle", | ||
| ["Price"] = 299.99, | ||
| }); | ||
| } | ||
|
|
||
| internal struct Food | ||
| { | ||
| public string Name { get; set; } | ||
|
|
||
| public double Price { get; set; } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| # Extending the OpenTelemetry .NET SDK | ||
|
|
||
| * [Building your own exporter](#exporter) | ||
| * [Building your own processor](#processor) | ||
| * [Building your own sampler](#sampler) | ||
| * [References](#references) | ||
|
|
||
| ## Exporter | ||
|
|
||
| TBD | ||
|
|
||
| ## Processor | ||
|
|
||
| TBD | ||
|
|
||
| ## Sampler | ||
|
|
||
| TBD | ||
|
|
||
| ## References |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>netcoreapp3.1</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry\OpenTelemetry.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'"> | ||
| <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" /> | ||
| <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'"> | ||
| <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPkgVer)" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
src/OpenTelemetry.Exporter.InMemory/InMemoryExporterLoggingExtensions.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // <copyright file="InMemoryExporterLoggingExtensions.cs" company="OpenTelemetry Authors"> | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // </copyright> | ||
|
|
||
| #if NETSTANDARD2_0 | ||
| using System; | ||
| using OpenTelemetry; | ||
| using OpenTelemetry.Exporter; | ||
| using OpenTelemetry.Logs; | ||
|
|
||
| namespace Microsoft.Extensions.Logging | ||
| { | ||
| public static class InMemoryExporterLoggingExtensions | ||
| { | ||
| public static OpenTelemetryLoggerOptions AddInMemoryExporter(this OpenTelemetryLoggerOptions loggerOptions, Action<InMemoryExporterOptions> configure = null) | ||
| { | ||
| if (loggerOptions == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(loggerOptions)); | ||
| } | ||
|
|
||
| var options = new InMemoryExporterOptions(); | ||
| configure?.Invoke(options); | ||
|
|
||
| return loggerOptions.AddProcessor(new SimpleExportProcessor<LogRecord>(new InMemoryExporter<LogRecord>(options))); | ||
| } | ||
| } | ||
| } | ||
| #endif |