diff --git a/build.gradle.kts b/build.gradle.kts index 13546a12..c043a440 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,9 +11,10 @@ val snapshot = true // end // The release version of https://github.com/open-telemetry/semantic-conventions used to generate classes -var semanticConventionsVersion = "1.36.0" +var semanticConventionsVersion = "1.37.0" val schemaUrlVersions = listOf( semanticConventionsVersion, + "1.36.0", "1.35.0", "1.34.0", "1.33.0", diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-semconv.txt b/docs/apidiffs/current_vs_latest/opentelemetry-semconv.txt index 10acc791..053685b3 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.36.0-SNAPSHOT.jar against opentelemetry-semconv-1.36.0.jar -No changes. \ No newline at end of file +Comparing source compatibility of opentelemetry-semconv-1.37.0-SNAPSHOT.jar against opentelemetry-semconv-1.36.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_37_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 fa214baa..28040189 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,15 +26,16 @@ 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 here. + * android operating system. More information can be found in the Android + * API levels documentation. */ public static final AttributeKey ANDROID_OS_API_LEVEL = stringKey("android.os.api_level"); /** - * Deprecated. Use {@code android.app.state} body field instead. + * Deprecated. Use {@code android.app.state} attribute instead. * - * @deprecated Use {@code android.app.state} body field instead. + * @deprecated Replaced by {@code android.app.state}. */ @Deprecated public static final AttributeKey ANDROID_STATE = stringKey("android.state"); @@ -66,7 +67,7 @@ private AndroidAppStateIncubatingValues() {} /** * Values for {@link #ANDROID_STATE} * - * @deprecated Use {@code android.app.state} body field instead. + * @deprecated Replaced by {@code android.app.state}. */ @Deprecated public static final class AndroidStateIncubatingValues { 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 b8e4a411..6d800e99 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 @@ -5,6 +5,7 @@ package io.opentelemetry.semconv.incubating; +import static io.opentelemetry.api.common.AttributeKey.doubleKey; import static io.opentelemetry.api.common.AttributeKey.longKey; import static io.opentelemetry.api.common.AttributeKey.stringKey; @@ -14,6 +15,9 @@ // buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2 @SuppressWarnings("unused") public final class AppIncubatingAttributes { + /** Unique identifier for a particular build or compilation of the application. */ + public static final AttributeKey APP_BUILD_ID = stringKey("app.build_id"); + /** * A unique identifier representing the installation of an application on a specific device * @@ -44,11 +48,27 @@ public final class AppIncubatingAttributes { * Settings.getString(Settings.Secure.ANDROID_ID)}. * * - *

More information about Android identifier best practices can be found here. + *

