Commit codegen changes from upgrade

Author: jack-berg

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

@@ -29,20 +29,11 @@ public final class AndroidIncubatingAttributes {
    * <p>The Android lifecycle states are defined in <a
    * 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");
+  public static final AttributeKey<String> ANDROID_STATE = stringKey("android.state");
 
   // Enum definitions
-  /**
-   * Values for {@link #ANDROID_STATE}
-   *
-   * @deprecated Replaced by {@code device.app.lifecycle}.
-   */
-  @Deprecated
+  /** Values for {@link #ANDROID_STATE}. */
   public static final class AndroidStateIncubatingValues {
     /**
      * Any time before Activity.onResume() or, if the app has no Activity, Context.startService()

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

@@ -14,14 +14,8 @@
 // buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2
 @SuppressWarnings("unused")
 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");
+  /** Deprecated, use {@code code.column.number} */
+  public static final AttributeKey<Long> CODE_COLUMN = longKey("code.column");
 
   /**
    * The column number in {@code code.file.path} best representing the operation. It SHOULD point
@@ -38,14 +32,8 @@ public final class CodeIncubatingAttributes {
   /** Deprecated, use {@code code.file.path} instead */
   public static final AttributeKey<String> CODE_FILEPATH = stringKey("code.filepath");
 
-  /**
-   * 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");
+  /** Deprecated, use {@code code.function.name} instead */
+  public static final AttributeKey<String> CODE_FUNCTION = stringKey("code.function");
 
   /**
    * The method or function name, or equivalent (usually rightmost part of the code unit's name).
@@ -58,14 +46,8 @@ public final class CodeIncubatingAttributes {
    */
   public static final AttributeKey<Long> CODE_LINE_NUMBER = longKey("code.line.number");
 
-  /**
-   * 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");
+  /** Deprecated, use {@code code.line.number} instead */
+  public static final AttributeKey<Long> CODE_LINENO = longKey("code.lineno");
 
   /**
    * The "namespace" within which {@code code.function.name} is defined. Usually the qualified class

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

@@ -35,14 +35,7 @@ public final class ContainerIncubatingAttributes {
   public static final AttributeKey<String> CONTAINER_COMMAND_LINE =
       stringKey("container.command_line");
 
-  /**
-   * Deprecated, use {@code cpu.mode} instead.
-   *
-   * <p>
-   *
-   * @deprecated Replaced by {@code cpu.mode}
-   */
-  @Deprecated
+  /** Deprecated, use {@code cpu.mode} instead. */
   public static final AttributeKey<String> CONTAINER_CPU_STATE = stringKey("container.cpu.state");
 
   /**
@@ -124,14 +117,7 @@ public final class ContainerIncubatingAttributes {
   public static final AttributeKeyTemplate<String> CONTAINER_LABEL =
       stringKeyTemplate("container.label");
 
-  /**
-   * Deprecated, use {@code container.label} instead.
-   *
-   * <p>
-   *
-   * @deprecated Replaced by {@code container.label}.
-   */
-  @Deprecated
+  /** Deprecated, use {@code container.label} instead. */
   public static final AttributeKeyTemplate<String> CONTAINER_LABELS =
       stringKeyTemplate("container.labels");
 
@@ -142,12 +128,7 @@ public final class ContainerIncubatingAttributes {
   public static final AttributeKey<String> CONTAINER_RUNTIME = stringKey("container.runtime");
 
   // Enum definitions
-  /**
-   * Values for {@link #CONTAINER_CPU_STATE}
-   *
-   * @deprecated Replaced by {@code cpu.mode}
-   */
-  @Deprecated
+  /** Values for {@link #CONTAINER_CPU_STATE}. */
   public static final class ContainerCpuStateIncubatingValues {
     /**
      * When tasks of the cgroup are in user mode (Linux). When all container processes are in user