Merge branch 'main' into http-propagation

Author: vishweshbankwar

.github/workflows/apicompatibility.yml

@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0 # fetching all
-    - uses: actions/setup-dotnet@v3.0.2
+    - uses: actions/setup-dotnet@v3.0.3
       with:
         dotnet-version: '7.0.x'
 

.github/workflows/code-coverage.yml

@@ -23,7 +23,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0 # fetching all
-    - uses: actions/setup-dotnet@v3.0.2
+    - uses: actions/setup-dotnet@v3.0.3
       with:
         dotnet-version: '7.0.x'
 

.github/workflows/dotnet-format.yml

@@ -21,7 +21,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Setup .NET Core 7.0
-      uses: actions/setup-dotnet@v3.0.2
+      uses: actions/setup-dotnet@v3.0.3
       with:
         dotnet-version: '7.0.x'
 

.github/workflows/linux-ci.yml

@@ -23,11 +23,11 @@ jobs:
       with:
         fetch-depth: 0 # fetching all
 
-    - uses: actions/setup-dotnet@v3.0.2
+    - uses: actions/setup-dotnet@v3.0.3
       with:
         dotnet-version: '6.0.x'
 
-    - uses: actions/setup-dotnet@v3.0.2
+    - uses: actions/setup-dotnet@v3.0.3
       with:
         dotnet-version: '7.0.x'
 

.github/workflows/publish-packages-1.0.yml

@@ -23,7 +23,7 @@ jobs:
         fetch-depth: 0 # fetching all
         ref: ${{ github.ref || 'main' }}
 
-    - uses: actions/setup-dotnet@v3.0.2
+    - uses: actions/setup-dotnet@v3.0.3
       with:
         dotnet-version: '7.0.x'
 

.github/workflows/windows-ci.yml

@@ -23,7 +23,7 @@ jobs:
       with:
         fetch-depth: 0 # fetching all
 
-    - uses: actions/setup-dotnet@v3.0.2
+    - uses: actions/setup-dotnet@v3.0.3
       with:
         dotnet-version: '7.0.x'
 

docs/metrics/customizing-the-sdk/README.md

@@ -204,7 +204,7 @@ with the metric are of interest to you.
         instrumentName: "MyFruitCounter",
         metricStreamConfiguration: new MetricStreamConfiguration
         {
-            TagKeys = new string[] { },
+            TagKeys = Array.Empty<string>(),
         })
 
     ...
@@ -255,7 +255,7 @@ default boundaries. This requires the use of
     // There are no buckets exported in this case.
     .AddView(
         instrumentName: "MyHistogram",
-        new ExplicitBucketHistogramConfiguration { Boundaries = new double[] { } })
+        new ExplicitBucketHistogramConfiguration { Boundaries = Array.Empty<double>() })
 ```
 
 ```csharp

docs/trace/extending-the-sdk/MyFilteringProcessor.cs

@@ -17,37 +17,32 @@
 using System;
 using System.Diagnostics;
 using OpenTelemetry;
-using OpenTelemetry.Resources;
-using OpenTelemetry.Trace;
 
 /// <summary>
 /// A custom processor for filtering <see cref="Activity"/> instances.
 /// </summary>
-/// <remarks>
-/// Note: <see cref="CompositeProcessor{T}"/> is used as the base class because
-/// the SDK needs to understand that <c>MyFilteringProcessor</c> wraps an inner
-/// processor. Without that understanding some features such as <see
-/// cref="Resource"/> would be unavailable because the SDK needs to push state
-/// about the parent <see cref="TracerProvider"/> to all processors in the
-/// chain.
-/// </remarks>
-internal sealed class MyFilteringProcessor : CompositeProcessor<Activity>
+internal sealed class MyFilteringProcessor : BaseProcessor<Activity>
 {
     private readonly Func<Activity, bool> filter;
 
-    public MyFilteringProcessor(BaseProcessor<Activity> processor, Func<Activity, bool> filter)
-        : base(new[] { processor })
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MyFilteringProcessor"/>
+    /// class.
+    /// </summary>
+    /// <param name="filter">Function used to test if an <see cref="Activity"/>
+    /// should be recorded or dropped. Return <see langword="true"/> to record
+    /// or <see langword="false"/> to drop.</param>
+    public MyFilteringProcessor(Func<Activity, bool> filter)
     {
         this.filter = filter ?? throw new ArgumentNullException(nameof(filter));
     }
 
     public override void OnEnd(Activity activity)
     {
-        // Call the underlying processor
-        // only if the Filter returns true.
-        if (this.filter(activity))
+        // Bypass export if the Filter returns false.
+        if (!this.filter(activity))
         {
-            base.OnEnd(activity);
+            activity.ActivityTraceFlags &= ~ActivityTraceFlags.Recorded;
         }
     }
 }

docs/trace/extending-the-sdk/README.md

@@ -270,20 +270,19 @@ capabilities such as offering easy access to more context (library specific).
 ### Filtering Processor
 
 Another common use case of writing custom processor is to filter Activities from
-being exported. Such a "FilteringProcessor" can be written as a wrapper around
-an underlying processor. An example "FilteringProcessor" is shown
+being exported. Such a "FilteringProcessor" can be written to toggle the
+`Activity.Recorded` flag. An example "FilteringProcessor" is shown
 [here](./MyFilteringProcessor.cs).
 
-When using such a filtering processor, instead of using extension method to
-register the exporter, they must be registered manually as shown below:
+When using such a filtering processor if should be registered BEFORE the
+processor containing the exporter which should be bypassed:
 
 ```csharp
 using var tracerProvider = Sdk.CreateTracerProviderBuilder()
     .SetSampler(new MySampler())
     .AddSource("OTel.Demo")
-    .AddProcessor(new MyFilteringProcessor(
-        new SimpleActivityExportProcessor(new MyExporter("ExporterX")),
-        (act) => true))
+    .AddProcessor(new MyFilteringProcessor(activity => true))
+    .AddProcessor(new SimpleActivityExportProcessor(new MyExporter("ExporterX")))
     .Build();
 ```
 

src/OpenTelemetry/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Fix instrument naming enforcement implementation to match the spec.
+  ([#3821](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3821))
+
 * Added support for loading environment variables from `IConfiguration` when
   using the `MetricReaderOptions` & `BatchExportActivityProcessorOptions`
   classes.