Merge branch 'main' into wcf-error-errorhandler

AngleOSaxon · web-flow · commit d64ffa959e3c · 2025-07-23T20:32:18.000-04:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -37,7 +37,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/init@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
         with:
           languages: ${{ matrix.language }}
 
@@ -48,4 +48,4 @@ jobs:
         run: dotnet pack opentelemetry-dotnet-contrib.proj --configuration Release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/analyze@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
         with:
           sarif_file: results.sarif
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -218,8 +218,8 @@ shipped through CI.
 > [!NOTE]
 > It is generally helpful to reference a previous pull request when adding a new
   project to the repository. A good example to follow is the pull request which
-  added the `OpenTelemetry.Resources.OperatingSystem` project:
-  [#1943](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1943).
+  added the `OpenTelemetry.OpAmp.Client` project:
+  [#2917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2917).
 
 * Based on what your project is, you may need to depend on the [OpenTelemetry
   SDK](https://www.nuget.org/packages/OpenTelemetry) or the [OpenTelemetry
diff --git a/README.md b/README.md
@@ -79,6 +79,7 @@ repository](https://github.com/open-telemetry/community/blob/main/guides/contrib
 
 [@open-telemetry/dotnet-contrib-approvers](https://github.com/orgs/open-telemetry/teams/dotnet-contrib-approvers):
 
+* [Martin Costello](https://github.com/martincostello), Grafana Labs
 * [Mikel Blanchard](https://github.com/CodeBlanch), Microsoft
 * [Timothy "Mothra" Lee](https://github.com/TimothyMothra)
 
diff --git a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/ActivityHelper.cs b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/ActivityHelper.cs
@@ -7,6 +7,7 @@
 using OpenTelemetry.Context;
 using OpenTelemetry.Context.Propagation;
 using OpenTelemetry.Internal;
+using OpenTelemetry.Trace;
 
 namespace OpenTelemetry.Instrumentation.AspNet;
 
@@ -68,7 +69,7 @@ public static bool HasStarted(HttpContext context, out Activity? aspNetActivity)
         {
             tags = cachedTagsStorage ??= new KeyValuePair<string, object?>[1];
 
-            tags[0] = new KeyValuePair<string, object?>("url.path", path);
+            tags[0] = new KeyValuePair<string, object?>(SemanticConventions.AttributeUrlPath, path);
         }
         else
         {
diff --git a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/AspNetTelemetryEventSource.cs b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/AspNetTelemetryEventSource.cs
@@ -14,7 +14,7 @@ namespace OpenTelemetry.Instrumentation.AspNet;
 internal sealed class AspNetTelemetryEventSource : EventSource
 {
     /// <summary>
-    /// Instance of the PlatformEventSource class.
+    /// Instance of the AspNetTelemetryEventSource class.
     /// </summary>
     public static readonly AspNetTelemetryEventSource Log = new();
 
diff --git a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.csproj b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.csproj
@@ -19,6 +19,7 @@
     <Compile Include="$(RepoRoot)\src\Shared\AssemblyVersionExtensions.cs" Link="Includes\AssemblyVersionExtensions.cs" />
     <Compile Include="$(RepoRoot)\src\Shared\ExceptionExtensions.cs" Link="Includes\ExceptionExtensions.cs" />
     <Compile Include="$(RepoRoot)\src\Shared\Guard.cs" Link="Includes\Guard.cs" />
+    <Compile Include="$(RepoRoot)\src\Shared\SemanticConventions.cs" Link="Includes\SemanticConventions.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/TelemetryHttpModule.cs b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/TelemetryHttpModule.cs
@@ -34,7 +34,7 @@ public class TelemetryHttpModule : IHttpModule
     /// <summary>
     /// Gets the <see cref="TelemetryHttpModuleOptions"/> applied to requests processed by the handler.
     /// </summary>
-    public static TelemetryHttpModuleOptions Options { get; } = new TelemetryHttpModuleOptions();
+    public static TelemetryHttpModuleOptions Options { get; } = new();
 
     /// <inheritdoc />
     public void Dispose()
diff --git a/src/OpenTelemetry.Instrumentation.AspNet/AspNetInstrumentationMeterProviderBuilderExtensions.cs b/src/OpenTelemetry.Instrumentation.AspNet/AspNetInstrumentationMeterProviderBuilderExtensions.cs
@@ -40,12 +40,12 @@ public static MeterProviderBuilder AddAspNetInstrumentation(
                 services.Configure(configure);
             }
 
-            services.ConfigureOpenTelemetryMeterProvider((sp, builder) =>
+            services.ConfigureOpenTelemetryMeterProvider((sp, meterProviderBuilder) =>
             {
                 var options = sp.GetRequiredService<IOptionsMonitor<AspNetMetricsInstrumentationOptions>>().Get(name: null);
 
-                builder.AddInstrumentation(() => new AspNetMetrics(options));
-                builder.AddMeter(AspNetMetrics.InstrumentationName);
+                meterProviderBuilder.AddInstrumentation(() => new AspNetMetrics(options));
+                meterProviderBuilder.AddMeter(AspNetMetrics.InstrumentationName);
             });
         });
     }
diff --git a/src/OpenTelemetry.Instrumentation.AspNet/AspNetInstrumentationTracerProviderBuilderExtensions.cs b/src/OpenTelemetry.Instrumentation.AspNet/AspNetInstrumentationTracerProviderBuilderExtensions.cs
@@ -43,12 +43,12 @@ public static TracerProviderBuilder AddAspNetInstrumentation(
             services.RegisterOptionsFactory(
                 configuration => new AspNetTraceInstrumentationOptions(configuration));
 
-            services.ConfigureOpenTelemetryTracerProvider((sp, builder) =>
+            services.ConfigureOpenTelemetryTracerProvider((sp, tracerProviderBuilder) =>
             {
                 var options = sp.GetRequiredService<IOptionsMonitor<AspNetTraceInstrumentationOptions>>().Get(name: null);
 
-                builder.AddInstrumentation(() => new AspNetInstrumentation(options));
-                builder.AddSource(TelemetryHttpModule.AspNetSourceName);
+                tracerProviderBuilder.AddInstrumentation(() => new AspNetInstrumentation(options));
+                tracerProviderBuilder.AddSource(TelemetryHttpModule.AspNetSourceName);
             });
         });
     }
diff --git a/src/OpenTelemetry.Instrumentation.AspNet/Implementation/HttpInListener.cs b/src/OpenTelemetry.Instrumentation.AspNet/Implementation/HttpInListener.cs
@@ -41,7 +41,7 @@ private void OnStartActivity(Activity activity, HttpContext context)
         {
             try
             {
-                // todo: Ideally we would also check
+                // TODO Ideally we would also check
                 // Sdk.SuppressInstrumentation here to prevent tagging a
                 // span that will not be collected, but we can't do that
                 // without an SDK reference. Need the spec to come around on
@@ -82,7 +82,6 @@ private void OnStartActivity(Activity activity, HttpContext context)
                 activity.SetTag(SemanticConventions.AttributeNetworkProtocolVersion, protocolVersion);
             }
 
-            // TODO url.query should be sanitized
             var query = url.Query;
             if (!string.IsNullOrEmpty(query))
             {
diff --git a/src/OpenTelemetry.Instrumentation.AspNet/Implementation/HttpRequestRouteHelper.cs b/src/OpenTelemetry.Instrumentation.AspNet/Implementation/HttpRequestRouteHelper.cs
@@ -28,7 +28,7 @@ internal sealed class HttpRequestRouteHelper
         {
             // WebAPI attribute routing flows here. Use reflection to not take a dependency on microsoft.aspnet.webapi.core\[version]\lib\[framework]\System.Web.Http.
 
-            if (msSubRoutes is Array attributeRouting && attributeRouting.Length >= 1)
+            if (msSubRoutes is Array { Length: >= 1 } attributeRouting)
             {
                 // There could be more than one subroute, each with a different method.
                 // But the template is the same across them, so we simply take the template
diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreTraceInstrumentationOptions.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreTraceInstrumentationOptions.cs
@@ -41,8 +41,8 @@ internal AspNetCoreTraceInstrumentationOptions(IConfiguration configuration)
     }
 
     /// <summary>
-    /// Gets or sets a filter function that determines whether or not to
-    /// collect telemetry on a per request basis.
+    /// Gets or sets a filter function that determines whether to
+    /// collect telemetry on a per-request basis.
     /// </summary>
     /// <remarks>
     /// Notes:
diff --git a/src/Shared/Options/DelegatingOptionsFactoryServiceCollectionExtensions.cs b/src/Shared/Options/DelegatingOptionsFactoryServiceCollectionExtensions.cs
@@ -28,7 +28,7 @@ public static IServiceCollection RegisterOptionsFactory<T>(
         services!.TryAddSingleton<IOptionsFactory<T>>(sp =>
         {
             return new DelegatingOptionsFactory<T>(
-                (c, n) => optionsFactoryFunc!(c),
+                (c, _) => optionsFactoryFunc!(c),
                 sp.GetRequiredService<IConfiguration>(),
                 sp.GetServices<IConfigureOptions<T>>(),
                 sp.GetServices<IPostConfigureOptions<T>>(),
diff --git a/test/Shared/TestTextMapPropagator.cs b/test/Shared/TestTextMapPropagator.cs
@@ -21,7 +21,6 @@ public override PropagationContext Extract<T>(PropagationContext context, T carr
 
     public override void Inject<T>(PropagationContext context, T carrier, Action<T, string, string> setter)
     {
-        var newAction = new Action<T, string, string>((c, k, v) => setter(c, k, v));
         this.OnInject?.Invoke(
             context,
             carrier!,

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using OpenTelemetry.Context;`
`8`	`8`	`using OpenTelemetry.Context.Propagation;`
`9`	`9`	`using OpenTelemetry.Internal;`
	`10`	`+using OpenTelemetry.Trace;`
`10`	`11`
`11`	`12`	`namespace OpenTelemetry.Instrumentation.AspNet;`
`12`	`13`
`@@ -68,7 +69,7 @@ public static bool HasStarted(HttpContext context, out Activity? aspNetActivity)`
`68`	`69`	`{`
`69`	`70`	`tags = cachedTagsStorage ??= new KeyValuePair<string, object?>[1];`
`70`	`71`
`71`		`- tags[0] = new KeyValuePair<string, object?>("url.path", path);`
	`72`	`+ tags[0] = new KeyValuePair<string, object?>(SemanticConventions.AttributeUrlPath, path);`
`72`	`73`	`}`
`73`	`74`	`else`
`74`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace OpenTelemetry.Instrumentation.AspNet;`
`14`	`14`	`internal sealed class AspNetTelemetryEventSource : EventSource`
`15`	`15`	`{`
`16`	`16`	`/// <summary>`
`17`		`- /// Instance of the PlatformEventSource class.`
	`17`	`+ /// Instance of the AspNetTelemetryEventSource class.`
`18`	`18`	`/// </summary>`
`19`	`19`	`public static readonly AspNetTelemetryEventSource Log = new();`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ public static MeterProviderBuilder AddAspNetInstrumentation(`
`40`	`40`	`services.Configure(configure);`
`41`	`41`	`}`
`42`	`42`
`43`		`- services.ConfigureOpenTelemetryMeterProvider((sp, builder) =>`
	`43`	`+ services.ConfigureOpenTelemetryMeterProvider((sp, meterProviderBuilder) =>`
`44`	`44`	`{`
`45`	`45`	`var options = sp.GetRequiredService<IOptionsMonitor<AspNetMetricsInstrumentationOptions>>().Get(name: null);`
`46`	`46`
`47`		`- builder.AddInstrumentation(() => new AspNetMetrics(options));`
`48`		`- builder.AddMeter(AspNetMetrics.InstrumentationName);`
	`47`	`+ meterProviderBuilder.AddInstrumentation(() => new AspNetMetrics(options));`
	`48`	`+ meterProviderBuilder.AddMeter(AspNetMetrics.InstrumentationName);`
`49`	`49`	`});`
`50`	`50`	`});`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,12 @@ public static TracerProviderBuilder AddAspNetInstrumentation(`
`43`	`43`	`services.RegisterOptionsFactory(`
`44`	`44`	`configuration => new AspNetTraceInstrumentationOptions(configuration));`
`45`	`45`
`46`		`- services.ConfigureOpenTelemetryTracerProvider((sp, builder) =>`
	`46`	`+ services.ConfigureOpenTelemetryTracerProvider((sp, tracerProviderBuilder) =>`
`47`	`47`	`{`
`48`	`48`	`var options = sp.GetRequiredService<IOptionsMonitor<AspNetTraceInstrumentationOptions>>().Get(name: null);`
`49`	`49`
`50`		`- builder.AddInstrumentation(() => new AspNetInstrumentation(options));`
`51`		`- builder.AddSource(TelemetryHttpModule.AspNetSourceName);`
	`50`	`+ tracerProviderBuilder.AddInstrumentation(() => new AspNetInstrumentation(options));`
	`51`	`+ tracerProviderBuilder.AddSource(TelemetryHttpModule.AspNetSourceName);`
`52`	`52`	`});`
`53`	`53`	`});`
`54`	`54`	`}`