Merge branch 'main' into aspnetcore-statuscode-boxing

src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.5.0-alpha.2
+
+Released 2023-Mar-31
+
 ## 1.5.0-alpha.1
 
 Released 2023-Mar-07

src/OpenTelemetry.Api/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.5.0-alpha.2
+
+Released 2023-Mar-31
+
 ## 1.5.0-alpha.1
 
 Released 2023-Mar-07

src/OpenTelemetry.Exporter.Console/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.5.0-alpha.2
+
+Released 2023-Mar-31
+
 ## 1.5.0-alpha.1
 
 Released 2023-Mar-07

src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.5.0-alpha.2
+
+Released 2023-Mar-31
+
 * Fixed issue where the `MetricSnapshot` of a histogram did not capture the min
   and max values.
   ([#4306](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4306))

src/OpenTelemetry.Exporter.Jaeger/ApacheThrift/Protocol/TBinaryProtocol.cs

@@ -192,7 +192,7 @@ public override void WriteDouble(double d)
             WriteI64(BitConverter.DoubleToInt64Bits(d));
         }
 
-#if NETSTANDARD2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
         public override void WriteBinary(ReadOnlySpan<byte> bytes)
         {
             WriteI32(bytes.Length);

src/OpenTelemetry.Exporter.Jaeger/ApacheThrift/Protocol/TCompactProtocol.cs

@@ -356,7 +356,7 @@ public override void WriteDouble(double d)
             Transport.Write(PreAllocatedBuffer, 0, 8);
         }
 
-#if NETSTANDARD2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
         public override void WriteBinary(ReadOnlySpan<byte> bytes)
         {
             Int32ToVarInt((uint)bytes.Length, ref PreAllocatedVarInt);

src/OpenTelemetry.Exporter.Jaeger/ApacheThrift/Protocol/TProtocol.cs

@@ -143,7 +143,7 @@ protected virtual void Dispose(bool disposing)
 
         public virtual void WriteString(string s)
         {
-#if NETSTANDARD2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
             if (s.Length <= 128)
             {
                 Span<byte> buffer = stackalloc byte[256];
@@ -165,7 +165,7 @@ public virtual void WriteString(string s)
             }
         }
 
-#if NETSTANDARD2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
         public abstract void WriteBinary(ReadOnlySpan<byte> bytes);
 #endif
 

src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 1.5.0-alpha.2
+
+Released 2023-Mar-31
+
+* Enabled performance optimizations for .NET 6.0+ runtimes.
+  ([#4349](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4349))
+
 ## 1.5.0-alpha.1
 
 Released 2023-Mar-07

src/OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.5.0-alpha.2
+
+Released 2023-Mar-31
+
 ## 1.5.0-alpha.1
 
 Released 2023-Mar-07

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.5.0-alpha.2
+
+Released 2023-Mar-31
+
 * Add support for exporting histograms aggregated using the
   [Base2 Exponential Bucket Histogram Aggregation](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#base2-exponential-bucket-histogram-aggregation).
   ([#4337](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4337))

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/README.md

@@ -67,7 +67,16 @@ and environment variables.
 The `OtlpExporterOptions` type setters take precedence over the environment variables.
 
 This can be achieved by providing an `Action<OtlpExporterOptions>` delegate to the
-`AddOtlpExporter()` method.
+`AddOtlpExporter()` method or using `AddOptions<OtlpExporterOptions>()`.
+
+If additional services from the dependency injection are required, they can be
+configured like this:
+
+```csharp
+services.AddOptions<OtlpExporterOptions>().Configure<Service>((opts, svc) => {
+    // ...
+});
+```
 
 TODO: Show metrics specific configuration (i.e MetricReaderOptions).
 

src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.5.0-alpha.2
+
+Released 2023-Mar-31
+
 ## 1.5.0-alpha.1
 
 Released 2023-Mar-07

src/OpenTelemetry.Exporter.Prometheus.HttpListener/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.5.0-alpha.2
+
+Released 2023-Mar-31
+
 ## 1.5.0-alpha.1
 
 Released 2023-Mar-07

src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.5.0-alpha.2
+
+Released 2023-Mar-31
+
 ## 1.5.0-alpha.1
 
 Released 2023-Mar-07

src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.5.0-alpha.2
+
+Released 2023-Mar-31
+
 ## 1.5.0-alpha.1
 
 Released 2023-Mar-07

src/OpenTelemetry.Extensions.Hosting/README.md

@@ -83,6 +83,41 @@ app.Run();
 A fully functional example can be found
 [here](https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/examples/AspNetCore).
 
+### Resources
+
+To dynamically add resources at startup from the dependency injection you can
+provide an `IResourceDetector`.
+To make use of it add it to the dependency injection and they you can use the
+`ISerivceProvider` add it to OpenTelemetry:
+
+```csharp
+public class MyResourceDetector : IResourceDetector
+{
+    private readonly IWebHostEnvironment webHostEnvironment;
+
+    public MyResourceDetector(IWebHostEnvironment webHostEnvironment)
+    {
+        this.webHostEnvironment = webHostEnvironment;
+    }
+
+    public Resource Detect()
+    {
+        return ResourceBuilder.CreateEmpty()
+            .AddService(serviceName: this.webHostEnvironment.ApplicationName)
+            .AddAttributes(new Dictionary<string, object> { ["host.environment"] = this.webHostEnvironment.EnvironmentName })
+            .Build();
+    }
+}
+
+services.AddSingleton<MyResourceDetector>();
+
+services.AddOpenTelemetry()
+    .ConfigureResource(builder =>
+        builder.AddDetector(sp => sp.GetRequiredService<MyResourceDetector>()))
+    .WithTracing(builder => builder.AddConsoleExporter())
+    .WithMetrics(builder => builder.AddConsoleExporter());
+```
+
 ## Migrating from pre-release versions of OpenTelemetry.Extensions.Hosting
 
 Pre-release versions (all versions prior to 1.4.0) of

src/OpenTelemetry.Extensions.Propagators/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.5.0-alpha.2
+
+Released 2023-Mar-31
+
 ## 1.5.0-alpha.1
 
 Released 2023-Mar-07

src/OpenTelemetry/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## 1.5.0-alpha.2
+
+Released 2023-Mar-31
+
+* Enabling `SetErrorStatusOnException` on TracerProvider will now set the
+`Status` property on Activity to `ActivityStatusCode.Error` in case of an error.
+This will be done in addition to current behavior of setting `otel.status_code`
+tag on activity.
+([#4336](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4336))
+
 * Add support for configuring the
   [Base2 Exponential Bucket Histogram Aggregation](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#base2-exponential-bucket-histogram-aggregation)
   using the `AddView` API. This aggregation is supported by OTLP but not yet by

src/OpenTelemetry/Trace/ExceptionProcessor.cs

@@ -75,7 +75,11 @@ public override void OnEnd(Activity activity)
 
             if (snapshot != pointers)
             {
+                // TODO: Remove this when SetStatus is deprecated
                 activity.SetStatus(Status.Error);
+
+                // For processors/exporters checking `Status` property.
+                activity.SetStatus(ActivityStatusCode.Error);
             }
         }
     }

test/OpenTelemetry.Tests/Trace/TracerProviderBuilderExtensionsTest.cs

@@ -56,6 +56,7 @@ public void SetErrorStatusOnExceptionEnabled()
             }
 
             Assert.Equal(StatusCode.Error, activity.GetStatus().StatusCode);
+            Assert.Equal(ActivityStatusCode.Error, activity.Status);
         }
 
         [Fact]
@@ -84,6 +85,7 @@ public void SetErrorStatusOnExceptionDisabled()
             }
 
             Assert.Equal(StatusCode.Unset, activity.GetStatus().StatusCode);
+            Assert.Equal(ActivityStatusCode.Unset, activity.Status);
         }
 
         [Fact]