From eb5c4a4d3ccb92e4eeab89d381f82367007fd485 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 13 Feb 2025 15:34:33 -0800 Subject: [PATCH 1/2] Update weaver to 0.13.2 --- build.gradle.kts | 2 +- .../IncubatingSemanticAttributes.java.j2 | 4 +- .../registry/java/SemanticAttributes.java.j2 | 2 +- .../AndroidIncubatingAttributes.java | 2 - .../ClientIncubatingAttributes.java | 4 -- .../incubating/CodeIncubatingAttributes.java | 6 -- .../ContainerIncubatingAttributes.java | 4 -- .../incubating/DbIncubatingAttributes.java | 70 ------------------- .../DeploymentIncubatingAttributes.java | 2 - .../EnduserIncubatingAttributes.java | 6 -- .../incubating/ErrorIncubatingAttributes.java | 2 - .../incubating/EventIncubatingAttributes.java | 2 - .../ExceptionIncubatingAttributes.java | 6 -- .../incubating/GenAiIncubatingAttributes.java | 10 --- .../incubating/HttpIncubatingAttributes.java | 42 ----------- .../incubating/JvmIncubatingAttributes.java | 12 ---- .../incubating/K8sIncubatingAttributes.java | 2 - .../MessageIncubatingAttributes.java | 8 --- .../MessagingIncubatingAttributes.java | 18 ----- .../incubating/NetIncubatingAttributes.java | 30 -------- .../NetworkIncubatingAttributes.java | 12 ---- .../incubating/OtelIncubatingAttributes.java | 12 ---- .../incubating/OtherIncubatingAttributes.java | 2 - .../incubating/PoolIncubatingAttributes.java | 2 - .../ProcessIncubatingAttributes.java | 4 -- .../ServerIncubatingAttributes.java | 4 -- .../ServiceIncubatingAttributes.java | 4 -- .../SystemIncubatingAttributes.java | 6 -- .../TelemetryIncubatingAttributes.java | 6 -- .../incubating/TlsIncubatingAttributes.java | 2 - .../incubating/UrlIncubatingAttributes.java | 10 --- .../UserAgentIncubatingAttributes.java | 2 - .../incubating/VcsIncubatingAttributes.java | 10 --- 33 files changed, 4 insertions(+), 306 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 71b9f96c..5a6b3ce2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -108,7 +108,7 @@ fun generateTask(taskName: String, incubating: Boolean) { "--mount", "type=bind,source=${modelPath},target=/home/weaver/source,readonly", "--mount", "type=bind,source=$projectDir/buildscripts/templates,target=/home/weaver/templates,readonly", "--mount", "type=bind,source=$projectDir/$outputDir,target=/home/weaver/target", - "otel/weaver:v0.12.0", + "otel/weaver:v0.13.2", "registry", "generate", "--registry=/home/weaver/source", "--templates=/home/weaver/templates", diff --git a/buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2 b/buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2 index ce0bef4a..76260caf 100644 --- a/buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2 +++ b/buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2 @@ -37,7 +37,7 @@ import java.util.List; @SuppressWarnings("unused") public final class {{ my_class_name }} { {% for attribute in ctx.attributes | rejectattr("name", "in", ctx.excluded_attributes) %}{% if attribute is experimental %} - {%- if attribute is deprecated %}{%- set deprecated_javadoc = "@deprecated " ~ attribute.deprecated -%} + {%- if attribute is deprecated %}{%- set deprecated_javadoc = "@deprecated " ~ attribute.deprecated.note -%} {%- else -%}{%- set deprecated_javadoc = "" -%} {%- endif -%} {{ [attribute.brief, concat_if("\n\nNotes:\n\n", attribute.note), deprecated_javadoc] | comment(indent=4) }} @@ -58,7 +58,7 @@ public final class {{ my_class_name }} { * @deprecated deprecated in favor of stable {@link {{stable_class_link}}}. */ {%- elif attribute is deprecated -%} - {{ ["Values for {@link #" ~ attribute.name | screaming_snake_case ~ "}", "@deprecated " ~ attribute.deprecated ] | comment }} + {{ ["Values for {@link #" ~ attribute.name | screaming_snake_case ~ "}", "@deprecated " ~ attribute.deprecated.note ] | comment }} {%- else -%} /** Values for {@link #{{ attribute.name | screaming_snake_case }}}. */ {%- endif -%} diff --git a/buildscripts/templates/registry/java/SemanticAttributes.java.j2 b/buildscripts/templates/registry/java/SemanticAttributes.java.j2 index d30cfbaa..e37c3919 100644 --- a/buildscripts/templates/registry/java/SemanticAttributes.java.j2 +++ b/buildscripts/templates/registry/java/SemanticAttributes.java.j2 @@ -38,7 +38,7 @@ import java.util.List; public final class {{ my_class_name }} { {% for attribute in ctx.attributes | rejectattr("name", "in", ctx.excluded_attributes) %}{% if attribute is stable %} {%- if attribute is deprecated %} - {%- set deprecated_javadoc = "@deprecated " ~ attribute.deprecated -%} + {%- set deprecated_javadoc = "@deprecated " ~ attribute.deprecated.note -%} {%- endif -%} {{ [attribute.brief, concat_if("\n\nNotes:\n\n", attribute.note), deprecated_javadoc] | comment(indent=4) }} {% if attribute is deprecated %}@Deprecated{% endif %} public static final {{ to_java_key_type(attribute) | trim }} {{ attribute.name | screaming_snake_case }} = {{ to_java_key_factory(attribute) | trim }}("{{ attribute.name }}"); 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 82fc36a8..48e44da8 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 @@ -30,8 +30,6 @@ public final class AndroidIncubatingAttributes { * href="https://developer.android.com/guide/components/activities/activity-lifecycle#lc">Activity * lifecycle callbacks, and from which the {@code OS identifiers} are derived. * - *

- * * @deprecated Replaced by {@code device.app.lifecycle}. */ @Deprecated public static final AttributeKey ANDROID_STATE = stringKey("android.state"); 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 ce50d809..acb15c94 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 @@ -24,8 +24,6 @@ public final class ClientIncubatingAttributes { * client.address} SHOULD represent the client address behind any intermediaries, for example * proxies, if it's available. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.ClientAttributes#CLIENT_ADDRESS} attribute. */ @@ -40,8 +38,6 @@ public final class ClientIncubatingAttributes { * client.port} SHOULD represent the client port behind any intermediaries, for example proxies, * if it's available. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.ClientAttributes#CLIENT_PORT} attribute. */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CodeIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CodeIncubatingAttributes.java index bd644b14..8fa89d91 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CodeIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CodeIncubatingAttributes.java @@ -17,8 +17,6 @@ public final class CodeIncubatingAttributes { /** * Deprecated, use {@code code.column.number} * - *

- * * @deprecated Replaced by {@code code.column.number} */ @Deprecated public static final AttributeKey CODE_COLUMN = longKey("code.column"); @@ -41,8 +39,6 @@ public final class CodeIncubatingAttributes { /** * Deprecated, use {@code code.function.name} instead * - *

- * * @deprecated Replaced by {@code code.function.name} */ @Deprecated public static final AttributeKey CODE_FUNCTION = stringKey("code.function"); @@ -61,8 +57,6 @@ public final class CodeIncubatingAttributes { /** * Deprecated, use {@code code.line.number} instead * - *

- * * @deprecated Replaced by {@code code.line.number} */ @Deprecated public static final AttributeKey CODE_LINENO = longKey("code.lineno"); 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 69ba8028..e834329a 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 @@ -38,8 +38,6 @@ public final class ContainerIncubatingAttributes { /** * Deprecated, use {@code cpu.mode} instead. * - *

- * * @deprecated Replaced by {@code cpu.mode} */ @Deprecated @@ -127,8 +125,6 @@ public final class ContainerIncubatingAttributes { /** * Deprecated, use {@code container.label} instead. * - *

- * * @deprecated Replaced by {@code container.label}. */ @Deprecated 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 9fafeaf8..d0c6bafb 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 @@ -23,8 +23,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code cassandra.consistency.level} instead. * - *

- * * @deprecated Replaced by {@code cassandra.consistency.level}. */ @Deprecated @@ -34,8 +32,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code cassandra.coordinator.dc} instead. * - *

- * * @deprecated Replaced by {@code cassandra.coordinator.dc}. */ @Deprecated @@ -45,8 +41,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code cassandra.coordinator.id} instead. * - *

- * * @deprecated Replaced by {@code cassandra.coordinator.id}. */ @Deprecated @@ -56,8 +50,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code cassandra.query.idempotent} instead. * - *

- * * @deprecated Replaced by {@code cassandra.query.idempotent}. */ @Deprecated @@ -67,8 +59,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code cassandra.page.size} instead. * - *

- * * @deprecated Replaced by {@code cassandra.page.size}. */ @Deprecated @@ -77,8 +67,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code cassandra.speculative_execution.count} instead. * - *

- * * @deprecated Replaced by {@code cassandra.speculative_execution.count}. */ @Deprecated @@ -88,8 +76,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.collection.name} instead. * - *

- * * @deprecated Replaced by {@code db.collection.name}. */ @Deprecated @@ -113,8 +99,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.client.connection.pool.name} instead. * - *

- * * @deprecated Replaced by {@code db.client.connection.pool.name}. */ @Deprecated @@ -124,8 +108,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.client.connection.state} instead. * - *

