Update to weaver 0.13.2 and enable javadoc validation(!)

build.gradle.kts

@@ -108,7 +108,7 @@ fun generateTask(taskName: String, incubating: Boolean) {
         "--mount", "type=bind,source=${modelPath},target=/home/weaver/source,readonly",
         "--mount", "type=bind,source=$projectDir/buildscripts/templates,target=/home/weaver/templates,readonly",
         "--mount", "type=bind,source=$projectDir/$outputDir,target=/home/weaver/target",
-        "otel/weaver:v0.12.0",
+        "otel/weaver:v0.13.2",
         "registry", "generate",
         "--registry=/home/weaver/source",
         "--templates=/home/weaver/templates",

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -76,9 +76,7 @@ tasks {
       breakIterator(true)
 
       addBooleanOption("html5", true)
-      // TODO (trask) need to disable html validation until next semconv release
-      //  see https://github.com/open-telemetry/semantic-conventions/pull/1664
-      addBooleanOption("Xdoclint:all,-missing,-html", true)
+      addBooleanOption("Xdoclint:all,-missing", true)
       // non-standard option to fail on warnings, see https://bugs.openjdk.java.net/browse/JDK-8200363
       addStringOption("Xwerror", "-quiet")
     }

buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2

@@ -37,7 +37,7 @@ import java.util.List;
 @SuppressWarnings("unused")
 public final class {{ my_class_name }} {
     {% for attribute in ctx.attributes | rejectattr("name", "in", ctx.excluded_attributes) %}{% if attribute is experimental %}
-    {%- if attribute is deprecated %}{%- set deprecated_javadoc = "@deprecated " ~ attribute.deprecated -%}
+    {%- if attribute is deprecated %}{%- set deprecated_javadoc = "@deprecated " ~ attribute.deprecated.note -%}
     {%- else -%}{%- set deprecated_javadoc = "" -%}
     {%- endif -%}
     {{ [attribute.brief, concat_if("\n\nNotes:\n\n", attribute.note), deprecated_javadoc] | comment(indent=4) }}
@@ -58,7 +58,7 @@ public final class {{ my_class_name }} {
      *  @deprecated deprecated in favor of stable {@link {{stable_class_link}}}.
      */
     {%- elif attribute is deprecated -%}
-    {{ ["Values for {@link #" ~ attribute.name | screaming_snake_case ~ "}", "@deprecated " ~ attribute.deprecated ] | comment }}
+    {{ ["Values for {@link #" ~ attribute.name | screaming_snake_case ~ "}", "@deprecated " ~ attribute.deprecated.note ] | comment }}
     {%- else -%}
     /** Values for {@link #{{ attribute.name | screaming_snake_case }}}. */
     {%- endif -%}

buildscripts/templates/registry/java/SemanticAttributes.java.j2

@@ -38,7 +38,7 @@ import java.util.List;
 public final class {{ my_class_name }} {
     {% for attribute in ctx.attributes | rejectattr("name", "in", ctx.excluded_attributes) %}{% if attribute is stable %}
     {%- if attribute is deprecated %}
-    {%- set deprecated_javadoc = "@deprecated " ~ attribute.deprecated -%}
+    {%- set deprecated_javadoc = "@deprecated " ~ attribute.deprecated.note -%}
     {%- endif -%}
     {{ [attribute.brief, concat_if("\n\nNotes:\n\n", attribute.note), deprecated_javadoc] | comment(indent=4) }}
     {% if attribute is deprecated %}@Deprecated{% endif %} public static final {{ to_java_key_type(attribute) | trim }} {{ attribute.name | screaming_snake_case }} = {{ to_java_key_factory(attribute) | trim }}("{{ attribute.name }}");

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AndroidIncubatingAttributes.java

@@ -30,8 +30,6 @@ public final class AndroidIncubatingAttributes {
    * href="https://developer.android.com/guide/components/activities/activity-lifecycle#lc">Activity
    * lifecycle callbacks</a>, and from which the {@code OS identifiers} are derived.
    *
-   * <p>
-   *
    * @deprecated Replaced by {@code device.app.lifecycle}.
    */
   @Deprecated public static final AttributeKey<String> ANDROID_STATE = stringKey("android.state");

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ClientIncubatingAttributes.java

@@ -24,8 +24,6 @@ public final class ClientIncubatingAttributes {
    * client.address} SHOULD represent the client address behind any intermediaries, for example
    * proxies, if it's available.
    *
-   * <p>
-   *
    * @deprecated deprecated in favor of stable {@link
    *     io.opentelemetry.semconv.ClientAttributes#CLIENT_ADDRESS} attribute.
    */
@@ -40,8 +38,6 @@ public final class ClientIncubatingAttributes {
    * client.port} SHOULD represent the client port behind any intermediaries, for example proxies,
    * if it's available.
    *
-   * <p>
-   *
    * @deprecated deprecated in favor of stable {@link
    *     io.opentelemetry.semconv.ClientAttributes#CLIENT_PORT} attribute.
    */

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CodeIncubatingAttributes.java

@@ -17,8 +17,6 @@ public final class CodeIncubatingAttributes {
   /**
    * Deprecated, use {@code code.column.number}
    *
-   * <p>
-   *
    * @deprecated Replaced by {@code code.column.number}
    */
   @Deprecated public static final AttributeKey<Long> CODE_COLUMN = longKey("code.column");
@@ -41,8 +39,6 @@ public final class CodeIncubatingAttributes {
   /**
    * Deprecated, use {@code code.function.name} instead
    *
-   * <p>
-   *
    * @deprecated Replaced by {@code code.function.name}
    */
   @Deprecated public static final AttributeKey<String> CODE_FUNCTION = stringKey("code.function");
@@ -61,8 +57,6 @@ public final class CodeIncubatingAttributes {
   /**
    * Deprecated, use {@code code.line.number} instead
    *
-   * <p>
-   *
    * @deprecated Replaced by {@code code.line.number}
    */
   @Deprecated public static final AttributeKey<Long> CODE_LINENO = longKey("code.lineno");

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ContainerIncubatingAttributes.java

@@ -38,8 +38,6 @@ public final class ContainerIncubatingAttributes {
   /**
    * Deprecated, use {@code cpu.mode} instead.
    *
-   * <p>
-   *
    * @deprecated Replaced by {@code cpu.mode}
    */
   @Deprecated
@@ -127,8 +125,6 @@ public final class ContainerIncubatingAttributes {
   /**
    * Deprecated, use {@code container.label} instead.
    *
-   * <p>
-   *
    * @deprecated Replaced by {@code container.label}.
    */
   @Deprecated