Update OTEL HTTP instrumentation packages to 1.8.1 (dotnet#3676)

Xen0byte · Apr 13, 2024 · e444435 · e444435
1 parent f71c302
commit e444435
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -123,8 +123,8 @@
  <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.0" />
  <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
  <PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.8.0-beta.1" />
- <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.8.0" />
- <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.0" />
+ <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
+ <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
  <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
  <!-- build dependencies -->
  <PackageVersion Include="MicroBuild.Plugins.SwixBuild.Dotnet" Version="1.1.87-gba258badda" />

diff --git a/src/Aspire.Hosting/OtlpConfigurationExtensions.cs b/src/Aspire.Hosting/OtlpConfigurationExtensions.cs
@@ -63,6 +63,9 @@ public static void AddOtlpEnvironment(IResource resource, IConfiguration configu
 
  // Configure trace sampler to send all traces to the dashboard.
  context.EnvironmentVariables["OTEL_TRACES_SAMPLER"] = "always_on";
+
+ // Disable URL query redaction, e.g. ?myvalue=Redacted
+ context.EnvironmentVariables["OTEL_DOTNET_EXPERIMENTAL_ASPNETCORE_DISABLE_URL_QUERY_REDACTION"] = "true";
  }
  }));
  }

diff --git a/...pire-empty/AspireApplication.1.ServiceDefaults/AspireApplication.1.ServiceDefaults.csproj b/...pire-empty/AspireApplication.1.ServiceDefaults/AspireApplication.1.ServiceDefaults.csproj
@@ -14,8 +14,8 @@
  <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
  <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.0" />
  <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
- <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.0" />
- <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.0" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
  <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
  </ItemGroup>
 

diff --git a/src/Aspire.ProjectTemplates/templates/aspire-servicedefaults/Aspire.ServiceDefaults1.csproj b/src/Aspire.ProjectTemplates/templates/aspire-servicedefaults/Aspire.ServiceDefaults1.csproj
@@ -14,8 +14,8 @@
  <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
  <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.0" />
  <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
- <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.0" />
- <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.0" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
  <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
  </ItemGroup>
 

diff --git a/...ireStarterApplication.1.ServiceDefaults/AspireStarterApplication.1.ServiceDefaults.csproj b/...ireStarterApplication.1.ServiceDefaults/AspireStarterApplication.1.ServiceDefaults.csproj
@@ -14,8 +14,8 @@
  <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="!!REPLACE_WITH_LATEST_VERSION!!" />
  <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.0" />
  <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
- <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.0" />
- <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.0" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
  <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
  </ItemGroup>
 

diff --git a/tests/Aspire.Hosting.Tests/ProjectResourceTests.cs b/tests/Aspire.Hosting.Tests/ProjectResourceTests.cs
@@ -97,6 +97,11 @@ public async Task AddProjectAddsEnvironmentVariablesAndServiceMetadata()
  Assert.Equal("always_on", env.Value);
  },
  env =>
+ {
+ Assert.Equal("OTEL_DOTNET_EXPERIMENTAL_ASPNETCORE_DISABLE_URL_QUERY_REDACTION", env.Key);
+ Assert.Equal("true", env.Value);
+ },
+ env =>
  {
  Assert.Equal("DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION", env.Key);
  Assert.Equal("true", env.Value);