Update to semantic-conventions 1.25.0 (#61)

Author: jack-berg

build.gradle.kts

@@ -11,9 +11,10 @@ val snapshot = true
 // end
 
 // The release version of https://github.com/open-telemetry/semantic-conventions used to generate classes
-var semanticConventionsVersion = "1.24.0"
+var semanticConventionsVersion = "1.25.0"
 val schemaUrlVersions = listOf(
     semanticConventionsVersion,
+    "1.24.0",
     "1.23.1",
     "1.22.0")
 
@@ -52,7 +53,7 @@ nexusPublishing {
 
 // start - define tasks to download, unzip, and generate from opentelemetry/semantic-conventions
 var generatorVersion = "0.24.0"
-val semanticConventionsRepoZip = "https://github.com/open-telemetry/semantic-conventions/archive/v$semanticConventionsVersion.zip"
+val semanticConventionsRepoZip = "https://github.com/open-telemetry/semantic-conventions/archive/v${semanticConventionsVersion}.zip"
 val schemaUrl = "https://opentelemetry.io/schemas/$semanticConventionsVersion"
 
 val downloadSemanticConventions by tasks.registering(Download::class) {

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

@@ -43,7 +43,7 @@ public final class AwsIncubatingAttributes {
       stringKey("aws.dynamodb.exclusive_start_table");
 
   /**
-   * The JSON-serialized value of each item in the the {@code GlobalSecondaryIndexUpdates} request
+   * The JSON-serialized value of each item in the {@code GlobalSecondaryIndexUpdates} request
    * field.
    */
   public static final AttributeKey<List<String>> AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES =
@@ -94,7 +94,7 @@ public final class AwsIncubatingAttributes {
   /** The value of the {@code Select} request parameter. */
   public static final AttributeKey<String> AWS_DYNAMODB_SELECT = stringKey("aws.dynamodb.select");
 
-  /** The the number of items in the {@code TableNames} response parameter. */
+  /** The number of items in the {@code TableNames} response parameter. */
   public static final AttributeKey<Long> AWS_DYNAMODB_TABLE_COUNT =
       longKey("aws.dynamodb.table_count");
 
@@ -129,16 +129,23 @@ public final class AwsIncubatingAttributes {
   public static final AttributeKey<String> AWS_ECS_LAUNCHTYPE = stringKey("aws.ecs.launchtype");
 
   /**
-   * The ARN of an <a
-   * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html">ECS
-   * task definition</a>.
+   * The ARN of a running <a
+   * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-account-settings.html#ecs-resource-ids">ECS
+   * task</a>.
    */
   public static final AttributeKey<String> AWS_ECS_TASK_ARN = stringKey("aws.ecs.task.arn");
 
-  /** The task definition family this task definition is a member of. */
+  /**
+   * The family name of the <a
+   * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html">ECS
+   * task definition</a> used to create the ECS task.
+   */
   public static final AttributeKey<String> AWS_ECS_TASK_FAMILY = stringKey("aws.ecs.task.family");
 
-  /** The revision for this task definition. */
+  /** The ID of a running ECS task. The ID MUST be extracted from {@code task.arn}. */
+  public static final AttributeKey<String> AWS_ECS_TASK_ID = stringKey("aws.ecs.task.id");
+
+  /** The revision for the task definition used to create the ECS task. */
   public static final AttributeKey<String> AWS_ECS_TASK_REVISION =
       stringKey("aws.ecs.task.revision");
 

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

@@ -131,6 +131,9 @@ public static final class CloudPlatformValues {
     /** Azure Virtual Machines. */
     public static final String AZURE_VM = "azure_vm";
 
+    /** Azure Container Apps. */
+    public static final String AZURE_CONTAINER_APPS = "azure_container_apps";
+
     /** Azure Container Instances. */
     public static final String AZURE_CONTAINER_INSTANCES = "azure_container_instances";
 

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

@@ -40,6 +40,9 @@ public final class ContainerIncubatingAttributes {
   public static final AttributeKey<String> CONTAINER_COMMAND_LINE =
       stringKey("container.command_line");
 
+  /** The CPU state for this data point. */
+  public static final AttributeKey<String> CONTAINER_CPU_STATE = stringKey("container.cpu.state");
+
   /**
    * Container ID. Usually a UUID, as for example used to <a
    * href="https://docs.docker.com/engine/reference/run/#container-identification">identify Docker
@@ -95,6 +98,15 @@ public final class ContainerIncubatingAttributes {
       stringArrayKey("container.image.tags");
 
   /** Container labels, {@code <key>} being the label name, the value being the label value. */
+  public static final AttributeKeyTemplate<String> CONTAINER_LABEL =
+      stringKeyTemplate("container.label");
+
+  /**
+   * Deprecated, use {@code container.label} instead.
+   *
+   * @deprecated Deprecated, use `container.label` instead.
+   */
+  @Deprecated
   public static final AttributeKeyTemplate<String> CONTAINER_LABELS =
       stringKeyTemplate("container.labels");
 
@@ -104,5 +116,26 @@ public final class ContainerIncubatingAttributes {
   /** The container runtime managing this container. */
   public static final AttributeKey<String> CONTAINER_RUNTIME = stringKey("container.runtime");
 
+  // Enum definitions
+  /** Values for {@link #CONTAINER_CPU_STATE}. */
+  public static final class ContainerCpuStateValues {
+    /**
+     * When tasks of the cgroup are in user mode (Linux). When all container processes are in user
+     * mode (Windows).
+     */
+    public static final String USER = "user";
+
+    /** When CPU is used by the system (host OS). */
+    public static final String SYSTEM = "system";
+
+    /**
+     * When tasks of the cgroup are in kernel mode (Linux). When all container processes are in
+     * kernel mode (Windows).
+     */
+    public static final String KERNEL = "kernel";
+
+    private ContainerCpuStateValues() {}
+  }
+
   private ContainerIncubatingAttributes() {}
 }

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

@@ -65,9 +65,11 @@ public final class DbIncubatingAttributes {
   public static final AttributeKey<String> DB_CASSANDRA_TABLE = stringKey("db.cassandra.table");
 
   /**
-   * The connection string used to connect to the database. It is recommended to remove embedded
-   * credentials.
+   * Deprecated, use {@code server.address}, {@code server.port} attributes instead.
+   *
+   * @deprecated Deprecated, use `server.address`, `server.port` attributes instead.
    */
+  @Deprecated
   public static final AttributeKey<String> DB_CONNECTION_STRING = stringKey("db.connection_string");
 
   /** Unique Cosmos client instance id. */
@@ -107,8 +109,11 @@ public final class DbIncubatingAttributes {
       stringKey("db.elasticsearch.cluster.name");
 
   /**
-   * Represents the human-readable identifier of the node/instance to which a request was routed.
+   * Deprecated, use {@code db.instance.id} instead.
+   *
+   * @deprecated Deprecated, use `db.instance.id` instead.
    */
+  @Deprecated
   public static final AttributeKey<String> DB_ELASTICSEARCH_NODE_NAME =
       stringKey("db.elasticsearch.node.name");
 
@@ -138,10 +143,11 @@ public final class DbIncubatingAttributes {
   public static final AttributeKey<String> DB_INSTANCE_ID = stringKey("db.instance.id");
 
   /**
-   * The fully-qualified class name of the <a
-   * href="https://docs.oracle.com/javase/8/docs/technotes/guides/jdbc/">Java Database Connectivity
-   * (JDBC)</a> driver used to connect.
+   * Removed, no replacement at this time.
+   *
+   * @deprecated Removed, no replacement at this time.
    */
+  @Deprecated
   public static final AttributeKey<String> DB_JDBC_DRIVER_CLASSNAME =
       stringKey("db.jdbc.driver_classname");
 

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

@@ -20,10 +20,10 @@ public final class DnsIncubatingAttributes {
    * <p>Notes:
    *
    * <ul>
-   *   <li>The name being queried. If the name field contains non-printable characters (below 32 or
-   *       above 126), those characters should be represented as escaped base 10 integers (\DDD).
-   *       Back slashes and quotes should be escaped. Tabs, carriage returns, and line feeds should
-   *       be converted to \t, \r, and \n respectively.
+   *   <li>If the name field contains non-printable characters (below 32 or above 126), those
+   *       characters should be represented as escaped base 10 integers (\DDD). Back slashes and
+   *       quotes should be escaped. Tabs, carriage returns, and line feeds should be converted to
+   *       \t, \r, and \n respectively.
    * </ul>
    */
   public static final AttributeKey<String> DNS_QUESTION_NAME = stringKey("dns.question.name");

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

@@ -21,7 +21,7 @@ public final class EventIncubatingAttributes {
    *
    * <ul>
    *   <li>Event names are subject to the same rules as <a
-   *       href="https://github.com/open-telemetry/opentelemetry-specification/tree/v1.26.0/specification/common/attribute-naming.md">attribute
+   *       href="https://github.com/open-telemetry/opentelemetry-specification/tree/v1.31.0/specification/common/attribute-naming.md">attribute
    *       names</a>. Notably, event names are namespaced to avoid collisions and provide a clean
    *       separation of semantics for events in separate domains like browser, mobile, and
    *       kubernetes.

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

@@ -35,23 +35,40 @@ public final class ExceptionIncubatingAttributes {
    *       exception.escaped} attribute was not set or set to false, since the event might have been
    *       recorded at a time where it was not clear whether the exception will escape.
    * </ul>
+   *
+   * @deprecated deprecated in favor of stable {@link
+   *     io.opentelemetry.semconv.ExceptionAttributes#EXCEPTION_ESCAPED} attribute.
    */
+  @Deprecated
   public static final AttributeKey<Boolean> EXCEPTION_ESCAPED = booleanKey("exception.escaped");
 
-  /** The exception message. */
+  /**
+   * The exception message.
+   *
+   * @deprecated deprecated in favor of stable {@link
+   *     io.opentelemetry.semconv.ExceptionAttributes#EXCEPTION_MESSAGE} attribute.
+   */
+  @Deprecated
   public static final AttributeKey<String> EXCEPTION_MESSAGE = stringKey("exception.message");
 
   /**
    * A stacktrace as a string in the natural representation for the language runtime. The
    * representation is to be determined and documented by each language SIG.
+   *
+   * @deprecated deprecated in favor of stable {@link
+   *     io.opentelemetry.semconv.ExceptionAttributes#EXCEPTION_STACKTRACE} attribute.
    */
+  @Deprecated
   public static final AttributeKey<String> EXCEPTION_STACKTRACE = stringKey("exception.stacktrace");
 
   /**
    * The type of the exception (its fully-qualified class name, if applicable). The dynamic type of
    * the exception should be preferred over the static type in languages that support it.
+   *
+   * @deprecated deprecated in favor of stable {@link
+   *     io.opentelemetry.semconv.ExceptionAttributes#EXCEPTION_TYPE} attribute.
    */
-  public static final AttributeKey<String> EXCEPTION_TYPE = stringKey("exception.type");
+  @Deprecated public static final AttributeKey<String> EXCEPTION_TYPE = stringKey("exception.type");
 
   private ExceptionIncubatingAttributes() {}
 }

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.semconv.incubating;
+
+import static io.opentelemetry.api.common.AttributeKey.longKey;
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
+
+import io.opentelemetry.api.common.AttributeKey;
+
+// DO NOT EDIT, this is an Auto-generated file from
+// buildscripts/templates/SemanticAttributes.java.j2
+@SuppressWarnings("unused")
+public final class FileIncubatingAttributes {
+
+  /** Directory where the file is located. It should include the drive letter, when appropriate. */
+  public static final AttributeKey<String> FILE_DIRECTORY = stringKey("file.directory");
+
+  /**
+   * File extension, excluding the leading dot.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>When the file name has multiple extensions (example.tar.gz), only the last one should be
+   *       captured (&quot;gz&quot;, not &quot;tar.gz&quot;).
+   * </ul>
+   */
+  public static final AttributeKey<String> FILE_EXTENSION = stringKey("file.extension");
+
+  /** Name of the file including the extension, without the directory. */
+  public static final AttributeKey<String> FILE_NAME = stringKey("file.name");
+
+  /**
+   * Full path to the file, including the file name. It should include the drive letter, when
+   * appropriate.
+   */
+  public static final AttributeKey<String> FILE_PATH = stringKey("file.path");
+
+  /** File size in bytes. */
+  public static final AttributeKey<Long> FILE_SIZE = longKey("file.size");
+
+  private FileIncubatingAttributes() {}
+}

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

@@ -36,7 +36,7 @@ public final class HostIncubatingAttributes {
   public static final AttributeKey<String> HOST_CPU_MODEL_NAME = stringKey("host.cpu.model.name");
 
   /** Stepping or core revisions. */
-  public static final AttributeKey<Long> HOST_CPU_STEPPING = longKey("host.cpu.stepping");
+  public static final AttributeKey<String> HOST_CPU_STEPPING = stringKey("host.cpu.stepping");
 
   /**
    * Processor manufacturer identifier. A maximum 12-character string.