- * * @deprecated Replaced by {@code db.client.connection.state}. */ @Deprecated @@ -151,8 +133,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code server.address}, {@code server.port} attributes instead. * - *

- * * @deprecated Replaced by {@code server.address} and {@code server.port}. */ @Deprecated @@ -161,8 +141,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code azure.client.id} instead. * - *

- * * @deprecated Replaced by {@code azure.client.id}. */ @Deprecated @@ -172,8 +150,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code azure.cosmosdb.connection.mode} instead. * - *

- * * @deprecated Replaced by {@code azure.cosmosdb.connection.mode}. */ @Deprecated @@ -183,8 +159,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code cosmosdb.consistency.level} instead. * - *

- * * @deprecated Replaced by {@code azure.cosmosdb.consistency.level}. */ @Deprecated @@ -194,8 +168,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.collection.name} instead. * - *

- * * @deprecated Replaced by {@code db.collection.name}. */ @Deprecated @@ -205,8 +177,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, no replacement at this time. * - *

- * * @deprecated No replacement at this time. */ @Deprecated @@ -216,8 +186,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code azure.cosmosdb.operation.contacted_regions} instead. * - *

- * * @deprecated Replaced by {@code azure.cosmosdb.operation.contacted_regions}. */ @Deprecated @@ -227,8 +195,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code azure.cosmosdb.operation.request_charge} instead. * - *

