diff --git a/CHANGELOG.md b/CHANGELOG.md index e4b60c66..ad366102 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Bump to semconv v1.44.0 + ([#549](https://github.com/open-telemetry/semantic-conventions-java/pull/549)) + ## Version 1.43.0 (2026-07-08) * Bump to semconv v1.43.0 diff --git a/build.gradle.kts b/build.gradle.kts index c6189637..47e0b6c2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,9 +13,10 @@ val snapshot = true val apidiffBaselineVersion = "1.43.0" // The release version of https://github.com/open-telemetry/semantic-conventions used to generate classes -var semanticConventionsVersion = "1.43.0" +var semanticConventionsVersion = "1.44.0" val schemaUrlVersions = listOf( semanticConventionsVersion, + "1.43.0", "1.42.0", "1.41.1", "1.41.0", diff --git a/buildscripts/templates/registry/incubating_java/weaver.yaml b/buildscripts/templates/registry/incubating_java/weaver.yaml index f6224dfa..e859345c 100644 --- a/buildscripts/templates/registry/incubating_java/weaver.yaml +++ b/buildscripts/templates/registry/incubating_java/weaver.yaml @@ -46,7 +46,7 @@ templates: "exclude_stability": [] }) | map({ root_namespace: .root_namespace, - metrics: .metrics + metrics: [.metrics[] | select(.id == ("metric." + .metric_name))] }) application_mode: each file_name: "{{ctx.root_namespace | pascal_case}}IncubatingMetrics.java" diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-semconv.txt b/docs/apidiffs/current_vs_latest/opentelemetry-semconv.txt index 1a8d2763..5015d52b 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-semconv.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-semconv.txt @@ -1,2 +1,4 @@ -Comparing source compatibility of opentelemetry-semconv-1.43.0-SNAPSHOT.jar against opentelemetry-semconv-1.43.0.jar -No changes. \ No newline at end of file +Comparing source compatibility of opentelemetry-semconv-1.44.0-SNAPSHOT.jar against opentelemetry-semconv-1.43.0.jar +*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.semconv.SchemaUrls (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_44_0 diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AndroidIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AndroidIncubatingAttributes.java index 99a97caa..6798b58d 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AndroidIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AndroidIncubatingAttributes.java @@ -26,7 +26,7 @@ public final class AndroidIncubatingAttributes { /** * Uniquely identifies the framework API revision offered by a version ({@code os.version}) of the - * android operating system. More information can be found in the Android * API levels documentation. */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AppIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AppIncubatingAttributes.java index e756f2e1..49a34258 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AppIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AppIncubatingAttributes.java @@ -19,7 +19,7 @@ public final class AppIncubatingAttributes { public static final AttributeKey APP_BUILD_ID = stringKey("app.build_id"); /** - * A unique identifier representing an instance of an end-user facing app crash. + * A unique identifier representing an instance of an end user facing app crash. * *

Notes: * diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ArtifactIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ArtifactIncubatingAttributes.java index a7883528..f65f1fb0 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ArtifactIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ArtifactIncubatingAttributes.java @@ -31,17 +31,17 @@ public final class ArtifactIncubatingAttributes { public static final AttributeKey ARTIFACT_ATTESTATION_HASH = stringKey("artifact.attestation.hash"); - /** The id of the build software attestation. */ + /** The ID of the build software attestation. */ public static final AttributeKey ARTIFACT_ATTESTATION_ID = stringKey("artifact.attestation.id"); /** - * The human readable file name of the artifact, typically generated during build and release - * processes. Often includes the package name and version in the file name. + * The human readable filename of the artifact, typically generated during build and release + * processes. Often includes the package name and version in the filename. * *

Notes: * - *

This file name can also act as the This filename can also act as the Package Name in cases where the * package ecosystem maps accordingly. Additionally, the artifact can be published for diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/BrowserIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/BrowserIncubatingAttributes.java index 3b0ed968..0d334c47 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/BrowserIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/BrowserIncubatingAttributes.java @@ -6,6 +6,7 @@ package io.opentelemetry.semconv.incubating; import static io.opentelemetry.api.common.AttributeKey.booleanKey; +import static io.opentelemetry.api.common.AttributeKey.doubleKey; import static io.opentelemetry.api.common.AttributeKey.stringArrayKey; import static io.opentelemetry.api.common.AttributeKey.stringKey; @@ -72,7 +73,108 @@ public final class BrowserIncubatingAttributes { */ public static final AttributeKey BROWSER_PLATFORM = stringKey("browser.platform"); + /** + * The delta between the current value and the last-reported value. See delta. + */ + public static final AttributeKey BROWSER_WEB_VITAL_DELTA = + doubleKey("browser.web_vital.delta"); + + /** A unique ID representing this particular metric instance. */ + public static final AttributeKey BROWSER_WEB_VITAL_ID = stringKey("browser.web_vital.id"); + + /** Name of the web vital. */ + public static final AttributeKey BROWSER_WEB_VITAL_NAME = + stringKey("browser.web_vital.name"); + + /** + * The type of navigation, as reported by the Navigation + * Timing API, with additional values reported by the web-vitals library. + */ + public static final AttributeKey BROWSER_WEB_VITAL_NAVIGATION_TYPE = + stringKey("browser.web_vital.navigation_type"); + + /** + * The rating of the web vital value against the "good", "needs improvement", and "poor" + * thresholds defined for the metric. + */ + public static final AttributeKey BROWSER_WEB_VITAL_RATING = + stringKey("browser.web_vital.rating"); + + /** Value of the web vital. */ + public static final AttributeKey BROWSER_WEB_VITAL_VALUE = + doubleKey("browser.web_vital.value"); + // Enum definitions + /** Values for {@link #BROWSER_WEB_VITAL_NAME}. */ + public static final class BrowserWebVitalNameIncubatingValues { + /** Cumulative Layout Shift. See cls. */ + public static final String CLS = "cls"; + + /** Largest Contentful Paint. See lcp. */ + public static final String LCP = "lcp"; + + /** First Contentful Paint. See fcp. */ + public static final String FCP = "fcp"; + + /** Interaction to Next Paint. See inp. */ + public static final String INP = "inp"; + + /** Time to First Byte. See ttfb. */ + public static final String TTFB = "ttfb"; + + /** + * First Input Delay. See fid. + * + * @deprecated Replaced by Interaction to Next Paint ({@code inp}), which became a Core Web + * Vital in March 2024. See inp. + */ + @Deprecated public static final String FID = "fid"; + + private BrowserWebVitalNameIncubatingValues() {} + } + + /** Values for {@link #BROWSER_WEB_VITAL_NAVIGATION_TYPE}. */ + public static final class BrowserWebVitalNavigationTypeIncubatingValues { + /** + * Navigation started by clicking a link, entering a URL, form submission, or a script + * operation. + */ + public static final String NAVIGATE = "navigate"; + + /** Navigation through a reload operation or a {@code Location.reload()} call. */ + public static final String RELOAD = "reload"; + + /** Navigation through the browser's history traversal (e.g. back/forward buttons). */ + public static final String BACK_FORWARD = "back-forward"; + + /** Navigation restoring a page from the back/forward cache (bfcache). */ + public static final String BACK_FORWARD_CACHE = "back-forward-cache"; + + /** Navigation to a page that was prerendered. */ + public static final String PRERENDER = "prerender"; + + /** Navigation restoring a page that was previously discarded by the browser. */ + public static final String RESTORE = "restore"; + + private BrowserWebVitalNavigationTypeIncubatingValues() {} + } + + /** Values for {@link #BROWSER_WEB_VITAL_RATING}. */ + public static final class BrowserWebVitalRatingIncubatingValues { + /** The metric value is within the "good" threshold. */ + public static final String GOOD = "good"; + + /** The metric value is within the "needs improvement" threshold. */ + public static final String NEEDS_IMPROVEMENT = "needs-improvement"; + + /** The metric value is within the "poor" threshold. */ + public static final String POOR = "poor"; + + private BrowserWebVitalRatingIncubatingValues() {} + } + private BrowserIncubatingAttributes() {} } diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ClientIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ClientIncubatingAttributes.java index acb15c94..5c235a4e 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ClientIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ClientIncubatingAttributes.java @@ -16,7 +16,7 @@ public final class ClientIncubatingAttributes { /** * Client address - domain name if available without reverse DNS lookup; otherwise, IP address or - * Unix domain socket name. + * UNIX domain socket name. * *

Notes: * diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CloudIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CloudIncubatingAttributes.java index 07882905..e7c35559 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CloudIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CloudIncubatingAttributes.java @@ -191,6 +191,9 @@ public static final class CloudPlatformIncubatingValues { /** Kubernetes Engine (OKE) on Oracle Cloud Infrastructure (OCI) */ public static final String ORACLE_CLOUD_OKE = "oracle_cloud_oke"; + /** Compute on Scaleway Cloud */ + public static final String SCALEWAY_CLOUD_COMPUTE = "scaleway_cloud_compute"; + /** Tencent Cloud Cloud Virtual Machine (CVM) */ public static final String TENCENT_CLOUD_CVM = "tencent_cloud_cvm"; @@ -235,6 +238,9 @@ public static final class CloudProviderIncubatingValues { /** Oracle Cloud Infrastructure (OCI) */ public static final String ORACLE_CLOUD = "oracle_cloud"; + /** Scaleway Cloud */ + public static final String SCALEWAY_CLOUD = "scaleway_cloud"; + /** Tencent Cloud */ public static final String TENCENT_CLOUD = "tencent_cloud"; diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CloudfoundryIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CloudfoundryIncubatingAttributes.java index bbae1545..e6cd514c 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CloudfoundryIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CloudfoundryIncubatingAttributes.java @@ -144,7 +144,7 @@ public final class CloudfoundryIncubatingAttributes { * *

CloudFoundry defines the {@code instance_id} in the Loggregator v2 envelope. - * It is used for logs and metrics emitted by CloudFoundry. It is supposed to contain the vm id + * It is used for logs and metrics emitted by CloudFoundry. It is supposed to contain the vm ID * for CloudFoundry components. * *

When system components are instrumented, values from the CODE_COLUMN_NUMBER = longKey("code.column.number"); /** - * The source code file name that identifies the code unit as uniquely as possible (preferably an + * The source code filename that identifies the code unit as uniquely as possible (preferably an * absolute file path). This attribute MUST NOT be used on the Profile signal since the data is * already captured in 'message Function'. This constraint is imposed to prevent redundancy and * maintain data integrity. diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ContainerIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ContainerIncubatingAttributes.java index f165c0f1..32165c38 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ContainerIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ContainerIncubatingAttributes.java @@ -83,7 +83,7 @@ public final class ContainerIncubatingAttributes { * *

Notes: * - *

Docker defines a sha256 of the image id; {@code container.image.id} corresponds to the + *

Docker defines a sha256 of the image ID; {@code container.image.id} corresponds to the * {@code Image} field from the Docker container inspect API * endpoint. K8s defines a link to the container registry repository with digest {@code "imageID": @@ -105,7 +105,7 @@ public final class ContainerIncubatingAttributes { public static final AttributeKey CONTAINER_IMAGE_NAME = stringKey("container.image.name"); /** - * Repo digests of the container image as provided by the container runtime. + * Repository digests of the container image as provided by the container runtime. * *

Notes: * @@ -140,7 +140,7 @@ public final class ContainerIncubatingAttributes { * *

Notes: * - *

For example, a docker container label {@code app} with value {@code nginx} SHOULD be + *

For example, a Docker container label {@code app} with value {@code nginx} SHOULD be * recorded as the {@code container.label.app} attribute with value {@code "nginx"}. */ public static final AttributeKeyTemplate CONTAINER_LABEL = diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ContainerIncubatingMetrics.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ContainerIncubatingMetrics.java index c72130cf..11ba6058 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ContainerIncubatingMetrics.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ContainerIncubatingMetrics.java @@ -16,7 +16,7 @@ public final class ContainerIncubatingMetrics { public static final String CONTAINER_CPU_TIME_UNIT = "s"; /** Description of the {@code container.cpu.time} metric. */ - public static final String CONTAINER_CPU_TIME_DESCRIPTION = "CPU time consumed."; + public static final String CONTAINER_CPU_TIME_DESCRIPTION = "Total CPU time consumed."; /** Name of the {@code container.cpu.usage} metric. */ public static final String CONTAINER_CPU_USAGE_NAME = "container.cpu.usage"; @@ -26,7 +26,7 @@ public final class ContainerIncubatingMetrics { /** Description of the {@code container.cpu.usage} metric. */ public static final String CONTAINER_CPU_USAGE_DESCRIPTION = - "Container's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs."; + "Container's CPU usage, measured in CPUs. Range from 0 to the number of allocatable CPUs."; /** Name of the {@code container.disk.io} metric. */ public static final String CONTAINER_DISK_IO_NAME = "container.disk.io"; @@ -75,15 +75,29 @@ public final class ContainerIncubatingMetrics { /** Description of the {@code container.memory.available} metric. */ public static final String CONTAINER_MEMORY_AVAILABLE_DESCRIPTION = "Container memory available."; - /** Name of the {@code container.memory.paging.faults} metric. */ + /** + * Name of the {@code container.memory.paging.faults} metric. + * + * @deprecated Replaced by {@code container.paging.faults}. + */ + @Deprecated public static final String CONTAINER_MEMORY_PAGING_FAULTS_NAME = "container.memory.paging.faults"; - /** Unit of the {@code container.memory.paging.faults} metric. */ - public static final String CONTAINER_MEMORY_PAGING_FAULTS_UNIT = "{fault}"; - - /** Description of the {@code container.memory.paging.faults} metric. */ + /** + * Unit of the {@code container.memory.paging.faults} metric. + * + * @deprecated Replaced by {@code container.paging.faults}. + */ + @Deprecated public static final String CONTAINER_MEMORY_PAGING_FAULTS_UNIT = "{fault}"; + + /** + * Description of the {@code container.memory.paging.faults} metric. + * + * @deprecated Replaced by {@code container.paging.faults}. + */ + @Deprecated public static final String CONTAINER_MEMORY_PAGING_FAULTS_DESCRIPTION = - "Container memory paging faults."; + "Deprecated, use `container.paging.faults` instead."; /** Name of the {@code container.memory.rss} metric. */ public static final String CONTAINER_MEMORY_RSS_NAME = "container.memory.rss"; @@ -122,6 +136,16 @@ public final class ContainerIncubatingMetrics { /** Description of the {@code container.network.io} metric. */ public static final String CONTAINER_NETWORK_IO_DESCRIPTION = "Network bytes for the container."; + /** Name of the {@code container.paging.faults} metric. */ + public static final String CONTAINER_PAGING_FAULTS_NAME = "container.paging.faults"; + + /** Unit of the {@code container.paging.faults} metric. */ + public static final String CONTAINER_PAGING_FAULTS_UNIT = "{fault}"; + + /** Description of the {@code container.paging.faults} metric. */ + public static final String CONTAINER_PAGING_FAULTS_DESCRIPTION = + "Container memory paging faults."; + /** Name of the {@code container.uptime} metric. */ public static final String CONTAINER_UPTIME_NAME = "container.uptime"; diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DbIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DbIncubatingAttributes.java index b63b7468..604d9773 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DbIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DbIncubatingAttributes.java @@ -413,7 +413,11 @@ public final class DbIncubatingAttributes { * in {@code db.query.text}. * *

It is RECOMMENDED to capture the value as provided by the application without attempting to - * do any case normalization. + * do any case normalization or sanitization. + * + *

Instrumentations SHOULD NOT capture {@code db.query.parameter.} by default since values + * may contain PII or sensitive details. Application operators are expected to enable specific + * keys depending on their privacy and security considerations. * *

{@code db.query.parameter.} SHOULD NOT be captured on batch operations. * @@ -479,7 +483,7 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.namespace} instead. * - * @deprecated + * @deprecated Replaced by {@code db.namespace} (string). */ @Deprecated public static final AttributeKey DB_REDIS_DATABASE_INDEX = diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DeploymentIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DeploymentIncubatingAttributes.java index 7d658635..51e0ba4f 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DeploymentIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DeploymentIncubatingAttributes.java @@ -45,7 +45,7 @@ public final class DeploymentIncubatingAttributes { public static final AttributeKey DEPLOYMENT_ENVIRONMENT_NAME = stringKey("deployment.environment.name"); - /** The id of the deployment. */ + /** The ID of the deployment. */ public static final AttributeKey DEPLOYMENT_ID = stringKey("deployment.id"); /** The name of the deployment. */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DestinationIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DestinationIncubatingAttributes.java index b17e0859..abeecb16 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DestinationIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DestinationIncubatingAttributes.java @@ -16,7 +16,7 @@ public final class DestinationIncubatingAttributes { /** * Destination address - domain name if available without reverse DNS lookup; otherwise, IP - * address or Unix domain socket name. + * address or UNIX domain socket name. * *

Notes: * diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/FileIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/FileIncubatingAttributes.java index 37507808..88dd55cd 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/FileIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/FileIncubatingAttributes.java @@ -69,7 +69,7 @@ public final class FileIncubatingAttributes { * *

Notes: * - *

When the file name has multiple extensions (example.tar.gz), only the last one should be + *

When the filename has multiple extensions (example.tar.gz), only the last one should be * captured ("gz", not "tar.gz"). */ public static final AttributeKey FILE_EXTENSION = stringKey("file.extension"); @@ -83,7 +83,7 @@ public final class FileIncubatingAttributes { * always has at least one fork for the data portion, and additional forks may exist. On NTFS, * this is analogous to an Alternate Data Stream (ADS), and the default data stream for a file is * just called $DATA. Zone.Identifier is commonly used by Windows to track contents downloaded - * from the Internet. An ADS is typically of the form: + * from the internet. An ADS is typically of the form: * C:\path\to\filename.extension:some_fork_name, and some_fork_name is the value that should * populate {@code fork_name}. {@code filename.extension} should populate {@code file.name}, and * {@code extension} should populate {@code file.extension}. The full path, {@code file.path}, @@ -135,7 +135,7 @@ public final class FileIncubatingAttributes { public static final AttributeKey FILE_OWNER_NAME = stringKey("file.owner.name"); /** - * Full path to the file, including the file name. It should include the drive letter, when + * Full path to the file, including the filename. It should include the drive letter, when * appropriate. */ public static final AttributeKey FILE_PATH = stringKey("file.path"); diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingEvents.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingEvents.java index 1dad8803..8a013797 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingEvents.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingEvents.java @@ -64,7 +64,7 @@ public final class GenAiIncubatingEvents { /** * This event captures the result of evaluating GenAI output for quality, accuracy, or other * characteristics. This event SHOULD be parented to GenAI operation span being evaluated when - * possible or set {@code gen_ai.response.id} when span id is not available. + * possible or set {@code gen_ai.response.id} when span ID is not available. * * @deprecated Moved to the OpenTelemetry GenAI diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/HostIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/HostIncubatingAttributes.java index c0bb0045..f6388e8c 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/HostIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/HostIncubatingAttributes.java @@ -90,7 +90,7 @@ public final class HostIncubatingAttributes { public static final AttributeKey> HOST_MAC = stringArrayKey("host.mac"); /** - * Name of the host. On Unix systems, it may contain what the hostname command returns, or the + * 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. */ public static final AttributeKey HOST_NAME = stringKey("host.name"); diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/K8sIncubatingMetrics.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/K8sIncubatingMetrics.java index 11e13127..4de27b24 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/K8sIncubatingMetrics.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/K8sIncubatingMetrics.java @@ -1007,7 +1007,7 @@ public final class K8sIncubatingMetrics { /** Description of the {@code k8s.node.cpu.allocatable} metric. */ public static final String K8S_NODE_CPU_ALLOCATABLE_DESCRIPTION = - "Amount of cpu allocatable on the node."; + "Amount of CPU allocatable on the node."; /** Name of the {@code k8s.node.cpu.time} metric. */ public static final String K8S_NODE_CPU_TIME_NAME = "k8s.node.cpu.time"; @@ -1026,7 +1026,7 @@ public final class K8sIncubatingMetrics { /** Description of the {@code k8s.node.cpu.usage} metric. */ public static final String K8S_NODE_CPU_USAGE_DESCRIPTION = - "Node's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs."; + "Node's CPU usage, measured in CPUs. Range from 0 to the number of allocatable CPUs."; /** Name of the {@code k8s.node.ephemeral_storage.allocatable} metric. */ public static final String K8S_NODE_EPHEMERAL_STORAGE_ALLOCATABLE_NAME = @@ -1058,6 +1058,27 @@ public final class K8sIncubatingMetrics { /** Description of the {@code k8s.node.filesystem.capacity} metric. */ public static final String K8S_NODE_FILESYSTEM_CAPACITY_DESCRIPTION = "Node filesystem capacity."; + /** Name of the {@code k8s.node.filesystem.inode.count} metric. */ + public static final String K8S_NODE_FILESYSTEM_INODE_COUNT_NAME = + "k8s.node.filesystem.inode.count"; + + /** Unit of the {@code k8s.node.filesystem.inode.count} metric. */ + public static final String K8S_NODE_FILESYSTEM_INODE_COUNT_UNIT = "{inode}"; + + /** Description of the {@code k8s.node.filesystem.inode.count} metric. */ + public static final String K8S_NODE_FILESYSTEM_INODE_COUNT_DESCRIPTION = + "The total inodes in the node's root filesystem."; + + /** Name of the {@code k8s.node.filesystem.inode.free} metric. */ + public static final String K8S_NODE_FILESYSTEM_INODE_FREE_NAME = "k8s.node.filesystem.inode.free"; + + /** Unit of the {@code k8s.node.filesystem.inode.free} metric. */ + public static final String K8S_NODE_FILESYSTEM_INODE_FREE_UNIT = "{inode}"; + + /** Description of the {@code k8s.node.filesystem.inode.free} metric. */ + public static final String K8S_NODE_FILESYSTEM_INODE_FREE_DESCRIPTION = + "The free inodes in the node's root filesystem."; + /** Name of the {@code k8s.node.filesystem.usage} metric. */ public static final String K8S_NODE_FILESYSTEM_USAGE_NAME = "k8s.node.filesystem.usage"; @@ -1086,15 +1107,29 @@ public final class K8sIncubatingMetrics { /** Description of the {@code k8s.node.memory.available} metric. */ public static final String K8S_NODE_MEMORY_AVAILABLE_DESCRIPTION = "Node memory available."; - /** Name of the {@code k8s.node.memory.paging.faults} metric. */ + /** + * Name of the {@code k8s.node.memory.paging.faults} metric. + * + * @deprecated Replaced by {@code k8s.node.paging.faults}. + */ + @Deprecated public static final String K8S_NODE_MEMORY_PAGING_FAULTS_NAME = "k8s.node.memory.paging.faults"; - /** Unit of the {@code k8s.node.memory.paging.faults} metric. */ - public static final String K8S_NODE_MEMORY_PAGING_FAULTS_UNIT = "{fault}"; + /** + * Unit of the {@code k8s.node.memory.paging.faults} metric. + * + * @deprecated Replaced by {@code k8s.node.paging.faults}. + */ + @Deprecated public static final String K8S_NODE_MEMORY_PAGING_FAULTS_UNIT = "{fault}"; - /** Description of the {@code k8s.node.memory.paging.faults} metric. */ + /** + * Description of the {@code k8s.node.memory.paging.faults} metric. + * + * @deprecated Replaced by {@code k8s.node.paging.faults}. + */ + @Deprecated public static final String K8S_NODE_MEMORY_PAGING_FAULTS_DESCRIPTION = - "Node memory paging faults."; + "Deprecated, use `k8s.node.paging.faults` instead."; /** Name of the {@code k8s.node.memory.rss} metric. */ public static final String K8S_NODE_MEMORY_RSS_NAME = "k8s.node.memory.rss"; @@ -1141,6 +1176,15 @@ public final class K8sIncubatingMetrics { /** Description of the {@code k8s.node.network.io} metric. */ public static final String K8S_NODE_NETWORK_IO_DESCRIPTION = "Network bytes for the Node."; + /** Name of the {@code k8s.node.paging.faults} metric. */ + public static final String K8S_NODE_PAGING_FAULTS_NAME = "k8s.node.paging.faults"; + + /** Unit of the {@code k8s.node.paging.faults} metric. */ + public static final String K8S_NODE_PAGING_FAULTS_UNIT = "{fault}"; + + /** Description of the {@code k8s.node.paging.faults} metric. */ + public static final String K8S_NODE_PAGING_FAULTS_DESCRIPTION = "Node memory paging faults."; + /** Name of the {@code k8s.node.pod.allocatable} metric. */ public static final String K8S_NODE_POD_ALLOCATABLE_NAME = "k8s.node.pod.allocatable"; @@ -1171,7 +1215,7 @@ public final class K8sIncubatingMetrics { /** Description of the {@code k8s.node.system_container.cpu.usage} metric. */ public static final String K8S_NODE_SYSTEM_CONTAINER_CPU_USAGE_DESCRIPTION = - "Node's system container CPU usage, measured in cpus."; + "Node's system container CPU usage, measured in CPUs."; /** Name of the {@code k8s.node.system_container.memory.usage} metric. */ public static final String K8S_NODE_SYSTEM_CONTAINER_MEMORY_USAGE_NAME = @@ -1277,7 +1321,7 @@ public final class K8sIncubatingMetrics { /** Description of the {@code k8s.pod.cpu.usage} metric. */ public static final String K8S_POD_CPU_USAGE_DESCRIPTION = - "Pod's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs."; + "Pod's CPU usage, measured in CPUs. Range from 0 to the number of allocatable CPUs."; /** Name of the {@code k8s.pod.filesystem.available} metric. */ public static final String K8S_POD_FILESYSTEM_AVAILABLE_NAME = "k8s.pod.filesystem.available"; @@ -1316,14 +1360,29 @@ public final class K8sIncubatingMetrics { /** Description of the {@code k8s.pod.memory.available} metric. */ public static final String K8S_POD_MEMORY_AVAILABLE_DESCRIPTION = "Pod memory available."; - /** Name of the {@code k8s.pod.memory.paging.faults} metric. */ + /** + * Name of the {@code k8s.pod.memory.paging.faults} metric. + * + * @deprecated Replaced by {@code k8s.pod.paging.faults}. + */ + @Deprecated public static final String K8S_POD_MEMORY_PAGING_FAULTS_NAME = "k8s.pod.memory.paging.faults"; - /** Unit of the {@code k8s.pod.memory.paging.faults} metric. */ - public static final String K8S_POD_MEMORY_PAGING_FAULTS_UNIT = "{fault}"; + /** + * Unit of the {@code k8s.pod.memory.paging.faults} metric. + * + * @deprecated Replaced by {@code k8s.pod.paging.faults}. + */ + @Deprecated public static final String K8S_POD_MEMORY_PAGING_FAULTS_UNIT = "{fault}"; - /** Description of the {@code k8s.pod.memory.paging.faults} metric. */ - public static final String K8S_POD_MEMORY_PAGING_FAULTS_DESCRIPTION = "Pod memory paging faults."; + /** + * Description of the {@code k8s.pod.memory.paging.faults} metric. + * + * @deprecated Replaced by {@code k8s.pod.paging.faults}. + */ + @Deprecated + public static final String K8S_POD_MEMORY_PAGING_FAULTS_DESCRIPTION = + "Deprecated, use `k8s.pod.paging.faults` instead."; /** Name of the {@code k8s.pod.memory.rss} metric. */ public static final String K8S_POD_MEMORY_RSS_NAME = "k8s.pod.memory.rss"; @@ -1370,6 +1429,15 @@ public final class K8sIncubatingMetrics { /** Description of the {@code k8s.pod.network.io} metric. */ public static final String K8S_POD_NETWORK_IO_DESCRIPTION = "Network bytes for the Pod."; + /** Name of the {@code k8s.pod.paging.faults} metric. */ + public static final String K8S_POD_PAGING_FAULTS_NAME = "k8s.pod.paging.faults"; + + /** Unit of the {@code k8s.pod.paging.faults} metric. */ + public static final String K8S_POD_PAGING_FAULTS_UNIT = "{fault}"; + + /** Description of the {@code k8s.pod.paging.faults} metric. */ + public static final String K8S_POD_PAGING_FAULTS_DESCRIPTION = "Pod memory paging faults."; + /** Name of the {@code k8s.pod.status.phase} metric. */ public static final String K8S_POD_STATUS_PHASE_NAME = "k8s.pod.status.phase"; diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/LogIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/LogIncubatingAttributes.java index 6ce00115..77eaeb79 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/LogIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/LogIncubatingAttributes.java @@ -46,9 +46,9 @@ public final class LogIncubatingAttributes { * *

Notes: * - *

If an id is provided, other log records with the same id will be considered duplicates and + *

If an ID is provided, other log records with the same ID will be considered duplicates and * can be removed safely. This means, that two distinguishable log records MUST have different - * values. The id MAY be an Universally Unique + * values. The ID MAY be an Universally Unique * Lexicographically Sortable Identifier (ULID), but other identifiers (e.g. UUID) may be used * as needed. */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/McpIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/McpIncubatingAttributes.java index b988a95b..8863aa23 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/McpIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/McpIncubatingAttributes.java @@ -35,7 +35,7 @@ public final class McpIncubatingAttributes { public static final AttributeKey MCP_PROTOCOL_VERSION = stringKey("mcp.protocol.version"); /** - * The value of the resource uri. + * The value of the resource URI. * *

Notes: * diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/MessagingIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/MessagingIncubatingAttributes.java index 7ac8bb8c..ace817bf 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/MessagingIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/MessagingIncubatingAttributes.java @@ -56,9 +56,8 @@ public final class MessagingIncubatingAttributes { * *

Notes: * - *

Destination name SHOULD uniquely identify a specific queue, topic or other entity within the - * broker. If the broker doesn't have such notion, the destination name SHOULD uniquely identify - * the broker. + *

SHOULD uniquely identify a specific queue, topic or other entity within the broker. If the + * broker doesn't have such notion, it SHOULD uniquely identify the broker. */ public static final AttributeKey MESSAGING_DESTINATION_NAME = stringKey("messaging.destination.name"); @@ -88,7 +87,7 @@ public final class MessagingIncubatingAttributes { *

Notes: * *

Destination names could be constructed from templates. An example would be a destination - * name involving a user name or product id. Although the destination name in this case is of high + * name involving a username or product ID. Although the destination name in this case is of high * cardinality, the underlying template is of low cardinality and can be effectively used for * grouping and aggregation. */ @@ -137,7 +136,7 @@ public final class MessagingIncubatingAttributes { public static final AttributeKey MESSAGING_GCP_PUBSUB_MESSAGE_ACK_DEADLINE = longKey("messaging.gcp_pubsub.message.ack_deadline"); - /** The ack id for a given message. */ + /** The ack ID for a given message. */ public static final AttributeKey MESSAGING_GCP_PUBSUB_MESSAGE_ACK_ID = stringKey("messaging.gcp_pubsub.message.ack_id"); @@ -152,6 +151,19 @@ public final class MessagingIncubatingAttributes { public static final AttributeKey MESSAGING_GCP_PUBSUB_MESSAGE_ORDERING_KEY = stringKey("messaging.gcp_pubsub.message.ordering_key"); + /** + * The Kafka cluster ID, obtained from the broker metadata exposed through the Kafka client (or + * AdminClient) API. + * + *

Notes: + * + *

The cluster ID is a unique identifier reported by the Kafka broker. It identifies the + * cluster independently of the individual brokers the client is configured to connect to, and + * remains stable even if broker hostnames, IP addresses, or ports change. + */ + public static final AttributeKey MESSAGING_KAFKA_CLUSTER_ID = + stringKey("messaging.kafka.cluster.id"); + /** * Deprecated, use {@code messaging.consumer.group.name} instead. * @@ -164,7 +176,7 @@ public final class MessagingIncubatingAttributes { /** * Deprecated, use {@code messaging.destination.partition.id} instead. * - * @deprecated Record string representation of the partition id in {@code + * @deprecated Record string representation of the partition ID in {@code * messaging.destination.partition.id} attribute. */ @Deprecated @@ -295,7 +307,7 @@ public final class MessagingIncubatingAttributes { public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_GROUP = stringKey("messaging.rocketmq.message.group"); - /** Key(s) of message, another way to mark message besides message id. */ + /** Key(s) of message, another way to mark message besides message ID. */ public static final AttributeKey> MESSAGING_ROCKETMQ_MESSAGE_KEYS = stringArrayKey("messaging.rocketmq.message.keys"); diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/NetIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/NetIncubatingAttributes.java index 0ffb53ee..4be320cd 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/NetIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/NetIncubatingAttributes.java @@ -145,7 +145,7 @@ public static final class NetSockFamilyIncubatingValues { /** IPv6 address */ public static final String INET6 = "inet6"; - /** Unix domain socket path */ + /** UNIX domain socket path */ public static final String UNIX = "unix"; private NetSockFamilyIncubatingValues() {} diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/NetworkIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/NetworkIncubatingAttributes.java index 954e9849..f403005d 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/NetworkIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/NetworkIncubatingAttributes.java @@ -39,7 +39,7 @@ public final class NetworkIncubatingAttributes { /** * 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. + * technology connection, but it could be used for describing details about a Wi-Fi connection. */ public static final AttributeKey NETWORK_CONNECTION_SUBTYPE = stringKey("network.connection.subtype"); @@ -60,7 +60,7 @@ public final class NetworkIncubatingAttributes { public static final AttributeKey NETWORK_IO_DIRECTION = stringKey("network.io.direction"); /** - * Local address of the network connection - IP address or Unix domain socket name. + * Local address of the network connection - IP address or UNIX domain socket name. * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.NetworkAttributes#NETWORK_LOCAL_ADDRESS} attribute. @@ -79,7 +79,7 @@ public final class NetworkIncubatingAttributes { public static final AttributeKey NETWORK_LOCAL_PORT = longKey("network.local.port"); /** - * Peer address of the network connection - IP address or Unix domain socket name. + * Peer address of the network connection - IP address or UNIX domain socket name. * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.NetworkAttributes#NETWORK_PEER_ADDRESS} attribute. @@ -269,7 +269,7 @@ private NetworkConnectionSubtypeIncubatingValues() {} /** Values for {@link #NETWORK_CONNECTION_TYPE}. */ public static final class NetworkConnectionTypeIncubatingValues { - /** wifi. */ + /** Wi-Fi */ public static final String WIFI = "wifi"; /** wired. */ @@ -315,7 +315,7 @@ public static final class NetworkTransportIncubatingValues { /** Named or anonymous pipe. */ public static final String PIPE = "pipe"; - /** Unix domain socket */ + /** UNIX domain socket */ public static final String UNIX = "unix"; /** QUIC */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OracleIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OracleIncubatingAttributes.java index fba19865..15166a67 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OracleIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OracleIncubatingAttributes.java @@ -67,7 +67,7 @@ public final class OracleIncubatingAttributes { *

Notes: * *

The effective service name for a connection can change during its lifetime, for example - * after executing sql, {@code ALTER SESSION}. If an instrumentation cannot reliably obtain the + * after executing SQL, {@code ALTER SESSION}. If an instrumentation cannot reliably obtain the * current service name for each operation without issuing an additional query (such as {@code * SELECT SYS_CONTEXT}), it is RECOMMENDED to fall back to the service name originally provided at * connection establishment. diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OsIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OsIncubatingAttributes.java index 315862bc..95c05c75 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OsIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OsIncubatingAttributes.java @@ -59,7 +59,7 @@ public static final class OsTypeIncubatingValues { /** DragonFly BSD */ public static final String DRAGONFLYBSD = "dragonflybsd"; - /** HP-UX (Hewlett Packard Unix) */ + /** HP-UX (Hewlett Packard UNIX) */ public static final String HPUX = "hpux"; /** AIX (Advanced Interactive eXecutive) */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OtelIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OtelIncubatingAttributes.java index d747969e..eedbfb8b 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OtelIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OtelIncubatingAttributes.java @@ -139,16 +139,16 @@ public final class OtelIncubatingAttributes { /** Values for {@link #OTEL_COMPONENT_TYPE}. */ public static final class OtelComponentTypeIncubatingValues { - /** The builtin SDK batching span processor */ + /** The built-in SDK batching span processor */ public static final String BATCHING_SPAN_PROCESSOR = "batching_span_processor"; - /** The builtin SDK simple span processor */ + /** The built-in SDK simple span processor */ public static final String SIMPLE_SPAN_PROCESSOR = "simple_span_processor"; - /** The builtin SDK batching log record processor */ + /** The built-in SDK batching log record processor */ public static final String BATCHING_LOG_PROCESSOR = "batching_log_processor"; - /** The builtin SDK simple log record processor */ + /** The built-in SDK simple log record processor */ public static final String SIMPLE_LOG_PROCESSOR = "simple_log_processor"; /** OTLP span exporter over gRPC with protobuf serialization */ @@ -172,7 +172,7 @@ public static final class OtelComponentTypeIncubatingValues { /** OTLP log record exporter over HTTP with JSON serialization */ public static final String OTLP_HTTP_JSON_LOG_EXPORTER = "otlp_http_json_log_exporter"; - /** The builtin SDK periodically exporting metric reader */ + /** The built-in SDK periodically exporting metric reader */ public static final String PERIODIC_METRIC_READER = "periodic_metric_reader"; /** OTLP metric exporter over gRPC with protobuf serialization */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/PprofIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/PprofIncubatingAttributes.java index bc0e4959..9daa464b 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/PprofIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/PprofIncubatingAttributes.java @@ -61,15 +61,15 @@ public final class PprofIncubatingAttributes { stringKey("pprof.profile.doc_url"); /** - * Frames with Function.function_name fully matching the regexp will be dropped from the samples, - * along with their successors. + * Frames with Function.function_name fully matching the regular expression will be dropped from + * the samples, along with their successors. */ public static final AttributeKey PPROF_PROFILE_DROP_FRAMES = stringKey("pprof.profile.drop_frames"); /** - * Frames with Function.function_name fully matching the regexp will be kept, even if it matches - * drop_frames. + * Frames with Function.function_name fully matching the regular expression will be kept, even if + * it matches drop_frames. */ public static final AttributeKey PPROF_PROFILE_KEEP_FRAMES = stringKey("pprof.profile.keep_frames"); diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ProcessIncubatingMetrics.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ProcessIncubatingMetrics.java index 06b89609..7bda835a 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ProcessIncubatingMetrics.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ProcessIncubatingMetrics.java @@ -48,6 +48,16 @@ public final class ProcessIncubatingMetrics { /** Description of the {@code process.disk.io} metric. */ public static final String PROCESS_DISK_IO_DESCRIPTION = "Disk bytes transferred."; + /** Name of the {@code process.disk.operations} metric. */ + public static final String PROCESS_DISK_OPERATIONS_NAME = "process.disk.operations"; + + /** Unit of the {@code process.disk.operations} metric. */ + public static final String PROCESS_DISK_OPERATIONS_UNIT = "{operation}"; + + /** Description of the {@code process.disk.operations} metric. */ + public static final String PROCESS_DISK_OPERATIONS_DESCRIPTION = + "Number of disk operations performed by the process."; + /** Name of the {@code process.memory.usage} metric. */ public static final String PROCESS_MEMORY_USAGE_NAME = "process.memory.usage"; @@ -58,6 +68,16 @@ public final class ProcessIncubatingMetrics { public static final String PROCESS_MEMORY_USAGE_DESCRIPTION = "The amount of physical memory in use."; + /** Name of the {@code process.memory.utilization} metric. */ + public static final String PROCESS_MEMORY_UTILIZATION_NAME = "process.memory.utilization"; + + /** Unit of the {@code process.memory.utilization} metric. */ + public static final String PROCESS_MEMORY_UTILIZATION_UNIT = "1"; + + /** Description of the {@code process.memory.utilization} metric. */ + public static final String PROCESS_MEMORY_UTILIZATION_DESCRIPTION = + "Percentage of total physical memory that is used by the process."; + /** Name of the {@code process.memory.virtual} metric. */ public static final String PROCESS_MEMORY_VIRTUAL_NAME = "process.memory.virtual"; @@ -113,6 +133,16 @@ public final class ProcessIncubatingMetrics { public static final String PROCESS_PAGING_FAULTS_DESCRIPTION = "Number of page faults the process has made."; + /** Name of the {@code process.signals_pending} metric. */ + public static final String PROCESS_SIGNALS_PENDING_NAME = "process.signals_pending"; + + /** Unit of the {@code process.signals_pending} metric. */ + public static final String PROCESS_SIGNALS_PENDING_UNIT = "{signal}"; + + /** Description of the {@code process.signals_pending} metric. */ + public static final String PROCESS_SIGNALS_PENDING_DESCRIPTION = + "Number of pending signals for the process."; + /** Name of the {@code process.thread.count} metric. */ public static final String PROCESS_THREAD_COUNT_NAME = "process.thread.count"; @@ -131,7 +161,7 @@ public final class ProcessIncubatingMetrics { /** Description of the {@code process.unix.file_descriptor.count} metric. */ public static final String PROCESS_UNIX_FILE_DESCRIPTOR_COUNT_DESCRIPTION = - "Number of unix file descriptors in use by the process."; + "Number of UNIX file descriptors in use by the process."; /** Name of the {@code process.uptime} metric. */ public static final String PROCESS_UPTIME_NAME = "process.uptime"; diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/RpcIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/RpcIncubatingAttributes.java index b9795a06..d6d3d2e8 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/RpcIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/RpcIncubatingAttributes.java @@ -159,9 +159,7 @@ public final class RpcIncubatingAttributes { * *

When the method is not recognized, for example, when the server receives a request for a * method that is not predefined on the server, or when instrumentation is not able to reliably - * detect if the method is predefined, the attribute MUST be set to {@code _OTHER}. In such cases, - * tracing instrumentations MUST also set {@code rpc.method_original} attribute to the original - * method value. + * detect if the method is predefined, the attribute MUST be set to {@code _OTHER}. * *

If the RPC instrumentation could end up converting valid RPC methods to {@code _OTHER}, then * it SHOULD provide a way to configure the list of recognized RPC methods. diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ServerIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ServerIncubatingAttributes.java index 5b7967e8..17fb6e4a 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ServerIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ServerIncubatingAttributes.java @@ -15,7 +15,7 @@ @SuppressWarnings("unused") public final class ServerIncubatingAttributes { /** - * Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix + * Server domain name if available without reverse DNS lookup; otherwise, IP address or UNIX * domain socket name. * *

Notes: diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SessionIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SessionIncubatingAttributes.java index 3a667f78..080d80df 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SessionIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SessionIncubatingAttributes.java @@ -13,7 +13,7 @@ // buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2 @SuppressWarnings("unused") public final class SessionIncubatingAttributes { - /** A unique id to identify a session. */ + /** A unique ID to identify a session. */ public static final AttributeKey SESSION_ID = stringKey("session.id"); /** The previous {@code session.id} for this user, when known. */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SourceIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SourceIncubatingAttributes.java index 6223e233..2001586a 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SourceIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SourceIncubatingAttributes.java @@ -16,7 +16,7 @@ public final class SourceIncubatingAttributes { /** * Source address - domain name if available without reverse DNS lookup; otherwise, IP address or - * Unix domain socket name. + * UNIX domain socket name. * *

Notes: * diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SystemIncubatingMetrics.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SystemIncubatingMetrics.java index 162a9b07..67beb8ab 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SystemIncubatingMetrics.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SystemIncubatingMetrics.java @@ -499,7 +499,7 @@ public final class SystemIncubatingMetrics { /** Description of the {@code system.paging.usage} metric. */ public static final String SYSTEM_PAGING_USAGE_DESCRIPTION = - "Unix swap or windows pagefile usage."; + "UNIX swap or windows pagefile usage."; /** Name of the {@code system.paging.utilization} metric. */ public static final String SYSTEM_PAGING_UTILIZATION_NAME = "system.paging.utilization"; @@ -509,7 +509,7 @@ public final class SystemIncubatingMetrics { /** Description of the {@code system.paging.utilization} metric. */ public static final String SYSTEM_PAGING_UTILIZATION_DESCRIPTION = - "Swap (unix) or pagefile (windows) utilization."; + "Swap (UNIX) or pagefile (windows) utilization."; /** Name of the {@code system.process.count} metric. */ public static final String SYSTEM_PROCESS_COUNT_NAME = "system.process.count"; @@ -531,6 +531,16 @@ public final class SystemIncubatingMetrics { public static final String SYSTEM_PROCESS_CREATED_DESCRIPTION = "Total number of processes created over uptime of the host."; + /** Name of the {@code system.process.limit} metric. */ + public static final String SYSTEM_PROCESS_LIMIT_NAME = "system.process.limit"; + + /** Unit of the {@code system.process.limit} metric. */ + public static final String SYSTEM_PROCESS_LIMIT_UNIT = "{thread}"; + + /** Description of the {@code system.process.limit} metric. */ + public static final String SYSTEM_PROCESS_LIMIT_DESCRIPTION = + "The maximum number of concurrent processes/tasks allowed by the operating system."; + /** Name of the {@code system.uptime} metric. */ public static final String SYSTEM_UPTIME_NAME = "system.uptime"; diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/TelemetryIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/TelemetryIncubatingAttributes.java index 594a1fea..65a57e0b 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/TelemetryIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/TelemetryIncubatingAttributes.java @@ -87,43 +87,43 @@ public final class TelemetryIncubatingAttributes { */ @Deprecated public static final class TelemetrySdkLanguageIncubatingValues { - /** cpp. */ + /** C++ */ public static final String CPP = "cpp"; - /** dotnet. */ + /** .NET */ public static final String DOTNET = "dotnet"; - /** erlang. */ + /** Erlang/Elixir */ public static final String ERLANG = "erlang"; - /** go. */ + /** Go */ public static final String GO = "go"; - /** java. */ + /** Java */ public static final String JAVA = "java"; - /** kotlin. */ + /** Kotlin */ public static final String KOTLIN = "kotlin"; - /** nodejs. */ + /** Node.js */ public static final String NODEJS = "nodejs"; - /** php. */ + /** PHP */ public static final String PHP = "php"; - /** python. */ + /** Python */ public static final String PYTHON = "python"; - /** ruby. */ + /** Ruby */ public static final String RUBY = "ruby"; - /** rust. */ + /** Rust */ public static final String RUST = "rust"; - /** swift. */ + /** Swift */ public static final String SWIFT = "swift"; - /** webjs. */ + /** Browser */ public static final String WEBJS = "webjs"; private TelemetrySdkLanguageIncubatingValues() {} diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/TlsIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/TlsIncubatingAttributes.java index e6f9ef19..70a80047 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/TlsIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/TlsIncubatingAttributes.java @@ -195,10 +195,10 @@ public final class TlsIncubatingAttributes { /** Values for {@link #TLS_PROTOCOL_NAME}. */ public static final class TlsProtocolNameIncubatingValues { - /** ssl. */ + /** SSL */ public static final String SSL = "ssl"; - /** tls. */ + /** TLS */ public static final String TLS = "tls"; private TlsProtocolNameIncubatingValues() {} diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/UrlIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/UrlIncubatingAttributes.java index 6e3524a0..c6292004 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/UrlIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/UrlIncubatingAttributes.java @@ -32,8 +32,8 @@ public final class UrlIncubatingAttributes { * *

Notes: * - *

The file extension is only set if it exists, as not every url has a file extension. When the - * file name has multiple extensions {@code example.tar.gz}, only the last one should be captured + *

The file extension is only set if it exists, as not every URL has a file extension. When the + * filename has multiple extensions {@code example.tar.gz}, only the last one should be captured * {@code gz}, not {@code tar.gz}. */ public static final AttributeKey URL_EXTENSION = stringKey("url.extension"); @@ -180,7 +180,7 @@ public final class UrlIncubatingAttributes { @Deprecated public static final AttributeKey URL_QUERY = stringKey("url.query"); /** - * The highest registered url domain, stripped of the subdomain. + * The highest registered URL domain, stripped of the subdomain. * *

Notes: * @@ -203,7 +203,7 @@ public final class UrlIncubatingAttributes { /** * The subdomain portion of a fully qualified domain name includes all of the names except the - * host name under the registered_domain. In a partially qualified domain, or if the qualification + * hostname under the registered_domain. In a partially qualified domain, or if the qualification * level of the full name cannot be determined, subdomain contains all of the names below the * registered domain. * diff --git a/semconv/src/main/java/io/opentelemetry/semconv/ClientAttributes.java b/semconv/src/main/java/io/opentelemetry/semconv/ClientAttributes.java index c8b42736..57eeea79 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/ClientAttributes.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/ClientAttributes.java @@ -16,7 +16,7 @@ public final class ClientAttributes { /** * Client address - domain name if available without reverse DNS lookup; otherwise, IP address or - * Unix domain socket name. + * UNIX domain socket name. * *

Notes: * diff --git a/semconv/src/main/java/io/opentelemetry/semconv/CodeAttributes.java b/semconv/src/main/java/io/opentelemetry/semconv/CodeAttributes.java index d32b7177..cf4aac5c 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/CodeAttributes.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/CodeAttributes.java @@ -23,7 +23,7 @@ public final class CodeAttributes { public static final AttributeKey CODE_COLUMN_NUMBER = longKey("code.column.number"); /** - * The source code file name that identifies the code unit as uniquely as possible (preferably an + * The source code filename that identifies the code unit as uniquely as possible (preferably an * absolute file path). This attribute MUST NOT be used on the Profile signal since the data is * already captured in 'message Function'. This constraint is imposed to prevent redundancy and * maintain data integrity. diff --git a/semconv/src/main/java/io/opentelemetry/semconv/ContainerAttributes.java b/semconv/src/main/java/io/opentelemetry/semconv/ContainerAttributes.java index 4030b965..edfc3184 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/ContainerAttributes.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/ContainerAttributes.java @@ -26,7 +26,7 @@ public final class ContainerAttributes { public static final AttributeKey CONTAINER_IMAGE_NAME = stringKey("container.image.name"); /** - * Repo digests of the container image as provided by the container runtime. + * Repository digests of the container image as provided by the container runtime. * *

Notes: * diff --git a/semconv/src/main/java/io/opentelemetry/semconv/NetworkAttributes.java b/semconv/src/main/java/io/opentelemetry/semconv/NetworkAttributes.java index b45c5b97..d32d9299 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/NetworkAttributes.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/NetworkAttributes.java @@ -14,14 +14,14 @@ // buildscripts/templates/registry/java/SemanticAttributes.java.j2 @SuppressWarnings("unused") public final class NetworkAttributes { - /** Local address of the network connection - IP address or Unix domain socket name. */ + /** Local address of the network connection - IP address or UNIX domain socket name. */ public static final AttributeKey NETWORK_LOCAL_ADDRESS = stringKey("network.local.address"); /** Local port number of the network connection. */ public static final AttributeKey NETWORK_LOCAL_PORT = longKey("network.local.port"); - /** Peer address of the network connection - IP address or Unix domain socket name. */ + /** Peer address of the network connection - IP address or UNIX domain socket name. */ public static final AttributeKey NETWORK_PEER_ADDRESS = stringKey("network.peer.address"); /** Peer port number of the network connection. */ @@ -87,7 +87,7 @@ public static final class NetworkTransportValues { /** Named or anonymous pipe. */ public static final String PIPE = "pipe"; - /** Unix domain socket */ + /** UNIX domain socket */ public static final String UNIX = "unix"; /** QUIC */ diff --git a/semconv/src/main/java/io/opentelemetry/semconv/SchemaUrls.java b/semconv/src/main/java/io/opentelemetry/semconv/SchemaUrls.java index 10924065..fcf8458a 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/SchemaUrls.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/SchemaUrls.java @@ -6,6 +6,7 @@ package io.opentelemetry.semconv; public final class SchemaUrls { + public static final String V1_44_0 = "https://opentelemetry.io/schemas/1.44.0"; public static final String V1_43_0 = "https://opentelemetry.io/schemas/1.43.0"; public static final String V1_42_0 = "https://opentelemetry.io/schemas/1.42.0"; public static final String V1_41_1 = "https://opentelemetry.io/schemas/1.41.1"; diff --git a/semconv/src/main/java/io/opentelemetry/semconv/ServerAttributes.java b/semconv/src/main/java/io/opentelemetry/semconv/ServerAttributes.java index eb1b6b59..cc25a7a1 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/ServerAttributes.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/ServerAttributes.java @@ -15,7 +15,7 @@ @SuppressWarnings("unused") public final class ServerAttributes { /** - * Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix + * Server domain name if available without reverse DNS lookup; otherwise, IP address or UNIX * domain socket name. * *

Notes: diff --git a/semconv/src/main/java/io/opentelemetry/semconv/TelemetryAttributes.java b/semconv/src/main/java/io/opentelemetry/semconv/TelemetryAttributes.java index 329daa72..55b9eae4 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/TelemetryAttributes.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/TelemetryAttributes.java @@ -54,43 +54,43 @@ public final class TelemetryAttributes { // Enum definition /** Values for {@link #TELEMETRY_SDK_LANGUAGE}. */ public static final class TelemetrySdkLanguageValues { - /** cpp. */ + /** C++ */ public static final String CPP = "cpp"; - /** dotnet. */ + /** .NET */ public static final String DOTNET = "dotnet"; - /** erlang. */ + /** Erlang/Elixir */ public static final String ERLANG = "erlang"; - /** go. */ + /** Go */ public static final String GO = "go"; - /** java. */ + /** Java */ public static final String JAVA = "java"; - /** kotlin. */ + /** Kotlin */ public static final String KOTLIN = "kotlin"; - /** nodejs. */ + /** Node.js */ public static final String NODEJS = "nodejs"; - /** php. */ + /** PHP */ public static final String PHP = "php"; - /** python. */ + /** Python */ public static final String PYTHON = "python"; - /** ruby. */ + /** Ruby */ public static final String RUBY = "ruby"; - /** rust. */ + /** Rust */ public static final String RUST = "rust"; - /** swift. */ + /** Swift */ public static final String SWIFT = "swift"; - /** webjs. */ + /** Browser */ public static final String WEBJS = "webjs"; private TelemetrySdkLanguageValues() {}