Skip to content

Commit 7ba0b8c

Browse files
committed
fix
1 parent af6b6d2 commit 7ba0b8c

File tree

7 files changed

+79
-16
lines changed

7 files changed

+79
-16
lines changed

buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ public final class {{ my_class_name }} {
7676
{% if enum_deprecated_in_favor_of_stable.value or attribute is deprecated %}@Deprecated{% endif %}
7777
public static final class {{ attribute.name | pascal_case }}IncubatingValues {
7878
{%- for member in attribute.type.members %}
79-
{% if member is experimental or enum_deprecated_in_favor_of_stable.value %}{{ [member.brief or (member.id ~ '.')] | comment(indent=4) }}
79+
{% if member is experimental and member is deprecated %}{{ [member.brief or (member.id ~ '.'), "@deprecated " ~ member.deprecated.note] | comment(indent=4) }}
80+
@Deprecated public static final {{ attribute.type | instantiated_type | map_text("java_enum_type") }} {{ member.id | screaming_snake_case }} = {{ member.value | print_member_value }};
81+
{% elif member is experimental or enum_deprecated_in_favor_of_stable.value %}{{ [member.brief or (member.id ~ '.')] | comment(indent=4) }}
8082
{% if member is deprecated %}@Deprecated{% endif %} public static final {{ attribute.type | instantiated_type | map_text("java_enum_type") }} {{ member.id | screaming_snake_case }} = {{ member.value | print_member_value }};
8183
{% elif member is stable %}
8284
{%- set stable_class_link = "io.opentelemetry.semconv." ~ stable_class_name ~ "." ~ (attribute.name | pascal_case) ~ "Values#" ~ (member.id | screaming_snake_case) -%}

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DbIncubatingAttributes.java

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,11 @@ public static final class DbSystemIncubatingValues {
721721
/** Adabas (Adaptable Database System) */
722722
public static final String ADABAS = "adabas";
723723

724-
/** Deprecated, use {@code intersystems_cache} instead. */
724+
/**
725+
* Deprecated, use {@code intersystems_cache} instead.
726+
*
727+
* @deprecated Replaced by {@code intersystems_cache}.
728+
*/
725729
@Deprecated public static final String CACHE = "cache";
726730

727731
/** InterSystems Caché */
@@ -733,13 +737,21 @@ public static final class DbSystemIncubatingValues {
733737
/** ClickHouse */
734738
public static final String CLICKHOUSE = "clickhouse";
735739

736-
/** Deprecated, use {@code other_sql} instead. */
740+
/**
741+
* Deprecated, use {@code other_sql} instead.
742+
*
743+
* @deprecated Replaced by {@code other_sql}.
744+
*/
737745
@Deprecated public static final String CLOUDSCAPE = "cloudscape";
738746

739747
/** CockroachDB */
740748
public static final String COCKROACHDB = "cockroachdb";
741749

742-
/** Deprecated, no replacement at this time. */
750+
/**
751+
* Deprecated, no replacement at this time.
752+
*
753+
* @deprecated Removed.
754+
*/
743755
@Deprecated public static final String COLDFUSION = "coldfusion";
744756

745757
/** Microsoft Azure Cosmos DB */
@@ -772,7 +784,11 @@ public static final class DbSystemIncubatingValues {
772784
/** Firebird */
773785
public static final String FIREBIRD = "firebird";
774786

775-
/** Deprecated, use {@code other_sql} instead. */
787+
/**
788+
* Deprecated, use {@code other_sql} instead.
789+
*
790+
* @deprecated Replaced by {@code other_sql}.
791+
*/
776792
@Deprecated public static final String FIRSTSQL = "firstsql";
777793

778794
/** Apache Geode */
@@ -823,7 +839,11 @@ public static final class DbSystemIncubatingValues {
823839
/** Microsoft SQL Server */
824840
public static final String MSSQL = "mssql";
825841

826-
/** Deprecated, Microsoft SQL Server Compact is discontinued. */
842+
/**
843+
* Deprecated, Microsoft SQL Server Compact is discontinued.
844+
*
845+
* @deprecated Removed, use {@code other_sql} instead.
846+
*/
827847
@Deprecated public static final String MSSQLCOMPACT = "mssqlcompact";
828848

829849
/** MySQL */

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingAttributes.java

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,18 @@ public static final class GenAiSystemIncubatingValues {
359359
/** Gemini */
360360
public static final String GCP_GEMINI = "gcp.gemini";
361361

362-
/** Vertex AI */
362+
/**
363+
* Vertex AI
364+
*
365+
* @deprecated Use 'gcp.vertex_ai' instead.
366+
*/
363367
@Deprecated public static final String VERTEX_AI = "vertex_ai";
364368

365-
/** Gemini */
369+
/**
370+
* Gemini
371+
*
372+
* @deprecated Use 'gcp.gemini' instead.
373+
*/
366374
@Deprecated public static final String GEMINI = "gemini";
367375

368376
/** Anthropic */
@@ -377,10 +385,18 @@ public static final class GenAiSystemIncubatingValues {
377385
/** Azure OpenAI */
378386
public static final String AZURE_AI_OPENAI = "azure.ai.openai";
379387

380-
/** Azure AI Inference */
388+
/**
389+
* Azure AI Inference
390+
*
391+
* @deprecated Replaced by azure.ai.inference
392+
*/
381393
@Deprecated public static final String AZ_AI_INFERENCE = "az.ai.inference";
382394

383-
/** Azure OpenAI */
395+
/**
396+
* Azure OpenAI
397+
*
398+
* @deprecated Replaced by azure.ai.openai
399+
*/
384400
@Deprecated public static final String AZ_AI_OPENAI = "azure.ai.openai";
385401

386402
/** IBM Watsonx AI */
@@ -412,7 +428,11 @@ public static final class GenAiTokenTypeIncubatingValues {
412428
/** Input tokens (prompt, input, etc.) */
413429
public static final String INPUT = "input";
414430

415-
/** Output tokens (completion, response, etc.) */
431+
/**
432+
* Output tokens (completion, response, etc.)
433+
*
434+
* @deprecated Replaced by {@code output}.
435+
*/
416436
@Deprecated public static final String COMPLETION = "output";
417437

418438
/** Output tokens (completion, response, etc.) */

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/MessagingIncubatingAttributes.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,18 @@ public static final class MessagingOperationTypeIncubatingValues {
375375
/** One or more messages are settled. */
376376
public static final String SETTLE = "settle";
377377

378-
/** Deprecated. Use {@code process} instead. */
378+
/**
379+
* Deprecated. Use {@code process} instead.
380+
*
381+
* @deprecated Replaced by {@code process}.
382+
*/
379383
@Deprecated public static final String DELIVER = "deliver";
380384

381-
/** Deprecated. Use {@code send} instead. */
385+
/**
386+
* Deprecated. Use {@code send} instead.
387+
*
388+
* @deprecated Replaced by {@code send}.
389+
*/
382390
@Deprecated public static final String PUBLISH = "publish";
383391

384392
private MessagingOperationTypeIncubatingValues() {}

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OsIncubatingAttributes.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,11 @@ public static final class OsTypeIncubatingValues {
6868
/** SunOS, Oracle Solaris */
6969
public static final String SOLARIS = "solaris";
7070

71-
/** Deprecated. Use {@code zos} instead. */
71+
/**
72+
* Deprecated. Use {@code zos} instead.
73+
*
74+
* @deprecated Replaced by {@code zos}.
75+
*/
7276
@Deprecated public static final String Z_OS = "z_os";
7377

7478
/** IBM z/OS */

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/SystemIncubatingAttributes.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,12 @@ public static final class SystemMemoryStateIncubatingValues {
161161
/** free. */
162162
public static final String FREE = "free";
163163

164-
/** shared. */
164+
/**
165+
* shared.
166+
*
167+
* @deprecated Removed, report shared memory usage with {@code metric.system.memory.shared}
168+
* metric
169+
*/
165170
@Deprecated public static final String SHARED = "shared";
166171

167172
/** buffers. */

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/VcsIncubatingAttributes.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,11 @@ public static final class VcsProviderNameIncubatingValues {
254254
/** <a href="https://gitlab.com">GitLab</a> */
255255
public static final String GITLAB = "gitlab";
256256

257-
/** Deprecated, use {@code gitea} instead. */
257+
/**
258+
* Deprecated, use {@code gitea} instead.
259+
*
260+
* @deprecated Replaced by {@code gitea}.
261+
*/
258262
@Deprecated public static final String GITTEA = "gittea";
259263

260264
/** <a href="https://gitea.io">Gitea</a> */

0 commit comments

Comments
 (0)