- * * @deprecated Replaced by {@code azure.cosmosdb.operation.request_charge}. */ @Deprecated @@ -238,8 +204,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code azure.cosmosdb.request.body.size} instead. * - *

- * * @deprecated Replaced by {@code azure.cosmosdb.request.body.size}. */ @Deprecated @@ -249,8 +213,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.response.status_code} instead. * - *

- * * @deprecated Replaced by {@code db.response.status_code}. */ @Deprecated @@ -260,8 +222,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code azure.cosmosdb.response.sub_status_code} instead. * - *

- * * @deprecated Replaced by {@code azure.cosmosdb.response.sub_status_code}. */ @Deprecated @@ -271,8 +231,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.namespace} instead. * - *

- * * @deprecated Replaced by {@code db.namespace}. */ @Deprecated @@ -282,8 +240,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code elasticsearch.node.name} instead. * - *

- * * @deprecated Replaced by {@code elasticsearch.node.name}. */ @Deprecated @@ -293,8 +249,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.operation.parameter} instead. * - *

- * * @deprecated Replaced by {@code db.operation.parameter}. */ @Deprecated @@ -305,8 +259,6 @@ public final class DbIncubatingAttributes { * Deprecated, no general replacement at this time. For Elasticsearch, use {@code * db.elasticsearch.node.name} instead. * - *

- * * @deprecated Deprecated, no general replacement at this time. For Elasticsearch, use {@code * db.elasticsearch.node.name} instead. */ @@ -315,8 +267,6 @@ public final class DbIncubatingAttributes { /** * Removed, no replacement at this time. * - *

- * * @deprecated Removed as not used. */ @Deprecated @@ -326,8 +276,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.collection.name} instead. * - *

- * * @deprecated Replaced by {@code db.collection.name}. */ @Deprecated @@ -337,8 +285,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, SQL Server instance is now populated as a part of {@code db.namespace} attribute. * - *

- * * @deprecated Deprecated, no replacement at this time. */ @Deprecated @@ -348,8 +294,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.namespace} instead. * - *

- * * @deprecated Replaced by {@code db.namespace}. */ @Deprecated public static final AttributeKey DB_NAME = stringKey("db.name"); @@ -372,8 +316,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.operation.name} instead. * - *

- * * @deprecated Replaced by {@code db.operation.name}. */ @Deprecated public static final AttributeKey DB_OPERATION = stringKey("db.operation"); @@ -425,8 +367,6 @@ public final class DbIncubatingAttributes { * A query parameter used in {@code db.query.text}, with {@code } being the parameter name, * and the attribute value being a string representation of the parameter value. * - *

- * * @deprecated Replaced by {@code db.operation.parameter}. */ @Deprecated @@ -468,8 +408,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.namespace} instead. * - *

- * * @deprecated Replaced by {@code db.namespace}. */ @Deprecated @@ -496,8 +434,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.collection.name} instead. * - *

