Fix record-level Avro doc

Author: clairemcginty

scio-avro/src/main/scala/com/spotify/scio/avro/types/SchemaProvider.scala

@@ -98,10 +98,14 @@ private[types] object SchemaProvider {
   private def getFields(t: Type): Iterable[(Symbol, Option[String])] =
     t.decls.filter(isField) zip fieldDoc(t)
 
+  // Scala 2.13.17+ resolves annotation type using `com.spotify.scio.avro.doc` alias; previous Scala
+  // versions (and all 2.12 versions) resolve to `com.spotify.scio.avro.types.doc`
+  // See: https://github.com/spotify/scio/issues/5874
+  private val DocTypes = Set("com.spotify.scio.avro.types.doc", "com.spotify.scio.avro.doc")
+
   private def recordDoc(t: Type): Option[String] = {
-    val tpe = "com.spotify.scio.avro.types.doc"
     t.typeSymbol.annotations
-      .find(_.tree.tpe.toString == tpe)
+      .find(a => DocTypes.contains(a.tree.tpe.toString))
       .map { a =>
         val q"new $_($v)" = a.tree: @nowarn
         val Literal(Constant(s)) = v: @nowarn
@@ -110,13 +114,9 @@ private[types] object SchemaProvider {
   }
 
   private def fieldDoc(t: Type): Iterable[Option[String]] = {
-    // Scala 2.13.17+ resolves annotation type using `com.spotify.scio.avro.doc` alias; previous Scala
-    // versions (and all 2.12 versions) resolve to `com.spotify.scio.avro.types.doc`
-    // See: https://github.com/spotify/scio/issues/5874
-    val tpes = Set("com.spotify.scio.avro.types.doc", "com.spotify.scio.avro.doc")
     t.typeSymbol.asClass.primaryConstructor.typeSignature.paramLists.head.map {
       _.annotations
-        .find(a => tpes.contains(a.tree.tpe.toString))
+        .find(a => DocTypes.contains(a.tree.tpe.toString))
         .map { a =>
           val q"new $_($v)" = a.tree: @nowarn
           val Literal(Constant(s)) = v: @nowarn

scio-avro/src/test/scala/com/spotify/scio/avro/AvroTypeTest.scala

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2026 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.spotify.scio.avro
+
+import com.spotify.scio.avro.types.Schemas.parseSchema
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+
+@AvroType.toSchema
+@doc("User record schema")
+case class UserType(@doc("user name") name: String, @doc("user age") age: Int)
+
+// We have to keep this test out of the `com.spotify.scio.avro.types` package to replicate the Scala
+// issue outlined in https://github.com/spotify/scio/issues/5874
+class AvroTypeTest extends AnyFlatSpec with Matchers {
+  "AvroType" should "preserve doc and field-level annotations" in {
+    val userSchema: String =
+      s"""
+         |{
+         |  "type": "record",
+         |  "namespace": "com.spotify.scio.avro",
+         |  "doc": "User record schema",
+         |  "name": "UserType",
+         |  "fields": [
+         |    { "name": "name", "type": "string", "doc": "user name"},
+         |    { "name": "age", "type": "int", "doc": "user age"}
+         |  ]
+         |}
+         |""".stripMargin
+
+    AvroType[UserType].schema.toString shouldBe parseSchema(userSchema).toString
+  }
+}