From a58db82e2b282429314c2df96705a8cf6a23a468 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Thu, 12 Oct 2023 16:36:03 -0700
Subject: [PATCH 1/5] Update to semconv 1.22.0

---
 build.gradle.kts                              |    4 +-
 .../semconv/ResourceAttributes.java           |  565 +++--
 .../semconv/SemanticAttributes.java           | 2166 ++++++++++-------
 3 files changed, 1604 insertions(+), 1131 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index aac6f02..bcb4451 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ val snapshot = true
 // end
 
 // The release version of https://github.com/open-telemetry/semantic-conventions used to generate classes
-var semanticConventionsVersion = "1.21.0"
+var semanticConventionsVersion = "1.22.0"
 
 // Compute the artifact version, which includes the "-alpha" suffix and includes "-SNAPSHOT" suffix if not releasing
 // Release example: version=1.21.0-alpha
@@ -66,7 +66,7 @@ dependencies {
 }
 
 // start - define tasks to download, unzip, and generate from opentelemetry/semantic-conventions
-var generatorVersion = "0.18.0"
+var generatorVersion = "0.22.0"
 val semanticConventionsRepoZip = "https://github.com/open-telemetry/semantic-conventions/archive/v$semanticConventionsVersion.zip"
 val schemaUrl = "https://opentelemetry.io/schemas/$semanticConventionsVersion"
 
