[Logs-branch] Add LoggerProvider spec changes

.github/workflows/apicompatibility.yml

@@ -2,7 +2,7 @@ name: API Compatibility
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths-ignore:
     - '**.md'
 

.github/workflows/code-coverage.yml

@@ -2,11 +2,11 @@ name: Code Coverage
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths-ignore:
     - '**.md'
   pull_request:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths-ignore:
     - '**.md'
 

.github/workflows/docfx.yml

@@ -2,9 +2,9 @@ name: docfx
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 'main*' ]
   pull_request:
-    branches: [ main ]
+    branches: [ 'main*' ]
 
 jobs:
   build:

.github/workflows/dotnet-format-md.yml

@@ -9,7 +9,7 @@ name: dotnet format
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths-ignore:
     - '**.cs'
     - '.editorconfig'

.github/workflows/dotnet-format.yml

@@ -2,12 +2,12 @@ name: dotnet format
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths:
     - '**.cs'
     - '.editorconfig'
   pull_request:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths:
     - '**.cs'
     - '.editorconfig'

.github/workflows/integration-md.yml

@@ -9,7 +9,7 @@ name: Integration Tests
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths:
     - '**.md'
 

.github/workflows/integration.yml

@@ -2,11 +2,11 @@ name: Integration Tests
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths-ignore:
     - '**.md'
   pull_request:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths-ignore:
     - '**.md'
 

.github/workflows/linux-ci-md.yml

@@ -9,7 +9,7 @@ name: Linux
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths:
     - '**.md'
 

.github/workflows/linux-ci.yml

@@ -2,11 +2,11 @@ name: Linux
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths-ignore:
     - '**.md'
   pull_request:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths-ignore:
     - '**.md'
 

.github/workflows/markdownlint.yml

@@ -2,11 +2,11 @@ name: markdownlint
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths:
     - '**.md'
   pull_request:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths:
     - '**.md'
 

.github/workflows/sanitycheck.yml

@@ -2,9 +2,9 @@ name: sanitycheck
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 'main*' ]
   pull_request:
-    branches: [ main ]
+    branches: [ 'main*' ]
 
 jobs:
   misspell:

.github/workflows/windows-ci-md.yml

@@ -9,7 +9,7 @@ name: Windows
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths:
     - '**.md'
 

.github/workflows/windows-ci.yml

@@ -2,11 +2,11 @@ name: Windows
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths-ignore:
     - '**.md'
   pull_request:
-    branches: [ main ]
+    branches: [ 'main*' ]
     paths-ignore:
     - '**.md'
 

OpenTelemetry.sln

@@ -234,6 +234,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Tests.Stress.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.AspNetCore", "test\TestApp.AspNetCore\TestApp.AspNetCore.csproj", "{5FDAF679-DE5A-4C73-A49B-8ABCF2399229}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.LoggingExtensions", "examples\LoggingExtensions\Examples.LoggingExtensions.csproj", "{7642798D-12D4-403A-BB92-B6BEF67C9D4F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.EventSource", "src\OpenTelemetry.Extensions.EventSource\OpenTelemetry.Extensions.EventSource.csproj", "{E55029E5-46B5-46E5-9BB3-CD5CE63E16CB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.Serilog", "src\OpenTelemetry.Extensions.Serilog\OpenTelemetry.Extensions.Serilog.csproj", "{CB55CD2E-449C-44A2-A7CA-3C701B533F16}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.EventSource.Tests", "test\OpenTelemetry.Extensions.EventSource.Tests\OpenTelemetry.Extensions.EventSource.Tests.csproj", "{2A896854-8537-4BD6-8E1C-2B66B1160258}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.Serilog.Tests", "test\OpenTelemetry.Extensions.Serilog.Tests\OpenTelemetry.Extensions.Serilog.Tests.csproj", "{3B3C3571-6116-49D6-B28F-2A541E003577}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -476,6 +486,26 @@ Global
 		{5FDAF679-DE5A-4C73-A49B-8ABCF2399229}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5FDAF679-DE5A-4C73-A49B-8ABCF2399229}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5FDAF679-DE5A-4C73-A49B-8ABCF2399229}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7642798D-12D4-403A-BB92-B6BEF67C9D4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7642798D-12D4-403A-BB92-B6BEF67C9D4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7642798D-12D4-403A-BB92-B6BEF67C9D4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7642798D-12D4-403A-BB92-B6BEF67C9D4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E55029E5-46B5-46E5-9BB3-CD5CE63E16CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E55029E5-46B5-46E5-9BB3-CD5CE63E16CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E55029E5-46B5-46E5-9BB3-CD5CE63E16CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E55029E5-46B5-46E5-9BB3-CD5CE63E16CB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB55CD2E-449C-44A2-A7CA-3C701B533F16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB55CD2E-449C-44A2-A7CA-3C701B533F16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB55CD2E-449C-44A2-A7CA-3C701B533F16}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB55CD2E-449C-44A2-A7CA-3C701B533F16}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A896854-8537-4BD6-8E1C-2B66B1160258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A896854-8537-4BD6-8E1C-2B66B1160258}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A896854-8537-4BD6-8E1C-2B66B1160258}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A896854-8537-4BD6-8E1C-2B66B1160258}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B3C3571-6116-49D6-B28F-2A541E003577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B3C3571-6116-49D6-B28F-2A541E003577}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B3C3571-6116-49D6-B28F-2A541E003577}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B3C3571-6116-49D6-B28F-2A541E003577}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -512,6 +542,7 @@ Global
 		{6C7A1595-36D6-4229-BBB5-5A6B5791791D} = {3862190B-E2C5-418E-AFDC-DB281FB5C705}
 		{9A07D215-90AC-4BAF-BCDB-73D74FD3A5C5} = {3862190B-E2C5-418E-AFDC-DB281FB5C705}
 		{5FDAF679-DE5A-4C73-A49B-8ABCF2399229} = {77C7929A-2EED-4AA6-8705-B5C443C8AA0F}
