Merge remote-tracking branch 'origin/master' into develop

src/GraphQL.ApiTests/net50/GraphQL.approved.txt

@@ -572,6 +572,11 @@ namespace GraphQL
  public bool TryRetrieve(TKey key, out TValue? value) { }
  public void WithValue(TKey key, System.Action<TValue> action) { }
  }
+ [System.AttributeUsage(System.AttributeTargets.Class, AllowMultiple=false, Inherited=true)]
+ public sealed class MapAutoClrTypeAttribute : System.Attribute
+ {
+ public MapAutoClrTypeAttribute() { }
+ }
  public static class MemoryExtensions
  {
  public static System.Collections.Generic.IList<T> Constrained<T>(this T[] array, int count) { }

src/GraphQL.ApiTests/net60/GraphQL.approved.txt

@@ -572,6 +572,11 @@ namespace GraphQL
  public bool TryRetrieve(TKey key, out TValue? value) { }
  public void WithValue(TKey key, System.Action<TValue> action) { }
  }
+ [System.AttributeUsage(System.AttributeTargets.Class, AllowMultiple=false, Inherited=true)]
+ public sealed class MapAutoClrTypeAttribute : System.Attribute
+ {
+ public MapAutoClrTypeAttribute() { }
+ }
  public static class MemoryExtensions
  {
  public static System.Collections.Generic.IList<T> Constrained<T>(this T[] array, int count) { }

src/GraphQL.ApiTests/netstandard20+netstandard21/GraphQL.approved.txt

@@ -548,6 +548,11 @@ namespace GraphQL
  public bool TryRetrieve(TKey key, out TValue? value) { }
  public void WithValue(TKey key, System.Action<TValue> action) { }
  }
+ [System.AttributeUsage(System.AttributeTargets.Class, AllowMultiple=false, Inherited=true)]
+ public sealed class MapAutoClrTypeAttribute : System.Attribute
+ {
+ public MapAutoClrTypeAttribute() { }
+ }
  public static class MemoryExtensions
  {
  public static System.Collections.Generic.IList<T> Constrained<T>(this T[] array, int count) { }

src/GraphQL/Attributes/MapAutoClrTypeAttribute.cs

@@ -0,0 +1,12 @@
+namespace GraphQL;
+
+/// <summary>
+/// Indicates that <see cref="GraphQLBuilderExtensions.AddAutoClrMappings(DI.IGraphQLBuilder, bool, bool)"/>
+/// should include this class when creating auto CLR type mappings, even when <c>mapInputTypes</c>
+/// or <c>mapOutputTypes</c> is <see langword="false"/>.
+/// This attribute should be placed on the CLR type that comprises the mapping.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+public sealed class MapAutoClrTypeAttribute : Attribute
+{
+}

src/GraphQL/Extensions/GraphQLBuilderExtensions.cs

@@ -1101,6 +1101,15 @@ public static IGraphQLBuilder AddExecutionStrategy<TExecutionStrategy>(this IGra
  /// </summary>
  /// <remarks>
  /// When applicable, place after calls to UseAutomaticPersistedQueries to ensure that the query document is recorded properly.
+ /// <br/>
+ /// To instruct OpenTelemetry SDK to collect the traces produced by GraphQL.NET register the
+ /// '<see cref="GraphQLTelemetryProvider.SourceName"/>' source name with the TracerProviderBuilder.
+ /// <code>
+ /// services
+ /// .AddOpenTelemetry()
+ /// .WithTracing(tracing =&gt; tracing
+ /// .AddSource(GraphQLTelemetryProvider.SourceName));
+ /// </code>
  /// </remarks>
  public static IGraphQLBuilder UseTelemetry(this IGraphQLBuilder builder, Action<GraphQLTelemetryOptions>? configure = null)
  => UseTelemetry<GraphQLTelemetryProvider>(builder, configure);

src/GraphQL/Types/Collections/AutoRegisteringGraphTypeMappingProvider.cs

@@ -1,3 +1,5 @@
+using System.Reflection;
+
 namespace GraphQL.Types;
 
 /// <summary>
@@ -40,8 +42,8 @@ public AutoRegisteringGraphTypeMappingProvider(bool mapInputTypes, bool mapOutpu
  if (preferredType != null)
  return preferredType;
 
- if (isInputType && !_mapInputTypes ||
- !isInputType && !_mapOutputTypes ||
+ if (isInputType && !_mapInputTypes && !IsForcedType(clrType) ||
+ !isInputType && !_mapOutputTypes && !IsForcedType(clrType) ||
  clrType.IsEnum ||
  SchemaTypes.BuiltInScalarMappings.ContainsKey(clrType))
  return null;
@@ -58,5 +60,7 @@ public AutoRegisteringGraphTypeMappingProvider(bool mapInputTypes, bool mapOutpu
  {
  return typeof(AutoRegisteringObjectGraphType<>).MakeGenericType(clrType);
  }
+
+ static bool IsForcedType(Type type) => type.GetCustomAttribute<MapAutoClrTypeAttribute>() != null;
  }
 }