- * * @deprecated Replaced by {@code db.collection.name}. */ @Deprecated public static final AttributeKey DB_SQL_TABLE = stringKey("db.sql.table"); @@ -505,8 +441,6 @@ public final class DbIncubatingAttributes { /** * The database statement being executed. * - *

- * * @deprecated Replaced by {@code db.query.text}. */ @Deprecated public static final AttributeKey DB_STATEMENT = stringKey("db.statement"); @@ -514,8 +448,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, use {@code db.system.name} instead. * - *

- * * @deprecated Replaced by {@code db.system.name}. */ @Deprecated public static final AttributeKey DB_SYSTEM = stringKey("db.system"); @@ -534,8 +466,6 @@ public final class DbIncubatingAttributes { /** * Deprecated, no replacement at this time. * - *

- * * @deprecated No replacement at this time. */ @Deprecated public static final AttributeKey DB_USER = stringKey("db.user"); 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 6620a7c5..4be8f6e1 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 @@ -16,8 +16,6 @@ public final class DeploymentIncubatingAttributes { /** * 'Deprecated, use {@code deployment.environment.name} instead.' * - *

- * * @deprecated Deprecated, use {@code deployment.environment.name} instead. */ @Deprecated 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 cdf48b64..ecdcb642 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 @@ -16,8 +16,6 @@ public final class EnduserIncubatingAttributes { /** * Deprecated, use {@code user.id} instead. * - *

- * * @deprecated Replaced by {@code user.id} attribute. */ @Deprecated public static final AttributeKey ENDUSER_ID = stringKey("enduser.id"); @@ -25,8 +23,6 @@ public final class EnduserIncubatingAttributes { /** * Deprecated, use {@code user.roles} instead. * - *

- * * @deprecated Replaced by {@code user.roles} attribute. */ @Deprecated public static final AttributeKey ENDUSER_ROLE = stringKey("enduser.role"); @@ -34,8 +30,6 @@ public final class EnduserIncubatingAttributes { /** * Deprecated, no replacement at this time. * - *

- * * @deprecated Removed. */ @Deprecated public static final AttributeKey ENDUSER_SCOPE = stringKey("enduser.scope"); diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ErrorIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ErrorIncubatingAttributes.java index 97a6af37..b43385bd 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ErrorIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ErrorIncubatingAttributes.java @@ -42,8 +42,6 @@ public final class ErrorIncubatingAttributes { * within the domain-specific set or not. * * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.ErrorAttributes#ERROR_TYPE} attribute. */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/EventIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/EventIncubatingAttributes.java index a4be0c8b..1609ac42 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/EventIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/EventIncubatingAttributes.java @@ -16,8 +16,6 @@ public final class EventIncubatingAttributes { /** * Identifies the class / type of event. * - *

- * * @deprecated Replaced by EventName top-level field on the LogRecord */ @Deprecated public static final AttributeKey EVENT_NAME = stringKey("event.name"); diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ExceptionIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ExceptionIncubatingAttributes.java index a7438a8e..740d51b6 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ExceptionIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ExceptionIncubatingAttributes.java @@ -16,8 +16,6 @@ public final class ExceptionIncubatingAttributes { /** * The exception message. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.ExceptionAttributes#EXCEPTION_MESSAGE} attribute. */ @@ -28,8 +26,6 @@ public final class ExceptionIncubatingAttributes { * A stacktrace as a string in the natural representation for the language runtime. The * representation is to be determined and documented by each language SIG. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.ExceptionAttributes#EXCEPTION_STACKTRACE} attribute. */ @@ -40,8 +36,6 @@ public final class ExceptionIncubatingAttributes { * The type of the exception (its fully-qualified class name, if applicable). The dynamic type of * the exception should be preferred over the static type in languages that support it. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.ExceptionAttributes#EXCEPTION_TYPE} attribute. */ 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 9fd95dc8..ff9fddd6 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 @@ -20,8 +20,6 @@ public final class GenAiIncubatingAttributes { /** * Deprecated, use Event API to report completions contents. * - *

- * * @deprecated Removed, no replacement at this time. */ @Deprecated @@ -34,8 +32,6 @@ public final class GenAiIncubatingAttributes { /** * Deprecated, use {@code gen_ai.request.seed}. * - *

- * * @deprecated Replaced by {@code gen_ai.request.seed} attribute. */ @Deprecated @@ -70,8 +66,6 @@ public final class GenAiIncubatingAttributes { /** * Deprecated, use Event API to report prompt contents. * - *

- * * @deprecated Removed, no replacement at this time. */ @Deprecated public static final AttributeKey GEN_AI_PROMPT = stringKey("gen_ai.prompt"); @@ -158,8 +152,6 @@ public final class GenAiIncubatingAttributes { /** * Deprecated, use {@code gen_ai.usage.output_tokens} instead. * - *

- * * @deprecated Replaced by {@code gen_ai.usage.output_tokens} attribute. */ @Deprecated @@ -177,8 +169,6 @@ public final class GenAiIncubatingAttributes { /** * Deprecated, use {@code gen_ai.usage.input_tokens} instead. * - *

- * * @deprecated Replaced by {@code gen_ai.usage.input_tokens} attribute. */ @Deprecated diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/HttpIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/HttpIncubatingAttributes.java index a4f9e497..120143d4 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/HttpIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/HttpIncubatingAttributes.java @@ -20,8 +20,6 @@ public final class HttpIncubatingAttributes { /** * Deprecated, use {@code client.address} instead. * - *

- * * @deprecated Replaced by {@code client.address}. */ @Deprecated public static final AttributeKey HTTP_CLIENT_IP = stringKey("http.client_ip"); @@ -33,8 +31,6 @@ public final class HttpIncubatingAttributes { /** * Deprecated, use {@code network.protocol.name} instead. * - *

- * * @deprecated Replaced by {@code network.protocol.name}. */ @Deprecated public static final AttributeKey HTTP_FLAVOR = stringKey("http.flavor"); @@ -43,8 +39,6 @@ public final class HttpIncubatingAttributes { * Deprecated, use one of {@code server.address}, {@code client.address} or {@code * http.request.header.host} instead, depending on the usage. * - *

- * * @deprecated Replaced by one of {@code server.address}, {@code client.address} or {@code * http.request.header.host}, depending on the usage. */ @@ -53,8 +47,6 @@ public final class HttpIncubatingAttributes { /** * Deprecated, use {@code http.request.method} instead. * - *

- * * @deprecated Replaced by {@code http.request.method}. */ @Deprecated public static final AttributeKey HTTP_METHOD = stringKey("http.method"); @@ -81,8 +73,6 @@ public final class HttpIncubatingAttributes { * multiple header values as an array of strings or a single-item array containing a possibly * comma-concatenated string, depending on the way the HTTP library provides access to headers. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.HttpAttributes#HTTP_REQUEST_HEADER} attribute. */ @@ -116,8 +106,6 @@ public final class HttpIncubatingAttributes { * instrumentations that do so, MUST also set {@code http.request.method_original} to the original * value. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.HttpAttributes#HTTP_REQUEST_METHOD} attribute. */ @@ -127,8 +115,6 @@ public final class HttpIncubatingAttributes { /** * Original HTTP method sent by the client in the request line. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.HttpAttributes#HTTP_REQUEST_METHOD_ORIGINAL} attribute. */ @@ -145,8 +131,6 @@ public final class HttpIncubatingAttributes { * regardless of what was the cause of the resending (e.g. redirection, authorization failure, 503 * Server Unavailable, network issues, or any other). * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.HttpAttributes#HTTP_REQUEST_RESEND_COUNT} attribute. */ @@ -164,8 +148,6 @@ public final class HttpIncubatingAttributes { /** * Deprecated, use {@code http.request.header.} instead. * - *

- * * @deprecated Replaced by {@code http.request.header.}. */ @Deprecated @@ -175,8 +157,6 @@ public final class HttpIncubatingAttributes { /** * Deprecated, use {@code http.request.body.size} instead. * - *

- * * @deprecated Replaced by {@code http.request.body.size}. */ @Deprecated @@ -205,8 +185,6 @@ public final class HttpIncubatingAttributes { * header values as an array of strings or a single-item array containing a possibly * comma-concatenated string, depending on the way the HTTP library provides access to headers. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.HttpAttributes#HTTP_RESPONSE_HEADER} attribute. */ @@ -224,8 +202,6 @@ public final class HttpIncubatingAttributes { /** * HTTP response status code. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.HttpAttributes#HTTP_RESPONSE_STATUS_CODE} attribute. */ @@ -236,8 +212,6 @@ public final class HttpIncubatingAttributes { /** * Deprecated, use {@code http.response.header.} instead. * - *

- * * @deprecated Replaced by {@code http.response.header.}. */ @Deprecated @@ -247,8 +221,6 @@ public final class HttpIncubatingAttributes { /** * Deprecated, use {@code http.response.body.size} instead. * - *

- * * @deprecated Replace by {@code http.response.body.size}. */ @Deprecated @@ -266,8 +238,6 @@ public final class HttpIncubatingAttributes { * the application root if there is * one. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.HttpAttributes#HTTP_ROUTE} attribute. */ @@ -276,8 +246,6 @@ public final class HttpIncubatingAttributes { /** * Deprecated, use {@code url.scheme} instead. * - *

- * * @deprecated Replaced by {@code url.scheme} instead. */ @Deprecated public static final AttributeKey HTTP_SCHEME = stringKey("http.scheme"); @@ -285,8 +253,6 @@ public final class HttpIncubatingAttributes { /** * Deprecated, use {@code server.address} instead. * - *

- * * @deprecated Replaced by {@code server.address}. */ @Deprecated @@ -295,8 +261,6 @@ public final class HttpIncubatingAttributes { /** * Deprecated, use {@code http.response.status_code} instead. * - *

- * * @deprecated Replaced by {@code http.response.status_code}. */ @Deprecated public static final AttributeKey HTTP_STATUS_CODE = longKey("http.status_code"); @@ -304,8 +268,6 @@ public final class HttpIncubatingAttributes { /** * Deprecated, use {@code url.path} and {@code url.query} instead. * - *

- * * @deprecated Split to {@code url.path} and `url.query. */ @Deprecated public static final AttributeKey HTTP_TARGET = stringKey("http.target"); @@ -313,8 +275,6 @@ public final class HttpIncubatingAttributes { /** * Deprecated, use {@code url.full} instead. * - *

- * * @deprecated Replaced by {@code url.full}. */ @Deprecated public static final AttributeKey HTTP_URL = stringKey("http.url"); @@ -322,8 +282,6 @@ public final class HttpIncubatingAttributes { /** * Deprecated, use {@code user_agent.original} instead. * - *

- * * @deprecated Replaced by {@code user_agent.original}. */ @Deprecated diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/JvmIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/JvmIncubatingAttributes.java index 06ff6e46..0680fdb1 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/JvmIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/JvmIncubatingAttributes.java @@ -32,8 +32,6 @@ public final class JvmIncubatingAttributes { *

Garbage collector action is generally obtained via GarbageCollectionNotificationInfo#getGcAction(). * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.JvmAttributes#JVM_GC_ACTION} attribute. */ @@ -47,8 +45,6 @@ public final class JvmIncubatingAttributes { *

Garbage collector name is generally obtained via GarbageCollectionNotificationInfo#getGcName(). * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.JvmAttributes#JVM_GC_NAME} attribute. */ @@ -62,8 +58,6 @@ public final class JvmIncubatingAttributes { *

Pool names are generally obtained via MemoryPoolMXBean#getName(). * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.JvmAttributes#JVM_MEMORY_POOL_NAME} attribute. */ @@ -73,8 +67,6 @@ public final class JvmIncubatingAttributes { /** * The type of memory. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.JvmAttributes#JVM_MEMORY_TYPE} attribute. */ @@ -84,8 +76,6 @@ public final class JvmIncubatingAttributes { /** * Whether the thread is daemon or not. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.JvmAttributes#JVM_THREAD_DAEMON} attribute. */ @@ -95,8 +85,6 @@ public final class JvmIncubatingAttributes { /** * State of the thread. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.JvmAttributes#JVM_THREAD_STATE} attribute. */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/K8sIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/K8sIncubatingAttributes.java index e9a539db..c05fb4d8 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/K8sIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/K8sIncubatingAttributes.java @@ -126,8 +126,6 @@ public final class K8sIncubatingAttributes { /** * Deprecated, use {@code k8s.pod.label} instead. * - *

- * * @deprecated Replaced by {@code k8s.pod.label}. */ @Deprecated diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/MessageIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/MessageIncubatingAttributes.java index 9e341cd8..07a7b525 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/MessageIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/MessageIncubatingAttributes.java @@ -17,8 +17,6 @@ public final class MessageIncubatingAttributes { /** * Deprecated, use {@code rpc.message.compressed_size} instead. * - *

- * * @deprecated Replaced by {@code rpc.message.compressed_size}. */ @Deprecated @@ -28,8 +26,6 @@ public final class MessageIncubatingAttributes { /** * Deprecated, use {@code rpc.message.id} instead. * - *

- * * @deprecated Replaced by {@code rpc.message.id}. */ @Deprecated public static final AttributeKey MESSAGE_ID = longKey("message.id"); @@ -37,8 +33,6 @@ public final class MessageIncubatingAttributes { /** * Deprecated, use {@code rpc.message.type} instead. * - *

- * * @deprecated Replaced by {@code rpc.message.type}. */ @Deprecated public static final AttributeKey MESSAGE_TYPE = stringKey("message.type"); @@ -46,8 +40,6 @@ public final class MessageIncubatingAttributes { /** * Deprecated, use {@code rpc.message.uncompressed_size} instead. * - *

- * * @deprecated Replaced by {@code rpc.message.uncompressed_size}. */ @Deprecated 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 ad9db4ae..b8f4cdc8 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 @@ -105,8 +105,6 @@ public final class MessagingIncubatingAttributes { /** * Deprecated, no replacement at this time. * - *

- * * @deprecated No replacement at this time. */ @Deprecated @@ -116,8 +114,6 @@ public final class MessagingIncubatingAttributes { /** * Deprecated, no replacement at this time. * - *

- * * @deprecated No replacement at this time. */ @Deprecated @@ -127,8 +123,6 @@ public final class MessagingIncubatingAttributes { /** * Deprecated, use {@code messaging.consumer.group.name} instead. * - *

- * * @deprecated Replaced by {@code messaging.consumer.group.name}. */ @Deprecated @@ -161,8 +155,6 @@ public final class MessagingIncubatingAttributes { /** * Deprecated, use {@code messaging.consumer.group.name} instead. * - *

- * * @deprecated Replaced by {@code messaging.consumer.group.name}. */ @Deprecated @@ -172,8 +164,6 @@ public final class MessagingIncubatingAttributes { /** * Deprecated, use {@code messaging.destination.partition.id} instead. * - *

- * * @deprecated Replaced by {@code messaging.destination.partition.id}. */ @Deprecated @@ -196,8 +186,6 @@ public final class MessagingIncubatingAttributes { /** * Deprecated, use {@code messaging.kafka.offset} instead. * - *

- * * @deprecated Replaced by {@code messaging.kafka.offset}. */ @Deprecated @@ -248,8 +236,6 @@ public final class MessagingIncubatingAttributes { /** * Deprecated, use {@code messaging.operation.type} instead. * - *

- * * @deprecated Replaced by {@code messaging.operation.type}. */ @Deprecated @@ -280,8 +266,6 @@ public final class MessagingIncubatingAttributes { /** * Deprecated, use {@code messaging.consumer.group.name} instead. * - *

- * * @deprecated Replaced by {@code messaging.consumer.group.name} on the consumer spans. No * replacement for producer spans. */ @@ -329,8 +313,6 @@ public final class MessagingIncubatingAttributes { /** * Deprecated, use {@code messaging.destination.subscription.name} instead. * - *

- * * @deprecated Replaced by {@code messaging.destination.subscription.name}. */ @Deprecated 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 6aa7e2ee..fe01d687 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 @@ -17,8 +17,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, use {@code network.local.address}. * - *

- * * @deprecated Replaced by {@code network.local.address}. */ @Deprecated public static final AttributeKey NET_HOST_IP = stringKey("net.host.ip"); @@ -26,8 +24,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, use {@code server.address}. * - *

- * * @deprecated Replaced by {@code server.address}. */ @Deprecated public static final AttributeKey NET_HOST_NAME = stringKey("net.host.name"); @@ -35,8 +31,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, use {@code server.port}. * - *

- * * @deprecated Replaced by {@code server.port}. */ @Deprecated public static final AttributeKey NET_HOST_PORT = longKey("net.host.port"); @@ -44,8 +38,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, use {@code network.peer.address}. * - *

- * * @deprecated Replaced by {@code network.peer.address}. */ @Deprecated public static final AttributeKey NET_PEER_IP = stringKey("net.peer.ip"); @@ -54,8 +46,6 @@ public final class NetIncubatingAttributes { * Deprecated, use {@code server.address} on client spans and {@code client.address} on server * spans. * - *

- * * @deprecated Replaced by {@code server.address} on client spans and {@code client.address} on * server spans. */ @@ -64,8 +54,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, use {@code server.port} on client spans and {@code client.port} on server spans. * - *

- * * @deprecated Replaced by {@code server.port} on client spans and {@code client.port} on server * spans. */ @@ -74,8 +62,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, use {@code network.protocol.name}. * - *

- * * @deprecated Replaced by {@code network.protocol.name}. */ @Deprecated @@ -84,8 +70,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, use {@code network.protocol.version}. * - *

- * * @deprecated Replaced by {@code network.protocol.version}. */ @Deprecated @@ -94,8 +78,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, use {@code network.transport} and {@code network.type}. * - *

- * * @deprecated Split to {@code network.transport} and {@code network.type}. */ @Deprecated @@ -104,8 +86,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, use {@code network.local.address}. * - *

- * * @deprecated Replaced by {@code network.local.address}. */ @Deprecated @@ -114,8 +94,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, use {@code network.local.port}. * - *

- * * @deprecated Replaced by {@code network.local.port}. */ @Deprecated @@ -124,8 +102,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, use {@code network.peer.address}. * - *

- * * @deprecated Replaced by {@code network.peer.address}. */ @Deprecated @@ -134,8 +110,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, no replacement at this time. * - *

- * * @deprecated Removed. */ @Deprecated @@ -144,8 +118,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, use {@code network.peer.port}. * - *

- * * @deprecated Replaced by {@code network.peer.port}. */ @Deprecated @@ -154,8 +126,6 @@ public final class NetIncubatingAttributes { /** * Deprecated, use {@code network.transport}. * - *

- * * @deprecated Replaced by {@code network.transport}. */ @Deprecated public static final AttributeKey NET_TRANSPORT = stringKey("net.transport"); 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 22ad6bd1..c2b4e457 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 @@ -58,8 +58,6 @@ public final class NetworkIncubatingAttributes { /** * 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. */ @@ -70,8 +68,6 @@ public final class NetworkIncubatingAttributes { /** * Local port number of the network connection. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.NetworkAttributes#NETWORK_LOCAL_PORT} attribute. */ @@ -81,8 +77,6 @@ public final class NetworkIncubatingAttributes { /** * 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. */ @@ -92,8 +86,6 @@ public final class NetworkIncubatingAttributes { /** * Peer port number of the network connection. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.NetworkAttributes#NETWORK_PEER_PORT} attribute. */ @@ -125,8 +117,6 @@ public final class NetworkIncubatingAttributes { * the negotiated version. If the actual protocol version is not known, this attribute SHOULD NOT * be set. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.NetworkAttributes#NETWORK_PROTOCOL_VERSION} attribute. */ @@ -147,8 +137,6 @@ public final class NetworkIncubatingAttributes { * ambiguous without knowing the transport. For example different processes could be listening on * TCP port 12345 and UDP port 12345. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.NetworkAttributes#NETWORK_TRANSPORT} attribute. */ 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 7b34764e..0213e1da 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 @@ -16,8 +16,6 @@ public final class OtelIncubatingAttributes { /** * Deprecated. Use the {@code otel.scope.name} attribute * - *

- * * @deprecated Use the {@code otel.scope.name} attribute. */ @Deprecated @@ -26,8 +24,6 @@ public final class OtelIncubatingAttributes { /** * Deprecated. Use the {@code otel.scope.version} attribute. * - *

- * * @deprecated Use the {@code otel.scope.version} attribute. */ @Deprecated @@ -36,8 +32,6 @@ public final class OtelIncubatingAttributes { /** * The name of the instrumentation scope - ({@code InstrumentationScope.Name} in OTLP). * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.OtelAttributes#OTEL_SCOPE_NAME} attribute. */ @@ -47,8 +41,6 @@ public final class OtelIncubatingAttributes { /** * The version of the instrumentation scope - ({@code InstrumentationScope.Version} in OTLP). * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.OtelAttributes#OTEL_SCOPE_VERSION} attribute. */ @@ -58,8 +50,6 @@ public final class OtelIncubatingAttributes { /** * Name of the code, either "OK" or "ERROR". MUST NOT be set if the status code is UNSET. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.OtelAttributes#OTEL_STATUS_CODE} attribute. */ @@ -69,8 +59,6 @@ public final class OtelIncubatingAttributes { /** * Description of the Status if it has a value, otherwise not set. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.OtelAttributes#OTEL_STATUS_DESCRIPTION} attribute. */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OtherIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OtherIncubatingAttributes.java index 70081f70..80e7019f 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OtherIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OtherIncubatingAttributes.java @@ -16,8 +16,6 @@ public final class OtherIncubatingAttributes { /** * Deprecated, use {@code db.client.connection.state} instead. * - *

- * * @deprecated Replaced by {@code db.client.connection.state}. */ @Deprecated public static final AttributeKey STATE = stringKey("state"); diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/PoolIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/PoolIncubatingAttributes.java index c4291142..251a914f 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/PoolIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/PoolIncubatingAttributes.java @@ -16,8 +16,6 @@ public final class PoolIncubatingAttributes { /** * Deprecated, use {@code db.client.connection.pool.name} instead. * - *

- * * @deprecated Replaced by {@code db.client.connection.pool.name}. */ @Deprecated public static final AttributeKey POOL_NAME = stringKey("pool.name"); diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ProcessIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ProcessIncubatingAttributes.java index 0cb28833..4d671a95 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ProcessIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ProcessIncubatingAttributes.java @@ -57,8 +57,6 @@ public final class ProcessIncubatingAttributes { /** * Deprecated, use {@code cpu.mode} instead. * - *

- * * @deprecated Replaced by {@code cpu.mode} */ @Deprecated @@ -86,8 +84,6 @@ public final class ProcessIncubatingAttributes { /** * "Deprecated, use {@code process.executable.build_id.htlhash} instead." * - *

- * * @deprecated Replaced by {@code process.executable.build_id.htlhash} */ @Deprecated 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 bfb7eeb5..5b7967e8 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 @@ -24,8 +24,6 @@ public final class ServerIncubatingAttributes { * server.address} SHOULD represent the server address behind any intermediaries, for example * proxies, if it's available. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.ServerAttributes#SERVER_ADDRESS} attribute. */ @@ -40,8 +38,6 @@ public final class ServerIncubatingAttributes { * server.port} SHOULD represent the server port behind any intermediaries, for example proxies, * if it's available. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.ServerAttributes#SERVER_PORT} attribute. */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ServiceIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ServiceIncubatingAttributes.java index 529e3434..d5b9c015 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ServiceIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ServiceIncubatingAttributes.java @@ -61,8 +61,6 @@ public final class ServiceIncubatingAttributes { * {@code process.executable.name} is not available, the value MUST be set to {@code * unknown_service}. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.ServiceAttributes#SERVICE_NAME} attribute. */ @@ -86,8 +84,6 @@ public final class ServiceIncubatingAttributes { * The version string of the service API or implementation. The format is not defined by these * conventions. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.ServiceAttributes#SERVICE_VERSION} attribute. */ 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 fc334845..faeacac4 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 @@ -21,8 +21,6 @@ public final class SystemIncubatingAttributes { /** * Deprecated, use {@code cpu.mode} instead. * - *

- * * @deprecated Replaced by {@code cpu.mode} */ @Deprecated @@ -53,8 +51,6 @@ public final class SystemIncubatingAttributes { /** * Deprecated, use {@code network.connection.state} instead. * - *

- * * @deprecated Removed, report network connection state with {@code network.connection.state} * attribute */ @@ -82,8 +78,6 @@ public final class SystemIncubatingAttributes { /** * Deprecated, use {@code system.process.status} instead. * - *

- * * @deprecated Replaced by {@code system.process.status}. */ @Deprecated 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 5037a6e4..bda48a1d 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 @@ -32,8 +32,6 @@ public final class TelemetryIncubatingAttributes { /** * The language of the telemetry SDK. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.TelemetryAttributes#TELEMETRY_SDK_LANGUAGE} attribute. */ @@ -53,8 +51,6 @@ public final class TelemetryIncubatingAttributes { * The identifier {@code opentelemetry} is reserved and MUST NOT be used in this case. All custom * identifiers SHOULD be stable across different versions of an implementation. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.TelemetryAttributes#TELEMETRY_SDK_NAME} attribute. */ @@ -64,8 +60,6 @@ public final class TelemetryIncubatingAttributes { /** * The version string of the telemetry SDK. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.TelemetryAttributes#TELEMETRY_SDK_VERSION} attribute. */ 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 25611ee8..b8fd423e 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 @@ -86,8 +86,6 @@ public final class TlsIncubatingAttributes { /** * Deprecated, use {@code server.address} instead. * - *

- * * @deprecated Replaced by {@code server.address}. */ @Deprecated 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 c409eb30..73a41fde 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 @@ -41,8 +41,6 @@ public final class UrlIncubatingAttributes { /** * The URI fragment component * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.UrlAttributes#URL_FRAGMENT} attribute. */ @@ -90,8 +88,6 @@ public final class UrlIncubatingAttributes { *

When a query string value is redacted, the query string key SHOULD still be preserved, e.g. * {@code https://www.example.com/path?color=blue&sig=REDACTED}. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.UrlAttributes#URL_FULL} attribute. */ @@ -118,8 +114,6 @@ public final class UrlIncubatingAttributes { *

Sensitive content provided in {@code url.path} SHOULD be scrubbed when instrumentations can * identify it. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.UrlAttributes#URL_PATH} attribute. */ @@ -158,8 +152,6 @@ public final class UrlIncubatingAttributes { *

When a query string value is redacted, the query string key SHOULD still be preserved, e.g. * {@code q=OpenTelemetry&sig=REDACTED}. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.UrlAttributes#URL_QUERY} attribute. */ @@ -182,8 +174,6 @@ public final class UrlIncubatingAttributes { * The URI scheme component * identifying the used protocol. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.UrlAttributes#URL_SCHEME} attribute. */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/UserAgentIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/UserAgentIncubatingAttributes.java index 8639e6ec..bb1bae47 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/UserAgentIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/UserAgentIncubatingAttributes.java @@ -29,8 +29,6 @@ public final class UserAgentIncubatingAttributes { * Value of the HTTP * User-Agent header sent by the client. * - *

- * * @deprecated deprecated in favor of stable {@link * io.opentelemetry.semconv.UserAgentAttributes#USER_AGENT_ORIGINAL} attribute. */ diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/VcsIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/VcsIncubatingAttributes.java index aa0106aa..c238de4c 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/VcsIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/VcsIncubatingAttributes.java @@ -127,8 +127,6 @@ public final class VcsIncubatingAttributes { /** * Deprecated, use {@code vcs.change.id} instead. * - *

- * * @deprecated Deprecated, use {@code vcs.change.id} instead. */ @Deprecated @@ -138,8 +136,6 @@ public final class VcsIncubatingAttributes { /** * Deprecated, use {@code vcs.change.title} instead. * - *

- * * @deprecated Deprecated, use {@code vcs.change.title} instead. */ @Deprecated @@ -160,8 +156,6 @@ public final class VcsIncubatingAttributes { /** * Deprecated, use {@code vcs.ref.head.name} instead. * - *

- * * @deprecated Deprecated, use {@code vcs.ref.head.name} instead. */ @Deprecated @@ -171,8 +165,6 @@ public final class VcsIncubatingAttributes { /** * Deprecated, use {@code vcs.ref.head.revision} instead. * - *

- * * @deprecated Deprecated, use {@code vcs.ref.head.revision} instead. */ @Deprecated @@ -182,8 +174,6 @@ public final class VcsIncubatingAttributes { /** * Deprecated, use {@code vcs.ref.head.type} instead. * - *

- * * @deprecated Deprecated, use {@code vcs.ref.head.type} instead. */ @Deprecated From deed39928c28cf4fcc555e30c7af25356e27e5e4 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 13 Feb 2025 15:35:46 -0800 Subject: [PATCH 2/2] Validate javadoc --- buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 85308a8f..98b72470 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -76,9 +76,7 @@ tasks { breakIterator(true) addBooleanOption("html5", true) - // TODO (trask) need to disable html validation until next semconv release - // see https://github.com/open-telemetry/semantic-conventions/pull/1664 - addBooleanOption("Xdoclint:all,-missing,-html", true) + addBooleanOption("Xdoclint:all,-missing", true) // non-standard option to fail on warnings, see https://bugs.openjdk.java.net/browse/JDK-8200363 addStringOption("Xwerror", "-quiet") }