From be32b40d9db03531e22f9ebc88d94d13023a39ab Mon Sep 17 00:00:00 2001
From: Matt Hensley <130569+matt-hensley@users.noreply.github.com>
Date: Tue, 19 Dec 2023 09:02:49 -0500
Subject: [PATCH] Upgrade core packages to 1.7.0 (#70)
* upgrade to 1.7.0
* update to stable ASP.NET Core and HTTP instrumentations
* remove OTEL_SEMCONV_STABILITY_OPT_IN default
* enable OTEL_DOTNET_EXPERIMENTAL_ASPNETCORE_ENABLE_GRPC_INSTRUMENTATION by default
---
CHANGELOG.md | 19 +++++++++++++++++++
examples/net6.0/aspnetcore/aspnetcore.csproj | 2 +-
.../Grafana.OpenTelemetry.Base.csproj | 6 +++---
.../TracerProviderBuilderExtensions.cs | 6 +++---
.../Grafana.OpenTelemetry.csproj | 4 ++--
5 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6e1780..8a58a22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
# Changelog
+## 0.7.0-beta.1
+
+### BREAKING CHANGES
+
+* Use 1.7.0 of ASP.NET Core instrumentation.
+ * Removes support for `OTEL_SEMCONV_STABILITY_OPT_IN`.
+ [Instrumentation will only emit stable conventions](https://github.com/open-telemetry/semantic-conventions/tree/v1.23.0/docs/http).
+ * Defaults `OTEL_DOTNET_EXPERIMENTAL_ASPNETCORE_ENABLE_GRPC_INSTRUMENTATION`
+ to `true`. [gRPC instrumentation is experimental](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/Instrumentation.AspNetCore-1.6.0),
+ while HTTP is stable.
+* Use 1.7.0 of HTTP instrumentation.
+ * [`http.user_agent` Activity tag removed from HTTP instrumentation](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/1.6.0-rc.1).
+ * Removes support for `OTEL_SEMCONV_STABILITY_OPT_IN`.
+ [Instrumentation will only emit stable conventions](https://github.com/open-telemetry/semantic-conventions/tree/v1.23.0/docs/http).
+
+### New features
+
+* [Use 1.7.0 of upstream SDK](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/Instrumentation.AspNetCore-1.7.0).
+
## 0.6.0-beta.3
### Bug fixes
diff --git a/examples/net6.0/aspnetcore/aspnetcore.csproj b/examples/net6.0/aspnetcore/aspnetcore.csproj
index 7b2e23b..8934fe5 100644
--- a/examples/net6.0/aspnetcore/aspnetcore.csproj
+++ b/examples/net6.0/aspnetcore/aspnetcore.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj
index 3c8a0ef..3b059c0 100644
--- a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj
+++ b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj
@@ -27,8 +27,8 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
@@ -40,7 +40,7 @@
-
+
diff --git a/src/Grafana.OpenTelemetry.Base/TracerProviderBuilderExtensions.cs b/src/Grafana.OpenTelemetry.Base/TracerProviderBuilderExtensions.cs
index bc0da04..4bc4bc9 100644
--- a/src/Grafana.OpenTelemetry.Base/TracerProviderBuilderExtensions.cs
+++ b/src/Grafana.OpenTelemetry.Base/TracerProviderBuilderExtensions.cs
@@ -31,10 +31,10 @@ public static TracerProviderBuilder UseGrafana(this TracerProviderBuilder builde
GrafanaOpenTelemetryEventSource.Log.InitializeDistribution(settings);
- // Default to using stable HTTP semantic conventions
- if (Environment.GetEnvironmentVariable("OTEL_SEMCONV_STABILITY_OPT_IN") == null)
+ // Default to using experimental gRPC instrumentation
+ if (Environment.GetEnvironmentVariable("OTEL_DOTNET_EXPERIMENTAL_ASPNETCORE_ENABLE_GRPC_INSTRUMENTATION") == null)
{
- Environment.SetEnvironmentVariable("OTEL_SEMCONV_STABILITY_OPT_IN", "http");
+ Environment.SetEnvironmentVariable("OTEL_DOTNET_EXPERIMENTAL_ASPNETCORE_ENABLE_GRPC_INSTRUMENTATION", "true");
}
return builder
diff --git a/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj b/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
index 0833c77..dc0d18e 100644
--- a/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
+++ b/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
@@ -43,7 +43,7 @@
-
+
@@ -62,7 +62,7 @@
-
+