+		{7642798D-12D4-403A-BB92-B6BEF67C9D4F} = {E359BB2B-9AEC-497D-B321-7DF2450C3B8E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {55639B5C-0770-4A22-AB56-859604650521}

build/Common.props

@@ -38,7 +38,7 @@
     <MicrosoftNETFrameworkReferenceAssembliesPkgVer>[1.0.0,2.0)</MicrosoftNETFrameworkReferenceAssembliesPkgVer>
     <MicrosoftSourceLinkGitHubPkgVer>[1.0.0,2.0)</MicrosoftSourceLinkGitHubPkgVer>
     <OpenTracingPkgVer>[0.12.1,0.13)</OpenTracingPkgVer>
-    <OTelPreviousStableVer>1.3.0</OTelPreviousStableVer>
+    <OTelPreviousStableVer>1.3.1</OTelPreviousStableVer>
     <SerilogPkgVer>[2.8.0,3.0)</SerilogPkgVer>
     <StyleCopAnalyzersPkgVer>[1.2.0-beta.435,2.0)</StyleCopAnalyzersPkgVer>
     <SystemCollectionsImmutablePkgVer>1.4.0</SystemCollectionsImmutablePkgVer>

docs/logs/correlation/Program.cs

@@ -32,10 +32,7 @@ public static void Main()
         // Setup Logging
         using var loggerFactory = LoggerFactory.Create(builder =>
         {
-            builder.AddOpenTelemetry(options =>
-            {
-                options.AddConsoleExporter();
-            });
+            builder.AddOpenTelemetry().AddConsoleExporter();
         });
 
         var logger = loggerFactory.CreateLogger<Program>();

docs/logs/customizing-the-sdk/Program.cs

@@ -27,12 +27,10 @@ public static void Main()
     {
         using var loggerFactory = LoggerFactory.Create(builder =>
         {
-            builder.AddOpenTelemetry(options =>
-            {
-                options.IncludeScopes = true;
-                options.ConfigureResource(r => r.AddService(serviceName: "MyService", serviceVersion: "1.0.0"));
-                options.AddConsoleExporter();
-            });
+            builder
+                .AddOpenTelemetry(options => options.IncludeScopes = true)
+                .ConfigureResource(r => r.AddService(serviceName: "MyService", serviceVersion: "1.0.0"))
+                .AddConsoleExporter();
         });
 
         var logger = loggerFactory.CreateLogger<Program>();

docs/logs/extending-the-sdk/LoggerExtensions.cs

@@ -20,13 +20,13 @@
 
 internal static class LoggerExtensions
 {
-    public static OpenTelemetryLoggerOptions AddMyExporter(this OpenTelemetryLoggerOptions options)
+    public static LoggerProviderBuilder AddMyExporter(this LoggerProviderBuilder builder)
     {
-        if (options == null)
+        if (builder == null)
         {
-            throw new ArgumentNullException(nameof(options));
+            throw new ArgumentNullException(nameof(builder));
         }
 
-        return options.AddProcessor(new BatchLogRecordExportProcessor(new MyExporter()));
+        return builder.AddProcessor(new BatchLogRecordExportProcessor(new MyExporter()));
     }
 }

docs/logs/extending-the-sdk/MyClassWithRedactionEnumerator.cs → docs/logs/extending-the-sdk/MyRedactedAttributeList.cs

@@ -1,4 +1,4 @@
-// <copyright file="MyClassWithRedactionEnumerator.cs" company="OpenTelemetry Authors">
+// <copyright file="MyRedactedAttributeList.cs" company="OpenTelemetry Authors">
 // Copyright The OpenTelemetry Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,32 +17,38 @@
 using System.Collections;
 using System.Collections.Generic;
 
-internal class MyClassWithRedactionEnumerator : IReadOnlyList<KeyValuePair<string, object>>
+internal class MyRedactedAttributeList : IReadOnlyList<KeyValuePair<string, object>>
 {
-    private readonly IReadOnlyList<KeyValuePair<string, object>> state;
+    private readonly IReadOnlyList<KeyValuePair<string, object>> attributes;
 
-    public MyClassWithRedactionEnumerator(IReadOnlyList<KeyValuePair<string, object>> state)
+    public MyRedactedAttributeList(IReadOnlyList<KeyValuePair<string, object>> attributes)
     {
-        this.state = state;
+        this.attributes = attributes;
     }
 
-    public int Count => this.state.Count;
+    public int Count => this.attributes.Count;
 
-    public KeyValuePair<string, object> this[int index] => this.state[index];
-
-    public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+    public KeyValuePair<string, object> this[int index]
     {
-        foreach (var entry in this.state)
+        get
         {
-            var entryVal = entry.Value;
+            var item = this.attributes[index];
+
+            var entryVal = item.Value;
             if (entryVal != null && entryVal.ToString() != null && entryVal.ToString().Contains("<secret>"))
             {
-                yield return new KeyValuePair<string, object>(entry.Key, "newRedactedValueHere");
-            }
-            else
-            {
-                yield return entry;
+                return new KeyValuePair<string, object>(item.Key, "newRedactedValueHere");
             }
+
+            return item;
+        }
+    }
+
+    public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+    {
+        for (var i = 0; i < this.Count; i++)
+        {
+            yield return this[i];
         }
     }
 

docs/logs/extending-the-sdk/MyRedactionProcessor.cs

@@ -14,17 +14,16 @@
 // limitations under the License.
 // </copyright>
 
-using System.Collections.Generic;
 using OpenTelemetry;
 using OpenTelemetry.Logs;
 
 internal class MyRedactionProcessor : BaseProcessor<LogRecord>
 {
     public override void OnEnd(LogRecord logRecord)
     {
-        if (logRecord.State is IReadOnlyList<KeyValuePair<string, object>> listOfKvp)
+        if (logRecord.Attributes != null)
         {
-            logRecord.State = new MyClassWithRedactionEnumerator(listOfKvp);
+            logRecord.Attributes = new MyRedactedAttributeList(logRecord.Attributes);
         }
     }
 }

docs/logs/extending-the-sdk/Program.cs

@@ -17,23 +17,21 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
 using OpenTelemetry;
+using OpenTelemetry.Logs;
 
 namespace ExtendingTheSdk;
 
 public class Program
 {
     public static void Main()
     {
-        using var loggerFactory = LoggerFactory.Create(builder =>
-            builder.AddOpenTelemetry(options =>
-            {
-                options.IncludeScopes = true;
-                options.AddProcessor(new MyRedactionProcessor())
-                       .AddProcessor(new MyProcessor("ProcessorA"))
-                       .AddProcessor(new MyProcessor("ProcessorB"))
-                       .AddProcessor(new SimpleLogRecordExportProcessor(new MyExporter("ExporterX")))
-                       .AddMyExporter();
-            }));
+        using var loggerFactory = LoggerFactory.Create(builder => builder
+            .AddOpenTelemetry(options => options.IncludeScopes = true)
+            .AddProcessor(new MyRedactionProcessor())
+            .AddProcessor(new MyProcessor("ProcessorA"))
+            .AddProcessor(new MyProcessor("ProcessorB"))
+            .AddProcessor(new SimpleLogRecordExportProcessor(new MyExporter("ExporterX")))
+            .AddMyExporter());
 
         var logger = loggerFactory.CreateLogger<Program>();
 

docs/logs/getting-started/Program.cs

@@ -25,10 +25,7 @@ public static void Main()
     {
         using var loggerFactory = LoggerFactory.Create(builder =>
         {
-            builder.AddOpenTelemetry(options =>
-            {
-                options.AddConsoleExporter();
-            });
+            builder.AddOpenTelemetry().AddConsoleExporter();
         });
 
         var logger = loggerFactory.CreateLogger<Program>();