Merge branch 'main' into metrics

build/RELEASING.md

@@ -72,12 +72,19 @@ Released $(Get-Date -UFormat '%Y-%b-%d')" | Set-Content -Path $changelog.FullNam
 We use [MinVer](https://github.com/adamralph/minver) to do versioning,
 which produces version numbers based on git tags.
 
-Note: If releasing only core components, prefix the tag
+Note:
+If releasing only core components, prefix the tag
 with "core-". For example:
-git tag -a core-1.0.0-rc4 -m "1.0.0-rc4 release of core"
+git tag -a core-1.1.0-beta1 -m "1.1.0-beta1 of all core components"
+
+If releasing only non-core components, use tags without
+prefix. For example:
+git tag -a 1.0.0-rc3 -m "1.0.0-rc3 of all non-core components"
+
+If releasing both, push both tags above.
 
 6.Open [Pack and publish to MyGet
-   workflow](https://github.com/open-telemetry/opentelemetry-dotnet/actions?query=workflow%3A%22Pack+and+publish+to+Myget%22)
+   workflow](https://github.com/open-telemetry/opentelemetry-dotnet/actions/workflows/publish-packages-1.0.yml)
    and manually trigger a build. At the end of this, MyGet will have the
    packages. The package name will be the tag name used in step 5.
 

examples/Console/TestJaegerExporter.cs

@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // </copyright>
+
 using System.Diagnostics;
 using OpenTelemetry;
 using OpenTelemetry.Resources;

src/OpenTelemetry.Api/CHANGELOG.md

@@ -9,6 +9,10 @@ please check the latest changes
 
 ## Unreleased
 
+## 1.1.0-beta1
+
+Released 2021-Mar-19
+
 ## 1.0.1
 
 Released 2021-Feb-10

src/OpenTelemetry.Exporter.Console/CHANGELOG.md

@@ -9,6 +9,10 @@ please check the latest changes
 
 ## Unreleased
 
+## 1.1.0-beta1
+
+Released 2021-Mar-19
+
 * Removed code that prints Baggage information
   ([#1825](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1825))
 * LogRecordExporter exports Message, Scope, StateValues from LogRecord.

src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md

@@ -9,6 +9,10 @@ please check the latest changes
 
 ## Unreleased
 
+## 1.1.0-beta1
+
+Released 2021-Mar-19
+
 ## 1.0.1
 
 Released 2021-Feb-10

src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.1.0-beta1
+
+Released 2021-Mar-19
+
 ## 1.0.1
 
 Released 2021-Feb-10

src/OpenTelemetry.Exporter.Jaeger/README.md

@@ -3,8 +3,11 @@
 [![NuGet](https://img.shields.io/nuget/v/OpenTelemetry.Exporter.Jaeger.svg)](https://www.nuget.org/packages/OpenTelemetry.Exporter.Jaeger)
 [![NuGet](https://img.shields.io/nuget/dt/OpenTelemetry.Exporter.Jaeger.svg)](https://www.nuget.org/packages/OpenTelemetry.Exporter.Jaeger)
 
-The Jaeger exporter communicates to a Jaeger Agent through the compact thrift
-protocol on the Compact Thrift API port.
+The Jaeger exporter converts OpenTelemetry traces into the Jaeger model
+following the [OpenTelemetry specification](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk_exporters/jaeger.md).
+
+The exporter communicates to a Jaeger Agent through the thrift protocol on
+the Compact Thrift API port, and as such only supports Thrift over UDP.
 
 ## Supported .NET Versions
 
@@ -34,7 +37,6 @@ properties:
   `6831`).
 * `MaxPayloadSizeInBytes`: The maximum size of each UDP packet that gets
   sent to the agent. (default `4096`).
-* `ProcessTags`: Which tags should be sent with telemetry.
 * `ExportProcessorType`: Whether the exporter should use
   [Batch or Simple exporting processor](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk.md#built-in-span-processors)
   .

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md

@@ -9,6 +9,10 @@ please check the latest changes
 
 ## Unreleased
 
+## 1.1.0-beta1
+
+Released 2021-Mar-19
+
 ## 1.0.1
 
 Released 2021-Feb-10

src/OpenTelemetry.Exporter.ZPages/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.0.0-rc3
+
+Released 2021-Mar-19
+
 ## 1.0.0-rc2
 
 Released 2021-Jan-29

src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.1.0-beta1
+
+Released 2021-Mar-19
+
 ## 1.0.1
 
 Released 2021-Feb-10

src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.0.0-rc3
+
+Released 2021-Mar-19
+
 ## 1.0.0-rc2
 
 Released 2021-Jan-29

src/OpenTelemetry.Instrumentation.AspNet/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Unreleased
 
+## 1.0.0-rc3
+
+Released 2021-Mar-19
+
+* Leverages added AddLegacySource API from OpenTelemetry SDK to trigger Samplers
+  and ActivityProcessors. Samplers, ActivityProcessor.OnStart will now get the
+  Activity before any enrichment done by the instrumentation.
+  ([#1836](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1836))
+* Performance optimization by leveraging sampling decision and short circuiting
+  activity enrichment.
+  ([#1903](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1903))
+
 ## 1.0.0-rc2
 
 Released 2021-Jan-29

src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## Unreleased
 
+## 1.0.0-rc3
+
+Released 2021-Mar-19
+
+* Leverages added AddLegacySource API from OpenTelemetry SDK to trigger Samplers
+  and ActivityProcessors. Samplers, ActivityProcessor.OnStart will now get the
+  Activity before any enrichment done by the instrumentation.
+  ([#1836](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1836))
+* Performance optimization by leveraging sampling decision and short circuiting
+  activity enrichment. `Filter` and `Enrich` are now only called if
+  `activity.IsAllDataRequested` is `true`
+  ([#1899](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1899))
+
 ## 1.0.0-rc2
 
 Released 2021-Jan-29

src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs

@@ -57,29 +57,29 @@ public HttpInListener(string name, AspNetCoreInstrumentationOptions options)
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "The objects should not be disposed.")]
         public override void OnStartActivity(Activity activity, object payload)
         {
-            _ = this.startContextFetcher.TryFetch(payload, out HttpContext context);
-            if (context == null)
+            // The overall flow of what AspNetCore library does is as below:
+            // Activity.Start()
+            // DiagnosticSource.WriteEvent("Start", payload)
+            // DiagnosticSource.WriteEvent("Stop", payload)
+            // Activity.Stop()
+
+            // This method is in the WriteEvent("Start", payload) path.
+            // By this time, samplers have already run and
+            // activity.IsAllDataRequested populated accordingly.
+
+            if (Sdk.SuppressInstrumentation)
             {
-                AspNetCoreInstrumentationEventSource.Log.NullPayload(nameof(HttpInListener), nameof(this.OnStartActivity));
                 return;
             }
 
-            try
-            {
-                if (this.options.Filter?.Invoke(context) == false)
-                {
-                    AspNetCoreInstrumentationEventSource.Log.RequestIsFilteredOut(activity.OperationName);
-                    activity.IsAllDataRequested = false;
-                    return;
-                }
-            }
-            catch (Exception ex)
+            _ = this.startContextFetcher.TryFetch(payload, out HttpContext context);
+            if (context == null)
             {
-                AspNetCoreInstrumentationEventSource.Log.RequestFilterException(ex);
-                activity.IsAllDataRequested = false;
+                AspNetCoreInstrumentationEventSource.Log.NullPayload(nameof(HttpInListener), nameof(this.OnStartActivity));
                 return;
             }
 
+            // Ensure context extraction irrespective of sampling decision
             var request = context.Request;
             var textMapPropagator = Propagators.DefaultTextMapPropagator;
             if (!this.hostingSupportsW3C || !(textMapPropagator is TraceContextPropagator))
@@ -110,11 +110,29 @@ public override void OnStartActivity(Activity activity, object payload)
                 }
             }
 
-            ActivityInstrumentationHelper.SetActivitySourceProperty(activity, ActivitySource);
-            ActivityInstrumentationHelper.SetKindProperty(activity, ActivityKind.Server);
-
+            // enrich Activity from payload only if sampling decision
+            // is favorable.
             if (activity.IsAllDataRequested)
             {
+                try
+                {
+                    if (this.options.Filter?.Invoke(context) == false)
+                    {
+                        AspNetCoreInstrumentationEventSource.Log.RequestIsFilteredOut(activity.OperationName);
+                        activity.IsAllDataRequested = false;
+                        return;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    AspNetCoreInstrumentationEventSource.Log.RequestFilterException(ex);
+                    activity.IsAllDataRequested = false;
+                    return;
+                }
+
+                ActivityInstrumentationHelper.SetActivitySourceProperty(activity, ActivitySource);
+                ActivityInstrumentationHelper.SetKindProperty(activity, ActivityKind.Server);
+
                 var path = (request.PathBase.HasValue || request.Path.HasValue) ? (request.PathBase + request.Path).ToString() : "/";
                 activity.DisplayName = path;
 

src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Unreleased
 
+## 1.0.0-rc3
+
+Released 2021-Mar-19
+
+* Leverages added AddLegacySource API from OpenTelemetry SDK to trigger Samplers
+  and ActivityProcessors. Samplers, ActivityProcessor.OnStart will now get the
+  Activity before any enrichment done by the instrumentation.
+  ([#1836](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1836))
+* Performance optimization by leveraging sampling decision and short circuiting
+  activity enrichment.
+  ([#1903](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1904))
+
 ## 1.0.0-rc2
 
 Released 2021-Jan-29

src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md

@@ -2,9 +2,17 @@
 
 ## Unreleased
 
-* HttpClient (.NET Core) instrumentation performance optimization
-  by leveraging sampling decision and short circuiting path.
-  ([#1894](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1894))
+## 1.0.0-rc3
+
+Released 2021-Mar-19
+
+* Leverages added AddLegacySource API from OpenTelemetry SDK to trigger Samplers
+  and ActivityProcessors. Samplers, ActivityProcessor.OnStart will now get the
+  Activity before any enrichment done by the instrumentation.
+  ([#1836](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1836))
+* Performance optimization by leveraging sampling decision and short circuiting
+  activity enrichment.
+  ([#1903](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1894))
 
 ## 1.0.0-rc2
 

src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.0.0-rc3
+
+Released 2021-Mar-19
+
 ## 1.0.0-rc2
 
 Released 2021-Jan-29

src/OpenTelemetry.Instrumentation.StackExchangeRedis/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.0.0-rc3
+
+Released 2021-Mar-19
+
 ## 1.0.0-rc2
 
 Released 2021-Jan-29

src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.0.0-rc3
+
+Released 2021-Mar-19
+
 ## 1.0.0-rc2
 
 Released 2021-Jan-29

src/OpenTelemetry/CHANGELOG.md

@@ -9,6 +9,10 @@ please check the latest changes
 
 ## Unreleased
 
+## 1.1.0-beta1
+
+Released 2021-Mar-19
+
 * Removed SuppressScope Increment/Decrement from DiagnosticSourceListeners.
   ([1893](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1893))