More information about Android identifier best practices can be found in the Android user data IDs + * guide. */ public static final AttributeKey APP_INSTALLATION_ID = stringKey("app.installation.id"); + /** + * A number of frame renders that experienced jank. + * + *

Notes: + * + *

Depending on platform limitations, the value provided MAY be approximation. + */ + public static final AttributeKey APP_JANK_FRAME_COUNT = longKey("app.jank.frame_count"); + + /** The time period, in seconds, for which this jank is being reported. */ + public static final AttributeKey APP_JANK_PERIOD = doubleKey("app.jank.period"); + + /** The minimum rendering threshold for this jank, in seconds. */ + public static final AttributeKey APP_JANK_THRESHOLD = doubleKey("app.jank.threshold"); + /** The x (horizontal) coordinate of a screen coordinate, in screen pixels. */ public static final AttributeKey APP_SCREEN_COORDINATE_X = longKey("app.screen.coordinate.x"); diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AwsIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AwsIncubatingAttributes.java index 89006a52..32c77003 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AwsIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AwsIncubatingAttributes.java @@ -409,10 +409,10 @@ public final class AwsIncubatingAttributes { /** Values for {@link #AWS_ECS_LAUNCHTYPE}. */ public static final class AwsEcsLaunchtypeIncubatingValues { - /** ec2. */ + /** Amazon EC2 */ public static final String EC2 = "ec2"; - /** fargate. */ + /** Amazon Fargate */ public static final String FARGATE = "fargate"; private AwsEcsLaunchtypeIncubatingValues() {} diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AzureIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AzureIncubatingAttributes.java index 7856fe75..54c066a1 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AzureIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AzureIncubatingAttributes.java @@ -87,19 +87,19 @@ private AzureCosmosdbConnectionModeIncubatingValues() {} /** Values for {@link #AZURE_COSMOSDB_CONSISTENCY_LEVEL}. */ public static final class AzureCosmosdbConsistencyLevelIncubatingValues { - /** strong. */ + /** Strong */ public static final String STRONG = "Strong"; - /** bounded_staleness. */ + /** Bounded Staleness */ public static final String BOUNDED_STALENESS = "BoundedStaleness"; - /** session. */ + /** Session */ public static final String SESSION = "Session"; - /** eventual. */ + /** Eventual */ public static final String EVENTUAL = "Eventual"; - /** consistent_prefix. */ + /** Consistent Prefix */ public static final String CONSISTENT_PREFIX = "ConsistentPrefix"; private AzureCosmosdbConsistencyLevelIncubatingValues() {} diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CassandraIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CassandraIncubatingAttributes.java index 0811dce5..4a3a929a 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CassandraIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CassandraIncubatingAttributes.java @@ -48,37 +48,37 @@ public final class CassandraIncubatingAttributes { /** Values for {@link #CASSANDRA_CONSISTENCY_LEVEL}. */ public static final class CassandraConsistencyLevelIncubatingValues { - /** all. */ + /** All */ public static final String ALL = "all"; - /** each_quorum. */ + /** Each Quorum */ public static final String EACH_QUORUM = "each_quorum"; - /** quorum. */ + /** Quorum */ public static final String QUORUM = "quorum"; - /** local_quorum. */ + /** Local Quorum */ public static final String LOCAL_QUORUM = "local_quorum"; - /** one. */ + /** One */ public static final String ONE = "one"; - /** two. */ + /** Two */ public static final String TWO = "two"; - /** three. */ + /** Three */ public static final String THREE = "three"; - /** local_one. */ + /** Local One */ public static final String LOCAL_ONE = "local_one"; - /** any. */ + /** Any */ public static final String ANY = "any"; - /** serial. */ + /** Serial */ public static final String SERIAL = "serial"; - /** local_serial. */ + /** Local Serial */ public static final String LOCAL_SERIAL = "local_serial"; private CassandraConsistencyLevelIncubatingValues() {} 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 1a616ce4..859a0c24 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 @@ -141,9 +141,31 @@ public final class ContainerIncubatingAttributes { /** Container name used by container runtime. */ public static final AttributeKey CONTAINER_NAME = stringKey("container.name"); - /** The container runtime managing this container. */ + /** + * The container runtime managing this container. + * + * @deprecated Replaced by {@code container.runtime.name}. + */ + @Deprecated public static final AttributeKey CONTAINER_RUNTIME = stringKey("container.runtime"); + /** + * A description about the runtime which could include, for example details about the CRI/API + * version being used or other customisations. + */ + public static final AttributeKey CONTAINER_RUNTIME_DESCRIPTION = + stringKey("container.runtime.description"); + + /** The container runtime managing this container. */ + public static final AttributeKey CONTAINER_RUNTIME_NAME = + stringKey("container.runtime.name"); + + /** + * The version of the runtime of this process, as returned by the runtime without modification. + */ + public static final AttributeKey CONTAINER_RUNTIME_VERSION = + stringKey("container.runtime.version"); + // Enum definitions /** diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CpuIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CpuIncubatingAttributes.java index 738f92d4..e28d1797 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CpuIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CpuIncubatingAttributes.java @@ -24,28 +24,28 @@ public final class CpuIncubatingAttributes { /** Values for {@link #CPU_MODE}. */ public static final class CpuModeIncubatingValues { - /** user. */ + /** User */ public static final String USER = "user"; - /** system. */ + /** System */ public static final String SYSTEM = "system"; - /** nice. */ + /** Nice */ public static final String NICE = "nice"; - /** idle. */ + /** Idle */ public static final String IDLE = "idle"; - /** iowait. */ + /** IO Wait */ public static final String IOWAIT = "iowait"; - /** interrupt. */ + /** Interrupt */ public static final String INTERRUPT = "interrupt"; - /** steal. */ + /** Steal */ public static final String STEAL = "steal"; - /** kernel. */ + /** Kernel */ public static final String KERNEL = "kernel"; private CpuModeIncubatingValues() {} 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 5cde4e94..d2494a33 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 @@ -750,7 +750,7 @@ public static final class DbSystemIncubatingValues { /** * Deprecated, no replacement at this time. * - * @deprecated Removed. + * @deprecated Obsoleted. */ @Deprecated public static final String COLDFUSION = "coldfusion"; @@ -842,7 +842,7 @@ public static final class DbSystemIncubatingValues { /** * Deprecated, Microsoft SQL Server Compact is discontinued. * - * @deprecated Removed, use {@code other_sql} instead. + * @deprecated Replaced by {@code other_sql}. */ @Deprecated public static final String MSSQLCOMPACT = "mssqlcompact"; 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 69e476d4..7a85a4c8 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 @@ -14,7 +14,7 @@ @SuppressWarnings("unused") public final class DeploymentIncubatingAttributes { /** - * 'Deprecated, use {@code deployment.environment.name} instead.' + * Deprecated, use {@code deployment.environment.name} instead. * * @deprecated Replaced by {@code deployment.environment.name}. */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DeviceIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DeviceIncubatingAttributes.java index 6aaab438..7c5d9663 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DeviceIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DeviceIncubatingAttributes.java @@ -23,8 +23,9 @@ public final class DeviceIncubatingAttributes { * device. Hardware IDs (e.g. vendor-specific serial number, IMEI or MAC address) MAY be used as * values. * - *

More information about Android identifier best practices can be found here. + *

More information about Android identifier best practices can be found in the Android user data IDs + * guide. * *

* diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/EnduserIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/EnduserIncubatingAttributes.java index f4120178..d91bd3c1 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/EnduserIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/EnduserIncubatingAttributes.java @@ -48,7 +48,7 @@ public final class EnduserIncubatingAttributes { /** * Deprecated, use {@code user.roles} instead. * - * @deprecated Use {@code user.roles} attribute instead. + * @deprecated Replaced by {@code user.roles}. */ @Deprecated public static final AttributeKey ENDUSER_ROLE = stringKey("enduser.role"); diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingAttributes.java index c40b437d..e085d0fc 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingAttributes.java @@ -76,15 +76,30 @@ public final class GenAiIncubatingAttributes { public static final AttributeKey GEN_AI_OPENAI_REQUEST_SEED = longKey("gen_ai.openai.request.seed"); - /** The service tier requested. May be a specific tier, default, or auto. */ + /** + * Deprecated, use {@code openai.request.service_tier}. + * + * @deprecated Replaced by {@code openai.request.service_tier}. + */ + @Deprecated public static final AttributeKey GEN_AI_OPENAI_REQUEST_SERVICE_TIER = stringKey("gen_ai.openai.request.service_tier"); - /** The service tier used for the response. */ + /** + * Deprecated, use {@code openai.response.service_tier}. + * + * @deprecated Replaced by {@code openai.response.service_tier}. + */ + @Deprecated public static final AttributeKey GEN_AI_OPENAI_RESPONSE_SERVICE_TIER = stringKey("gen_ai.openai.response.service_tier"); - /** A fingerprint to track any eventual change in the Generative AI environment. */ + /** + * Deprecated, use {@code openai.response.system_fingerprint}. + * + * @deprecated Replaced by {@code openai.response.system_fingerprint}. + */ + @Deprecated public static final AttributeKey GEN_AI_OPENAI_RESPONSE_SYSTEM_FINGERPRINT = stringKey("gen_ai.openai.response.system_fingerprint"); @@ -121,6 +136,30 @@ public final class GenAiIncubatingAttributes { */ @Deprecated public static final AttributeKey GEN_AI_PROMPT = stringKey("gen_ai.prompt"); + /** + * The Generative AI provider as identified by the client or server instrumentation. + * + *

Notes: + * + *

The attribute SHOULD be set based on the instrumentation's best knowledge and may differ + * from the actual model provider. + * + *

Multiple providers, including Azure OpenAI, Gemini, and AI hosting platforms are accessible + * using the OpenAI REST API and corresponding client libraries, but may proxy or host models from + * different providers. + * + *

The {@code gen_ai.request.model}, {@code gen_ai.response.model}, and {@code server.address} + * attributes may help identify the actual system in use. + * + *

The {@code gen_ai.provider.name} attribute acts as a discriminator that identifies the GenAI + * telemetry format flavor specific to that provider within GenAI semantic conventions. It SHOULD + * be set consistently with provider-specific attributes and signals. For example, GenAI spans, + * metrics, and events related to AWS Bedrock should have the {@code gen_ai.provider.name} set to + * {@code aws.bedrock} and include applicable {@code aws.bedrock.*} attributes and are not + * expected to include {@code openai.*} attributes. + */ + public static final AttributeKey GEN_AI_PROVIDER_NAME = stringKey("gen_ai.provider.name"); + /** The target number of candidate completions to return. */ public static final AttributeKey GEN_AI_REQUEST_CHOICE_COUNT = longKey("gen_ai.request.choice.count"); @@ -183,23 +222,11 @@ public final class GenAiIncubatingAttributes { stringKey("gen_ai.response.model"); /** - * The Generative AI product as identified by the client or server instrumentation. + * Deprecated, use {@code gen_ai.provider.name} instead. * - *

Notes: - * - *

The {@code gen_ai.system} describes a family of GenAI models with specific model identified - * by {@code gen_ai.request.model} and {@code gen_ai.response.model} attributes. - * - *

The actual GenAI product may differ from the one identified by the client. Multiple systems, - * including Azure OpenAI and Gemini, are accessible by OpenAI client libraries. In such cases, - * the {@code gen_ai.system} is set to {@code openai} based on the instrumentation's best - * knowledge, instead of the actual system. The {@code server.address} attribute may help identify - * the actual system in use for {@code openai}. - * - *

For custom model, a custom friendly name SHOULD be used. If none of these options apply, the - * {@code gen_ai.system} SHOULD be set to {@code _OTHER}. + * @deprecated Replaced by {@code gen_ai.provider.name}. */ - public static final AttributeKey GEN_AI_SYSTEM = stringKey("gen_ai.system"); + @Deprecated public static final AttributeKey GEN_AI_SYSTEM = stringKey("gen_ai.system"); /** The type of token being counted. */ public static final AttributeKey GEN_AI_TOKEN_TYPE = stringKey("gen_ai.token.type"); @@ -277,7 +304,12 @@ public static final class GenAiOpenaiRequestResponseFormatIncubatingValues { private GenAiOpenaiRequestResponseFormatIncubatingValues() {} } - /** Values for {@link #GEN_AI_OPENAI_REQUEST_SERVICE_TIER}. */ + /** + * Values for {@link #GEN_AI_OPENAI_REQUEST_SERVICE_TIER} + * + * @deprecated Replaced by {@code openai.request.service_tier}. + */ + @Deprecated public static final class GenAiOpenaiRequestServiceTierIncubatingValues { /** The system will utilize scale tier credits until they are exhausted. */ public static final String AUTO = "auto"; @@ -345,7 +377,64 @@ public static final class GenAiOutputTypeIncubatingValues { private GenAiOutputTypeIncubatingValues() {} } - /** Values for {@link #GEN_AI_SYSTEM}. */ + /** Values for {@link #GEN_AI_PROVIDER_NAME}. */ + public static final class GenAiProviderNameIncubatingValues { + /** OpenAI */ + public static final String OPENAI = "openai"; + + /** Any Google generative AI endpoint */ + public static final String GCP_GEN_AI = "gcp.gen_ai"; + + /** Vertex AI */ + public static final String GCP_VERTEX_AI = "gcp.vertex_ai"; + + /** Gemini */ + public static final String GCP_GEMINI = "gcp.gemini"; + + /** Anthropic */ + public static final String ANTHROPIC = "anthropic"; + + /** Cohere */ + public static final String COHERE = "cohere"; + + /** Azure AI Inference */ + public static final String AZURE_AI_INFERENCE = "azure.ai.inference"; + + /** + * Azure OpenAI + */ + public static final String AZURE_AI_OPENAI = "azure.ai.openai"; + + /** IBM Watsonx AI */ + public static final String IBM_WATSONX_AI = "ibm.watsonx.ai"; + + /** AWS Bedrock */ + public static final String AWS_BEDROCK = "aws.bedrock"; + + /** Perplexity */ + public static final String PERPLEXITY = "perplexity"; + + /** xAI */ + public static final String X_AI = "x_ai"; + + /** DeepSeek */ + public static final String DEEPSEEK = "deepseek"; + + /** Groq */ + public static final String GROQ = "groq"; + + /** Mistral AI */ + public static final String MISTRAL_AI = "mistral_ai"; + + private GenAiProviderNameIncubatingValues() {} + } + + /** + * Values for {@link #GEN_AI_SYSTEM} + * + * @deprecated Replaced by {@code gen_ai.provider.name}. + */ + @Deprecated public static final class GenAiSystemIncubatingValues { /** OpenAI */ public static final String OPENAI = "openai"; @@ -362,14 +451,14 @@ public static final class GenAiSystemIncubatingValues { /** * Vertex AI * - * @deprecated Use 'gcp.vertex_ai' instead. + * @deprecated Replaced by {@code gcp.vertex_ai}. */ @Deprecated public static final String VERTEX_AI = "vertex_ai"; /** * Gemini * - * @deprecated Use 'gcp.gemini' instead. + * @deprecated Replaced by {@code gcp.gemini}. */ @Deprecated public static final String GEMINI = "gemini"; @@ -380,24 +469,16 @@ public static final class GenAiSystemIncubatingValues { public static final String COHERE = "cohere"; /** Azure AI Inference */ - public static final String AZURE_AI_INFERENCE = "azure.ai.inference"; + public static final String AZ_AI_INFERENCE = "az.ai.inference"; /** Azure OpenAI */ - public static final String AZURE_AI_OPENAI = "azure.ai.openai"; + public static final String AZ_AI_OPENAI = "az.ai.openai"; - /** - * Azure AI Inference - * - * @deprecated Replaced by azure.ai.inference - */ - @Deprecated public static final String AZ_AI_INFERENCE = "az.ai.inference"; + /** Azure AI Inference */ + public static final String AZURE_AI_INFERENCE = "azure.ai.inference"; - /** - * Azure OpenAI - * - * @deprecated Replaced by azure.ai.openai - */ - @Deprecated public static final String AZ_AI_OPENAI = "azure.ai.openai"; + /** Azure OpenAI */ + public static final String AZURE_AI_OPENAI = "azure.ai.openai"; /** IBM Watsonx AI */ public static final String IBM_WATSONX_AI = "ibm.watsonx.ai"; @@ -408,8 +489,12 @@ public static final class GenAiSystemIncubatingValues { /** Perplexity */ public static final String PERPLEXITY = "perplexity"; - /** xAI */ - public static final String XAI = "xai"; + /** + * xAI + * + * @deprecated Replaced by {@code x_ai}. + */ + @Deprecated public static final String XAI = "xai"; /** DeepSeek */ public static final String DEEPSEEK = "deepseek"; diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/HwIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/HwIncubatingAttributes.java index 3f087ed3..e056c705 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/HwIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/HwIncubatingAttributes.java @@ -5,29 +5,108 @@ package io.opentelemetry.semconv.incubating; +import static io.opentelemetry.api.common.AttributeKey.stringArrayKey; import static io.opentelemetry.api.common.AttributeKey.stringKey; import io.opentelemetry.api.common.AttributeKey; +import java.util.List; // DO NOT EDIT, this is an Auto-generated file from // buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2 @SuppressWarnings("unused") public final class HwIncubatingAttributes { + /** Design capacity in Watts-hours or Amper-hours */ + public static final AttributeKey HW_BATTERY_CAPACITY = stringKey("hw.battery.capacity"); + + /** + * Battery chemistry, + * e.g. Lithium-Ion, Nickel-Cadmium, etc. + */ + public static final AttributeKey HW_BATTERY_CHEMISTRY = stringKey("hw.battery.chemistry"); + + /** The current state of the battery */ + public static final AttributeKey HW_BATTERY_STATE = stringKey("hw.battery.state"); + + /** BIOS version of the hardware component */ + public static final AttributeKey HW_BIOS_VERSION = stringKey("hw.bios_version"); + + /** Driver version for the hardware component */ + public static final AttributeKey HW_DRIVER_VERSION = stringKey("hw.driver_version"); + + /** Type of the enclosure (useful for modular systems) */ + public static final AttributeKey HW_ENCLOSURE_TYPE = stringKey("hw.enclosure.type"); + + /** Firmware version of the hardware component */ + public static final AttributeKey HW_FIRMWARE_VERSION = stringKey("hw.firmware_version"); + + /** Type of task the GPU is performing */ + public static final AttributeKey HW_GPU_TASK = stringKey("hw.gpu.task"); + /** An identifier for the hardware component, unique within the monitored host */ public static final AttributeKey HW_ID = stringKey("hw.id"); + /** Type of limit for hardware components */ + public static final AttributeKey HW_LIMIT_TYPE = stringKey("hw.limit_type"); + + /** RAID Level of the logical disk */ + public static final AttributeKey HW_LOGICAL_DISK_RAID_LEVEL = + stringKey("hw.logical_disk.raid_level"); + + /** State of the logical disk space usage */ + public static final AttributeKey HW_LOGICAL_DISK_STATE = + stringKey("hw.logical_disk.state"); + + /** Type of the memory module */ + public static final AttributeKey HW_MEMORY_TYPE = stringKey("hw.memory.type"); + + /** Descriptive model name of the hardware component */ + public static final AttributeKey HW_MODEL = stringKey("hw.model"); + /** An easily-recognizable name for the hardware component */ public static final AttributeKey HW_NAME = stringKey("hw.name"); + /** Logical addresses of the adapter (e.g. IP address, or WWPN) */ + public static final AttributeKey> HW_NETWORK_LOGICAL_ADDRESSES = + stringArrayKey("hw.network.logical_addresses"); + + /** Physical address of the adapter (e.g. MAC address, or WWNN) */ + public static final AttributeKey HW_NETWORK_PHYSICAL_ADDRESS = + stringKey("hw.network.physical_address"); + /** * Unique identifier of the parent component (typically the {@code hw.id} attribute of the * enclosure, or disk controller) */ public static final AttributeKey HW_PARENT = stringKey("hw.parent"); + /** + * S.M.A.R.T. (Self-Monitoring, Analysis, and + * Reporting Technology) attribute of the physical disk + */ + public static final AttributeKey HW_PHYSICAL_DISK_SMART_ATTRIBUTE = + stringKey("hw.physical_disk.smart_attribute"); + + /** State of the physical disk endurance utilization */ + public static final AttributeKey HW_PHYSICAL_DISK_STATE = + stringKey("hw.physical_disk.state"); + + /** Type of the physical disk */ + public static final AttributeKey HW_PHYSICAL_DISK_TYPE = + stringKey("hw.physical_disk.type"); + + /** Location of the sensor */ + public static final AttributeKey HW_SENSOR_LOCATION = stringKey("hw.sensor_location"); + + /** Serial number of the hardware component */ + public static final AttributeKey HW_SERIAL_NUMBER = stringKey("hw.serial_number"); + /** The current state of the component */ public static final AttributeKey HW_STATE = stringKey("hw.state"); + /** Type of tape drive operation */ + public static final AttributeKey HW_TAPE_DRIVE_OPERATION_TYPE = + stringKey("hw.tape_drive.operation_type"); + /** * Type of the component * @@ -39,22 +118,121 @@ public final class HwIncubatingAttributes { */ public static final AttributeKey HW_TYPE = stringKey("hw.type"); + /** Vendor name of the hardware component */ + public static final AttributeKey HW_VENDOR = stringKey("hw.vendor"); + // Enum definitions + /** Values for {@link #HW_BATTERY_STATE}. */ + public static final class HwBatteryStateIncubatingValues { + /** Charging */ + public static final String CHARGING = "charging"; + + /** Discharging */ + public static final String DISCHARGING = "discharging"; + + private HwBatteryStateIncubatingValues() {} + } + + /** Values for {@link #HW_GPU_TASK}. */ + public static final class HwGpuTaskIncubatingValues { + /** Decoder */ + public static final String DECODER = "decoder"; + + /** Encoder */ + public static final String ENCODER = "encoder"; + + /** General */ + public static final String GENERAL = "general"; + + private HwGpuTaskIncubatingValues() {} + } + + /** Values for {@link #HW_LIMIT_TYPE}. */ + public static final class HwLimitTypeIncubatingValues { + /** Critical */ + public static final String CRITICAL = "critical"; + + /** Degraded */ + public static final String DEGRADED = "degraded"; + + /** High Critical */ + public static final String HIGH_CRITICAL = "high.critical"; + + /** High Degraded */ + public static final String HIGH_DEGRADED = "high.degraded"; + + /** Low Critical */ + public static final String LOW_CRITICAL = "low.critical"; + + /** Low Degraded */ + public static final String LOW_DEGRADED = "low.degraded"; + + /** Maximum */ + public static final String MAX = "max"; + + /** Throttled */ + public static final String THROTTLED = "throttled"; + + /** Turbo */ + public static final String TURBO = "turbo"; + + private HwLimitTypeIncubatingValues() {} + } + + /** Values for {@link #HW_LOGICAL_DISK_STATE}. */ + public static final class HwLogicalDiskStateIncubatingValues { + /** Used */ + public static final String USED = "used"; + + /** Free */ + public static final String FREE = "free"; + + private HwLogicalDiskStateIncubatingValues() {} + } + + /** Values for {@link #HW_PHYSICAL_DISK_STATE}. */ + public static final class HwPhysicalDiskStateIncubatingValues { + /** Remaining */ + public static final String REMAINING = "remaining"; + + private HwPhysicalDiskStateIncubatingValues() {} + } + /** Values for {@link #HW_STATE}. */ public static final class HwStateIncubatingValues { - /** Ok */ - public static final String OK = "ok"; - /** Degraded */ public static final String DEGRADED = "degraded"; /** Failed */ public static final String FAILED = "failed"; + /** Needs Cleaning */ + public static final String NEEDS_CLEANING = "needs_cleaning"; + + /** OK */ + public static final String OK = "ok"; + + /** Predicted Failure */ + public static final String PREDICTED_FAILURE = "predicted_failure"; + private HwStateIncubatingValues() {} } + /** Values for {@link #HW_TAPE_DRIVE_OPERATION_TYPE}. */ + public static final class HwTapeDriveOperationTypeIncubatingValues { + /** Mount */ + public static final String MOUNT = "mount"; + + /** Unmount */ + public static final String UNMOUNT = "unmount"; + + /** Clean */ + public static final String CLEAN = "clean"; + + private HwTapeDriveOperationTypeIncubatingValues() {} + } + /** Values for {@link #HW_TYPE}. */ public static final class HwTypeIncubatingValues { /** Battery */ 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 3a7b8df5..7903508e 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 @@ -442,6 +442,9 @@ public static final class MessagingSystemIncubatingValues { /** Apache ActiveMQ */ public static final String ACTIVEMQ = "activemq"; + /** Amazon Simple Notification Service (SNS) */ + public static final String AWS_SNS = "aws.sns"; + /** Amazon Simple Queue Service (SQS) */ public static final String AWS_SQS = "aws_sqs"; diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OpenaiIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OpenaiIncubatingAttributes.java new file mode 100644 index 00000000..368c2e28 --- /dev/null +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OpenaiIncubatingAttributes.java @@ -0,0 +1,42 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.semconv.incubating; + +import static io.opentelemetry.api.common.AttributeKey.stringKey; + +import io.opentelemetry.api.common.AttributeKey; + +// DO NOT EDIT, this is an Auto-generated file from +// buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2 +@SuppressWarnings("unused") +public final class OpenaiIncubatingAttributes { + /** The service tier requested. May be a specific tier, default, or auto. */ + public static final AttributeKey OPENAI_REQUEST_SERVICE_TIER = + stringKey("openai.request.service_tier"); + + /** The service tier used for the response. */ + public static final AttributeKey OPENAI_RESPONSE_SERVICE_TIER = + stringKey("openai.response.service_tier"); + + /** A fingerprint to track any eventual change in the Generative AI environment. */ + public static final AttributeKey OPENAI_RESPONSE_SYSTEM_FINGERPRINT = + stringKey("openai.response.system_fingerprint"); + + // Enum definitions + + /** Values for {@link #OPENAI_REQUEST_SERVICE_TIER}. */ + public static final class OpenaiRequestServiceTierIncubatingValues { + /** The system will utilize scale tier credits until they are exhausted. */ + public static final String AUTO = "auto"; + + /** The system will utilize the default scale tier. */ + public static final String DEFAULT = "default"; + + private OpenaiRequestServiceTierIncubatingValues() {} + } + + private OpenaiIncubatingAttributes() {} +} 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 e88a7de6..dde3a272 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 @@ -75,6 +75,10 @@ public final class OtelIncubatingAttributes { @Deprecated public static final AttributeKey OTEL_SCOPE_NAME = stringKey("otel.scope.name"); + /** The schema URL of the instrumentation scope. */ + public static final AttributeKey OTEL_SCOPE_SCHEMA_URL = + stringKey("otel.scope.schema_url"); + /** * The version of the instrumentation scope - ({@code InstrumentationScope.Version} in OTLP). * diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SystemIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SystemIncubatingAttributes.java index 9844961b..dc44a681 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SystemIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SystemIncubatingAttributes.java @@ -155,7 +155,7 @@ private SystemFilesystemTypeIncubatingValues() {} /** Values for {@link #SYSTEM_MEMORY_STATE}. */ public static final class SystemMemoryStateIncubatingValues { - /** used. */ + /** Actual used virtual memory in bytes. */ public static final String USED = "used"; /** free. */ diff --git a/semconv/src/main/java/io/opentelemetry/semconv/SchemaUrls.java b/semconv/src/main/java/io/opentelemetry/semconv/SchemaUrls.java index 335fc007..00624b51 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/SchemaUrls.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/SchemaUrls.java @@ -7,6 +7,7 @@ public final class SchemaUrls { + public static final String V1_37_0 = "https://opentelemetry.io/schemas/1.37.0"; public static final String V1_36_0 = "https://opentelemetry.io/schemas/1.36.0"; public static final String V1_35_0 = "https://opentelemetry.io/schemas/1.35.0"; public static final String V1_34_0 = "https://opentelemetry.io/schemas/1.34.0";