diff --git a/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java b/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java
index 8e3ebe6..954b19d 100644
--- a/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java
+++ b/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java
@@ -18,7 +18,14 @@
 @SuppressWarnings("unused")
 public final class ResourceAttributes {
   /** The URL of the OpenTelemetry schema for these keys and values. */
-  public static final String SCHEMA_URL = "https://opentelemetry.io/schemas/1.21.0";
+  public static final String SCHEMA_URL = "https://opentelemetry.io/schemas/1.22.0";
+
+  /**
+   * Uniquely identifies the framework API revision offered by a version ({@code os.version}) of the
+   * android operating system. More information can be found <a
+   * href="https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels">here</a>.
+   */
+  public static final AttributeKey<String> ANDROID_OS_API_LEVEL = stringKey("android.os.api_level");
 
   /**
    * Array of brand name and version separated by a space
@@ -33,6 +40,30 @@ public final class ResourceAttributes {
    */
   public static final AttributeKey<List<String>> BROWSER_BRANDS = stringArrayKey("browser.brands");
 
+  /**
+   * Preferred language of the user using the browser
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>This value is intended to be taken from the Navigator API {@code navigator.language}.
+   * </ul>
+   */
+  public static final AttributeKey<String> BROWSER_LANGUAGE = stringKey("browser.language");
+
+  /**
+   * A boolean that is true if the browser is running on a mobile device
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>This value is intended to be taken from the <a
+   *       href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> ({@code
+   *       navigator.userAgentData.mobile}). If unavailable, this attribute SHOULD be left unset.
+   * </ul>
+   */
+  public static final AttributeKey<Boolean> BROWSER_MOBILE = booleanKey("browser.mobile");
+
   /**
    * The platform on which the browser is running
    *
@@ -53,36 +84,36 @@ public final class ResourceAttributes {
    */
   public static final AttributeKey<String> BROWSER_PLATFORM = stringKey("browser.platform");
 
+  /** The cloud account ID the resource is assigned to. */
+  public static final AttributeKey<String> CLOUD_ACCOUNT_ID = stringKey("cloud.account.id");
+
   /**
-   * A boolean that is true if the browser is running on a mobile device
+   * Cloud regions often have multiple, isolated locations known as zones to increase availability.
+   * Availability zone represents the zone where the resource is running.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>This value is intended to be taken from the <a
-   *       href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> ({@code
-   *       navigator.userAgentData.mobile}). If unavailable, this attribute SHOULD be left unset.
+   *   <li>Availability zones are called &quot;zones&quot; on Alibaba Cloud and Google Cloud.
    * </ul>
    */
-  public static final AttributeKey<Boolean> BROWSER_MOBILE = booleanKey("browser.mobile");
+  public static final AttributeKey<String> CLOUD_AVAILABILITY_ZONE =
+      stringKey("cloud.availability_zone");
 
   /**
-   * Preferred language of the user using the browser
+   * The cloud platform in use.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>This value is intended to be taken from the Navigator API {@code navigator.language}.
+   *   <li>The prefix of the service SHOULD match the one specified in {@code cloud.provider}.
    * </ul>
    */
-  public static final AttributeKey<String> BROWSER_LANGUAGE = stringKey("browser.language");
+  public static final AttributeKey<String> CLOUD_PLATFORM = stringKey("cloud.platform");
 
   /** Name of the cloud provider. */
   public static final AttributeKey<String> CLOUD_PROVIDER = stringKey("cloud.provider");
 
-  /** The cloud account ID the resource is assigned to. */
-  public static final AttributeKey<String> CLOUD_ACCOUNT_ID = stringKey("cloud.account.id");
-
   /**
    * The geographical region the resource is running.
    *
@@ -136,28 +167,11 @@ public final class ResourceAttributes {
   public static final AttributeKey<String> CLOUD_RESOURCE_ID = stringKey("cloud.resource_id");
 
   /**
-   * Cloud regions often have multiple, isolated locations known as zones to increase availability.
-   * Availability zone represents the zone where the resource is running.
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li>Availability zones are called &quot;zones&quot; on Alibaba Cloud and Google Cloud.
-   * </ul>
-   */
-  public static final AttributeKey<String> CLOUD_AVAILABILITY_ZONE =
-      stringKey("cloud.availability_zone");
-
-  /**
-   * The cloud platform in use.
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li>The prefix of the service SHOULD match the one specified in {@code cloud.provider}.
-   * </ul>
+   * The ARN of an <a
+   * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/clusters.html">ECS
+   * cluster</a>.
    */
-  public static final AttributeKey<String> CLOUD_PLATFORM = stringKey("cloud.platform");
+  public static final AttributeKey<String> AWS_ECS_CLUSTER_ARN = stringKey("aws.ecs.cluster.arn");
 
   /**
    * The Amazon Resource Name (ARN) of an <a
@@ -167,13 +181,6 @@ public final class ResourceAttributes {
   public static final AttributeKey<String> AWS_ECS_CONTAINER_ARN =
       stringKey("aws.ecs.container.arn");
 
-  /**
-   * The ARN of an <a
-   * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/clusters.html">ECS
-   * cluster</a>.
-   */
-  public static final AttributeKey<String> AWS_ECS_CLUSTER_ARN = stringKey("aws.ecs.cluster.arn");
-
   /**
    * The <a
    * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html">launch
@@ -199,35 +206,31 @@ public final class ResourceAttributes {
   public static final AttributeKey<String> AWS_EKS_CLUSTER_ARN = stringKey("aws.eks.cluster.arn");
 
   /**
-   * The name(s) of the AWS log group(s) an application is writing to.
+   * The Amazon Resource Name(s) (ARN) of the AWS log group(s).
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>Multiple log groups must be supported for cases like multi-container applications, where
-   *       a single application has sidecar containers, and each write to their own log group.
+   *   <li>See the <a
+   *       href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format">log
+   *       group ARN format documentation</a>.
    * </ul>
    */
-  public static final AttributeKey<List<String>> AWS_LOG_GROUP_NAMES =
-      stringArrayKey("aws.log.group.names");
+  public static final AttributeKey<List<String>> AWS_LOG_GROUP_ARNS =
+      stringArrayKey("aws.log.group.arns");
 
   /**
-   * The Amazon Resource Name(s) (ARN) of the AWS log group(s).
+   * The name(s) of the AWS log group(s) an application is writing to.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>See the <a
-   *       href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format">log
-   *       group ARN format documentation</a>.
+   *   <li>Multiple log groups must be supported for cases like multi-container applications, where
+   *       a single application has sidecar containers, and each write to their own log group.
    * </ul>
    */
-  public static final AttributeKey<List<String>> AWS_LOG_GROUP_ARNS =
-      stringArrayKey("aws.log.group.arns");
-
-  /** The name(s) of the AWS log stream(s) an application is writing to. */
-  public static final AttributeKey<List<String>> AWS_LOG_STREAM_NAMES =
-      stringArrayKey("aws.log.stream.names");
+  public static final AttributeKey<List<String>> AWS_LOG_GROUP_NAMES =
+      stringArrayKey("aws.log.group.names");
 
   /**
    * The ARN(s) of the AWS log stream(s).
@@ -244,6 +247,10 @@ public final class ResourceAttributes {
   public static final AttributeKey<List<String>> AWS_LOG_STREAM_ARNS =
       stringArrayKey("aws.log.stream.arns");
 
+  /** The name(s) of the AWS log stream(s) an application is writing to. */
+  public static final AttributeKey<List<String>> AWS_LOG_STREAM_NAMES =
+      stringArrayKey("aws.log.stream.names");
+
   /**
    * The name of the Cloud Run <a
    * href="https://cloud.google.com/run/docs/managing/job-executions">execution</a> being run for
@@ -262,6 +269,13 @@ public final class ResourceAttributes {
   public static final AttributeKey<Long> GCP_CLOUD_RUN_JOB_TASK_INDEX =
       longKey("gcp.cloud_run.job.task_index");
 
+  /**
+   * The hostname of a GCE instance. This is the full value of the default or <a
+   * href="https://cloud.google.com/compute/docs/instances/custom-hostname-vm">custom hostname</a>.
+   */
+  public static final AttributeKey<String> GCP_GCE_INSTANCE_HOSTNAME =
+      stringKey("gcp.gce.instance.hostname");
+
   /**
    * The instance name of a GCE instance. This is the value provided by {@code host.name}, the
    * visible name of the instance in the Cloud Console UI, and the prefix for the default hostname
@@ -272,26 +286,38 @@ public final class ResourceAttributes {
   public static final AttributeKey<String> GCP_GCE_INSTANCE_NAME =
       stringKey("gcp.gce.instance.name");
 
-  /**
-   * The hostname of a GCE instance. This is the full value of the default or <a
-   * href="https://cloud.google.com/compute/docs/instances/custom-hostname-vm">custom hostname</a>.
-   */
-  public static final AttributeKey<String> GCP_GCE_INSTANCE_HOSTNAME =
-      stringKey("gcp.gce.instance.hostname");
+  /** Unique identifier for the application */
+  public static final AttributeKey<String> HEROKU_APP_ID = stringKey("heroku.app.id");
+
+  /** Commit hash for the current release */
+  public static final AttributeKey<String> HEROKU_RELEASE_COMMIT =
+      stringKey("heroku.release.commit");
 
   /** Time and date the release was created */
   public static final AttributeKey<String> HEROKU_RELEASE_CREATION_TIMESTAMP =
       stringKey("heroku.release.creation_timestamp");
 
-  /** Commit hash for the current release */
-  public static final AttributeKey<String> HEROKU_RELEASE_COMMIT =
-      stringKey("heroku.release.commit");
+  /**
+   * The command used to run the container (i.e. the command name).
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>If using embedded credentials or sensitive data, it is recommended to remove them to
+   *       prevent potential leakage.
+   * </ul>
+   */
+  public static final AttributeKey<String> CONTAINER_COMMAND = stringKey("container.command");
 
-  /** Unique identifier for the application */
-  public static final AttributeKey<String> HEROKU_APP_ID = stringKey("heroku.app.id");
+  /**
+   * All the command arguments (including the command/executable itself) run by the container. [2]
+   */
+  public static final AttributeKey<List<String>> CONTAINER_COMMAND_ARGS =
+      stringArrayKey("container.command_args");
 
-  /** Container name used by container runtime. */
-  public static final AttributeKey<String> CONTAINER_NAME = stringKey("container.name");
+  /** The full command run by the container as a single string representing the full command. [2] */
+  public static final AttributeKey<String> CONTAINER_COMMAND_LINE =
+      stringKey("container.command_line");
 
   /**
    * Container ID. Usually a UUID, as for example used to <a
@@ -300,15 +326,6 @@ public final class ResourceAttributes {
    */
   public static final AttributeKey<String> CONTAINER_ID = stringKey("container.id");
 
-  /** The container runtime managing this container. */
-  public static final AttributeKey<String> CONTAINER_RUNTIME = stringKey("container.runtime");
-
-  /** Name of the image the container was built on. */
-  public static final AttributeKey<String> CONTAINER_IMAGE_NAME = stringKey("container.image.name");
-
-  /** Container image tag. */
-  public static final AttributeKey<String> CONTAINER_IMAGE_TAG = stringKey("container.image.tag");
-
   /**
    * Runtime specific image identifier. Usually a hash algorithm followed by a UUID.
    *
@@ -321,32 +338,46 @@ public final class ResourceAttributes {
    *       endpoint. K8s defines a link to the container registry repository with digest {@code
    *       "imageID": "registry.azurecr.io
    *       /namespace/service/dockerfile@sha256:bdeabd40c3a8a492eaf9e8e44d0ebbb84bac7ee25ac0cf8a7159d25f62555625"}.
-   *       OCI defines a digest of manifest.
+   *       The ID is assinged by the container runtime and can vary in different environments.
+   *       Consider using {@code oci.manifest.digest} if it is important to identify the same image
+   *       in different environments/runtimes.
    * </ul>
    */
   public static final AttributeKey<String> CONTAINER_IMAGE_ID = stringKey("container.image.id");
 
+  /** Name of the image the container was built on. */
+  public static final AttributeKey<String> CONTAINER_IMAGE_NAME = stringKey("container.image.name");
+
   /**
-   * The command used to run the container (i.e. the command name).
+   * Repo digests of the container image as provided by the container runtime.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>If using embedded credentials or sensitive data, it is recommended to remove them to
-   *       prevent potential leakage.
+   *   <li><a
+   *       href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker</a>
+   *       and <a
+   *       href="https://github.com/kubernetes/cri-api/blob/c75ef5b473bbe2d0a4fc92f82235efd665ea8e9f/pkg/apis/runtime/v1/api.proto#L1237-L1238">CRI</a>
+   *       report those under the {@code RepoDigests} field.
    * </ul>
    */
-  public static final AttributeKey<String> CONTAINER_COMMAND = stringKey("container.command");
-
-  /** The full command run by the container as a single string representing the full command. [2] */
-  public static final AttributeKey<String> CONTAINER_COMMAND_LINE =
-      stringKey("container.command_line");
+  public static final AttributeKey<List<String>> CONTAINER_IMAGE_REPO_DIGESTS =
+      stringArrayKey("container.image.repo_digests");
 
   /**
-   * All the command arguments (including the command/executable itself) run by the container. [2]
+   * Container image tags. An example can be found in <a
+   * href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker Image
+   * Inspect</a>. Should be only the {@code <tag>} section of the full name for example from {@code
+   * registry.example.com/my-org/my-image:<tag>}.
    */
-  public static final AttributeKey<List<String>> CONTAINER_COMMAND_ARGS =
-      stringArrayKey("container.command_args");
+  public static final AttributeKey<List<String>> CONTAINER_IMAGE_TAGS =
+      stringArrayKey("container.image.tags");
+
+  /** Container name used by container runtime. */
+  public static final AttributeKey<String> CONTAINER_NAME = stringKey("container.name");
+
+  /** The container runtime managing this container. */
+  public static final AttributeKey<String> CONTAINER_RUNTIME = stringKey("container.runtime");
 
   /**
    * Name of the <a href="https://en.wikipedia.org/wiki/Deployment_environment">deployment
@@ -376,6 +407,19 @@ public final class ResourceAttributes {
    */
   public static final AttributeKey<String> DEVICE_ID = stringKey("device.id");
 
+  /**
+   * The name of the device manufacturer
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>The Android OS provides this field via <a
+   *       href="https://developer.android.com/reference/android/os/Build#MANUFACTURER">Build</a>.
+   *       iOS apps SHOULD hardcode the value {@code Apple}.
+   * </ul>
+   */
+  public static final AttributeKey<String> DEVICE_MANUFACTURER = stringKey("device.manufacturer");
+
   /**
    * The model identifier for the device
    *
@@ -402,17 +446,30 @@ public final class ResourceAttributes {
   public static final AttributeKey<String> DEVICE_MODEL_NAME = stringKey("device.model.name");
 
   /**
-   * The name of the device manufacturer
+   * The execution environment ID as a string, that will be potentially reused for other invocations
+   * to the same function/function version.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>The Android OS provides this field via <a
-   *       href="https://developer.android.com/reference/android/os/Build#MANUFACTURER">Build</a>.
-   *       iOS apps SHOULD hardcode the value {@code Apple}.
+   *   <li><strong>AWS Lambda:</strong> Use the (full) log stream name.
    * </ul>
    */
-  public static final AttributeKey<String> DEVICE_MANUFACTURER = stringKey("device.manufacturer");
+  public static final AttributeKey<String> FAAS_INSTANCE = stringKey("faas.instance");
+
+  /**
+   * The amount of memory available to the serverless function converted to Bytes.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>It's recommended to set this attribute since e.g. too little memory can easily stop a
+   *       Java AWS Lambda function from working correctly. On AWS Lambda, the environment variable
+   *       {@code AWS_LAMBDA_FUNCTION_MEMORY_SIZE} provides this information (which must be
+   *       multiplied by 1,048,576).
+   * </ul>
+   */
+  public static final AttributeKey<Long> FAAS_MAX_MEMORY = longKey("faas.max_memory");
 
   /**
    * The name of the single function that this runtime instance executes.
@@ -422,8 +479,8 @@ public final class ResourceAttributes {
    * <ul>
    *   <li>This is the name of the function as configured/deployed on the FaaS platform and is
    *       usually different from the name of the callback function (which may be stored in the <a
-   *       href="/docs/general/general-attributes.md#source-code-attributes">{@code
-   *       code.namespace}/{@code code.function}</a> span attributes).
+   *       href="/docs/general/attributes.md#source-code-attributes">{@code code.namespace}/{@code
+   *       code.function}</a> span attributes).
    *   <li>For some cloud providers, the above definition is ambiguous. The following definition of
    *       function name MUST be used for this attribute (and consequently the span name) for the
    *       listed cloud providers/products:
@@ -457,38 +514,40 @@ public final class ResourceAttributes {
    */
   public static final AttributeKey<String> FAAS_VERSION = stringKey("faas.version");
 
+  /** The CPU architecture the host system is running on. */
+  public static final AttributeKey<String> HOST_ARCH = stringKey("host.arch");
+
   /**
-   * The execution environment ID as a string, that will be potentially reused for other invocations
-   * to the same function/function version.
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li><strong>AWS Lambda:</strong> Use the (full) log stream name.
-   * </ul>
+   * Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For
+   * non-containerized systems, this should be the {@code machine-id}. See the table below for the
+   * sources to use to determine the {@code machine-id} based on operating system.
    */
-  public static final AttributeKey<String> FAAS_INSTANCE = stringKey("faas.instance");
+  public static final AttributeKey<String> HOST_ID = stringKey("host.id");
+
+  /** VM image ID or host OS image ID. For Cloud, this value is from the provider. */
+  public static final AttributeKey<String> HOST_IMAGE_ID = stringKey("host.image.id");
+
+  /** Name of the VM image or OS install the host was instantiated from. */
+  public static final AttributeKey<String> HOST_IMAGE_NAME = stringKey("host.image.name");
 
   /**
-   * The amount of memory available to the serverless function converted to Bytes.
+   * The version string of the VM image or host OS as defined in <a
+   * href="README.md#version-attributes">Version Attributes</a>.
+   */
+  public static final AttributeKey<String> HOST_IMAGE_VERSION = stringKey("host.image.version");
+
+  /**
+   * Available IP addresses of the host, excluding loopback interfaces.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>It's recommended to set this attribute since e.g. too little memory can easily stop a
-   *       Java AWS Lambda function from working correctly. On AWS Lambda, the environment variable
-   *       {@code AWS_LAMBDA_FUNCTION_MEMORY_SIZE} provides this information (which must be
-   *       multiplied by 1,048,576).
+   *   <li>IPv4 Addresses MUST be specified in dotted-quad notation. IPv6 addresses MUST be
+   *       specified in the <a href="https://www.rfc-editor.org/rfc/rfc5952.html">RFC 5952</a>
+   *       format.
    * </ul>
    */
-  public static final AttributeKey<Long> FAAS_MAX_MEMORY = longKey("faas.max_memory");
-
-  /**
-   * Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For
-   * non-containerized systems, this should be the {@code machine-id}. See the table below for the
-   * sources to use to determine the {@code machine-id} based on operating system.
-   */
-  public static final AttributeKey<String> HOST_ID = stringKey("host.id");
+  public static final AttributeKey<List<String>> HOST_IP = stringArrayKey("host.ip");
 
   /**
    * Name of the host. On Unix systems, it may contain what the hostname command returns, or the
@@ -499,20 +558,36 @@ public final class ResourceAttributes {
   /** Type of host. For Cloud, this must be the machine type. */
   public static final AttributeKey<String> HOST_TYPE = stringKey("host.type");
 
-  /** The CPU architecture the host system is running on. */
-  public static final AttributeKey<String> HOST_ARCH = stringKey("host.arch");
+  /** The amount of level 2 memory cache available to the processor (in Bytes). */
+  public static final AttributeKey<Long> HOST_CPU_CACHE_L2_SIZE = longKey("host.cpu.cache.l2.size");
 
-  /** Name of the VM image or OS install the host was instantiated from. */
-  public static final AttributeKey<String> HOST_IMAGE_NAME = stringKey("host.image.name");
+  /** Numeric value specifying the family or generation of the CPU. */
+  public static final AttributeKey<Long> HOST_CPU_FAMILY = longKey("host.cpu.family");
 
-  /** VM image ID or host OS image ID. For Cloud, this value is from the provider. */
-  public static final AttributeKey<String> HOST_IMAGE_ID = stringKey("host.image.id");
+  /**
+   * Model identifier. It provides more granular information about the CPU, distinguishing it from
+   * other CPUs within the same family.
+   */
+  public static final AttributeKey<Long> HOST_CPU_MODEL_ID = longKey("host.cpu.model.id");
+
+  /** Model designation of the processor. */
+  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");
 
   /**
-   * The version string of the VM image or host OS as defined in <a
-   * href="README.md#version-attributes">Version Attributes</a>.
+   * Processor manufacturer identifier. A maximum 12-character string.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li><a href="https://wiki.osdev.org/CPUID">CPUID</a> command returns the vendor ID string in
+   *       EBX, EDX and ECX registers. Writing these to memory in this order results in a
+   *       12-character string.
+   * </ul>
    */
-  public static final AttributeKey<String> HOST_IMAGE_VERSION = stringKey("host.image.version");
+  public static final AttributeKey<String> HOST_CPU_VENDOR_ID = stringKey("host.cpu.vendor.id");
 
   /** The name of the cluster. */
   public static final AttributeKey<String> K8S_CLUSTER_NAME = stringKey("k8s.cluster.name");
@@ -551,12 +626,12 @@ public final class ResourceAttributes {
   /** The name of the namespace that the pod is running in. */
   public static final AttributeKey<String> K8S_NAMESPACE_NAME = stringKey("k8s.namespace.name");
 
-  /** The UID of the Pod. */
-  public static final AttributeKey<String> K8S_POD_UID = stringKey("k8s.pod.uid");
-
   /** The name of the Pod. */
   public static final AttributeKey<String> K8S_POD_NAME = stringKey("k8s.pod.name");
 
+  /** The UID of the Pod. */
+  public static final AttributeKey<String> K8S_POD_UID = stringKey("k8s.pod.uid");
+
   /**
    * The name of the Container from Pod specification, must be unique within a Pod. Container
    * runtime usually uses different globally unique name ({@code container.name}).
@@ -570,44 +645,61 @@ public final class ResourceAttributes {
   public static final AttributeKey<Long> K8S_CONTAINER_RESTART_COUNT =
       longKey("k8s.container.restart_count");
 
+  /** The name of the ReplicaSet. */
+  public static final AttributeKey<String> K8S_REPLICASET_NAME = stringKey("k8s.replicaset.name");
+
   /** The UID of the ReplicaSet. */
   public static final AttributeKey<String> K8S_REPLICASET_UID = stringKey("k8s.replicaset.uid");
 
-  /** The name of the ReplicaSet. */
-  public static final AttributeKey<String> K8S_REPLICASET_NAME = stringKey("k8s.replicaset.name");
+  /** The name of the Deployment. */
+  public static final AttributeKey<String> K8S_DEPLOYMENT_NAME = stringKey("k8s.deployment.name");
 
   /** The UID of the Deployment. */
   public static final AttributeKey<String> K8S_DEPLOYMENT_UID = stringKey("k8s.deployment.uid");
 
-  /** The name of the Deployment. */
-  public static final AttributeKey<String> K8S_DEPLOYMENT_NAME = stringKey("k8s.deployment.name");
+  /** The name of the StatefulSet. */
+  public static final AttributeKey<String> K8S_STATEFULSET_NAME = stringKey("k8s.statefulset.name");
 
   /** The UID of the StatefulSet. */
   public static final AttributeKey<String> K8S_STATEFULSET_UID = stringKey("k8s.statefulset.uid");
 
-  /** The name of the StatefulSet. */
-  public static final AttributeKey<String> K8S_STATEFULSET_NAME = stringKey("k8s.statefulset.name");
+  /** The name of the DaemonSet. */
+  public static final AttributeKey<String> K8S_DAEMONSET_NAME = stringKey("k8s.daemonset.name");
 
   /** The UID of the DaemonSet. */
   public static final AttributeKey<String> K8S_DAEMONSET_UID = stringKey("k8s.daemonset.uid");
 
-  /** The name of the DaemonSet. */
-  public static final AttributeKey<String> K8S_DAEMONSET_NAME = stringKey("k8s.daemonset.name");
+  /** The name of the Job. */
+  public static final AttributeKey<String> K8S_JOB_NAME = stringKey("k8s.job.name");
 
   /** The UID of the Job. */
   public static final AttributeKey<String> K8S_JOB_UID = stringKey("k8s.job.uid");
 
-  /** The name of the Job. */
-  public static final AttributeKey<String> K8S_JOB_NAME = stringKey("k8s.job.name");
+  /** The name of the CronJob. */
+  public static final AttributeKey<String> K8S_CRONJOB_NAME = stringKey("k8s.cronjob.name");
 
   /** The UID of the CronJob. */
   public static final AttributeKey<String> K8S_CRONJOB_UID = stringKey("k8s.cronjob.uid");
 
-  /** The name of the CronJob. */
-  public static final AttributeKey<String> K8S_CRONJOB_NAME = stringKey("k8s.cronjob.name");
+  /**
+   * The digest of the OCI image manifest. For container images specifically is the digest by which
+   * the container image is known.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>Follows <a href="https://github.com/opencontainers/image-spec/blob/main/manifest.md">OCI
+   *       Image Manifest Specification</a>, and specifically the <a
+   *       href="https://github.com/opencontainers/image-spec/blob/main/descriptor.md#digests">Digest
+   *       property</a>. An example can be found in <a
+   *       href="https://docs.docker.com/registry/spec/manifest-v2-2/#example-image-manifest">Example
+   *       Image Manifest</a>.
+   * </ul>
+   */
+  public static final AttributeKey<String> OCI_MANIFEST_DIGEST = stringKey("oci.manifest.digest");
 
-  /** The operating system type. */
-  public static final AttributeKey<String> OS_TYPE = stringKey("os.type");
+  /** Unique identifier for a particular build or compilation of the operating system. */
+  public static final AttributeKey<String> OS_BUILD_ID = stringKey("os.build_id");
 
   /**
    * Human readable (not intended to be parsed) OS version information, like e.g. reported by {@code
@@ -618,17 +710,37 @@ public final class ResourceAttributes {
   /** Human readable operating system name. */
   public static final AttributeKey<String> OS_NAME = stringKey("os.name");
 
+  /** The operating system type. */
+  public static final AttributeKey<String> OS_TYPE = stringKey("os.type");
+
   /**
    * The version string of the operating system as defined in <a
    * href="/docs/resource/README.md#version-attributes">Version Attributes</a>.
    */
   public static final AttributeKey<String> OS_VERSION = stringKey("os.version");
 
-  /** Process identifier (PID). */
-  public static final AttributeKey<Long> PROCESS_PID = longKey("process.pid");
+  /**
+   * The command used to launch the process (i.e. the command name). On Linux based systems, can be
+   * set to the zeroth string in {@code proc/[pid]/cmdline}. On Windows, can be set to the first
+   * parameter extracted from {@code GetCommandLineW}.
+   */
+  public static final AttributeKey<String> PROCESS_COMMAND = stringKey("process.command");
 
-  /** Parent Process identifier (PID). */
-  public static final AttributeKey<Long> PROCESS_PARENT_PID = longKey("process.parent_pid");
+  /**
+   * All the command arguments (including the command/executable itself) as received by the process.
+   * On Linux-based systems (and some other Unixoid systems supporting procfs), can be set according
+   * to the list of null-delimited strings extracted from {@code proc/[pid]/cmdline}. For libc-based
+   * executables, this would be the full argv vector passed to {@code main}.
+   */
+  public static final AttributeKey<List<String>> PROCESS_COMMAND_ARGS =
+      stringArrayKey("process.command_args");
+
+  /**
+   * The full command used to launch the process as a single string representing the full command.
+   * On Windows, can be set to the result of {@code GetCommandLineW}. Do not set this if you have to
+   * assemble it just for monitoring; use {@code process.command_args} instead.
+   */
+  public static final AttributeKey<String> PROCESS_COMMAND_LINE = stringKey("process.command_line");
 
   /**
    * The name of the process executable. On Linux based systems, can be set to the {@code Name} in
@@ -646,31 +758,21 @@ public final class ResourceAttributes {
   public static final AttributeKey<String> PROCESS_EXECUTABLE_PATH =
       stringKey("process.executable.path");
 
-  /**
-   * The command used to launch the process (i.e. the command name). On Linux based systems, can be
-   * set to the zeroth string in {@code proc/[pid]/cmdline}. On Windows, can be set to the first
-   * parameter extracted from {@code GetCommandLineW}.
-   */
-  public static final AttributeKey<String> PROCESS_COMMAND = stringKey("process.command");
+  /** The username of the user that owns the process. */
+  public static final AttributeKey<String> PROCESS_OWNER = stringKey("process.owner");
 
-  /**
-   * The full command used to launch the process as a single string representing the full command.
-   * On Windows, can be set to the result of {@code GetCommandLineW}. Do not set this if you have to
-   * assemble it just for monitoring; use {@code process.command_args} instead.
-   */
-  public static final AttributeKey<String> PROCESS_COMMAND_LINE = stringKey("process.command_line");
+  /** Parent Process identifier (PID). */
+  public static final AttributeKey<Long> PROCESS_PARENT_PID = longKey("process.parent_pid");
+
+  /** Process identifier (PID). */
+  public static final AttributeKey<Long> PROCESS_PID = longKey("process.pid");
 
   /**
-   * All the command arguments (including the command/executable itself) as received by the process.
-   * On Linux-based systems (and some other Unixoid systems supporting procfs), can be set according
-   * to the list of null-delimited strings extracted from {@code proc/[pid]/cmdline}. For libc-based
-   * executables, this would be the full argv vector passed to {@code main}.
+   * An additional description about the runtime of the process, for example a specific vendor
+   * customization of the runtime environment.
    */
-  public static final AttributeKey<List<String>> PROCESS_COMMAND_ARGS =
-      stringArrayKey("process.command_args");
-
-  /** The username of the user that owns the process. */
-  public static final AttributeKey<String> PROCESS_OWNER = stringKey("process.owner");
+  public static final AttributeKey<String> PROCESS_RUNTIME_DESCRIPTION =
+      stringKey("process.runtime.description");
 
   /**
    * The name of the runtime of this process. For compiled native binaries, this SHOULD be the name
@@ -684,13 +786,6 @@ public final class ResourceAttributes {
   public static final AttributeKey<String> PROCESS_RUNTIME_VERSION =
       stringKey("process.runtime.version");
 
-  /**
-   * An additional description about the runtime of the process, for example a specific vendor
-   * customization of the runtime environment.
-   */
-  public static final AttributeKey<String> PROCESS_RUNTIME_DESCRIPTION =
-      stringKey("process.runtime.description");
-
   /**
    * Logical name of the service.
    *
@@ -712,22 +807,6 @@ public final class ResourceAttributes {
    */
   public static final AttributeKey<String> SERVICE_VERSION = stringKey("service.version");
 
-  /**
-   * A namespace for {@code service.name}.
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li>A string value having a meaning that helps to distinguish a group of services, for
-   *       example the team name that owns a group of services. {@code service.name} is expected to
-   *       be unique within the same namespace. If {@code service.namespace} is not specified in the
-   *       Resource then {@code service.name} is expected to be unique for all services that have no
-   *       explicit namespace defined (so the empty/unspecified namespace is simply one more valid
-   *       namespace). Zero-length namespace string is assumed equal to unspecified namespace.
-   * </ul>
-   */
-  public static final AttributeKey<String> SERVICE_NAMESPACE = stringKey("service.namespace");
-
   /**
    * The string ID of the service instance.
    *
@@ -748,6 +827,26 @@ public final class ResourceAttributes {
    */
   public static final AttributeKey<String> SERVICE_INSTANCE_ID = stringKey("service.instance.id");
 
+  /**
+   * A namespace for {@code service.name}.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>A string value having a meaning that helps to distinguish a group of services, for
+   *       example the team name that owns a group of services. {@code service.name} is expected to
+   *       be unique within the same namespace. If {@code service.namespace} is not specified in the
+   *       Resource then {@code service.name} is expected to be unique for all services that have no
+   *       explicit namespace defined (so the empty/unspecified namespace is simply one more valid
+   *       namespace). Zero-length namespace string is assumed equal to unspecified namespace.
+   * </ul>
+   */
+  public static final AttributeKey<String> SERVICE_NAMESPACE = stringKey("service.namespace");
+
+  /** The language of the telemetry SDK. */
+  public static final AttributeKey<String> TELEMETRY_SDK_LANGUAGE =
+      stringKey("telemetry.sdk.language");
+
   /**
    * The name of the telemetry SDK as defined above.
    *
@@ -765,17 +864,31 @@ public final class ResourceAttributes {
    */
   public static final AttributeKey<String> TELEMETRY_SDK_NAME = stringKey("telemetry.sdk.name");
 
-  /** The language of the telemetry SDK. */
-  public static final AttributeKey<String> TELEMETRY_SDK_LANGUAGE =
-      stringKey("telemetry.sdk.language");
-
   /** The version string of the telemetry SDK. */
   public static final AttributeKey<String> TELEMETRY_SDK_VERSION =
       stringKey("telemetry.sdk.version");
 
-  /** The version string of the auto instrumentation agent, if used. */
-  public static final AttributeKey<String> TELEMETRY_AUTO_VERSION =
-      stringKey("telemetry.auto.version");
+  /**
+   * The name of the auto instrumentation agent or distribution, if used.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>Official auto instrumentation agents and distributions SHOULD set the {@code
+   *       telemetry.distro.name} attribute to a string starting with {@code opentelemetry-}, e.g.
+   *       {@code opentelemetry-java-instrumentation}.
+   * </ul>
+   */
+  public static final AttributeKey<String> TELEMETRY_DISTRO_NAME =
+      stringKey("telemetry.distro.name");
+
+  /** The version string of the auto instrumentation agent or distribution, if used. */
+  public static final AttributeKey<String> TELEMETRY_DISTRO_VERSION =
+      stringKey("telemetry.distro.version");
+
+  /** Additional description of the web engine (e.g. detailed version and edition information). */
+  public static final AttributeKey<String> WEBENGINE_DESCRIPTION =
+      stringKey("webengine.description");
 
   /** The name of the web engine. */
   public static final AttributeKey<String> WEBENGINE_NAME = stringKey("webengine.name");
@@ -783,10 +896,6 @@ public final class ResourceAttributes {
   /** The version of the web engine. */
   public static final AttributeKey<String> WEBENGINE_VERSION = stringKey("webengine.version");
 
-  /** Additional description of the web engine (e.g. detailed version and edition information). */
-  public static final AttributeKey<String> WEBENGINE_DESCRIPTION =
-      stringKey("webengine.description");
-
   /** The name of the instrumentation scope - ({@code InstrumentationScope.Name} in OTLP). */
   public static final AttributeKey<String> OTEL_SCOPE_NAME = stringKey("otel.scope.name");
 
@@ -810,31 +919,6 @@ public final class ResourceAttributes {
   public static final AttributeKey<String> OTEL_LIBRARY_VERSION = stringKey("otel.library.version");
 
   // Enum definitions
-  public static final class CloudProviderValues {
-    /** Alibaba Cloud. */
-    public static final String ALIBABA_CLOUD = "alibaba_cloud";
-
-    /** Amazon Web Services. */
-    public static final String AWS = "aws";
-
-    /** Microsoft Azure. */
-    public static final String AZURE = "azure";
-
-    /** Google Cloud Platform. */
-    public static final String GCP = "gcp";
-
-    /** Heroku Platform as a Service. */
-    public static final String HEROKU = "heroku";
-
-    /** IBM Cloud. */
-    public static final String IBM_CLOUD = "ibm_cloud";
-
-    /** Tencent Cloud. */
-    public static final String TENCENT_CLOUD = "tencent_cloud";
-
-    private CloudProviderValues() {}
-  }
-
   public static final class CloudPlatformValues {
     /** Alibaba Cloud Elastic Compute Service. */
     public static final String ALIBABA_CLOUD_ECS = "alibaba_cloud_ecs";
@@ -920,6 +1004,31 @@ public static final class CloudPlatformValues {
     private CloudPlatformValues() {}
   }
 
+  public static final class CloudProviderValues {
+    /** Alibaba Cloud. */
+    public static final String ALIBABA_CLOUD = "alibaba_cloud";
+
+    /** Amazon Web Services. */
+    public static final String AWS = "aws";
+
+    /** Microsoft Azure. */
+    public static final String AZURE = "azure";
+
+    /** Google Cloud Platform. */
+    public static final String GCP = "gcp";
+
+    /** Heroku Platform as a Service. */
+    public static final String HEROKU = "heroku";
+
+    /** IBM Cloud. */
+    public static final String IBM_CLOUD = "ibm_cloud";
+
+    /** Tencent Cloud. */
+    public static final String TENCENT_CLOUD = "tencent_cloud";
+
+    private CloudProviderValues() {}
+  }
+
   public static final class AwsEcsLaunchtypeValues {
     /** ec2. */
     public static final String EC2 = "ec2";
diff --git a/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java
index d778c4c..5a6eae7 100644
--- a/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java
+++ b/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java
@@ -19,282 +19,295 @@
 @SuppressWarnings("unused")
 public final class SemanticAttributes {
   /** The URL of the OpenTelemetry schema for these keys and values. */
-  public static final String SCHEMA_URL = "https://opentelemetry.io/schemas/1.21.0";
+  public static final String SCHEMA_URL = "https://opentelemetry.io/schemas/1.22.0";
 
   /**
-   * Client address - unix domain socket name, IPv4 or IPv6 address.
+   * Client address - domain name if available without reverse DNS lookup, otherwise IP address or
+   * Unix domain socket name.
    *
    * <p>Notes:
    *
    * <ul>
    *   <li>When observed from the server side, and when communicating through an intermediary,
-   *       {@code client.address} SHOULD represent client address behind any intermediaries (e.g.
-   *       proxies) if it's available.
+   *       {@code client.address} SHOULD represent the client address behind any intermediaries
+   *       (e.g. proxies) if it's available.
    * </ul>
    */
   public static final AttributeKey<String> CLIENT_ADDRESS = stringKey("client.address");
 
   /**
-   * Client port number
+   * Client port number.
    *
    * <p>Notes:
    *
    * <ul>
    *   <li>When observed from the server side, and when communicating through an intermediary,
-   *       {@code client.port} SHOULD represent client port behind any intermediaries (e.g. proxies)
-   *       if it's available.
+   *       {@code client.port} SHOULD represent the client port behind any intermediaries (e.g.
+   *       proxies) if it's available.
    * </ul>
    */
   public static final AttributeKey<Long> CLIENT_PORT = longKey("client.port");
 
-  /** Immediate client peer address - unix domain socket name, IPv4 or IPv6 address. */
-  public static final AttributeKey<String> CLIENT_SOCKET_ADDRESS =
-      stringKey("client.socket.address");
-
-  /** Immediate client peer port number */
-  public static final AttributeKey<Long> CLIENT_SOCKET_PORT = longKey("client.socket.port");
-
   /**
-   * Deprecated, use {@code http.request.method} instead.
+   * Deprecated, use {@code server.address}.
    *
-   * @deprecated Deprecated, use `http.request.method` instead.
+   * @deprecated Deprecated, use `server.address`.
    */
-  @Deprecated public static final AttributeKey<String> HTTP_METHOD = stringKey("http.method");
+  @Deprecated public static final AttributeKey<String> NET_HOST_NAME = stringKey("net.host.name");
 
   /**
-   * Deprecated, use {@code http.response.status_code} instead.
+   * Deprecated, use {@code server.port}.
    *
-   * @deprecated Deprecated, use `http.response.status_code` instead.
+   * @deprecated Deprecated, use `server.port`.
    */
-  @Deprecated public static final AttributeKey<Long> HTTP_STATUS_CODE = longKey("http.status_code");
+  @Deprecated public static final AttributeKey<Long> NET_HOST_PORT = longKey("net.host.port");
 
   /**
-   * Deprecated, use {@code url.scheme} instead.
+   * Deprecated, use {@code server.address} on client spans and {@code client.address} on server
+   * spans.
    *
-   * @deprecated Deprecated, use `url.scheme` instead.
+   * @deprecated Deprecated, use `server.address` on client spans and `client.address` on server
+   *     spans.
    */
-  @Deprecated public static final AttributeKey<String> HTTP_SCHEME = stringKey("http.scheme");
+  @Deprecated public static final AttributeKey<String> NET_PEER_NAME = stringKey("net.peer.name");
 
   /**
-   * Deprecated, use {@code url.full} instead.
+   * Deprecated, use {@code server.port} on client spans and {@code client.port} on server spans.
    *
-   * @deprecated Deprecated, use `url.full` instead.
+   * @deprecated Deprecated, use `server.port` on client spans and `client.port` on server spans.
    */
-  @Deprecated public static final AttributeKey<String> HTTP_URL = stringKey("http.url");
+  @Deprecated public static final AttributeKey<Long> NET_PEER_PORT = longKey("net.peer.port");
 
   /**
-   * Deprecated, use {@code url.path} and {@code url.query} instead.
+   * Deprecated, use {@code network.protocol.name}.
    *
-   * @deprecated Deprecated, use `url.path` and `url.query` instead.
+   * @deprecated Deprecated, use `network.protocol.name`.
    */
-  @Deprecated public static final AttributeKey<String> HTTP_TARGET = stringKey("http.target");
+  @Deprecated
+  public static final AttributeKey<String> NET_PROTOCOL_NAME = stringKey("net.protocol.name");
 
   /**
-   * Deprecated, use {@code http.request.body.size} instead.
+   * Deprecated, use {@code network.protocol.version}.
    *
-   * @deprecated Deprecated, use `http.request.body.size` instead.
+   * @deprecated Deprecated, use `network.protocol.version`.
    */
   @Deprecated
-  public static final AttributeKey<Long> HTTP_REQUEST_CONTENT_LENGTH =
-      longKey("http.request_content_length");
+  public static final AttributeKey<String> NET_PROTOCOL_VERSION = stringKey("net.protocol.version");
 
   /**
-   * Deprecated, use {@code http.response.body.size} instead.
+   * Deprecated, use {@code network.transport} and {@code network.type}.
    *
-   * @deprecated Deprecated, use `http.response.body.size` instead.
+   * @deprecated Deprecated, use `network.transport` and `network.type`.
    */
   @Deprecated
-  public static final AttributeKey<Long> HTTP_RESPONSE_CONTENT_LENGTH =
-      longKey("http.response_content_length");
+  public static final AttributeKey<String> NET_SOCK_FAMILY = stringKey("net.sock.family");
 
   /**
-   * Deprecated, use {@code server.socket.domain} on client spans.
+   * Deprecated, use {@code network.local.address}.
    *
-   * @deprecated Deprecated, use `server.socket.domain` on client spans.
+   * @deprecated Deprecated, use `network.local.address`.
    */
   @Deprecated
-  public static final AttributeKey<String> NET_SOCK_PEER_NAME = stringKey("net.sock.peer.name");
+  public static final AttributeKey<String> NET_SOCK_HOST_ADDR = stringKey("net.sock.host.addr");
 
   /**
-   * Deprecated, use {@code server.socket.address} on client spans and {@code client.socket.address}
-   * on server spans.
+   * Deprecated, use {@code network.local.port}.
    *
-   * @deprecated Deprecated, use `server.socket.address` on client spans and `client.socket.address`
-   *     on server spans.
+   * @deprecated Deprecated, use `network.local.port`.
    */
   @Deprecated
-  public static final AttributeKey<String> NET_SOCK_PEER_ADDR = stringKey("net.sock.peer.addr");
+  public static final AttributeKey<Long> NET_SOCK_HOST_PORT = longKey("net.sock.host.port");
 
   /**
-   * Deprecated, use {@code server.socket.port} on client spans and {@code client.socket.port} on
-   * server spans.
+   * Deprecated, use {@code network.peer.address}.
    *
-   * @deprecated Deprecated, use `server.socket.port` on client spans and `client.socket.port` on
-   *     server spans.
+   * @deprecated Deprecated, use `network.peer.address`.
    */
   @Deprecated
-  public static final AttributeKey<Long> NET_SOCK_PEER_PORT = longKey("net.sock.peer.port");
+  public static final AttributeKey<String> NET_SOCK_PEER_ADDR = stringKey("net.sock.peer.addr");
 
   /**
-   * Deprecated, use {@code server.address} on client spans and {@code client.address} on server
-   * spans.
+   * Deprecated, no replacement at this time.
    *
-   * @deprecated Deprecated, use `server.address` on client spans and `client.address` on server
-   *     spans.
+   * @deprecated Deprecated, no replacement at this time.
    */
-  @Deprecated public static final AttributeKey<String> NET_PEER_NAME = stringKey("net.peer.name");
+  @Deprecated
+  public static final AttributeKey<String> NET_SOCK_PEER_NAME = stringKey("net.sock.peer.name");
 
   /**
-   * Deprecated, use {@code server.port} on client spans and {@code client.port} on server spans.
+   * Deprecated, use {@code network.peer.port}.
    *
-   * @deprecated Deprecated, use `server.port` on client spans and `client.port` on server spans.
+   * @deprecated Deprecated, use `network.peer.port`.
    */
-  @Deprecated public static final AttributeKey<Long> NET_PEER_PORT = longKey("net.peer.port");
+  @Deprecated
+  public static final AttributeKey<Long> NET_SOCK_PEER_PORT = longKey("net.sock.peer.port");
 
   /**
-   * Deprecated, use {@code server.address}.
+   * Deprecated, use {@code network.transport}.
    *
-   * @deprecated Deprecated, use `server.address`.
+   * @deprecated Deprecated, use `network.transport`.
    */
-  @Deprecated public static final AttributeKey<String> NET_HOST_NAME = stringKey("net.host.name");
+  @Deprecated public static final AttributeKey<String> NET_TRANSPORT = stringKey("net.transport");
 
   /**
-   * Deprecated, use {@code server.port}.
+   * Destination address - domain name if available without reverse DNS lookup, otherwise IP address
+   * or Unix domain socket name.
    *
-   * @deprecated Deprecated, use `server.port`.
-   */
-  @Deprecated public static final AttributeKey<Long> NET_HOST_PORT = longKey("net.host.port");
-
-  /**
-   * Deprecated, use {@code server.socket.address}.
+   * <p>Notes:
    *
-   * @deprecated Deprecated, use `server.socket.address`.
+   * <ul>
+   *   <li>When observed from the source side, and when communicating through an intermediary,
+   *       {@code destination.address} SHOULD represent the destination address behind any
+   *       intermediaries (e.g. proxies) if it's available.
+   * </ul>
    */
-  @Deprecated
-  public static final AttributeKey<String> NET_SOCK_HOST_ADDR = stringKey("net.sock.host.addr");
+  public static final AttributeKey<String> DESTINATION_ADDRESS = stringKey("destination.address");
+
+  /** Destination port number */
+  public static final AttributeKey<Long> DESTINATION_PORT = longKey("destination.port");
 
   /**
-   * Deprecated, use {@code server.socket.port}.
+   * Describes a class of error the operation ended with.
+   *
+   * <p>Notes:
    *
-   * @deprecated Deprecated, use `server.socket.port`.
+   * <ul>
+   *   <li>The {@code error.type} SHOULD be predictable and SHOULD have low cardinality.
+   *       Instrumentations SHOULD document the list of errors they report.
+   *   <li>The cardinality of {@code error.type} within one instrumentation library SHOULD be low,
+   *       but telemetry consumers that aggregate data from multiple instrumentation libraries and
+   *       applications should be prepared for {@code error.type} to have high cardinality at query
+   *       time, when no additional filters are applied.
+   *   <li>If the operation has completed successfully, instrumentations SHOULD NOT set {@code
+   *       error.type}.
+   *   <li>If a specific domain defines its own set of error codes (such as HTTP or gRPC status
+   *       codes), it's RECOMMENDED to use a domain-specific attribute and also set {@code
+   *       error.type} to capture all errors, regardless of whether they are defined within the
+   *       domain-specific set or not.
+   * </ul>
    */
-  @Deprecated
-  public static final AttributeKey<Long> NET_SOCK_HOST_PORT = longKey("net.sock.host.port");
+  public static final AttributeKey<String> ERROR_TYPE = stringKey("error.type");
+
+  /** The exception message. */
+  public static final AttributeKey<String> EXCEPTION_MESSAGE = stringKey("exception.message");
 
   /**
-   * Deprecated, use {@code network.transport}.
-   *
-   * @deprecated Deprecated, use `network.transport`.
+   * 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 public static final AttributeKey<String> NET_TRANSPORT = stringKey("net.transport");
+  public static final AttributeKey<String> EXCEPTION_STACKTRACE = stringKey("exception.stacktrace");
 
   /**
-   * Deprecated, use {@code network.protocol.name}.
-   *
-   * @deprecated Deprecated, use `network.protocol.name`.
+   * 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
-  public static final AttributeKey<String> NET_PROTOCOL_NAME = stringKey("net.protocol.name");
+  public static final AttributeKey<String> EXCEPTION_TYPE = stringKey("exception.type");
 
   /**
-   * Deprecated, use {@code network.protocol.version}.
+   * The name of the invoked function.
    *
-   * @deprecated Deprecated, use `network.protocol.version`.
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>SHOULD be equal to the {@code faas.name} resource attribute of the invoked function.
+   * </ul>
    */
-  @Deprecated
-  public static final AttributeKey<String> NET_PROTOCOL_VERSION = stringKey("net.protocol.version");
+  public static final AttributeKey<String> FAAS_INVOKED_NAME = stringKey("faas.invoked_name");
 
   /**
-   * Deprecated, use {@code network.transport} and {@code network.type}.
+   * The cloud provider of the invoked function.
    *
-   * @deprecated Deprecated, use `network.transport` and `network.type`.
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>SHOULD be equal to the {@code cloud.provider} resource attribute of the invoked function.
+   * </ul>
    */
-  @Deprecated
-  public static final AttributeKey<String> NET_SOCK_FAMILY = stringKey("net.sock.family");
+  public static final AttributeKey<String> FAAS_INVOKED_PROVIDER =
+      stringKey("faas.invoked_provider");
 
   /**
-   * The domain name of the destination system.
+   * The cloud region of the invoked function.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>This value may be a host name, a fully qualified domain name, or another host naming
-   *       format.
+   *   <li>SHOULD be equal to the {@code cloud.region} resource attribute of the invoked function.
    * </ul>
    */
-  public static final AttributeKey<String> DESTINATION_DOMAIN = stringKey("destination.domain");
+  public static final AttributeKey<String> FAAS_INVOKED_REGION = stringKey("faas.invoked_region");
 
-  /** Peer address, for example IP address or UNIX socket name. */
-  public static final AttributeKey<String> DESTINATION_ADDRESS = stringKey("destination.address");
+  /** Type of the trigger which caused this function invocation. */
+  public static final AttributeKey<String> FAAS_TRIGGER = stringKey("faas.trigger");
 
-  /** Peer port number */
-  public static final AttributeKey<Long> DESTINATION_PORT = longKey("destination.port");
+  /**
+   * The <a href="/docs/resource/README.md#service">{@code service.name}</a> of the remote service.
+   * SHOULD be equal to the actual {@code service.name} resource attribute of the remote service if
+   * any.
+   */
+  public static final AttributeKey<String> PEER_SERVICE = stringKey("peer.service");
 
   /**
-   * 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.
+   * Username or client_id extracted from the access token or <a
+   * href="https://tools.ietf.org/html/rfc7235#section-4.2">Authorization</a> header in the inbound
+   * request from outside the system.
    */
-  public static final AttributeKey<String> EXCEPTION_TYPE = stringKey("exception.type");
+  public static final AttributeKey<String> ENDUSER_ID = stringKey("enduser.id");
 
-  /** The exception message. */
-  public static final AttributeKey<String> EXCEPTION_MESSAGE = stringKey("exception.message");
+  /**
+   * Actual/assumed role the client is making the request under extracted from token or application
+   * security context.
+   */
+  public static final AttributeKey<String> ENDUSER_ROLE = stringKey("enduser.role");
 
   /**
-   * 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.
+   * Scopes or granted authorities the client currently possesses extracted from token or
+   * application security context. The value would come from the scope associated with an <a
+   * href="https://tools.ietf.org/html/rfc6749#section-3.3">OAuth 2.0 Access Token</a> or an
+   * attribute value in a <a
+   * href="http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-tech-overview-2.0.html">SAML
+   * 2.0 Assertion</a>.
    */
-  public static final AttributeKey<String> EXCEPTION_STACKTRACE = stringKey("exception.stacktrace");
+  public static final AttributeKey<String> ENDUSER_SCOPE = stringKey("enduser.scope");
+
+  /** Whether the thread is daemon or not. */
+  public static final AttributeKey<Boolean> THREAD_DAEMON = booleanKey("thread.daemon");
+
+  /** Current &quot;managed&quot; thread ID (as opposed to OS thread ID). */
+  public static final AttributeKey<Long> THREAD_ID = longKey("thread.id");
+
+  /** Current thread name. */
+  public static final AttributeKey<String> THREAD_NAME = stringKey("thread.name");
 
   /**
-   * HTTP request method.
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li>HTTP request method value SHOULD be &quot;known&quot; to the instrumentation. By default,
-   *       this convention defines &quot;known&quot; methods as the ones listed in <a
-   *       href="https://www.rfc-editor.org/rfc/rfc9110.html#name-methods">RFC9110</a> and the PATCH
-   *       method defined in <a href="https://www.rfc-editor.org/rfc/rfc5789.html">RFC5789</a>.
-   *   <li>If the HTTP request method is not known to instrumentation, it MUST set the {@code
-   *       http.request.method} attribute to {@code _OTHER} and, except if reporting a metric, MUST
-   *       set the exact method received in the request line as value of the {@code
-   *       http.request.method_original} attribute.
-   *   <li>If the HTTP instrumentation could end up converting valid HTTP request methods to {@code
-   *       _OTHER}, then it MUST provide a way to override the list of known HTTP methods. If this
-   *       override is done via environment variable, then the environment variable MUST be named
-   *       OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS and support a comma-separated list of
-   *       case-sensitive known HTTP methods (this list MUST be a full override of the default known
-   *       method, it is not a list of known methods in addition to the defaults).
-   *   <li>HTTP method names are case-sensitive and {@code http.request.method} attribute value MUST
-   *       match a known HTTP method name exactly. Instrumentations for specific web frameworks that
-   *       consider HTTP methods to be case insensitive, SHOULD populate a canonical equivalent.
-   *       Tracing instrumentations that do so, MUST also set {@code http.request.method_original}
-   *       to the original value.
-   * </ul>
+   * The column number in {@code code.filepath} best representing the operation. It SHOULD point
+   * within the code unit named in {@code code.function}.
    */
-  public static final AttributeKey<String> HTTP_REQUEST_METHOD = stringKey("http.request.method");
+  public static final AttributeKey<Long> CODE_COLUMN = longKey("code.column");
 
-  /** <a href="https://tools.ietf.org/html/rfc7231#section-6">HTTP response status code</a>. */
-  public static final AttributeKey<Long> HTTP_RESPONSE_STATUS_CODE =
-      longKey("http.response.status_code");
+  /**
+   * The source code file name that identifies the code unit as uniquely as possible (preferably an
+   * absolute file path).
+   */
+  public static final AttributeKey<String> CODE_FILEPATH = stringKey("code.filepath");
 
   /**
-   * The matched route (path template in the format used by the respective server framework). See
-   * note below
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li>MUST NOT be populated when this is not supported by the HTTP server framework as the
-   *       route attribute should have low-cardinality and the URI path can NOT substitute it.
-   *       SHOULD include the <a href="/docs/http/http-spans.md#http-server-definitions">application
-   *       root</a> if there is one.
-   * </ul>
+   * The method or function name, or equivalent (usually rightmost part of the code unit's name).
    */
-  public static final AttributeKey<String> HTTP_ROUTE = stringKey("http.route");
+  public static final AttributeKey<String> CODE_FUNCTION = stringKey("code.function");
 
-  /** The name identifies the event. */
-  public static final AttributeKey<String> EVENT_NAME = stringKey("event.name");
+  /**
+   * The line number in {@code code.filepath} best representing the operation. It SHOULD point
+   * within the code unit named in {@code code.function}.
+   */
+  public static final AttributeKey<Long> CODE_LINENO = longKey("code.lineno");
+
+  /**
+   * The &quot;namespace&quot; within which {@code code.function} is defined. Usually the qualified
+   * class or module name, such that {@code code.namespace} + some separator + {@code code.function}
+   * form a unique identifier for the code unit.
+   */
+  public static final AttributeKey<String> CODE_NAMESPACE = stringKey("code.namespace");
 
   /**
    * The domain identifies the business context for the events.
@@ -308,6 +321,9 @@ public final class SemanticAttributes {
    */
   public static final AttributeKey<String> EVENT_DOMAIN = stringKey("event.domain");
 
+  /** The name identifies the event. */
+  public static final AttributeKey<String> EVENT_NAME = stringKey("event.name");
+
   /**
    * A unique identifier for the Log Record.
    *
@@ -329,263 +345,565 @@ public final class SemanticAttributes {
   /** The basename of the file. */
   public static final AttributeKey<String> LOG_FILE_NAME = stringKey("log.file.name");
 
-  /** The full path to the file. */
-  public static final AttributeKey<String> LOG_FILE_PATH = stringKey("log.file.path");
-
   /** The basename of the file, with symlinks resolved. */
   public static final AttributeKey<String> LOG_FILE_NAME_RESOLVED =
       stringKey("log.file.name_resolved");
 
+  /** The full path to the file. */
+  public static final AttributeKey<String> LOG_FILE_PATH = stringKey("log.file.path");
+
   /** The full path to the file, with symlinks resolved. */
   public static final AttributeKey<String> LOG_FILE_PATH_RESOLVED =
       stringKey("log.file.path_resolved");
 
-  /** The type of memory. */
-  public static final AttributeKey<String> TYPE = stringKey("type");
+  /**
+   * The name of the connection pool; unique within the instrumented application. In case the
+   * connection pool implementation does not provide a name, then the <a
+   * href="/docs/database/database-spans.md#connection-level-attributes">db.connection_string</a>
+   * should be used
+   */
+  public static final AttributeKey<String> POOL_NAME = stringKey("pool.name");
+
+  /** The state of a connection in the pool */
+  public static final AttributeKey<String> STATE = stringKey("state");
 
   /**
-   * Name of the memory pool.
+   * Name of the buffer pool.
    *
    * <p>Notes:
    *
    * <ul>
    *   <li>Pool names are generally obtained via <a
-   *       href="https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html#getName()">MemoryPoolMXBean#getName()</a>.
+   *       href="https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/BufferPoolMXBean.html#getName()">BufferPoolMXBean#getName()</a>.
    * </ul>
    */
-  public static final AttributeKey<String> POOL = stringKey("pool");
+  public static final AttributeKey<String> JVM_BUFFER_POOL_NAME = stringKey("jvm.buffer.pool.name");
 
   /**
-   * Logical server hostname, matches server FQDN if available, and IP or socket address if FQDN is
-   * not known.
+   * Name of the memory pool.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>Pool names are generally obtained via <a
+   *       href="https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html#getName()">MemoryPoolMXBean#getName()</a>.
+   * </ul>
    */
-  public static final AttributeKey<String> SERVER_ADDRESS = stringKey("server.address");
+  public static final AttributeKey<String> JVM_MEMORY_POOL_NAME = stringKey("jvm.memory.pool.name");
 
-  /** Logical server port number */
-  public static final AttributeKey<Long> SERVER_PORT = longKey("server.port");
+  /** The type of memory. */
+  public static final AttributeKey<String> JVM_MEMORY_TYPE = stringKey("jvm.memory.type");
+
+  /** The device identifier */
+  public static final AttributeKey<String> SYSTEM_DEVICE = stringKey("system.device");
+
+  /** The logical CPU number [0..n-1] */
+  public static final AttributeKey<Long> SYSTEM_CPU_LOGICAL_NUMBER =
+      longKey("system.cpu.logical_number");
+
+  /** The state of the CPU */
+  public static final AttributeKey<String> SYSTEM_CPU_STATE = stringKey("system.cpu.state");
+
+  /** The memory state */
+  public static final AttributeKey<String> SYSTEM_MEMORY_STATE = stringKey("system.memory.state");
+
+  /** The paging access direction */
+  public static final AttributeKey<String> SYSTEM_PAGING_DIRECTION =
+      stringKey("system.paging.direction");
+
+  /** The memory paging state */
+  public static final AttributeKey<String> SYSTEM_PAGING_STATE = stringKey("system.paging.state");
+
+  /** The memory paging type */
+  public static final AttributeKey<String> SYSTEM_PAGING_TYPE = stringKey("system.paging.type");
+
+  /** The disk operation direction */
+  public static final AttributeKey<String> SYSTEM_DISK_DIRECTION =
+      stringKey("system.disk.direction");
+
+  /** The filesystem mode */
+  public static final AttributeKey<String> SYSTEM_FILESYSTEM_MODE =
+      stringKey("system.filesystem.mode");
+
+  /** The filesystem mount path */
+  public static final AttributeKey<String> SYSTEM_FILESYSTEM_MOUNTPOINT =
+      stringKey("system.filesystem.mountpoint");
+
+  /** The filesystem state */
+  public static final AttributeKey<String> SYSTEM_FILESYSTEM_STATE =
+      stringKey("system.filesystem.state");
+
+  /** The filesystem type */
+  public static final AttributeKey<String> SYSTEM_FILESYSTEM_TYPE =
+      stringKey("system.filesystem.type");
+
+  /** */
+  public static final AttributeKey<String> SYSTEM_NETWORK_DIRECTION =
+      stringKey("system.network.direction");
+
+  /** A stateless protocol MUST NOT set this attribute */
+  public static final AttributeKey<String> SYSTEM_NETWORK_STATE = stringKey("system.network.state");
+
+  /**
+   * The process state, e.g., <a
+   * href="https://man7.org/linux/man-pages/man1/ps.1.html#PROCESS_STATE_CODES">Linux Process State
+   * Codes</a>
+   */
+  public static final AttributeKey<String> SYSTEM_PROCESSES_STATUS =
+      stringKey("system.processes.status");
+
+  /** Local address of the network connection - IP address or Unix domain socket name. */
+  public static final AttributeKey<String> NETWORK_LOCAL_ADDRESS =
+      stringKey("network.local.address");
+
+  /** Local port number of the network connection. */
+  public static final AttributeKey<Long> NETWORK_LOCAL_PORT = longKey("network.local.port");
+
+  /** Peer address of the network connection - IP address or Unix domain socket name. */
+  public static final AttributeKey<String> NETWORK_PEER_ADDRESS = stringKey("network.peer.address");
+
+  /** Peer port number of the network connection. */
+  public static final AttributeKey<Long> NETWORK_PEER_PORT = longKey("network.peer.port");
 
   /**
-   * The domain name of an immediate peer.
+   * <a href="https://osi-model.com/application-layer/">OSI application layer</a> or non-OSI
+   * equivalent.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>Typically observed from the client side, and represents a proxy or other intermediary
-   *       domain name.
+   *   <li>The value SHOULD be normalized to lowercase.
    * </ul>
    */
-  public static final AttributeKey<String> SERVER_SOCKET_DOMAIN = stringKey("server.socket.domain");
+  public static final AttributeKey<String> NETWORK_PROTOCOL_NAME =
+      stringKey("network.protocol.name");
 
   /**
-   * Physical server IP address or Unix socket address. If set from the client, should simply use
-   * the socket's peer address, and not attempt to find any actual server IP (i.e., if set from
-   * client, this may represent some proxy server instead of the logical server).
+   * Version of the protocol specified in {@code network.protocol.name}.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>{@code network.protocol.version} refers to the version of the protocol used and might be
+   *       different from the protocol client's version. If the HTTP client used has a version of
+   *       {@code 0.27.2}, but sends HTTP version {@code 1.1}, this attribute should be set to
+   *       {@code 1.1}.
+   * </ul>
    */
-  public static final AttributeKey<String> SERVER_SOCKET_ADDRESS =
-      stringKey("server.socket.address");
-
-  /** Physical server port. */
-  public static final AttributeKey<Long> SERVER_SOCKET_PORT = longKey("server.socket.port");
+  public static final AttributeKey<String> NETWORK_PROTOCOL_VERSION =
+      stringKey("network.protocol.version");
 
   /**
-   * The domain name of the source system.
+   * <a href="https://osi-model.com/transport-layer/">OSI transport layer</a> or <a
+   * href="https://en.wikipedia.org/wiki/Inter-process_communication">inter-process communication
+   * method</a>.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>This value may be a host name, a fully qualified domain name, or another host naming
-   *       format.
+   *   <li>The value SHOULD be normalized to lowercase.
+   *   <li>Consider always setting the transport when setting a port number, since a port number is
+   *       ambiguous without knowing the transport, for example different processes could be
+   *       listening on TCP port 12345 and UDP port 12345.
    * </ul>
    */
-  public static final AttributeKey<String> SOURCE_DOMAIN = stringKey("source.domain");
-
-  /** Source address, for example IP address or Unix socket name. */
-  public static final AttributeKey<String> SOURCE_ADDRESS = stringKey("source.address");
-
-  /** Source port number */
-  public static final AttributeKey<Long> SOURCE_PORT = longKey("source.port");
+  public static final AttributeKey<String> NETWORK_TRANSPORT = stringKey("network.transport");
 
   /**
-   * The full invoked ARN as provided on the {@code Context} passed to the function ({@code
-   * Lambda-Runtime-Invoked-Function-Arn} header on the {@code /runtime/invocation/next}
-   * applicable).
+   * <a href="https://osi-model.com/network-layer/">OSI network layer</a> or non-OSI equivalent.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>This may be different from {@code cloud.resource_id} if an alias is involved.
+   *   <li>The value SHOULD be normalized to lowercase.
    * </ul>
    */
-  public static final AttributeKey<String> AWS_LAMBDA_INVOKED_ARN =
-      stringKey("aws.lambda.invoked_arn");
+  public static final AttributeKey<String> NETWORK_TYPE = stringKey("network.type");
+
+  /** The ISO 3166-1 alpha-2 2-character country code associated with the mobile carrier network. */
+  public static final AttributeKey<String> NETWORK_CARRIER_ICC = stringKey("network.carrier.icc");
+
+  /** The mobile carrier country code. */
+  public static final AttributeKey<String> NETWORK_CARRIER_MCC = stringKey("network.carrier.mcc");
+
+  /** The mobile carrier network code. */
+  public static final AttributeKey<String> NETWORK_CARRIER_MNC = stringKey("network.carrier.mnc");
+
+  /** The name of the mobile carrier. */
+  public static final AttributeKey<String> NETWORK_CARRIER_NAME = stringKey("network.carrier.name");
 
   /**
-   * The <a
-   * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#id">event_id</a>
-   * uniquely identifies the event.
+   * This describes more details regarding the connection.type. It may be the type of cell
+   * technology connection, but it could be used for describing details about a wifi connection.
    */
-  public static final AttributeKey<String> CLOUDEVENTS_EVENT_ID = stringKey("cloudevents.event_id");
+  public static final AttributeKey<String> NETWORK_CONNECTION_SUBTYPE =
+      stringKey("network.connection.subtype");
+
+  /** The internet connection type. */
+  public static final AttributeKey<String> NETWORK_CONNECTION_TYPE =
+      stringKey("network.connection.type");
 
   /**
-   * The <a
-   * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#source-1">source</a>
-   * identifies the context in which an event happened.
+   * Deprecated, use {@code http.request.method} instead.
+   *
+   * @deprecated Deprecated, use `http.request.method` instead.
    */
-  public static final AttributeKey<String> CLOUDEVENTS_EVENT_SOURCE =
-      stringKey("cloudevents.event_source");
+  @Deprecated public static final AttributeKey<String> HTTP_METHOD = stringKey("http.method");
 
   /**
-   * The <a
-   * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#specversion">version
-   * of the CloudEvents specification</a> which the event uses.
+   * Deprecated, use {@code http.request.body.size} instead.
+   *
+   * @deprecated Deprecated, use `http.request.body.size` instead.
    */
-  public static final AttributeKey<String> CLOUDEVENTS_EVENT_SPEC_VERSION =
-      stringKey("cloudevents.event_spec_version");
+  @Deprecated
+  public static final AttributeKey<Long> HTTP_REQUEST_CONTENT_LENGTH =
+      longKey("http.request_content_length");
 
   /**
-   * The <a
-   * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#type">event_type</a>
-   * contains a value describing the type of event related to the originating occurrence.
+   * Deprecated, use {@code http.response.body.size} instead.
+   *
+   * @deprecated Deprecated, use `http.response.body.size` instead.
    */
-  public static final AttributeKey<String> CLOUDEVENTS_EVENT_TYPE =
-      stringKey("cloudevents.event_type");
+  @Deprecated
+  public static final AttributeKey<Long> HTTP_RESPONSE_CONTENT_LENGTH =
+      longKey("http.response_content_length");
 
   /**
-   * The <a
-   * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#subject">subject</a>
-   * of the event in the context of the event producer (identified by source).
+   * Deprecated, use {@code url.scheme} instead.
+   *
+   * @deprecated Deprecated, use `url.scheme` instead.
    */
-  public static final AttributeKey<String> CLOUDEVENTS_EVENT_SUBJECT =
-      stringKey("cloudevents.event_subject");
+  @Deprecated public static final AttributeKey<String> HTTP_SCHEME = stringKey("http.scheme");
 
   /**
-   * Parent-child Reference type
-   *
-   * <p>Notes:
+   * Deprecated, use {@code http.response.status_code} instead.
    *
-   * <ul>
-   *   <li>The causal relationship between a child Span and a parent Span.
-   * </ul>
+   * @deprecated Deprecated, use `http.response.status_code` instead.
    */
-  public static final AttributeKey<String> OPENTRACING_REF_TYPE = stringKey("opentracing.ref_type");
+  @Deprecated public static final AttributeKey<Long> HTTP_STATUS_CODE = longKey("http.status_code");
 
   /**
-   * An identifier for the database management system (DBMS) product being used. See below for a
-   * list of well-known identifiers.
+   * Deprecated, use {@code url.path} and {@code url.query} instead.
+   *
+   * @deprecated Deprecated, use `url.path` and `url.query` instead.
    */
-  public static final AttributeKey<String> DB_SYSTEM = stringKey("db.system");
+  @Deprecated public static final AttributeKey<String> HTTP_TARGET = stringKey("http.target");
 
   /**
-   * The connection string used to connect to the database. It is recommended to remove embedded
-   * credentials.
+   * Deprecated, use {@code url.full} instead.
+   *
+   * @deprecated Deprecated, use `url.full` instead.
    */
-  public static final AttributeKey<String> DB_CONNECTION_STRING = stringKey("db.connection_string");
-
-  /** Username for accessing the database. */
-  public static final AttributeKey<String> DB_USER = stringKey("db.user");
+  @Deprecated public static final AttributeKey<String> HTTP_URL = stringKey("http.url");
 
   /**
-   * 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.
+   * The size of the request payload body in bytes. This is the number of bytes transferred
+   * excluding headers and is often, but not always, present as the <a
+   * href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a>
+   * header. For requests using transport encoding, this should be the compressed size.
    */
-  public static final AttributeKey<String> DB_JDBC_DRIVER_CLASSNAME =
-      stringKey("db.jdbc.driver_classname");
+  public static final AttributeKey<Long> HTTP_REQUEST_BODY_SIZE = longKey("http.request.body.size");
 
   /**
-   * This attribute is used to report the name of the database being accessed. For commands that
-   * switch the database, this should be set to the target database (even if the command fails).
+   * HTTP request method.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>In some SQL databases, the database name to be used is called &quot;schema name&quot;. In
-   *       case there are multiple layers that could be considered for database name (e.g. Oracle
-   *       instance name and schema name), the database name to be used is the more specific layer
-   *       (e.g. Oracle schema name).
+   *   <li>HTTP request method value SHOULD be &quot;known&quot; to the instrumentation. By default,
+   *       this convention defines &quot;known&quot; methods as the ones listed in <a
+   *       href="https://www.rfc-editor.org/rfc/rfc9110.html#name-methods">RFC9110</a> and the PATCH
+   *       method defined in <a href="https://www.rfc-editor.org/rfc/rfc5789.html">RFC5789</a>.
+   *   <li>If the HTTP request method is not known to instrumentation, it MUST set the {@code
+   *       http.request.method} attribute to {@code _OTHER}.
+   *   <li>If the HTTP instrumentation could end up converting valid HTTP request methods to {@code
+   *       _OTHER}, then it MUST provide a way to override the list of known HTTP methods. If this
+   *       override is done via environment variable, then the environment variable MUST be named
+   *       OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS and support a comma-separated list of
+   *       case-sensitive known HTTP methods (this list MUST be a full override of the default known
+   *       method, it is not a list of known methods in addition to the defaults).
+   *   <li>HTTP method names are case-sensitive and {@code http.request.method} attribute value MUST
+   *       match a known HTTP method name exactly. Instrumentations for specific web frameworks that
+   *       consider HTTP methods to be case insensitive, SHOULD populate a canonical equivalent.
+   *       Tracing instrumentations that do so, MUST also set {@code http.request.method_original}
+   *       to the original value.
    * </ul>
    */
-  public static final AttributeKey<String> DB_NAME = stringKey("db.name");
+  public static final AttributeKey<String> HTTP_REQUEST_METHOD = stringKey("http.request.method");
 
-  /** The database statement being executed. */
-  public static final AttributeKey<String> DB_STATEMENT = stringKey("db.statement");
+  /** Original HTTP method sent by the client in the request line. */
+  public static final AttributeKey<String> HTTP_REQUEST_METHOD_ORIGINAL =
+      stringKey("http.request.method_original");
 
   /**
-   * The name of the operation being executed, e.g. the <a
-   * href="https://docs.mongodb.com/manual/reference/command/#database-operations">MongoDB command
-   * name</a> such as {@code findAndModify}, or the SQL keyword.
+   * The ordinal number of request resending attempt (for any reason, including redirects).
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>When setting this to an SQL keyword, it is not recommended to attempt any client-side
-   *       parsing of {@code db.statement} just to get this property, but it should be set if the
-   *       operation name is provided by the library being instrumented. If the SQL statement has an
-   *       ambiguous operation, or performs more than one operation, this value may be omitted.
+   *   <li>The resend count SHOULD be updated each time an HTTP request gets resent by the client,
+   *       regardless of what was the cause of the resending (e.g. redirection, authorization
+   *       failure, 503 Server Unavailable, network issues, or any other).
    * </ul>
    */
-  public static final AttributeKey<String> DB_OPERATION = stringKey("db.operation");
+  public static final AttributeKey<Long> HTTP_RESEND_COUNT = longKey("http.resend_count");
 
   /**
-   * The Microsoft SQL Server <a
-   * href="https://docs.microsoft.com/en-us/sql/connect/jdbc/building-the-connection-url?view=sql-server-ver15">instance
-   * name</a> connecting to. This name is used to determine the port of a named instance.
+   * The size of the response payload body in bytes. This is the number of bytes transferred
+   * excluding headers and is often, but not always, present as the <a
+   * href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a>
+   * header. For requests using transport encoding, this should be the compressed size.
+   */
+  public static final AttributeKey<Long> HTTP_RESPONSE_BODY_SIZE =
+      longKey("http.response.body.size");
+
+  /** <a href="https://tools.ietf.org/html/rfc7231#section-6">HTTP response status code</a>. */
+  public static final AttributeKey<Long> HTTP_RESPONSE_STATUS_CODE =
+      longKey("http.response.status_code");
+
+  /**
+   * The matched route (path template in the format used by the respective server framework). See
+   * note below
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>If setting a {@code db.mssql.instance_name}, {@code server.port} is no longer required
-   *       (but still recommended if non-standard).
+   *   <li>MUST NOT be populated when this is not supported by the HTTP server framework as the
+   *       route attribute should have low-cardinality and the URI path can NOT substitute it.
+   *       SHOULD include the <a href="/docs/http/http-spans.md#http-server-definitions">application
+   *       root</a> if there is one.
    * </ul>
    */
-  public static final AttributeKey<String> DB_MSSQL_INSTANCE_NAME =
-      stringKey("db.mssql.instance_name");
-
-  /** The fetch size used for paging, i.e. how many rows will be returned at once. */
-  public static final AttributeKey<Long> DB_CASSANDRA_PAGE_SIZE = longKey("db.cassandra.page_size");
+  public static final AttributeKey<String> HTTP_ROUTE = stringKey("http.route");
 
   /**
-   * The consistency level of the query. Based on consistency values from <a
-   * href="https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html">CQL</a>.
+   * Server address - domain name if available without reverse DNS lookup, otherwise IP address or
+   * Unix domain socket name.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>When observed from the client side, and when communicating through an intermediary,
+   *       {@code server.address} SHOULD represent the server address behind any intermediaries
+   *       (e.g. proxies) if it's available.
+   * </ul>
    */
-  public static final AttributeKey<String> DB_CASSANDRA_CONSISTENCY_LEVEL =
-      stringKey("db.cassandra.consistency_level");
+  public static final AttributeKey<String> SERVER_ADDRESS = stringKey("server.address");
 
   /**
-   * The name of the primary table that the operation is acting upon, including the keyspace name
-   * (if applicable).
+   * Server port number.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>This mirrors the db.sql.table attribute but references cassandra rather than sql. It is
-   *       not recommended to attempt any client-side parsing of {@code db.statement} just to get
-   *       this property, but it should be set if it is provided by the library being instrumented.
-   *       If the operation is acting upon an anonymous table, or more than one table, this value
-   *       MUST NOT be set.
+   *   <li>When observed from the client side, and when communicating through an intermediary,
+   *       {@code server.port} SHOULD represent the server port behind any intermediaries (e.g.
+   *       proxies) if it's available.
    * </ul>
    */
-  public static final AttributeKey<String> DB_CASSANDRA_TABLE = stringKey("db.cassandra.table");
+  public static final AttributeKey<Long> SERVER_PORT = longKey("server.port");
 
-  /** Whether or not the query is idempotent. */
-  public static final AttributeKey<Boolean> DB_CASSANDRA_IDEMPOTENCE =
-      booleanKey("db.cassandra.idempotence");
+  /** A unique id to identify a session. */
+  public static final AttributeKey<String> SESSION_ID = stringKey("session.id");
 
   /**
-   * The number of times a query was speculatively executed. Not set or {@code 0} if the query was
-   * not executed speculatively.
+   * Source address - domain name if available without reverse DNS lookup, otherwise IP address or
+   * Unix domain socket name.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>When observed from the destination side, and when communicating through an intermediary,
+   *       {@code source.address} SHOULD represent the source address behind any intermediaries
+   *       (e.g. proxies) if it's available.
+   * </ul>
    */
-  public static final AttributeKey<Long> DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT =
-      longKey("db.cassandra.speculative_execution_count");
+  public static final AttributeKey<String> SOURCE_ADDRESS = stringKey("source.address");
 
-  /** The ID of the coordinating node for a query. */
-  public static final AttributeKey<String> DB_CASSANDRA_COORDINATOR_ID =
-      stringKey("db.cassandra.coordinator.id");
+  /** Source port number */
+  public static final AttributeKey<Long> SOURCE_PORT = longKey("source.port");
+
+  /**
+   * The full invoked ARN as provided on the {@code Context} passed to the function ({@code
+   * Lambda-Runtime-Invoked-Function-Arn} header on the {@code /runtime/invocation/next}
+   * applicable).
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>This may be different from {@code cloud.resource_id} if an alias is involved.
+   * </ul>
+   */
+  public static final AttributeKey<String> AWS_LAMBDA_INVOKED_ARN =
+      stringKey("aws.lambda.invoked_arn");
+
+  /**
+   * The <a
+   * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#id">event_id</a>
+   * uniquely identifies the event.
+   */
+  public static final AttributeKey<String> CLOUDEVENTS_EVENT_ID = stringKey("cloudevents.event_id");
+
+  /**
+   * The <a
+   * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#source-1">source</a>
+   * identifies the context in which an event happened.
+   */
+  public static final AttributeKey<String> CLOUDEVENTS_EVENT_SOURCE =
+      stringKey("cloudevents.event_source");
+
+  /**
+   * The <a
+   * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#specversion">version
+   * of the CloudEvents specification</a> which the event uses.
+   */
+  public static final AttributeKey<String> CLOUDEVENTS_EVENT_SPEC_VERSION =
+      stringKey("cloudevents.event_spec_version");
+
+  /**
+   * The <a
+   * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#subject">subject</a>
+   * of the event in the context of the event producer (identified by source).
+   */
+  public static final AttributeKey<String> CLOUDEVENTS_EVENT_SUBJECT =
+      stringKey("cloudevents.event_subject");
+
+  /**
+   * The <a
+   * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#type">event_type</a>
+   * contains a value describing the type of event related to the originating occurrence.
+   */
+  public static final AttributeKey<String> CLOUDEVENTS_EVENT_TYPE =
+      stringKey("cloudevents.event_type");
+
+  /**
+   * Parent-child Reference type
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>The causal relationship between a child Span and a parent Span.
+   * </ul>
+   */
+  public static final AttributeKey<String> OPENTRACING_REF_TYPE = stringKey("opentracing.ref_type");
+
+  /**
+   * The connection string used to connect to the database. It is recommended to remove embedded
+   * credentials.
+   */
+  public static final AttributeKey<String> DB_CONNECTION_STRING = stringKey("db.connection_string");
+
+  /**
+   * 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.
+   */
+  public static final AttributeKey<String> DB_JDBC_DRIVER_CLASSNAME =
+      stringKey("db.jdbc.driver_classname");
+
+  /**
+   * This attribute is used to report the name of the database being accessed. For commands that
+   * switch the database, this should be set to the target database (even if the command fails).
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>In some SQL databases, the database name to be used is called &quot;schema name&quot;. In
+   *       case there are multiple layers that could be considered for database name (e.g. Oracle
+   *       instance name and schema name), the database name to be used is the more specific layer
+   *       (e.g. Oracle schema name).
+   * </ul>
+   */
+  public static final AttributeKey<String> DB_NAME = stringKey("db.name");
+
+  /**
+   * The name of the operation being executed, e.g. the <a
+   * href="https://docs.mongodb.com/manual/reference/command/#database-operations">MongoDB command
+   * name</a> such as {@code findAndModify}, or the SQL keyword.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>When setting this to an SQL keyword, it is not recommended to attempt any client-side
+   *       parsing of {@code db.statement} just to get this property, but it should be set if the
+   *       operation name is provided by the library being instrumented. If the SQL statement has an
+   *       ambiguous operation, or performs more than one operation, this value may be omitted.
+   * </ul>
+   */
+  public static final AttributeKey<String> DB_OPERATION = stringKey("db.operation");
+
+  /** The database statement being executed. */
+  public static final AttributeKey<String> DB_STATEMENT = stringKey("db.statement");
+
+  /**
+   * An identifier for the database management system (DBMS) product being used. See below for a
+   * list of well-known identifiers.
+   */
+  public static final AttributeKey<String> DB_SYSTEM = stringKey("db.system");
+
+  /** Username for accessing the database. */
+  public static final AttributeKey<String> DB_USER = stringKey("db.user");
+
+  /**
+   * The Microsoft SQL Server <a
+   * href="https://docs.microsoft.com/en-us/sql/connect/jdbc/building-the-connection-url?view=sql-server-ver15">instance
+   * name</a> connecting to. This name is used to determine the port of a named instance.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>If setting a {@code db.mssql.instance_name}, {@code server.port} is no longer required
+   *       (but still recommended if non-standard).
+   * </ul>
+   */
+  public static final AttributeKey<String> DB_MSSQL_INSTANCE_NAME =
+      stringKey("db.mssql.instance_name");
+
+  /**
+   * The consistency level of the query. Based on consistency values from <a
+   * href="https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html">CQL</a>.
+   */
+  public static final AttributeKey<String> DB_CASSANDRA_CONSISTENCY_LEVEL =
+      stringKey("db.cassandra.consistency_level");
 
   /** The data center of the coordinating node for a query. */
   public static final AttributeKey<String> DB_CASSANDRA_COORDINATOR_DC =
       stringKey("db.cassandra.coordinator.dc");
 
+  /** The ID of the coordinating node for a query. */
+  public static final AttributeKey<String> DB_CASSANDRA_COORDINATOR_ID =
+      stringKey("db.cassandra.coordinator.id");
+
+  /** Whether or not the query is idempotent. */
+  public static final AttributeKey<Boolean> DB_CASSANDRA_IDEMPOTENCE =
+      booleanKey("db.cassandra.idempotence");
+
+  /** The fetch size used for paging, i.e. how many rows will be returned at once. */
+  public static final AttributeKey<Long> DB_CASSANDRA_PAGE_SIZE = longKey("db.cassandra.page_size");
+
+  /**
+   * The number of times a query was speculatively executed. Not set or {@code 0} if the query was
+   * not executed speculatively.
+   */
+  public static final AttributeKey<Long> DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT =
+      longKey("db.cassandra.speculative_execution_count");
+
+  /**
+   * The name of the primary table that the operation is acting upon, including the keyspace name
+   * (if applicable).
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>This mirrors the db.sql.table attribute but references cassandra rather than sql. It is
+   *       not recommended to attempt any client-side parsing of {@code db.statement} just to get
+   *       this property, but it should be set if it is provided by the library being instrumented.
+   *       If the operation is acting upon an anonymous table, or more than one table, this value
+   *       MUST NOT be set.
+   * </ul>
+   */
+  public static final AttributeKey<String> DB_CASSANDRA_TABLE = stringKey("db.cassandra.table");
+
   /**
    * The index of the database being accessed as used in the <a
    * href="https://redis.io/commands/select">{@code SELECT} command</a>, provided as an integer. To
@@ -598,6 +916,16 @@ public final class SemanticAttributes {
   public static final AttributeKey<String> DB_MONGODB_COLLECTION =
       stringKey("db.mongodb.collection");
 
+  /** Represents the identifier of an Elasticsearch cluster. */
+  public static final AttributeKey<String> DB_ELASTICSEARCH_CLUSTER_NAME =
+      stringKey("db.elasticsearch.cluster.name");
+
+  /**
+   * Represents the human-readable identifier of the node/instance to which a request was routed.
+   */
+  public static final AttributeKey<String> DB_ELASTICSEARCH_NODE_NAME =
+      stringKey("db.elasticsearch.node.name");
+
   /**
    * The name of the primary table that the operation is acting upon, including the database name
    * (if applicable).
@@ -617,10 +945,6 @@ public final class SemanticAttributes {
   public static final AttributeKey<String> DB_COSMOSDB_CLIENT_ID =
       stringKey("db.cosmosdb.client_id");
 
-  /** CosmosDB Operation Type. */
-  public static final AttributeKey<String> DB_COSMOSDB_OPERATION_TYPE =
-      stringKey("db.cosmosdb.operation_type");
-
   /** Cosmos client connection mode. */
   public static final AttributeKey<String> DB_COSMOSDB_CONNECTION_MODE =
       stringKey("db.cosmosdb.connection_mode");
@@ -629,6 +953,14 @@ public final class SemanticAttributes {
   public static final AttributeKey<String> DB_COSMOSDB_CONTAINER =
       stringKey("db.cosmosdb.container");
 
+  /** CosmosDB Operation Type. */
+  public static final AttributeKey<String> DB_COSMOSDB_OPERATION_TYPE =
+      stringKey("db.cosmosdb.operation_type");
+
+  /** RU consumed for that operation */
+  public static final AttributeKey<Double> DB_COSMOSDB_REQUEST_CHARGE =
+      doubleKey("db.cosmosdb.request_charge");
+
   /** Request payload size in bytes */
   public static final AttributeKey<Long> DB_COSMOSDB_REQUEST_CONTENT_LENGTH =
       longKey("db.cosmosdb.request_content_length");
@@ -641,10 +973,6 @@ public final class SemanticAttributes {
   public static final AttributeKey<Long> DB_COSMOSDB_SUB_STATUS_CODE =
       longKey("db.cosmosdb.sub_status_code");
 
-  /** RU consumed for that operation */
-  public static final AttributeKey<Double> DB_COSMOSDB_REQUEST_CHARGE =
-      doubleKey("db.cosmosdb.request_charge");
-
   /**
    * Name of the code, either &quot;OK&quot; or &quot;ERROR&quot;. MUST NOT be set if the status
    * code is UNSET.
@@ -655,22 +983,6 @@ public final class SemanticAttributes {
   public static final AttributeKey<String> OTEL_STATUS_DESCRIPTION =
       stringKey("otel.status_description");
 
-  /**
-   * Type of the trigger which caused this function invocation.
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li>For the server/consumer span on the incoming side, {@code faas.trigger} MUST be set.
-   *   <li>Clients invoking FaaS instances usually cannot set {@code faas.trigger}, since they would
-   *       typically need to look in the payload to determine the event type. If clients set it, it
-   *       should be the same as the trigger that corresponding incoming would have (i.e., this has
-   *       nothing to do with the underlying transport used to make the API call to invoke the
-   *       lambda, which is often HTTP).
-   * </ul>
-   */
-  public static final AttributeKey<String> FAAS_TRIGGER = stringKey("faas.trigger");
-
   /** The invocation ID of the current function invocation. */
   public static final AttributeKey<String> FAAS_INVOCATION_ID = stringKey("faas.invocation_id");
 
@@ -681,6 +993,12 @@ public final class SemanticAttributes {
   public static final AttributeKey<String> FAAS_DOCUMENT_COLLECTION =
       stringKey("faas.document.collection");
 
+  /**
+   * The document name/table subjected to the operation. For example, in Cloud Storage or S3 is the
+   * name of the file, and in Cosmos DB the table name.
+   */
+  public static final AttributeKey<String> FAAS_DOCUMENT_NAME = stringKey("faas.document.name");
+
   /** Describes the type of the operation that was performed on the data. */
   public static final AttributeKey<String> FAAS_DOCUMENT_OPERATION =
       stringKey("faas.document.operation");
@@ -693,10 +1011,11 @@ public final class SemanticAttributes {
   public static final AttributeKey<String> FAAS_DOCUMENT_TIME = stringKey("faas.document.time");
 
   /**
-   * The document name/table subjected to the operation. For example, in Cloud Storage or S3 is the
-   * name of the file, and in Cosmos DB the table name.
+   * A string containing the schedule period as <a
+   * href="https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm">Cron
+   * Expression</a>.
    */
-  public static final AttributeKey<String> FAAS_DOCUMENT_NAME = stringKey("faas.document.name");
+  public static final AttributeKey<String> FAAS_CRON = stringKey("faas.cron");
 
   /**
    * A string containing the function invocation time in the <a
@@ -705,63 +1024,22 @@ public final class SemanticAttributes {
    */
   public static final AttributeKey<String> FAAS_TIME = stringKey("faas.time");
 
-  /**
-   * A string containing the schedule period as <a
-   * href="https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm">Cron
-   * Expression</a>.
-   */
-  public static final AttributeKey<String> FAAS_CRON = stringKey("faas.cron");
-
   /**
    * A boolean that is true if the serverless function is executed for the first time (aka
    * cold-start).
    */
   public static final AttributeKey<Boolean> FAAS_COLDSTART = booleanKey("faas.coldstart");
 
+  /** The unique identifier of the feature flag. */
+  public static final AttributeKey<String> FEATURE_FLAG_KEY = stringKey("feature_flag.key");
+
+  /** The name of the service provider that performs the flag evaluation. */
+  public static final AttributeKey<String> FEATURE_FLAG_PROVIDER_NAME =
+      stringKey("feature_flag.provider_name");
+
   /**
-   * The name of the invoked function.
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li>SHOULD be equal to the {@code faas.name} resource attribute of the invoked function.
-   * </ul>
-   */
-  public static final AttributeKey<String> FAAS_INVOKED_NAME = stringKey("faas.invoked_name");
-
-  /**
-   * The cloud provider of the invoked function.
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li>SHOULD be equal to the {@code cloud.provider} resource attribute of the invoked function.
-   * </ul>
-   */
-  public static final AttributeKey<String> FAAS_INVOKED_PROVIDER =
-      stringKey("faas.invoked_provider");
-
-  /**
-   * The cloud region of the invoked function.
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li>SHOULD be equal to the {@code cloud.region} resource attribute of the invoked function.
-   * </ul>
-   */
-  public static final AttributeKey<String> FAAS_INVOKED_REGION = stringKey("faas.invoked_region");
-
-  /** The unique identifier of the feature flag. */
-  public static final AttributeKey<String> FEATURE_FLAG_KEY = stringKey("feature_flag.key");
-
-  /** The name of the service provider that performs the flag evaluation. */
-  public static final AttributeKey<String> FEATURE_FLAG_PROVIDER_NAME =
-      stringKey("feature_flag.provider_name");
-
-  /**
-   * SHOULD be a semantic identifier for a value. If one is unavailable, a stringified version of
-   * the value can be used.
+   * SHOULD be a semantic identifier for a value. If one is unavailable, a stringified version of
+   * the value can be used.
    *
    * <p>Notes:
    *
@@ -777,182 +1055,39 @@ public final class SemanticAttributes {
    */
   public static final AttributeKey<String> FEATURE_FLAG_VARIANT = stringKey("feature_flag.variant");
 
-  /**
-   * <a href="https://osi-model.com/transport-layer/">OSI Transport Layer</a> or <a
-   * href="https://en.wikipedia.org/wiki/Inter-process_communication">Inter-process Communication
-   * method</a>. The value SHOULD be normalized to lowercase.
-   */
-  public static final AttributeKey<String> NETWORK_TRANSPORT = stringKey("network.transport");
-
-  /**
-   * <a href="https://osi-model.com/network-layer/">OSI Network Layer</a> or non-OSI equivalent. The
-   * value SHOULD be normalized to lowercase.
-   */
-  public static final AttributeKey<String> NETWORK_TYPE = stringKey("network.type");
-
-  /**
-   * <a href="https://osi-model.com/application-layer/">OSI Application Layer</a> or non-OSI
-   * equivalent. The value SHOULD be normalized to lowercase.
-   */
-  public static final AttributeKey<String> NETWORK_PROTOCOL_NAME =
-      stringKey("network.protocol.name");
-
-  /**
-   * Version of the application layer protocol used. See note below.
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li>{@code network.protocol.version} refers to the version of the protocol used and might be
-   *       different from the protocol client's version. If the HTTP client used has a version of
-   *       {@code 0.27.2}, but sends HTTP version {@code 1.1}, this attribute should be set to
-   *       {@code 1.1}.
-   * </ul>
-   */
-  public static final AttributeKey<String> NETWORK_PROTOCOL_VERSION =
-      stringKey("network.protocol.version");
-
-  /** The internet connection type. */
-  public static final AttributeKey<String> NETWORK_CONNECTION_TYPE =
-      stringKey("network.connection.type");
-
-  /**
-   * This describes more details regarding the connection.type. It may be the type of cell
-   * technology connection, but it could be used for describing details about a wifi connection.
-   */
-  public static final AttributeKey<String> NETWORK_CONNECTION_SUBTYPE =
-      stringKey("network.connection.subtype");
-
-  /** The name of the mobile carrier. */
-  public static final AttributeKey<String> NETWORK_CARRIER_NAME = stringKey("network.carrier.name");
-
-  /** The mobile carrier country code. */
-  public static final AttributeKey<String> NETWORK_CARRIER_MCC = stringKey("network.carrier.mcc");
-
-  /** The mobile carrier network code. */
-  public static final AttributeKey<String> NETWORK_CARRIER_MNC = stringKey("network.carrier.mnc");
-
-  /** The ISO 3166-1 alpha-2 2-character country code associated with the mobile carrier network. */
-  public static final AttributeKey<String> NETWORK_CARRIER_ICC = stringKey("network.carrier.icc");
-
-  /**
-   * The <a href="/docs/resource/README.md#service">{@code service.name}</a> of the remote service.
-   * SHOULD be equal to the actual {@code service.name} resource attribute of the remote service if
-   * any.
-   */
-  public static final AttributeKey<String> PEER_SERVICE = stringKey("peer.service");
-
-  /**
-   * Username or client_id extracted from the access token or <a
-   * href="https://tools.ietf.org/html/rfc7235#section-4.2">Authorization</a> header in the inbound
-   * request from outside the system.
-   */
-  public static final AttributeKey<String> ENDUSER_ID = stringKey("enduser.id");
-
-  /**
-   * Actual/assumed role the client is making the request under extracted from token or application
-   * security context.
-   */
-  public static final AttributeKey<String> ENDUSER_ROLE = stringKey("enduser.role");
-
-  /**
-   * Scopes or granted authorities the client currently possesses extracted from token or
-   * application security context. The value would come from the scope associated with an <a
-   * href="https://tools.ietf.org/html/rfc6749#section-3.3">OAuth 2.0 Access Token</a> or an
-   * attribute value in a <a
-   * href="http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-tech-overview-2.0.html">SAML
-   * 2.0 Assertion</a>.
-   */
-  public static final AttributeKey<String> ENDUSER_SCOPE = stringKey("enduser.scope");
-
-  /** Current &quot;managed&quot; thread ID (as opposed to OS thread ID). */
-  public static final AttributeKey<Long> THREAD_ID = longKey("thread.id");
-
-  /** Current thread name. */
-  public static final AttributeKey<String> THREAD_NAME = stringKey("thread.name");
-
-  /**
-   * The method or function name, or equivalent (usually rightmost part of the code unit's name).
-   */
-  public static final AttributeKey<String> CODE_FUNCTION = stringKey("code.function");
-
-  /**
-   * The &quot;namespace&quot; within which {@code code.function} is defined. Usually the qualified
-   * class or module name, such that {@code code.namespace} + some separator + {@code code.function}
-   * form a unique identifier for the code unit.
-   */
-  public static final AttributeKey<String> CODE_NAMESPACE = stringKey("code.namespace");
-
-  /**
-   * The source code file name that identifies the code unit as uniquely as possible (preferably an
-   * absolute file path).
-   */
-  public static final AttributeKey<String> CODE_FILEPATH = stringKey("code.filepath");
-
-  /**
-   * The line number in {@code code.filepath} best representing the operation. It SHOULD point
-   * within the code unit named in {@code code.function}.
-   */
-  public static final AttributeKey<Long> CODE_LINENO = longKey("code.lineno");
-
-  /**
-   * The column number in {@code code.filepath} best representing the operation. It SHOULD point
-   * within the code unit named in {@code code.function}.
-   */
-  public static final AttributeKey<Long> CODE_COLUMN = longKey("code.column");
-
-  /** Original HTTP method sent by the client in the request line. */
-  public static final AttributeKey<String> HTTP_REQUEST_METHOD_ORIGINAL =
-      stringKey("http.request.method_original");
-
-  /**
-   * The size of the request payload body in bytes. This is the number of bytes transferred
-   * excluding headers and is often, but not always, present as the <a
-   * href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a>
-   * header. For requests using transport encoding, this should be the compressed size.
-   */
-  public static final AttributeKey<Long> HTTP_REQUEST_BODY_SIZE = longKey("http.request.body.size");
-
-  /**
-   * The size of the response payload body in bytes. This is the number of bytes transferred
-   * excluding headers and is often, but not always, present as the <a
-   * href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a>
-   * header. For requests using transport encoding, this should be the compressed size.
-   */
-  public static final AttributeKey<Long> HTTP_RESPONSE_BODY_SIZE =
-      longKey("http.response.body.size");
-
-  /**
-   * The ordinal number of request resending attempt (for any reason, including redirects).
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li>The resend count SHOULD be updated each time an HTTP request gets resent by the client,
-   *       regardless of what was the cause of the resending (e.g. redirection, authorization
-   *       failure, 503 Server Unavailable, network issues, or any other).
-   * </ul>
-   */
-  public static final AttributeKey<Long> HTTP_RESEND_COUNT = longKey("http.resend_count");
-
   /**
    * The AWS request ID as returned in the response headers {@code x-amz-request-id} or {@code
    * x-amz-requestid}.
    */
   public static final AttributeKey<String> AWS_REQUEST_ID = stringKey("aws.request_id");
 
-  /** The keys in the {@code RequestItems} object field. */
-  public static final AttributeKey<List<String>> AWS_DYNAMODB_TABLE_NAMES =
-      stringArrayKey("aws.dynamodb.table_names");
+  /** The value of the {@code AttributesToGet} request parameter. */
+  public static final AttributeKey<List<String>> AWS_DYNAMODB_ATTRIBUTES_TO_GET =
+      stringArrayKey("aws.dynamodb.attributes_to_get");
+
+  /** The value of the {@code ConsistentRead} request parameter. */
+  public static final AttributeKey<Boolean> AWS_DYNAMODB_CONSISTENT_READ =
+      booleanKey("aws.dynamodb.consistent_read");
 
   /** The JSON-serialized value of each item in the {@code ConsumedCapacity} response field. */
   public static final AttributeKey<List<String>> AWS_DYNAMODB_CONSUMED_CAPACITY =
       stringArrayKey("aws.dynamodb.consumed_capacity");
 
+  /** The value of the {@code IndexName} request parameter. */
+  public static final AttributeKey<String> AWS_DYNAMODB_INDEX_NAME =
+      stringKey("aws.dynamodb.index_name");
+
   /** The JSON-serialized value of the {@code ItemCollectionMetrics} response field. */
   public static final AttributeKey<String> AWS_DYNAMODB_ITEM_COLLECTION_METRICS =
       stringKey("aws.dynamodb.item_collection_metrics");
 
+  /** The value of the {@code Limit} request parameter. */
+  public static final AttributeKey<Long> AWS_DYNAMODB_LIMIT = longKey("aws.dynamodb.limit");
+
+  /** The value of the {@code ProjectionExpression} request parameter. */
+  public static final AttributeKey<String> AWS_DYNAMODB_PROJECTION =
+      stringKey("aws.dynamodb.projection");
+
   /** The value of the {@code ProvisionedThroughput.ReadCapacityUnits} request parameter. */
   public static final AttributeKey<Double> AWS_DYNAMODB_PROVISIONED_READ_CAPACITY =
       doubleKey("aws.dynamodb.provisioned_read_capacity");
@@ -961,28 +1096,13 @@ public final class SemanticAttributes {
   public static final AttributeKey<Double> AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY =
       doubleKey("aws.dynamodb.provisioned_write_capacity");
 
-  /** The value of the {@code ConsistentRead} request parameter. */
-  public static final AttributeKey<Boolean> AWS_DYNAMODB_CONSISTENT_READ =
-      booleanKey("aws.dynamodb.consistent_read");
-
-  /** The value of the {@code ProjectionExpression} request parameter. */
-  public static final AttributeKey<String> AWS_DYNAMODB_PROJECTION =
-      stringKey("aws.dynamodb.projection");
-
-  /** The value of the {@code Limit} request parameter. */
-  public static final AttributeKey<Long> AWS_DYNAMODB_LIMIT = longKey("aws.dynamodb.limit");
-
-  /** The value of the {@code AttributesToGet} request parameter. */
-  public static final AttributeKey<List<String>> AWS_DYNAMODB_ATTRIBUTES_TO_GET =
-      stringArrayKey("aws.dynamodb.attributes_to_get");
-
-  /** The value of the {@code IndexName} request parameter. */
-  public static final AttributeKey<String> AWS_DYNAMODB_INDEX_NAME =
-      stringKey("aws.dynamodb.index_name");
-
   /** The value of the {@code Select} request parameter. */
   public static final AttributeKey<String> AWS_DYNAMODB_SELECT = stringKey("aws.dynamodb.select");
 
+  /** The keys in the {@code RequestItems} object field. */
+  public static final AttributeKey<List<String>> AWS_DYNAMODB_TABLE_NAMES =
+      stringArrayKey("aws.dynamodb.table_names");
+
   /** The JSON-serialized value of each item of the {@code GlobalSecondaryIndexes} request field */
   public static final AttributeKey<List<String>> AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES =
       stringArrayKey("aws.dynamodb.global_secondary_indexes");
@@ -1003,13 +1123,6 @@ public final class SemanticAttributes {
   public static final AttributeKey<Boolean> AWS_DYNAMODB_SCAN_FORWARD =
       booleanKey("aws.dynamodb.scan_forward");
 
-  /** The value of the {@code Segment} request parameter. */
-  public static final AttributeKey<Long> AWS_DYNAMODB_SEGMENT = longKey("aws.dynamodb.segment");
-
-  /** The value of the {@code TotalSegments} request parameter. */
-  public static final AttributeKey<Long> AWS_DYNAMODB_TOTAL_SEGMENTS =
-      longKey("aws.dynamodb.total_segments");
-
   /** The value of the {@code Count} response parameter. */
   public static final AttributeKey<Long> AWS_DYNAMODB_COUNT = longKey("aws.dynamodb.count");
 
@@ -1017,6 +1130,13 @@ public final class SemanticAttributes {
   public static final AttributeKey<Long> AWS_DYNAMODB_SCANNED_COUNT =
       longKey("aws.dynamodb.scanned_count");
 
+  /** The value of the {@code Segment} request parameter. */
+  public static final AttributeKey<Long> AWS_DYNAMODB_SEGMENT = longKey("aws.dynamodb.segment");
+
+  /** The value of the {@code TotalSegments} request parameter. */
+  public static final AttributeKey<Long> AWS_DYNAMODB_TOTAL_SEGMENTS =
+      longKey("aws.dynamodb.total_segments");
+
   /** The JSON-serialized value of each item in the {@code AttributeDefinitions} request field. */
   public static final AttributeKey<List<String>> AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS =
       stringArrayKey("aws.dynamodb.attribute_definitions");
@@ -1044,15 +1164,49 @@ public final class SemanticAttributes {
   public static final AttributeKey<String> AWS_S3_BUCKET = stringKey("aws.s3.bucket");
 
   /**
-   * The S3 object key the request refers to. Corresponds to the {@code --key} parameter of the <a
-   * href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> operations.
+   * The source object (in the form {@code bucket}/{@code key}) for the copy operation.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>The {@code key} attribute is applicable to all object-related S3 operations, i.e. that
-   *       require the object key as a mandatory parameter. This applies in particular to the
-   *       following operations:
+   *   <li>The {@code copy_source} attribute applies to S3 copy operations and corresponds to the
+   *       {@code --copy-source} parameter of the <a
+   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object
+   *       operation within the S3 API</a>. This applies in particular to the following operations:
+   *   <li><a
+   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a>
+   *   <li><a
+   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a>
+   * </ul>
+   */
+  public static final AttributeKey<String> AWS_S3_COPY_SOURCE = stringKey("aws.s3.copy_source");
+
+  /**
+   * The delete request container that specifies the objects to be deleted.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>The {@code delete} attribute is only applicable to the <a
+   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a>
+   *       operation. The {@code delete} attribute corresponds to the {@code --delete} parameter of
+   *       the <a
+   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-objects.html">delete-objects
+   *       operation within the S3 API</a>.
+   * </ul>
+   */
+  public static final AttributeKey<String> AWS_S3_DELETE = stringKey("aws.s3.delete");
+
+  /**
+   * The S3 object key the request refers to. Corresponds to the {@code --key} parameter of the <a
+   * href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> operations.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>The {@code key} attribute is applicable to all object-related S3 operations, i.e. that
+   *       require the object key as a mandatory parameter. This applies in particular to the
+   *       following operations:
    *   <li><a
    *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a>
    *   <li><a
@@ -1084,22 +1238,23 @@ public final class SemanticAttributes {
   public static final AttributeKey<String> AWS_S3_KEY = stringKey("aws.s3.key");
 
   /**
-   * The source object (in the form {@code bucket}/{@code key}) for the copy operation.
+   * The part number of the part being uploaded in a multipart-upload operation. This is a positive
+   * integer between 1 and 10,000.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>The {@code copy_source} attribute applies to S3 copy operations and corresponds to the
-   *       {@code --copy-source} parameter of the <a
-   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object
-   *       operation within the S3 API</a>. This applies in particular to the following operations:
-   *   <li><a
-   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a>
-   *   <li><a
+   *   <li>The {@code part_number} attribute is only applicable to the <a
+   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a>
+   *       and <a
    *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a>
+   *       operations. The {@code part_number} attribute corresponds to the {@code --part-number}
+   *       parameter of the <a
+   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part
+   *       operation within the S3 API</a>.
    * </ul>
    */
-  public static final AttributeKey<String> AWS_S3_COPY_SOURCE = stringKey("aws.s3.copy_source");
+  public static final AttributeKey<Long> AWS_S3_PART_NUMBER = longKey("aws.s3.part_number");
 
   /**
    * Upload ID that identifies the multipart upload.
@@ -1126,39 +1281,15 @@ public final class SemanticAttributes {
   public static final AttributeKey<String> AWS_S3_UPLOAD_ID = stringKey("aws.s3.upload_id");
 
   /**
-   * The delete request container that specifies the objects to be deleted.
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li>The {@code delete} attribute is only applicable to the <a
-   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a>
-   *       operation. The {@code delete} attribute corresponds to the {@code --delete} parameter of
-   *       the <a
-   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-objects.html">delete-objects
-   *       operation within the S3 API</a>.
-   * </ul>
-   */
-  public static final AttributeKey<String> AWS_S3_DELETE = stringKey("aws.s3.delete");
-
-  /**
-   * The part number of the part being uploaded in a multipart-upload operation. This is a positive
-   * integer between 1 and 10,000.
+   * The GraphQL document being executed.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>The {@code part_number} attribute is only applicable to the <a
-   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a>
-   *       and <a
-   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a>
-   *       operations. The {@code part_number} attribute corresponds to the {@code --part-number}
-   *       parameter of the <a
-   *       href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part
-   *       operation within the S3 API</a>.
+   *   <li>The value may be sanitized to exclude sensitive information.
    * </ul>
    */
-  public static final AttributeKey<Long> AWS_S3_PART_NUMBER = longKey("aws.s3.part_number");
+  public static final AttributeKey<String> GRAPHQL_DOCUMENT = stringKey("graphql.document");
 
   /** The name of the operation being executed. */
   public static final AttributeKey<String> GRAPHQL_OPERATION_NAME =
@@ -1169,20 +1300,17 @@ public final class SemanticAttributes {
       stringKey("graphql.operation.type");
 
   /**
-   * The GraphQL document being executed.
+   * The size of the message body in bytes.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>The value may be sanitized to exclude sensitive information.
+   *   <li>This can refer to both the compressed or uncompressed body size. If both sizes are known,
+   *       the uncompressed body size should be used.
    * </ul>
    */
-  public static final AttributeKey<String> GRAPHQL_DOCUMENT = stringKey("graphql.document");
-
-  /**
-   * A value used by the messaging system as an identifier for the message, represented as a string.
-   */
-  public static final AttributeKey<String> MESSAGING_MESSAGE_ID = stringKey("messaging.message.id");
+  public static final AttributeKey<Long> MESSAGING_MESSAGE_BODY_SIZE =
+      longKey("messaging.message.body.size");
 
   /**
    * The <a href="#conversations">conversation ID</a> identifying the conversation to which the
@@ -1192,15 +1320,29 @@ public final class SemanticAttributes {
       stringKey("messaging.message.conversation_id");
 
   /**
-   * The (uncompressed) size of the message payload in bytes. Also use this attribute if it is
-   * unknown whether the compressed or uncompressed payload size is reported.
+   * The size of the message body and metadata in bytes.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>This can refer to both the compressed or uncompressed size. If both sizes are known, the
+   *       uncompressed size should be used.
+   * </ul>
+   */
+  public static final AttributeKey<Long> MESSAGING_MESSAGE_ENVELOPE_SIZE =
+      longKey("messaging.message.envelope.size");
+
+  /**
+   * A value used by the messaging system as an identifier for the message, represented as a string.
    */
-  public static final AttributeKey<Long> MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES =
-      longKey("messaging.message.payload_size_bytes");
+  public static final AttributeKey<String> MESSAGING_MESSAGE_ID = stringKey("messaging.message.id");
 
-  /** The compressed size of the message payload in bytes. */
-  public static final AttributeKey<Long> MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES =
-      longKey("messaging.message.payload_compressed_size_bytes");
+  /**
+   * A boolean that is true if the message destination is anonymous (could be unnamed or have
+   * auto-generated name).
+   */
+  public static final AttributeKey<Boolean> MESSAGING_DESTINATION_ANONYMOUS =
+      booleanKey("messaging.destination.anonymous");
 
   /**
    * The message destination name
@@ -1239,26 +1381,25 @@ public final class SemanticAttributes {
       booleanKey("messaging.destination.temporary");
 
   /**
-   * A boolean that is true if the message destination is anonymous (could be unnamed or have
-   * auto-generated name).
+   * A boolean that is true if the publish message destination is anonymous (could be unnamed or
+   * have auto-generated name).
    */
-  public static final AttributeKey<Boolean> MESSAGING_DESTINATION_ANONYMOUS =
-      booleanKey("messaging.destination.anonymous");
-
-  /** A string identifying the messaging system. */
-  public static final AttributeKey<String> MESSAGING_SYSTEM = stringKey("messaging.system");
+  public static final AttributeKey<Boolean> MESSAGING_DESTINATION_PUBLISH_ANONYMOUS =
+      booleanKey("messaging.destination_publish.anonymous");
 
   /**
-   * A string identifying the kind of messaging operation as defined in the <a
-   * href="#operation-names">Operation names</a> section above.
+   * The name of the original destination the message was published to
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>If a custom value is used, it MUST be of low cardinality.
+   *   <li>The name SHOULD uniquely identify a specific queue, topic, or other entity within the
+   *       broker. If the broker does not have such notion, the original destination name SHOULD
+   *       uniquely identify the broker.
    * </ul>
    */
-  public static final AttributeKey<String> MESSAGING_OPERATION = stringKey("messaging.operation");
+  public static final AttributeKey<String> MESSAGING_DESTINATION_PUBLISH_NAME =
+      stringKey("messaging.destination_publish.name");
 
   /**
    * The number of messages sent, received, or processed in the scope of the batching operation.
@@ -1279,24 +1420,24 @@ public final class SemanticAttributes {
   /** A unique identifier for the client that consumes or produces a message. */
   public static final AttributeKey<String> MESSAGING_CLIENT_ID = stringKey("messaging.client_id");
 
-  /** RabbitMQ message routing key. */
-  public static final AttributeKey<String> MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY =
-      stringKey("messaging.rabbitmq.destination.routing_key");
-
   /**
-   * Message keys in Kafka are used for grouping alike messages to ensure they're processed on the
-   * same partition. They differ from {@code messaging.message.id} in that they're not unique. If
-   * the key is {@code null}, the attribute MUST NOT be set.
+   * A string identifying the kind of messaging operation as defined in the <a
+   * href="#operation-names">Operation names</a> section above.
    *
    * <p>Notes:
    *
    * <ul>
-   *   <li>If the key type is not string, it's string representation has to be supplied for the
-   *       attribute. If the key has no unambiguous, canonical string form, don't include its value.
+   *   <li>If a custom value is used, it MUST be of low cardinality.
    * </ul>
    */
-  public static final AttributeKey<String> MESSAGING_KAFKA_MESSAGE_KEY =
-      stringKey("messaging.kafka.message.key");
+  public static final AttributeKey<String> MESSAGING_OPERATION = stringKey("messaging.operation");
+
+  /** A string identifying the messaging system. */
+  public static final AttributeKey<String> MESSAGING_SYSTEM = stringKey("messaging.system");
+
+  /** RabbitMQ message routing key. */
+  public static final AttributeKey<String> MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY =
+      stringKey("messaging.rabbitmq.destination.routing_key");
 
   /**
    * Name of the Kafka Consumer Group that is handling the message. Only applies to consumers, not
@@ -1309,6 +1450,21 @@ public final class SemanticAttributes {
   public static final AttributeKey<Long> MESSAGING_KAFKA_DESTINATION_PARTITION =
       longKey("messaging.kafka.destination.partition");
 
+  /**
+   * Message keys in Kafka are used for grouping alike messages to ensure they're processed on the
+   * same partition. They differ from {@code messaging.message.id} in that they're not unique. If
+   * the key is {@code null}, the attribute MUST NOT be set.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>If the key type is not string, it's string representation has to be supplied for the
+   *       attribute. If the key has no unambiguous, canonical string form, don't include its value.
+   * </ul>
+   */
+  public static final AttributeKey<String> MESSAGING_KAFKA_MESSAGE_KEY =
+      stringKey("messaging.kafka.message.key");
+
   /** The offset of a record in the corresponding Kafka partition. */
   public static final AttributeKey<Long> MESSAGING_KAFKA_MESSAGE_OFFSET =
       longKey("messaging.kafka.message.offset");
@@ -1317,10 +1473,6 @@ public final class SemanticAttributes {
   public static final AttributeKey<Boolean> MESSAGING_KAFKA_MESSAGE_TOMBSTONE =
       booleanKey("messaging.kafka.message.tombstone");
 
-  /** Namespace of RocketMQ resources, resources in different namespaces are individual. */
-  public static final AttributeKey<String> MESSAGING_ROCKETMQ_NAMESPACE =
-      stringKey("messaging.rocketmq.namespace");
-
   /**
    * Name of the RocketMQ producer/consumer group that is handling the message. The client type is
    * identified by the SpanKind.
@@ -1328,16 +1480,20 @@ public final class SemanticAttributes {
   public static final AttributeKey<String> MESSAGING_ROCKETMQ_CLIENT_GROUP =
       stringKey("messaging.rocketmq.client_group");
 
+  /** Model of message consumption. This only applies to consumer spans. */
+  public static final AttributeKey<String> MESSAGING_ROCKETMQ_CONSUMPTION_MODEL =
+      stringKey("messaging.rocketmq.consumption_model");
+
+  /** The delay time level for delay message, which determines the message delay time. */
+  public static final AttributeKey<Long> MESSAGING_ROCKETMQ_MESSAGE_DELAY_TIME_LEVEL =
+      longKey("messaging.rocketmq.message.delay_time_level");
+
   /**
    * The timestamp in milliseconds that the delay message is expected to be delivered to consumer.
    */
   public static final AttributeKey<Long> MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP =
       longKey("messaging.rocketmq.message.delivery_timestamp");
 
-  /** The delay time level for delay message, which determines the message delay time. */
-  public static final AttributeKey<Long> MESSAGING_ROCKETMQ_MESSAGE_DELAY_TIME_LEVEL =
-      longKey("messaging.rocketmq.message.delay_time_level");
-
   /**
    * It is essential for FIFO message. Messages that belong to the same message group are always
    * processed one by one within the same consumer group.
@@ -1345,24 +1501,36 @@ public final class SemanticAttributes {
   public static final AttributeKey<String> MESSAGING_ROCKETMQ_MESSAGE_GROUP =
       stringKey("messaging.rocketmq.message.group");
 
-  /** Type of message. */
-  public static final AttributeKey<String> MESSAGING_ROCKETMQ_MESSAGE_TYPE =
-      stringKey("messaging.rocketmq.message.type");
+  /** Key(s) of message, another way to mark message besides message id. */
+  public static final AttributeKey<List<String>> MESSAGING_ROCKETMQ_MESSAGE_KEYS =
+      stringArrayKey("messaging.rocketmq.message.keys");
 
   /** The secondary classifier of message besides topic. */
   public static final AttributeKey<String> MESSAGING_ROCKETMQ_MESSAGE_TAG =
       stringKey("messaging.rocketmq.message.tag");
 
-  /** Key(s) of message, another way to mark message besides message id. */
-  public static final AttributeKey<List<String>> MESSAGING_ROCKETMQ_MESSAGE_KEYS =
-      stringArrayKey("messaging.rocketmq.message.keys");
+  /** Type of message. */
+  public static final AttributeKey<String> MESSAGING_ROCKETMQ_MESSAGE_TYPE =
+      stringKey("messaging.rocketmq.message.type");
 
-  /** Model of message consumption. This only applies to consumer spans. */
-  public static final AttributeKey<String> MESSAGING_ROCKETMQ_CONSUMPTION_MODEL =
-      stringKey("messaging.rocketmq.consumption_model");
+  /** Namespace of RocketMQ resources, resources in different namespaces are individual. */
+  public static final AttributeKey<String> MESSAGING_ROCKETMQ_NAMESPACE =
+      stringKey("messaging.rocketmq.namespace");
 
-  /** A string identifying the remoting system. See below for a list of well-known identifiers. */
-  public static final AttributeKey<String> RPC_SYSTEM = stringKey("rpc.system");
+  /**
+   * The name of the (logical) method being called, must be equal to the $method part in the span
+   * name.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>This is the logical name of the method from the RPC interface perspective, which can be
+   *       different from the name of any implementing method/function. The {@code code.function}
+   *       attribute may be used to store the latter (e.g., method actually executing the call on
+   *       the server side, RPC client stub method on the client side).
+   * </ul>
+   */
+  public static final AttributeKey<String> RPC_METHOD = stringKey("rpc.method");
 
   /**
    * The full (logical) name of the service being called, including its package name, if applicable.
@@ -1379,20 +1547,8 @@ public final class SemanticAttributes {
    */
   public static final AttributeKey<String> RPC_SERVICE = stringKey("rpc.service");
 
-  /**
-   * The name of the (logical) method being called, must be equal to the $method part in the span
-   * name.
-   *
-   * <p>Notes:
-   *
-   * <ul>
-   *   <li>This is the logical name of the method from the RPC interface perspective, which can be
-   *       different from the name of any implementing method/function. The {@code code.function}
-   *       attribute may be used to store the latter (e.g., method actually executing the call on
-   *       the server side, RPC client stub method on the client side).
-   * </ul>
-   */
-  public static final AttributeKey<String> RPC_METHOD = stringKey("rpc.method");
+  /** A string identifying the remoting system. See below for a list of well-known identifiers. */
+  public static final AttributeKey<String> RPC_SYSTEM = stringKey("rpc.system");
 
   /**
    * The <a href="https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md">numeric status
@@ -1400,11 +1556,12 @@ public final class SemanticAttributes {
    */
   public static final AttributeKey<Long> RPC_GRPC_STATUS_CODE = longKey("rpc.grpc.status_code");
 
-  /**
-   * Protocol version as in {@code jsonrpc} property of request/response. Since JSON-RPC 1.0 does
-   * not specify this, the value can be omitted.
-   */
-  public static final AttributeKey<String> RPC_JSONRPC_VERSION = stringKey("rpc.jsonrpc.version");
+  /** {@code error.code} property of response if it is an error response. */
+  public static final AttributeKey<Long> RPC_JSONRPC_ERROR_CODE = longKey("rpc.jsonrpc.error_code");
+
+  /** {@code error.message} property of response if it is an error response. */
+  public static final AttributeKey<String> RPC_JSONRPC_ERROR_MESSAGE =
+      stringKey("rpc.jsonrpc.error_message");
 
   /**
    * {@code id} property of request or response. Since protocol allows id to be int, string, {@code
@@ -1414,15 +1571,15 @@ public final class SemanticAttributes {
   public static final AttributeKey<String> RPC_JSONRPC_REQUEST_ID =
       stringKey("rpc.jsonrpc.request_id");
 
-  /** {@code error.code} property of response if it is an error response. */
-  public static final AttributeKey<Long> RPC_JSONRPC_ERROR_CODE = longKey("rpc.jsonrpc.error_code");
-
-  /** {@code error.message} property of response if it is an error response. */
-  public static final AttributeKey<String> RPC_JSONRPC_ERROR_MESSAGE =
-      stringKey("rpc.jsonrpc.error_message");
+  /**
+   * Protocol version as in {@code jsonrpc} property of request/response. Since JSON-RPC 1.0 does
+   * not specify this, the value can be omitted.
+   */
+  public static final AttributeKey<String> RPC_JSONRPC_VERSION = stringKey("rpc.jsonrpc.version");
 
-  /** Whether this is a received or sent message. */
-  public static final AttributeKey<String> MESSAGE_TYPE = stringKey("message.type");
+  /** Compressed size of the message in bytes. */
+  public static final AttributeKey<Long> MESSAGE_COMPRESSED_SIZE =
+      longKey("message.compressed_size");
 
   /**
    * MUST be calculated as two different counters starting from {@code 1} one for sent messages and
@@ -1437,9 +1594,8 @@ public final class SemanticAttributes {
    */
   public static final AttributeKey<Long> MESSAGE_ID = longKey("message.id");
 
-  /** Compressed size of the message in bytes. */
-  public static final AttributeKey<Long> MESSAGE_COMPRESSED_SIZE =
-      longKey("message.compressed_size");
+  /** Whether this is a received or sent message. */
+  public static final AttributeKey<String> MESSAGE_TYPE = stringKey("message.type");
 
   /** Uncompressed size of the message in bytes. */
   public static final AttributeKey<Long> MESSAGE_UNCOMPRESSED_SIZE =
@@ -1474,12 +1630,9 @@ public final class SemanticAttributes {
    * </ul>
    */
   public static final AttributeKey<Boolean> EXCEPTION_ESCAPED = booleanKey("exception.escaped");
-
-  /**
-   * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.1">URI scheme</a> component
-   * identifying the used protocol.
-   */
-  public static final AttributeKey<String> URL_SCHEME = stringKey("url.scheme");
+
+  /** The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">URI fragment</a> component */
+  public static final AttributeKey<String> URL_FRAGMENT = stringKey("url.fragment");
 
   /**
    * Absolute URL describing a network resource according to <a
@@ -1523,8 +1676,11 @@ public final class SemanticAttributes {
    */
   public static final AttributeKey<String> URL_QUERY = stringKey("url.query");
 
-  /** The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">URI fragment</a> component */
-  public static final AttributeKey<String> URL_FRAGMENT = stringKey("url.fragment");
+  /**
+   * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.1">URI scheme</a> component
+   * identifying the used protocol.
+   */
+  public static final AttributeKey<String> URL_SCHEME = stringKey("url.scheme");
 
   /**
    * Value of the <a href="https://www.rfc-editor.org/rfc/rfc9110.html#field.user-agent">HTTP
@@ -1533,6 +1689,19 @@ public final class SemanticAttributes {
   public static final AttributeKey<String> USER_AGENT_ORIGINAL = stringKey("user_agent.original");
 
   // Enum definitions
+  public static final class NetSockFamilyValues {
+    /** IPv4 address. */
+    public static final String INET = "inet";
+
+    /** IPv6 address. */
+    public static final String INET6 = "inet6";
+
+    /** Unix domain socket path. */
+    public static final String UNIX = "unix";
+
+    private NetSockFamilyValues() {}
+  }
+
   public static final class NetTransportValues {
     /** ip_tcp. */
     public static final String IP_TCP = "ip_tcp";
@@ -1543,26 +1712,404 @@ public static final class NetTransportValues {
     /** Named or anonymous pipe. */
     public static final String PIPE = "pipe";
 
-    /** In-process communication. */
-    public static final String INPROC = "inproc";
+    /** In-process communication. */
+    public static final String INPROC = "inproc";
+
+    /** Something else (non IP-based). */
+    public static final String OTHER = "other";
+
+    private NetTransportValues() {}
+  }
+
+  public static final class ErrorTypeValues {
+    /**
+     * A fallback error value to be used when the instrumentation does not define a custom value for
+     * it.
+     */
+    public static final String OTHER = "_OTHER";
+
+    private ErrorTypeValues() {}
+  }
+
+  public static final class FaasInvokedProviderValues {
+    /** Alibaba Cloud. */
+    public static final String ALIBABA_CLOUD = "alibaba_cloud";
+
+    /** Amazon Web Services. */
+    public static final String AWS = "aws";
+
+    /** Microsoft Azure. */
+    public static final String AZURE = "azure";
+
+    /** Google Cloud Platform. */
+    public static final String GCP = "gcp";
+
+    /** Tencent Cloud. */
+    public static final String TENCENT_CLOUD = "tencent_cloud";
+
+    private FaasInvokedProviderValues() {}
+  }
+
+  public static final class FaasTriggerValues {
+    /** A response to some data source operation such as a database or filesystem read/write. */
+    public static final String DATASOURCE = "datasource";
+
+    /** To provide an answer to an inbound HTTP request. */
+    public static final String HTTP = "http";
+
+    /** A function is set to be executed when messages are sent to a messaging system. */
+    public static final String PUBSUB = "pubsub";
+
+    /** A function is scheduled to be executed regularly. */
+    public static final String TIMER = "timer";
+
+    /** If none of the others apply. */
+    public static final String OTHER = "other";
+
+    private FaasTriggerValues() {}
+  }
+
+  public static final class EventDomainValues {
+    /** Events from browser apps. */
+    public static final String BROWSER = "browser";
+
+    /** Events from mobile apps. */
+    public static final String DEVICE = "device";
+
+    /** Events from Kubernetes. */
+    public static final String K8S = "k8s";
+
+    private EventDomainValues() {}
+  }
+
+  public static final class LogIostreamValues {
+    /** Logs from stdout stream. */
+    public static final String STDOUT = "stdout";
+
+    /** Events from stderr stream. */
+    public static final String STDERR = "stderr";
+
+    private LogIostreamValues() {}
+  }
+
+  public static final class StateValues {
+    /** idle. */
+    public static final String IDLE = "idle";
+
+    /** used. */
+    public static final String USED = "used";
+
+    private StateValues() {}
+  }
+
+  public static final class JvmMemoryTypeValues {
+    /** Heap memory. */
+    public static final String HEAP = "heap";
+
+    /** Non-heap memory. */
+    public static final String NON_HEAP = "non_heap";
+
+    private JvmMemoryTypeValues() {}
+  }
+
+  public static final class SystemCpuStateValues {
+    /** user. */
+    public static final String USER = "user";
+
+    /** system. */
+    public static final String SYSTEM = "system";
+
+    /** nice. */
+    public static final String NICE = "nice";
+
+    /** idle. */
+    public static final String IDLE = "idle";
+
+    /** iowait. */
+    public static final String IOWAIT = "iowait";
+
+    /** interrupt. */
+    public static final String INTERRUPT = "interrupt";
+
+    /** steal. */
+    public static final String STEAL = "steal";
+
+    private SystemCpuStateValues() {}
+  }
+
+  public static final class SystemMemoryStateValues {
+    /** total. */
+    public static final String TOTAL = "total";
+
+    /** used. */
+    public static final String USED = "used";
+
+    /** free. */
+    public static final String FREE = "free";
+
+    /** shared. */
+    public static final String SHARED = "shared";
+
+    /** buffers. */
+    public static final String BUFFERS = "buffers";
+
+    /** cached. */
+    public static final String CACHED = "cached";
+
+    private SystemMemoryStateValues() {}
+  }
+
+  public static final class SystemPagingDirectionValues {
+    /** in. */
+    public static final String IN = "in";
+
+    /** out. */
+    public static final String OUT = "out";
+
+    private SystemPagingDirectionValues() {}
+  }
+
+  public static final class SystemPagingStateValues {
+    /** used. */
+    public static final String USED = "used";
+
+    /** free. */
+    public static final String FREE = "free";
+
+    private SystemPagingStateValues() {}
+  }
+
+  public static final class SystemPagingTypeValues {
+    /** major. */
+    public static final String MAJOR = "major";
+
+    /** minor. */
+    public static final String MINOR = "minor";
+
+    private SystemPagingTypeValues() {}
+  }
+
+  public static final class SystemDiskDirectionValues {
+    /** read. */
+    public static final String READ = "read";
+
+    /** write. */
+    public static final String WRITE = "write";
+
+    private SystemDiskDirectionValues() {}
+  }
+
+  public static final class SystemFilesystemStateValues {
+    /** used. */
+    public static final String USED = "used";
+
+    /** free. */
+    public static final String FREE = "free";
+
+    /** reserved. */
+    public static final String RESERVED = "reserved";
+
+    private SystemFilesystemStateValues() {}
+  }
+
+  public static final class SystemFilesystemTypeValues {
+    /** fat32. */
+    public static final String FAT32 = "fat32";
+
+    /** exfat. */
+    public static final String EXFAT = "exfat";
+
+    /** ntfs. */
+    public static final String NTFS = "ntfs";
+
+    /** refs. */
+    public static final String REFS = "refs";
+
+    /** hfsplus. */
+    public static final String HFSPLUS = "hfsplus";
+
+    /** ext4. */
+    public static final String EXT4 = "ext4";
+
+    private SystemFilesystemTypeValues() {}
+  }
+
+  public static final class SystemNetworkDirectionValues {
+    /** transmit. */
+    public static final String TRANSMIT = "transmit";
+
+    /** receive. */
+    public static final String RECEIVE = "receive";
+
+    private SystemNetworkDirectionValues() {}
+  }
+
+  public static final class SystemNetworkStateValues {
+    /** close. */
+    public static final String CLOSE = "close";
+
+    /** close_wait. */
+    public static final String CLOSE_WAIT = "close_wait";
+
+    /** closing. */
+    public static final String CLOSING = "closing";
+
+    /** delete. */
+    public static final String DELETE = "delete";
+
+    /** established. */
+    public static final String ESTABLISHED = "established";
+
+    /** fin_wait_1. */
+    public static final String FIN_WAIT_1 = "fin_wait_1";
+
+    /** fin_wait_2. */
+    public static final String FIN_WAIT_2 = "fin_wait_2";
+
+    /** last_ack. */
+    public static final String LAST_ACK = "last_ack";
+
+    /** listen. */
+    public static final String LISTEN = "listen";
+
+    /** syn_recv. */
+    public static final String SYN_RECV = "syn_recv";
+
+    /** syn_sent. */
+    public static final String SYN_SENT = "syn_sent";
+
+    /** time_wait. */
+    public static final String TIME_WAIT = "time_wait";
+
+    private SystemNetworkStateValues() {}
+  }
+
+  public static final class SystemProcessesStatusValues {
+    /** running. */
+    public static final String RUNNING = "running";
+
+    /** sleeping. */
+    public static final String SLEEPING = "sleeping";
+
+    /** stopped. */
+    public static final String STOPPED = "stopped";
+
+    /** defunct. */
+    public static final String DEFUNCT = "defunct";
+
+    private SystemProcessesStatusValues() {}
+  }
+
+  public static final class NetworkTransportValues {
+    /** TCP. */
+    public static final String TCP = "tcp";
+
+    /** UDP. */
+    public static final String UDP = "udp";
+
+    /** Named or anonymous pipe. See note below. */
+    public static final String PIPE = "pipe";
+
+    /** Unix domain socket. */
+    public static final String UNIX = "unix";
+
+    private NetworkTransportValues() {}
+  }
+
+  public static final class NetworkTypeValues {
+    /** IPv4. */
+    public static final String IPV4 = "ipv4";
+
+    /** IPv6. */
+    public static final String IPV6 = "ipv6";
+
+    private NetworkTypeValues() {}
+  }
+
+  public static final class NetworkConnectionSubtypeValues {
+    /** GPRS. */
+    public static final String GPRS = "gprs";
+
+    /** EDGE. */
+    public static final String EDGE = "edge";
+
+    /** UMTS. */
+    public static final String UMTS = "umts";
+
+    /** CDMA. */
+    public static final String CDMA = "cdma";
+
+    /** EVDO Rel. 0. */
+    public static final String EVDO_0 = "evdo_0";
+
+    /** EVDO Rev. A. */
+    public static final String EVDO_A = "evdo_a";
+
+    /** CDMA2000 1XRTT. */
+    public static final String CDMA2000_1XRTT = "cdma2000_1xrtt";
+
+    /** HSDPA. */
+    public static final String HSDPA = "hsdpa";
+
+    /** HSUPA. */
+    public static final String HSUPA = "hsupa";
+
+    /** HSPA. */
+    public static final String HSPA = "hspa";
+
+    /** IDEN. */
+    public static final String IDEN = "iden";
+
+    /** EVDO Rev. B. */
+    public static final String EVDO_B = "evdo_b";
+
+    /** LTE. */
+    public static final String LTE = "lte";
+
+    /** EHRPD. */
+    public static final String EHRPD = "ehrpd";
+
+    /** HSPAP. */
+    public static final String HSPAP = "hspap";
+
+    /** GSM. */
+    public static final String GSM = "gsm";
+
+    /** TD-SCDMA. */
+    public static final String TD_SCDMA = "td_scdma";
+
+    /** IWLAN. */
+    public static final String IWLAN = "iwlan";
+
+    /** 5G NR (New Radio). */
+    public static final String NR = "nr";
 
-    /** Something else (non IP-based). */
-    public static final String OTHER = "other";
+    /** 5G NRNSA (New Radio Non-Standalone). */
+    public static final String NRNSA = "nrnsa";
 
-    private NetTransportValues() {}
+    /** LTE CA. */
+    public static final String LTE_CA = "lte_ca";
+
+    private NetworkConnectionSubtypeValues() {}
   }
 
-  public static final class NetSockFamilyValues {
-    /** IPv4 address. */
-    public static final String INET = "inet";
+  public static final class NetworkConnectionTypeValues {
+    /** wifi. */
+    public static final String WIFI = "wifi";
 
-    /** IPv6 address. */
-    public static final String INET6 = "inet6";
+    /** wired. */
+    public static final String WIRED = "wired";
 
-    /** Unix domain socket path. */
-    public static final String UNIX = "unix";
+    /** cell. */
+    public static final String CELL = "cell";
 
-    private NetSockFamilyValues() {}
+    /** unavailable. */
+    public static final String UNAVAILABLE = "unavailable";
+
+    /** unknown. */
+    public static final String UNKNOWN = "unknown";
+
+    private NetworkConnectionTypeValues() {}
   }
 
   public static final class HttpRequestMethodValues {
@@ -1599,39 +2146,6 @@ public static final class HttpRequestMethodValues {
     private HttpRequestMethodValues() {}
   }
 
-  public static final class EventDomainValues {
-    /** Events from browser apps. */
-    public static final String BROWSER = "browser";
-
-    /** Events from mobile apps. */
-    public static final String DEVICE = "device";
-
-    /** Events from Kubernetes. */
-    public static final String K8S = "k8s";
-
-    private EventDomainValues() {}
-  }
-
-  public static final class LogIostreamValues {
-    /** Logs from stdout stream. */
-    public static final String STDOUT = "stdout";
-
-    /** Events from stderr stream. */
-    public static final String STDERR = "stderr";
-
-    private LogIostreamValues() {}
-  }
-
-  public static final class TypeValues {
-    /** Heap memory. */
-    public static final String HEAP = "heap";
-
-    /** Non-heap memory. */
-    public static final String NON_HEAP = "non_heap";
-
-    private TypeValues() {}
-  }
-
   public static final class OpentracingRefTypeValues {
     /** The parent Span depends on the child Span in some capacity. */
     public static final String CHILD_OF = "child_of";
@@ -1839,6 +2353,16 @@ public static final class DbCassandraConsistencyLevelValues {
     private DbCassandraConsistencyLevelValues() {}
   }
 
+  public static final class DbCosmosdbConnectionModeValues {
+    /** Gateway (HTTP) connections mode. */
+    public static final String GATEWAY = "gateway";
+
+    /** Direct connection. */
+    public static final String DIRECT = "direct";
+
+    private DbCosmosdbConnectionModeValues() {}
+  }
+
   public static final class DbCosmosdbOperationTypeValues {
     /** invalid. */
     public static final String INVALID = "Invalid";
@@ -1888,16 +2412,6 @@ public static final class DbCosmosdbOperationTypeValues {
     private DbCosmosdbOperationTypeValues() {}
   }
 
-  public static final class DbCosmosdbConnectionModeValues {
-    /** Gateway (HTTP) connections mode. */
-    public static final String GATEWAY = "gateway";
-
-    /** Direct connection. */
-    public static final String DIRECT = "direct";
-
-    private DbCosmosdbConnectionModeValues() {}
-  }
-
   public static final class OtelStatusCodeValues {
     /**
      * The operation has been validated by an Application developer or Operator to have completed
@@ -1911,25 +2425,6 @@ public static final class OtelStatusCodeValues {
     private OtelStatusCodeValues() {}
   }
 
-  public static final class FaasTriggerValues {
-    /** A response to some data source operation such as a database or filesystem read/write. */
-    public static final String DATASOURCE = "datasource";
-
-    /** To provide an answer to an inbound HTTP request. */
-    public static final String HTTP = "http";
-
-    /** A function is set to be executed when messages are sent to a messaging system. */
-    public static final String PUBSUB = "pubsub";
-
-    /** A function is scheduled to be executed regularly. */
-    public static final String TIMER = "timer";
-
-    /** If none of the others apply. */
-    public static final String OTHER = "other";
-
-    private FaasTriggerValues() {}
-  }
-
   public static final class FaasDocumentOperationValues {
     /** When a new object is created. */
     public static final String INSERT = "insert";
@@ -1943,137 +2438,6 @@ public static final class FaasDocumentOperationValues {
     private FaasDocumentOperationValues() {}
   }
 
-  public static final class FaasInvokedProviderValues {
-    /** Alibaba Cloud. */
-    public static final String ALIBABA_CLOUD = "alibaba_cloud";
-
-    /** Amazon Web Services. */
-    public static final String AWS = "aws";
-
-    /** Microsoft Azure. */
-    public static final String AZURE = "azure";
-
-    /** Google Cloud Platform. */
-    public static final String GCP = "gcp";
-
-    /** Tencent Cloud. */
-    public static final String TENCENT_CLOUD = "tencent_cloud";
-
-    private FaasInvokedProviderValues() {}
-  }
-
-  public static final class NetworkTransportValues {
-    /** TCP. */
-    public static final String TCP = "tcp";
-
-    /** UDP. */
-    public static final String UDP = "udp";
-
-    /** Named or anonymous pipe. See note below. */
-    public static final String PIPE = "pipe";
-
-    /** Unix domain socket. */
-    public static final String UNIX = "unix";
-
-    private NetworkTransportValues() {}
-  }
-
-  public static final class NetworkTypeValues {
-    /** IPv4. */
-    public static final String IPV4 = "ipv4";
-
-    /** IPv6. */
-    public static final String IPV6 = "ipv6";
-
-    private NetworkTypeValues() {}
-  }
-
-  public static final class NetworkConnectionTypeValues {
-    /** wifi. */
-    public static final String WIFI = "wifi";
-
-    /** wired. */
-    public static final String WIRED = "wired";
-
-    /** cell. */
-    public static final String CELL = "cell";
-
-    /** unavailable. */
-    public static final String UNAVAILABLE = "unavailable";
-
-    /** unknown. */
-    public static final String UNKNOWN = "unknown";
-
-    private NetworkConnectionTypeValues() {}
-  }
-
-  public static final class NetworkConnectionSubtypeValues {
-    /** GPRS. */
-    public static final String GPRS = "gprs";
-
-    /** EDGE. */
-    public static final String EDGE = "edge";
-
-    /** UMTS. */
-    public static final String UMTS = "umts";
-
-    /** CDMA. */
-    public static final String CDMA = "cdma";
-
-    /** EVDO Rel. 0. */
-    public static final String EVDO_0 = "evdo_0";
-
-    /** EVDO Rev. A. */
-    public static final String EVDO_A = "evdo_a";
-
-    /** CDMA2000 1XRTT. */
-    public static final String CDMA2000_1XRTT = "cdma2000_1xrtt";
-
-    /** HSDPA. */
-    public static final String HSDPA = "hsdpa";
-
-    /** HSUPA. */
-    public static final String HSUPA = "hsupa";
-
-    /** HSPA. */
-    public static final String HSPA = "hspa";
-
-    /** IDEN. */
-    public static final String IDEN = "iden";
-
-    /** EVDO Rev. B. */
-    public static final String EVDO_B = "evdo_b";
-
-    /** LTE. */
-    public static final String LTE = "lte";
-
-    /** EHRPD. */
-    public static final String EHRPD = "ehrpd";
-
-    /** HSPAP. */
-    public static final String HSPAP = "hspap";
-
-    /** GSM. */
-    public static final String GSM = "gsm";
-
-    /** TD-SCDMA. */
-    public static final String TD_SCDMA = "td_scdma";
-
-    /** IWLAN. */
-    public static final String IWLAN = "iwlan";
-
-    /** 5G NR (New Radio). */
-    public static final String NR = "nr";
-
-    /** 5G NRNSA (New Radio Non-Standalone). */
-    public static final String NRNSA = "nrnsa";
-
-    /** LTE CA. */
-    public static final String LTE_CA = "lte_ca";
-
-    private NetworkConnectionSubtypeValues() {}
-  }
-
   public static final class GraphqlOperationTypeValues {
     /** GraphQL query. */
     public static final String QUERY = "query";
@@ -2100,6 +2464,16 @@ public static final class MessagingOperationValues {
     private MessagingOperationValues() {}
   }
 
+  public static final class MessagingRocketmqConsumptionModelValues {
+    /** Clustering consumption model. */
+    public static final String CLUSTERING = "clustering";
+
+    /** Broadcasting consumption model. */
+    public static final String BROADCASTING = "broadcasting";
+
+    private MessagingRocketmqConsumptionModelValues() {}
+  }
+
   public static final class MessagingRocketmqMessageTypeValues {
     /** Normal message. */
     public static final String NORMAL = "normal";
@@ -2116,16 +2490,6 @@ public static final class MessagingRocketmqMessageTypeValues {
     private MessagingRocketmqMessageTypeValues() {}
   }
 
-  public static final class MessagingRocketmqConsumptionModelValues {
-    /** Clustering consumption model. */
-    public static final String CLUSTERING = "clustering";
-
-    /** Broadcasting consumption model. */
-    public static final String BROADCASTING = "broadcasting";
-
-    private MessagingRocketmqConsumptionModelValues() {}
-  }
-
   public static final class RpcSystemValues {
     /** gRPC. */
     public static final String GRPC = "grpc";

From eaab3457ca7e964698de6e05281e27f7e27c9018 Mon Sep 17 00:00:00 2001
From: jack-berg <jberg@newrelic.com>
Date: Wed, 25 Oct 2023 15:16:43 -0500
Subject: [PATCH 2/5] Restore and deprecated removed attributes

---
 README.md                                     |  15 +-
 build.gradle.kts                              |   1 +
 buildSrc/build.gradle.kts                     |   9 +-
 .../otel.japicmp-conventions.gradle.kts       | 126 +++++++++++++++
 .../templates/SemanticAttributes.java.j2      | 144 ++++++++++++++++++
 .../semconv/ResourceAttributes.java           |  19 +++
 .../semconv/SemanticAttributes.java           | 135 ++++++++++++++++
 7 files changed, 445 insertions(+), 4 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts

diff --git a/README.md b/README.md
index 1f3d98c..0569b3d 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ Requires docker.
 In a shell, execute the following gradle tasks:
 
 ```shell
-./gradlew generateSemanticConventions --console=plain
+./gradlew clean generateSemanticConventions --console=plain
 ./gradlew spotlessApply
 ```
 
@@ -53,6 +53,19 @@ of [open-telemetry/semantic-conventions](https://github.com/open-telemetry/seman
 defined in the `semanticConventionsVersion` variable of [build.gradle.kts](./build.gradle.kts) and
 generate semantic conventions classes from the release contents.
 
+This repository publishes `-alpha` artifacts and as discussed
+in [opentelemetry-java/VERSIONING.md](https://github.com/open-telemetry/opentelemetry-java/blob/main/VERSIONING.md),
+we make no compatibility guarantees. However, by convention we've been keeping attribute constants
+around with `@Deprecated` annotation while we work towards formalizing the strategy (
+see [#6](https://github.com/open-telemetry/semantic-conventions-java/issues/6)). The process for
+retaining removed attributes is to carefully add entries to
+the [SemanticAttributes.java.j2](./buildscripts/templates/SemanticAttributes.java.j2) template. This
+is meticulous and error prone, hence the desire to fix it. To ensure we don't accidentally delete
+any constants while we work our a permanent
+strategy, [japicmp](./buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts) has been added
+as a build check. It will ensure that only binary / source compatible changes are made. **NOTE: this
+checking of binary / source compatibility is not required and will change in the future.**
+
 ## Contributing
 
 Before you start - see OpenTelemetry
diff --git a/build.gradle.kts b/build.gradle.kts
index bcb4451..2fff484 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,6 +4,7 @@ import java.time.Duration
 plugins {
   id("otel.java-conventions")
   id("otel.publish-conventions")
+  id("otel.japicmp-conventions")
 
   id("otel.animalsniffer-conventions")
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index bd4d8a5..d49f94e 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -9,6 +9,9 @@ repositories {
 }
 
 dependencies {
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.20.0")
-    implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.1")
-}
\ No newline at end of file
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.20.0")
+  implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.1")
+  implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.2")
+  // Needed for japicmp but not automatically brought in for some reason.
+  implementation("com.google.guava:guava:32.1.3-jre")
+}
diff --git a/buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts
new file mode 100644
index 0000000..fc2331d
--- /dev/null
+++ b/buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts
@@ -0,0 +1,126 @@
+import japicmp.model.JApiChangeStatus
+import japicmp.model.JApiClass
+import japicmp.model.JApiCompatibility
+import japicmp.model.JApiCompatibilityChange
+import japicmp.model.JApiMethod
+import me.champeau.gradle.japicmp.JapicmpTask
+import me.champeau.gradle.japicmp.report.Violation
+import me.champeau.gradle.japicmp.report.stdrules.AbstractRecordingSeenMembers
+import me.champeau.gradle.japicmp.report.stdrules.BinaryIncompatibleRule
+import me.champeau.gradle.japicmp.report.stdrules.RecordSeenMembersSetup
+import me.champeau.gradle.japicmp.report.stdrules.SourceCompatibleRule
+import me.champeau.gradle.japicmp.report.stdrules.UnchangedMemberRule
+
+
+plugins {
+  base
+
+  id("me.champeau.gradle.japicmp")
+}
+
+/**
+ * The latest *released* version of the project. Evaluated lazily so the work is only done if necessary.
+ */
+val latestReleasedVersion: String by lazy {
+  // hack to find the current released version of the project
+  val temp: Configuration = configurations.create("tempConfig")
+  dependencies.add(temp.name, "io.opentelemetry.semconv:opentelemetry-semconv:latest.release")
+  val moduleVersion = configurations["tempConfig"].resolvedConfiguration.firstLevelModuleDependencies.elementAt(0).moduleVersion
+  configurations.remove(temp)
+  logger.debug("Discovered latest release version: " + moduleVersion)
+  moduleVersion
+}
+
+class SourceIncompatibleRule : AbstractRecordingSeenMembers() {
+  override fun maybeAddViolation(member: JApiCompatibility): Violation? {
+    if (!member.isSourceCompatible()) {
+      return Violation.error(member, "Not source compatible")
+    }
+    return null
+  }
+}
+
+/**
+ * Locate the project's artifact of a particular version.
+ */
+fun findArtifact(version: String): File {
+  val existingGroup = group
+  try {
+    // Temporarily change the group name because we want to fetch an artifact with the same
+    // Maven coordinates as the project, which Gradle would not allow otherwise.
+    group = "virtual_group"
+    val depModule = "io.opentelemetry.semconv:${base.archivesName.get()}:$version@jar"
+    val depJar = "${base.archivesName.get()}-$version.jar"
+    val configuration: Configuration = configurations.detachedConfiguration(
+      dependencies.create(depModule),
+    )
+    return files(configuration.files).filter {
+      it.name.equals(depJar)
+    }.singleFile
+  } finally {
+    group = existingGroup
+  }
+}
+
+// generate the api diff report for any module that is stable and publishes a jar.
+if (!project.hasProperty("otel.release")) {
+  afterEvaluate {
+    tasks {
+      val jApiCmp by registering(JapicmpTask::class) {
+        dependsOn("jar")
+
+        // the japicmp "new" version is either the user-specified one, or the locally built jar.
+        val apiNewVersion: String? by project
+        val newArtifact = apiNewVersion?.let { findArtifact(it) }
+          ?: file(getByName<Jar>("jar").archiveFile)
+        newClasspath.from(files(newArtifact))
+
+        // only output changes, not everything
+        onlyModified.set(true)
+
+        // the japicmp "old" version is either the user-specified one, or the latest release.
+        val apiBaseVersion: String? by project
+        val baselineVersion = apiBaseVersion ?: latestReleasedVersion
+        oldClasspath.from(
+          try {
+            files(findArtifact(baselineVersion))
+          } catch (e: Exception) {
+            // if we can't find the baseline artifact, this is probably one that's never been published before,
+            // so publish the whole API. We do that by flipping this flag, and comparing the current against nothing.
+            onlyModified.set(false)
+            files()
+          },
+        )
+
+        // Reproduce defaults from https://github.com/melix/japicmp-gradle-plugin/blob/09f52739ef1fccda6b4310cf3f4b19dc97377024/src/main/java/me/champeau/gradle/japicmp/report/ViolationsGenerator.java#L130
+        // with some changes.
+        val exclusions = mutableListOf<String>()
+        // Allow new default methods on interfaces
+        exclusions.add("METHOD_NEW_DEFAULT")
+        // Allow adding default implementations for default methods
+        exclusions.add("METHOD_ABSTRACT_NOW_DEFAULT")
+        // Bug prevents recognizing default methods of superinterface.
+        // Fixed in https://github.com/siom79/japicmp/pull/343 but not yet available in me.champeau.gradle.japicmp
+        exclusions.add("METHOD_ABSTRACT_ADDED_IN_IMPLEMENTED_INTERFACE")
+        compatibilityChangeExcludes.set(exclusions)
+        richReport {
+          addSetupRule(RecordSeenMembersSetup::class.java)
+          addRule(JApiChangeStatus.NEW, SourceCompatibleRule::class.java)
+          addRule(JApiChangeStatus.MODIFIED, SourceCompatibleRule::class.java)
+          addRule(JApiChangeStatus.UNCHANGED, UnchangedMemberRule::class.java)
+          addRule(BinaryIncompatibleRule::class.java)
+          // Disallow source incompatible changes, which are allowed by default for some reason
+          addRule(SourceIncompatibleRule::class.java)
+        }
+
+        // this is needed so that we only consider the current artifact, and not dependencies
+        ignoreMissingClasses.set(true)
+        packageExcludes.addAll("*.internal", "*.internal.*")
+      }
+      // have the check task depend on the api comparison task, to make it more likely it will get used.
+      named("check") {
+        dependsOn(jApiCmp)
+      }
+    }
+  }
+}
diff --git a/buildscripts/templates/SemanticAttributes.java.j2 b/buildscripts/templates/SemanticAttributes.java.j2
index 8929c76..d1ceb6c 100644
--- a/buildscripts/templates/SemanticAttributes.java.j2
+++ b/buildscripts/templates/SemanticAttributes.java.j2
@@ -667,6 +667,134 @@ public final class {{class}} {
     private NetHostConnectionSubtypeValues() {}
   }
 
+  /**
+   * Immediate client peer port number.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_PEER_PORT} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<Long> CLIENT_SOCKET_PORT = longKey("client.socket.port");
+
+  /**
+   * Name of the memory pool.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>Pool names are generally obtained via <a
+   *       href="https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html#getName()">MemoryPoolMXBean#getName()</a>.
+   * </ul>
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#JVM_MEMORY_POOL_NAME} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<String> POOL = stringKey("pool");
+
+  /**
+   * The domain name of the source system.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>This value may be a host name, a fully qualified domain name, or another host naming
+   *       format.
+   * </ul>
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   */
+  @Deprecated
+  public static final AttributeKey<String> SOURCE_DOMAIN = stringKey("source.domain");
+
+  /**
+   * Physical server IP address or Unix socket address. If set from the client, should simply use
+   * the socket's peer address, and not attempt to find any actual server IP (i.e., if set from
+   * client, this may represent some proxy server instead of the logical server).
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_LOCAL_ADDRESS} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<String> SERVER_SOCKET_ADDRESS =
+      stringKey("server.socket.address");
+
+  /**
+   * The (uncompressed) size of the message payload in bytes. Also use this attribute if it is
+   * unknown whether the compressed or uncompressed payload size is reported.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#MESSAGING_MESSAGE_BODY_SIZE} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<Long> MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES =
+      longKey("messaging.message.payload_size_bytes");
+
+  /**
+   * The domain name of the destination system.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   */
+  @Deprecated
+  public static final AttributeKey<String> DESTINATION_DOMAIN = stringKey("destination.domain");
+
+  /**
+   * The compressed size of the message payload in bytes.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   */
+  @Deprecated
+  public static final AttributeKey<Long> MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES =
+      longKey("messaging.message.payload_compressed_size_bytes");
+
+  /**
+   * The domain name of an immediate peer.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>Typically observed from the client side, and represents a proxy or other intermediary
+   *       domain name.
+   * </ul>
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   */
+  @Deprecated
+  public static final AttributeKey<String> SERVER_SOCKET_DOMAIN = stringKey("server.socket.domain");
+
+  /**
+   * The type of memory.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#JVM_MEMORY_TYPE} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<String> TYPE = stringKey("type");
+
+  /**
+   * Physical server port.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_LOCAL_PORT} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<Long> SERVER_SOCKET_PORT = longKey("server.socket.port");
+
+  /**
+   * Immediate client peer address - unix domain socket name, IPv4 or IPv6 address.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_PEER_ADDRESS} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<String> CLIENT_SOCKET_ADDRESS =
+      stringKey("client.socket.address");
+
+  /**
+   * @deprecated This item has been removed as of 1.21.0 of the semantic conventions. Use {@link JvmMemoryTypeValues} instead.
+   */
+  @Deprecated
+  public static final class TypeValues {
+    /** Heap memory. */
+    public static final String HEAP = "heap";
+
+    /** Non-heap memory. */
+    public static final String NON_HEAP = "non_heap";
+
+    private TypeValues() {}
+  }
+
   {% endif %}
 
   {%- if class == "ResourceAttributes" %}
@@ -723,6 +851,22 @@ public final class {{class}} {
   @Deprecated
   public static final AttributeKey<String> FAAS_ID = stringKey("faas.id");
 
+  /**
+   * The version string of the auto instrumentation agent, if used.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link ResourceAttributes#TELEMETRY_DISTRO_VERSION} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<String> TELEMETRY_AUTO_VERSION = stringKey("telemetry.auto.version");
+
+  /**
+   * Container image tag.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link ResourceAttributes#CONTAINER_IMAGE_TAGS} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<String> CONTAINER_IMAGE_TAG = stringKey("container.image.tag");
+
   {% endif %}
 
   private {{class}}() {}
diff --git a/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java b/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java
index 954b19d..1553cba 100644
--- a/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java
+++ b/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java
@@ -1200,5 +1200,24 @@ private TelemetrySdkLanguageValues() {}
    */
   @Deprecated public static final AttributeKey<String> FAAS_ID = stringKey("faas.id");
 
+  /**
+   * The version string of the auto instrumentation agent, if used.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   *     ResourceAttributes#TELEMETRY_DISTRO_VERSION} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<String> TELEMETRY_AUTO_VERSION =
+      stringKey("telemetry.auto.version");
+
+  /**
+   * Container image tag.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   *     ResourceAttributes#CONTAINER_IMAGE_TAGS} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<String> CONTAINER_IMAGE_TAG = stringKey("container.image.tag");
+
   private ResourceAttributes() {}
 }
diff --git a/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java
index 5a6eae7..bfd31f9 100644
--- a/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java
+++ b/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java
@@ -3260,5 +3260,140 @@ public static final class NetHostConnectionSubtypeValues {
     private NetHostConnectionSubtypeValues() {}
   }
 
+  /**
+   * Immediate client peer port number.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   *     SemanticAttributes#NETWORK_PEER_PORT} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<Long> CLIENT_SOCKET_PORT = longKey("client.socket.port");
+
+  /**
+   * Name of the memory pool.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>Pool names are generally obtained via <a
+   *       href="https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html#getName()">MemoryPoolMXBean#getName()</a>.
+   * </ul>
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   *     SemanticAttributes#JVM_MEMORY_POOL_NAME} instead.
+   */
+  @Deprecated public static final AttributeKey<String> POOL = stringKey("pool");
+
+  /**
+   * The domain name of the source system.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>This value may be a host name, a fully qualified domain name, or another host naming
+   *       format.
+   * </ul>
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   */
+  @Deprecated public static final AttributeKey<String> SOURCE_DOMAIN = stringKey("source.domain");
+
+  /**
+   * Physical server IP address or Unix socket address. If set from the client, should simply use
+   * the socket's peer address, and not attempt to find any actual server IP (i.e., if set from
+   * client, this may represent some proxy server instead of the logical server).
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   *     SemanticAttributes#NETWORK_LOCAL_ADDRESS} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<String> SERVER_SOCKET_ADDRESS =
+      stringKey("server.socket.address");
+
+  /**
+   * The (uncompressed) size of the message payload in bytes. Also use this attribute if it is
+   * unknown whether the compressed or uncompressed payload size is reported.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   *     SemanticAttributes#MESSAGING_MESSAGE_BODY_SIZE} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<Long> MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES =
+      longKey("messaging.message.payload_size_bytes");
+
+  /**
+   * The domain name of the destination system.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   */
+  @Deprecated
+  public static final AttributeKey<String> DESTINATION_DOMAIN = stringKey("destination.domain");
+
+  /**
+   * The compressed size of the message payload in bytes.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   */
+  @Deprecated
+  public static final AttributeKey<Long> MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES =
+      longKey("messaging.message.payload_compressed_size_bytes");
+
+  /**
+   * The domain name of an immediate peer.
+   *
+   * <p>Notes:
+   *
+   * <ul>
+   *   <li>Typically observed from the client side, and represents a proxy or other intermediary
+   *       domain name.
+   * </ul>
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   */
+  @Deprecated
+  public static final AttributeKey<String> SERVER_SOCKET_DOMAIN = stringKey("server.socket.domain");
+
+  /**
+   * The type of memory.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   *     SemanticAttributes#JVM_MEMORY_TYPE} instead.
+   */
+  @Deprecated public static final AttributeKey<String> TYPE = stringKey("type");
+
+  /**
+   * Physical server port.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   *     SemanticAttributes#NETWORK_LOCAL_PORT} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<Long> SERVER_SOCKET_PORT = longKey("server.socket.port");
+
+  /**
+   * Immediate client peer address - unix domain socket name, IPv4 or IPv6 address.
+   *
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   *     SemanticAttributes#NETWORK_PEER_ADDRESS} instead.
+   */
+  @Deprecated
+  public static final AttributeKey<String> CLIENT_SOCKET_ADDRESS =
+      stringKey("client.socket.address");
+
+  /**
+   * @deprecated This item has been removed as of 1.21.0 of the semantic conventions. Use {@link
+   *     JvmMemoryTypeValues} instead.
+   */
+  @Deprecated
+  public static final class TypeValues {
+    /** Heap memory. */
+    public static final String HEAP = "heap";
+
+    /** Non-heap memory. */
+    public static final String NON_HEAP = "non_heap";
+
+    private TypeValues() {}
+  }
+
   private SemanticAttributes() {}
 }

From eca521247f22a9ca2871b9206a448c3eccf272a6 Mon Sep 17 00:00:00 2001
From: jack-berg <jberg@newrelic.com>
Date: Wed, 25 Oct 2023 15:20:46 -0500
Subject: [PATCH 3/5] Add note about checing compatibility

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 0569b3d..d1c8733 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,8 @@ strategy, [japicmp](./buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.k
 as a build check. It will ensure that only binary / source compatible changes are made. **NOTE: this
 checking of binary / source compatibility is not required and will change in the future.**
 
+To check compatibility, run `./gradlew build` after updating the template and running the generation task as documented above.
+
 ## Contributing
 
 Before you start - see OpenTelemetry

From 9a217571cb34baf6ea5df252a26b8005b70c9f22 Mon Sep 17 00:00:00 2001
From: jack-berg <34418638+jack-berg@users.noreply.github.com>
Date: Wed, 25 Oct 2023 20:33:01 -0500
Subject: [PATCH 4/5] Apply suggestions from code review

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
---
 buildscripts/templates/SemanticAttributes.java.j2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildscripts/templates/SemanticAttributes.java.j2 b/buildscripts/templates/SemanticAttributes.java.j2
index d1ceb6c..c4caf84 100644
--- a/buildscripts/templates/SemanticAttributes.java.j2
+++ b/buildscripts/templates/SemanticAttributes.java.j2
@@ -670,7 +670,7 @@ public final class {{class}} {
   /**
    * Immediate client peer port number.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_PEER_PORT} instead.
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_PEER_PORT} on server telemetry and {@link SemanticAttributes#NETWORK_LOCAL_PORT} on client telemetry instead.
    */
   @Deprecated
   public static final AttributeKey<Long> CLIENT_SOCKET_PORT = longKey("client.socket.port");
@@ -708,7 +708,7 @@ public final class {{class}} {
    * the socket's peer address, and not attempt to find any actual server IP (i.e., if set from
    * client, this may represent some proxy server instead of the logical server).
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_LOCAL_ADDRESS} instead.
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_LOCAL_ADDRESS} on server telemetry and {@link SemanticAttributes#NETWORK_PEER_ADDRESS} on client telemetry instead.
    */
   @Deprecated
   public static final AttributeKey<String> SERVER_SOCKET_ADDRESS =
@@ -767,7 +767,7 @@ public final class {{class}} {
   /**
    * Physical server port.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_LOCAL_PORT} instead.
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_LOCAL_PORT} on server telemetry and {@link SemanticAttributes#NETWORK_PEER_PORT} on client telemetry instead.
    */
   @Deprecated
   public static final AttributeKey<Long> SERVER_SOCKET_PORT = longKey("server.socket.port");
@@ -775,7 +775,7 @@ public final class {{class}} {
   /**
    * Immediate client peer address - unix domain socket name, IPv4 or IPv6 address.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_PEER_ADDRESS} instead.
+   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_PEER_ADDRESS} on server telemetry and {@link SemanticAttributes#NETWORK_LOCAL_ADDRESS} on client telemetry instead.
    */
   @Deprecated
   public static final AttributeKey<String> CLIENT_SOCKET_ADDRESS =

From 58ae276e8c2f75afcd06c527f6a19ce479684745 Mon Sep 17 00:00:00 2001
From: jack-berg <jberg@newrelic.com>
Date: Wed, 25 Oct 2023 20:35:47 -0500
Subject: [PATCH 5/5] Fix grammar

---
 .../templates/SemanticAttributes.java.j2      | 28 +++++++--------
 .../semconv/ResourceAttributes.java           |  4 +--
 .../semconv/SemanticAttributes.java           | 36 ++++++++++---------
 3 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/buildscripts/templates/SemanticAttributes.java.j2 b/buildscripts/templates/SemanticAttributes.java.j2
index c4caf84..079ddef 100644
--- a/buildscripts/templates/SemanticAttributes.java.j2
+++ b/buildscripts/templates/SemanticAttributes.java.j2
@@ -670,7 +670,7 @@ public final class {{class}} {
   /**
    * Immediate client peer port number.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_PEER_PORT} on server telemetry and {@link SemanticAttributes#NETWORK_LOCAL_PORT} on client telemetry instead.
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_PEER_PORT} on server telemetry and {@link SemanticAttributes#NETWORK_LOCAL_PORT} on client telemetry instead.
    */
   @Deprecated
   public static final AttributeKey<Long> CLIENT_SOCKET_PORT = longKey("client.socket.port");
@@ -684,7 +684,7 @@ public final class {{class}} {
    *   <li>Pool names are generally obtained via <a
    *       href="https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html#getName()">MemoryPoolMXBean#getName()</a>.
    * </ul>
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#JVM_MEMORY_POOL_NAME} instead.
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#JVM_MEMORY_POOL_NAME} instead.
    */
   @Deprecated
   public static final AttributeKey<String> POOL = stringKey("pool");
@@ -698,7 +698,7 @@ public final class {{class}} {
    *   <li>This value may be a host name, a fully qualified domain name, or another host naming
    *       format.
    * </ul>
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   * @deprecated This item has been removed in 1.22.0 of the semantic conventions.
    */
   @Deprecated
   public static final AttributeKey<String> SOURCE_DOMAIN = stringKey("source.domain");
@@ -708,7 +708,7 @@ public final class {{class}} {
    * the socket's peer address, and not attempt to find any actual server IP (i.e., if set from
    * client, this may represent some proxy server instead of the logical server).
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_LOCAL_ADDRESS} on server telemetry and {@link SemanticAttributes#NETWORK_PEER_ADDRESS} on client telemetry instead.
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_LOCAL_ADDRESS} on server telemetry and {@link SemanticAttributes#NETWORK_PEER_ADDRESS} on client telemetry instead.
    */
   @Deprecated
   public static final AttributeKey<String> SERVER_SOCKET_ADDRESS =
@@ -718,7 +718,7 @@ public final class {{class}} {
    * The (uncompressed) size of the message payload in bytes. Also use this attribute if it is
    * unknown whether the compressed or uncompressed payload size is reported.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#MESSAGING_MESSAGE_BODY_SIZE} instead.
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#MESSAGING_MESSAGE_BODY_SIZE} instead.
    */
   @Deprecated
   public static final AttributeKey<Long> MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES =
@@ -727,7 +727,7 @@ public final class {{class}} {
   /**
    * The domain name of the destination system.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   * @deprecated This item has been removed in 1.22.0 of the semantic conventions.
    */
   @Deprecated
   public static final AttributeKey<String> DESTINATION_DOMAIN = stringKey("destination.domain");
@@ -735,7 +735,7 @@ public final class {{class}} {
   /**
    * The compressed size of the message payload in bytes.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   * @deprecated This item has been removed in 1.22.0 of the semantic conventions.
    */
   @Deprecated
   public static final AttributeKey<Long> MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES =
@@ -751,7 +751,7 @@ public final class {{class}} {
    *       domain name.
    * </ul>
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   * @deprecated This item has been removed in 1.22.0 of the semantic conventions.
    */
   @Deprecated
   public static final AttributeKey<String> SERVER_SOCKET_DOMAIN = stringKey("server.socket.domain");
@@ -759,7 +759,7 @@ public final class {{class}} {
   /**
    * The type of memory.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#JVM_MEMORY_TYPE} instead.
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#JVM_MEMORY_TYPE} instead.
    */
   @Deprecated
   public static final AttributeKey<String> TYPE = stringKey("type");
@@ -767,7 +767,7 @@ public final class {{class}} {
   /**
    * Physical server port.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_LOCAL_PORT} on server telemetry and {@link SemanticAttributes#NETWORK_PEER_PORT} on client telemetry instead.
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_LOCAL_PORT} on server telemetry and {@link SemanticAttributes#NETWORK_PEER_PORT} on client telemetry instead.
    */
   @Deprecated
   public static final AttributeKey<Long> SERVER_SOCKET_PORT = longKey("server.socket.port");
@@ -775,14 +775,14 @@ public final class {{class}} {
   /**
    * Immediate client peer address - unix domain socket name, IPv4 or IPv6 address.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_PEER_ADDRESS} on server telemetry and {@link SemanticAttributes#NETWORK_LOCAL_ADDRESS} on client telemetry instead.
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link SemanticAttributes#NETWORK_PEER_ADDRESS} on server telemetry and {@link SemanticAttributes#NETWORK_LOCAL_ADDRESS} on client telemetry instead.
    */
   @Deprecated
   public static final AttributeKey<String> CLIENT_SOCKET_ADDRESS =
       stringKey("client.socket.address");
 
   /**
-   * @deprecated This item has been removed as of 1.21.0 of the semantic conventions. Use {@link JvmMemoryTypeValues} instead.
+   * @deprecated This item has been renamed as of 1.21.0 of the semantic conventions. Use {@link JvmMemoryTypeValues} instead.
    */
   @Deprecated
   public static final class TypeValues {
@@ -854,7 +854,7 @@ public final class {{class}} {
   /**
    * The version string of the auto instrumentation agent, if used.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link ResourceAttributes#TELEMETRY_DISTRO_VERSION} instead.
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link ResourceAttributes#TELEMETRY_DISTRO_VERSION} instead.
    */
   @Deprecated
   public static final AttributeKey<String> TELEMETRY_AUTO_VERSION = stringKey("telemetry.auto.version");
@@ -862,7 +862,7 @@ public final class {{class}} {
   /**
    * Container image tag.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link ResourceAttributes#CONTAINER_IMAGE_TAGS} instead.
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link ResourceAttributes#CONTAINER_IMAGE_TAGS} instead.
    */
   @Deprecated
   public static final AttributeKey<String> CONTAINER_IMAGE_TAG = stringKey("container.image.tag");
diff --git a/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java b/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java
index 1553cba..3a1ca0b 100644
--- a/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java
+++ b/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java
@@ -1203,7 +1203,7 @@ private TelemetrySdkLanguageValues() {}
   /**
    * The version string of the auto instrumentation agent, if used.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link
    *     ResourceAttributes#TELEMETRY_DISTRO_VERSION} instead.
    */
   @Deprecated
@@ -1213,7 +1213,7 @@ private TelemetrySdkLanguageValues() {}
   /**
    * Container image tag.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link
    *     ResourceAttributes#CONTAINER_IMAGE_TAGS} instead.
    */
   @Deprecated
diff --git a/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java
index bfd31f9..24a2ad2 100644
--- a/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java
+++ b/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java
@@ -3263,8 +3263,9 @@ private NetHostConnectionSubtypeValues() {}
   /**
    * Immediate client peer port number.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
-   *     SemanticAttributes#NETWORK_PEER_PORT} instead.
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link
+   *     SemanticAttributes#NETWORK_PEER_PORT} on server telemetry and {@link
+   *     SemanticAttributes#NETWORK_LOCAL_PORT} on client telemetry instead.
    */
   @Deprecated
   public static final AttributeKey<Long> CLIENT_SOCKET_PORT = longKey("client.socket.port");
@@ -3279,7 +3280,7 @@ private NetHostConnectionSubtypeValues() {}
    *       href="https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html#getName()">MemoryPoolMXBean#getName()</a>.
    * </ul>
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link
    *     SemanticAttributes#JVM_MEMORY_POOL_NAME} instead.
    */
   @Deprecated public static final AttributeKey<String> POOL = stringKey("pool");
@@ -3294,7 +3295,7 @@ private NetHostConnectionSubtypeValues() {}
    *       format.
    * </ul>
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   * @deprecated This item has been removed in 1.22.0 of the semantic conventions.
    */
   @Deprecated public static final AttributeKey<String> SOURCE_DOMAIN = stringKey("source.domain");
 
@@ -3303,8 +3304,9 @@ private NetHostConnectionSubtypeValues() {}
    * the socket's peer address, and not attempt to find any actual server IP (i.e., if set from
    * client, this may represent some proxy server instead of the logical server).
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
-   *     SemanticAttributes#NETWORK_LOCAL_ADDRESS} instead.
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link
+   *     SemanticAttributes#NETWORK_LOCAL_ADDRESS} on server telemetry and {@link
+   *     SemanticAttributes#NETWORK_PEER_ADDRESS} on client telemetry instead.
    */
   @Deprecated
   public static final AttributeKey<String> SERVER_SOCKET_ADDRESS =
@@ -3314,7 +3316,7 @@ private NetHostConnectionSubtypeValues() {}
    * The (uncompressed) size of the message payload in bytes. Also use this attribute if it is
    * unknown whether the compressed or uncompressed payload size is reported.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link
    *     SemanticAttributes#MESSAGING_MESSAGE_BODY_SIZE} instead.
    */
   @Deprecated
@@ -3324,7 +3326,7 @@ private NetHostConnectionSubtypeValues() {}
   /**
    * The domain name of the destination system.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   * @deprecated This item has been removed in 1.22.0 of the semantic conventions.
    */
   @Deprecated
   public static final AttributeKey<String> DESTINATION_DOMAIN = stringKey("destination.domain");
@@ -3332,7 +3334,7 @@ private NetHostConnectionSubtypeValues() {}
   /**
    * The compressed size of the message payload in bytes.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   * @deprecated This item has been removed in 1.22.0 of the semantic conventions.
    */
   @Deprecated
   public static final AttributeKey<Long> MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES =
@@ -3348,7 +3350,7 @@ private NetHostConnectionSubtypeValues() {}
    *       domain name.
    * </ul>
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions.
+   * @deprecated This item has been removed in 1.22.0 of the semantic conventions.
    */
   @Deprecated
   public static final AttributeKey<String> SERVER_SOCKET_DOMAIN = stringKey("server.socket.domain");
@@ -3356,7 +3358,7 @@ private NetHostConnectionSubtypeValues() {}
   /**
    * The type of memory.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link
    *     SemanticAttributes#JVM_MEMORY_TYPE} instead.
    */
   @Deprecated public static final AttributeKey<String> TYPE = stringKey("type");
@@ -3364,8 +3366,9 @@ private NetHostConnectionSubtypeValues() {}
   /**
    * Physical server port.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
-   *     SemanticAttributes#NETWORK_LOCAL_PORT} instead.
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link
+   *     SemanticAttributes#NETWORK_LOCAL_PORT} on server telemetry and {@link
+   *     SemanticAttributes#NETWORK_PEER_PORT} on client telemetry instead.
    */
   @Deprecated
   public static final AttributeKey<Long> SERVER_SOCKET_PORT = longKey("server.socket.port");
@@ -3373,15 +3376,16 @@ private NetHostConnectionSubtypeValues() {}
   /**
    * Immediate client peer address - unix domain socket name, IPv4 or IPv6 address.
    *
-   * @deprecated This item has renamed in 1.22.0 of the semantic conventions. Use {@link
-   *     SemanticAttributes#NETWORK_PEER_ADDRESS} instead.
+   * @deprecated This item has been renamed in 1.22.0 of the semantic conventions. Use {@link
+   *     SemanticAttributes#NETWORK_PEER_ADDRESS} on server telemetry and {@link
+   *     SemanticAttributes#NETWORK_LOCAL_ADDRESS} on client telemetry instead.
    */
   @Deprecated
   public static final AttributeKey<String> CLIENT_SOCKET_ADDRESS =
       stringKey("client.socket.address");
 
   /**
-   * @deprecated This item has been removed as of 1.21.0 of the semantic conventions. Use {@link
+   * @deprecated This item has been renamed as of 1.21.0 of the semantic conventions. Use {@link
    *     JvmMemoryTypeValues} instead.
    */
   @Deprecated