generate semantic conventions for 1.23.0 (#1137)

open-telemetry · Nov 7, 2023 · 30b73d9 · 30b73d9
1 parent 42a8b95
commit 30b73d9
Show file tree

Hide file tree

Showing 4 changed files with 777 additions and 609 deletions.
diff --git a/script/semantic-conventions/semconv.sh b/script/semantic-conventions/semconv.sh
@@ -12,10 +12,10 @@ SPEC_DIR="${ROOT_DIR}/var/semantic-conventions"
 CODE_DIR="${ROOT_DIR}/src/SemConv"
 
 # freeze the spec & generator tools versions to make SemanticAttributes generation reproducible
-SEMCONV_VERSION=${SEMCONV_VERSION:=1.22.0}
+SEMCONV_VERSION=${SEMCONV_VERSION:=1.23.0}
 SPEC_VERSION=v$SEMCONV_VERSION
 SCHEMA_URL=https://opentelemetry.io/schemas/$SEMCONV_VERSION
-GENERATOR_VERSION=0.22.0
+GENERATOR_VERSION=0.23.0
 
 cd "${SCRIPT_DIR}" || exit
 

diff --git a/script/semantic-conventions/templates/trace_deprecations.php.partial b/script/semantic-conventions/templates/trace_deprecations.php.partial
@@ -196,4 +196,14 @@
     /**
      * @deprecated
      */
-    public const NET_HOST_CONNECTION_TYPE = 'net.host.connection.type';
+    public const NET_HOST_CONNECTION_TYPE = 'net.host.connection.type';
+
+    /**
+     * @deprecated
+     */
+    public const HTTP_RESEND_COUNT = 'http.resend_count';
+
+    /**
+     * @deprecated
+     */
+    public const THREAD_DAEMON = 'thread.daemon';
diff --git a/src/SemConv/ResourceAttributes.php b/src/SemConv/ResourceAttributes.php
@@ -11,7 +11,7 @@ interface ResourceAttributes
     /**
      * The URL of the OpenTelemetry schema for these keys and values.
      */
-    public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.22.0';
+    public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.23.0';
 
     /**
      * Uniquely identifies the framework API revision offered by a version (`os.version`) of the android operating system. More information can be found here.
@@ -353,6 +353,16 @@ interface ResourceAttributes
      */
     public const CONTAINER_RUNTIME = 'container.runtime';
 
+    /**
+     * The digest of the OCI image manifest. For container images specifically is the digest by which the container image is known.
+     *
+     * Follows OCI Image Manifest Specification, and specifically the Digest property.
+     * An example can be found in Example Image Manifest.
+     *
+     * @example sha256:e4ca62c0d62f3e886e684806dfe9d4e0cda60d54986898173c1083856cfda0f4
+     */
+    public const OCI_MANIFEST_DIGEST = 'oci.manifest.digest';
+
     /**
      * Name of the deployment environment (aka deployment tier).
      *
@@ -505,6 +515,16 @@ interface ResourceAttributes
      */
     public const HOST_IP = 'host.ip';
 
+    /**
+     * Available MAC addresses of the host, excluding loopback interfaces.
+     *
+     * MAC Addresses MUST be represented in IEEE RA hexadecimal form: as hyphen-separated octets in uppercase hexadecimal form from most to least significant.
+     *
+     * @example AC-DE-48-23-45-67
+     * @example AC-DE-48-23-45-67-01-9F
+     */
+    public const HOST_MAC = 'host.mac';
+
     /**
      * Name of the host. On Unix systems, it may contain what the hostname command returns, or the fully qualified hostname, or another name specified by the user.
      *
@@ -573,7 +593,7 @@ interface ResourceAttributes
     /**
      * A pseudo-ID for the cluster, set to the UID of the `kube-system` namespace.
      *
-     * K8s does not have support for obtaining a cluster ID. If this is ever
+     * K8s doesn't have support for obtaining a cluster ID. If this is ever
      * added, we will recommend collecting the `k8s.cluster.uid` through the
      * official APIs. In the meantime, we are able to use the `uid` of the
      * `kube-system` namespace as a proxy for cluster ID. Read on for the
@@ -728,16 +748,6 @@ interface ResourceAttributes
      */
     public const K8S_CRONJOB_UID = 'k8s.cronjob.uid';
 
-    /**
-     * The digest of the OCI image manifest. For container images specifically is the digest by which the container image is known.
-     *
-     * Follows OCI Image Manifest Specification, and specifically the Digest property.
-     * An example can be found in Example Image Manifest.
-     *
-     * @example sha256:e4ca62c0d62f3e886e684806dfe9d4e0cda60d54986898173c1083856cfda0f4
-     */
-    public const OCI_MANIFEST_DIGEST = 'oci.manifest.digest';
-
     /**
      * Unique identifier for a particular build or compilation of the operating system.
      *