From 1643cbe0e9810baf963ba663a87ef16bd82373f3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Aug 2025 20:05:15 +0000 Subject: [PATCH 1/3] chore(deps): update otel/weaver docker tag to v0.17.1 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index be80ab7d..13546a12 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -117,7 +117,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.16.1@sha256:5ca4901b460217604ddb83feaca05238e2b016a226ecfb9b87a95555918a03af", + "otel/weaver:v0.17.1@sha256:32523b5e44fb44418786347e9f7dde187d8797adb6d57a2ee99c245346c3cdfe", "registry", "generate", "--registry=/home/weaver/source", "--templates=/home/weaver/templates", From dcdde3b657e087968f85ff712c7b3c9a7f13aa34 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 26 Aug 2025 13:10:25 -0700 Subject: [PATCH 2/3] regenerate --- .../semconv/incubating/DbIncubatingAttributes.java | 10 +++++----- .../semconv/incubating/GenAiIncubatingAttributes.java | 10 +++++----- .../incubating/MessagingIncubatingAttributes.java | 4 ++-- .../semconv/incubating/OsIncubatingAttributes.java | 2 +- .../semconv/incubating/SystemIncubatingAttributes.java | 2 +- .../semconv/incubating/VcsIncubatingAttributes.java | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) 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 47295955..afa9b4c2 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 @@ -722,7 +722,7 @@ public static final class DbSystemIncubatingValues { public static final String ADABAS = "adabas"; /** Deprecated, use {@code intersystems_cache} instead. */ - public static final String CACHE = "cache"; + @Deprecated public static final String CACHE = "cache"; /** InterSystems Caché */ public static final String INTERSYSTEMS_CACHE = "intersystems_cache"; @@ -734,13 +734,13 @@ public static final class DbSystemIncubatingValues { public static final String CLICKHOUSE = "clickhouse"; /** Deprecated, use {@code other_sql} instead. */ - public static final String CLOUDSCAPE = "cloudscape"; + @Deprecated public static final String CLOUDSCAPE = "cloudscape"; /** CockroachDB */ public static final String COCKROACHDB = "cockroachdb"; /** Deprecated, no replacement at this time. */ - public static final String COLDFUSION = "coldfusion"; + @Deprecated public static final String COLDFUSION = "coldfusion"; /** Microsoft Azure Cosmos DB */ public static final String COSMOSDB = "cosmosdb"; @@ -773,7 +773,7 @@ public static final class DbSystemIncubatingValues { public static final String FIREBIRD = "firebird"; /** Deprecated, use {@code other_sql} instead. */ - public static final String FIRSTSQL = "firstsql"; + @Deprecated public static final String FIRSTSQL = "firstsql"; /** Apache Geode */ public static final String GEODE = "geode"; @@ -824,7 +824,7 @@ public static final class DbSystemIncubatingValues { public static final String MSSQL = "mssql"; /** Deprecated, Microsoft SQL Server Compact is discontinued. */ - public static final String MSSQLCOMPACT = "mssqlcompact"; + @Deprecated public static final String MSSQLCOMPACT = "mssqlcompact"; /** MySQL */ public static final String MYSQL = "mysql"; 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 5539c176..1a2b4506 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 @@ -360,10 +360,10 @@ public static final class GenAiSystemIncubatingValues { public static final String GCP_GEMINI = "gcp.gemini"; /** Vertex AI */ - public static final String VERTEX_AI = "vertex_ai"; + @Deprecated public static final String VERTEX_AI = "vertex_ai"; /** Gemini */ - public static final String GEMINI = "gemini"; + @Deprecated public static final String GEMINI = "gemini"; /** Anthropic */ public static final String ANTHROPIC = "anthropic"; @@ -378,10 +378,10 @@ public static final class GenAiSystemIncubatingValues { public static final String AZURE_AI_OPENAI = "azure.ai.openai"; /** Azure AI Inference */ - public static final String AZ_AI_INFERENCE = "az.ai.inference"; + @Deprecated public static final String AZ_AI_INFERENCE = "az.ai.inference"; /** Azure OpenAI */ - public static final String AZ_AI_OPENAI = "azure.ai.openai"; + @Deprecated public static final String AZ_AI_OPENAI = "azure.ai.openai"; /** IBM Watsonx AI */ public static final String IBM_WATSONX_AI = "ibm.watsonx.ai"; @@ -413,7 +413,7 @@ public static final class GenAiTokenTypeIncubatingValues { public static final String INPUT = "input"; /** Output tokens (completion, response, etc.) */ - public static final String COMPLETION = "output"; + @Deprecated public static final String COMPLETION = "output"; /** Output tokens (completion, response, etc.) */ public static final String OUTPUT = "output"; 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 78c6bdc0..e81192df 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 @@ -376,10 +376,10 @@ public static final class MessagingOperationTypeIncubatingValues { public static final String SETTLE = "settle"; /** Deprecated. Use {@code process} instead. */ - public static final String DELIVER = "deliver"; + @Deprecated public static final String DELIVER = "deliver"; /** Deprecated. Use {@code send} instead. */ - public static final String PUBLISH = "publish"; + @Deprecated public static final String PUBLISH = "publish"; private MessagingOperationTypeIncubatingValues() {} } diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OsIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OsIncubatingAttributes.java index 25d4c2ae..d0e0c7dc 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OsIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OsIncubatingAttributes.java @@ -69,7 +69,7 @@ public static final class OsTypeIncubatingValues { public static final String SOLARIS = "solaris"; /** Deprecated. Use {@code zos} instead. */ - public static final String Z_OS = "z_os"; + @Deprecated public static final String Z_OS = "z_os"; /** IBM z/OS */ public static final String ZOS = "zos"; 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 567050aa..fb4e4672 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 @@ -162,7 +162,7 @@ public static final class SystemMemoryStateIncubatingValues { public static final String FREE = "free"; /** shared. */ - public static final String SHARED = "shared"; + @Deprecated public static final String SHARED = "shared"; /** buffers. */ public static final String BUFFERS = "buffers"; 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 176ad4c4..a89d7d99 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 @@ -255,7 +255,7 @@ public static final class VcsProviderNameIncubatingValues { public static final String GITLAB = "gitlab"; /** Deprecated, use {@code gitea} instead. */ - public static final String GITTEA = "gittea"; + @Deprecated public static final String GITTEA = "gittea"; /** Gitea */ public static final String GITEA = "gitea"; From 7d040611491bd436ba753ba9ea12c2143f492592 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 26 Aug 2025 13:24:57 -0700 Subject: [PATCH 3/3] fix --- .../IncubatingSemanticAttributes.java.j2 | 6 +++- .../incubating/DbIncubatingAttributes.java | 30 +++++++++++++++---- .../incubating/GenAiIncubatingAttributes.java | 30 +++++++++++++++---- .../MessagingIncubatingAttributes.java | 12 ++++++-- .../incubating/OsIncubatingAttributes.java | 6 +++- .../SystemIncubatingAttributes.java | 7 ++++- .../incubating/VcsIncubatingAttributes.java | 6 +++- 7 files changed, 81 insertions(+), 16 deletions(-) diff --git a/buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2 b/buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2 index e963cce5..0181c136 100644 --- a/buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2 +++ b/buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2 @@ -89,7 +89,11 @@ public final class {{ my_class_name }} { {% endif %} public static final class {{ attribute.name | pascal_case }}IncubatingValues { {%- for member in attribute.type.members %} - {% if member is experimental or enum_deprecated_in_favor_of_stable.value %}{{ [member.brief or (member.id ~ '.')] | comment }} + {%- if member is experimental and member is deprecated -%} + {{ [member.brief or (member.id ~ '.'), "@deprecated " ~ member.deprecated.note] | comment }} + @Deprecated public static final {{ attribute.type | instantiated_type | map_text("java_enum_type") }} {{ member.id | screaming_snake_case }} = {{ member.value | print_member_value }}; + {% elif member is experimental or enum_deprecated_in_favor_of_stable.value %} + {{ [member.brief or (member.id ~ '.')] | comment }} {%- if member is deprecated -%} @Deprecated {%- endif -%} 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 afa9b4c2..5cde4e94 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 @@ -721,7 +721,11 @@ public static final class DbSystemIncubatingValues { /** Adabas (Adaptable Database System) */ public static final String ADABAS = "adabas"; - /** Deprecated, use {@code intersystems_cache} instead. */ + /** + * Deprecated, use {@code intersystems_cache} instead. + * + * @deprecated Replaced by {@code intersystems_cache}. + */ @Deprecated public static final String CACHE = "cache"; /** InterSystems Caché */ @@ -733,13 +737,21 @@ public static final class DbSystemIncubatingValues { /** ClickHouse */ public static final String CLICKHOUSE = "clickhouse"; - /** Deprecated, use {@code other_sql} instead. */ + /** + * Deprecated, use {@code other_sql} instead. + * + * @deprecated Replaced by {@code other_sql}. + */ @Deprecated public static final String CLOUDSCAPE = "cloudscape"; /** CockroachDB */ public static final String COCKROACHDB = "cockroachdb"; - /** Deprecated, no replacement at this time. */ + /** + * Deprecated, no replacement at this time. + * + * @deprecated Removed. + */ @Deprecated public static final String COLDFUSION = "coldfusion"; /** Microsoft Azure Cosmos DB */ @@ -772,7 +784,11 @@ public static final class DbSystemIncubatingValues { /** Firebird */ public static final String FIREBIRD = "firebird"; - /** Deprecated, use {@code other_sql} instead. */ + /** + * Deprecated, use {@code other_sql} instead. + * + * @deprecated Replaced by {@code other_sql}. + */ @Deprecated public static final String FIRSTSQL = "firstsql"; /** Apache Geode */ @@ -823,7 +839,11 @@ public static final class DbSystemIncubatingValues { /** Microsoft SQL Server */ public static final String MSSQL = "mssql"; - /** Deprecated, Microsoft SQL Server Compact is discontinued. */ + /** + * Deprecated, Microsoft SQL Server Compact is discontinued. + * + * @deprecated Removed, use {@code other_sql} instead. + */ @Deprecated public static final String MSSQLCOMPACT = "mssqlcompact"; /** MySQL */ 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 1a2b4506..c40b437d 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 @@ -359,10 +359,18 @@ public static final class GenAiSystemIncubatingValues { /** Gemini */ public static final String GCP_GEMINI = "gcp.gemini"; - /** Vertex AI */ + /** + * Vertex AI + * + * @deprecated Use 'gcp.vertex_ai' instead. + */ @Deprecated public static final String VERTEX_AI = "vertex_ai"; - /** Gemini */ + /** + * Gemini + * + * @deprecated Use 'gcp.gemini' instead. + */ @Deprecated public static final String GEMINI = "gemini"; /** Anthropic */ @@ -377,10 +385,18 @@ public static final class GenAiSystemIncubatingValues { /** Azure OpenAI */ public static final String AZURE_AI_OPENAI = "azure.ai.openai"; - /** Azure AI Inference */ + /** + * Azure AI Inference + * + * @deprecated Replaced by azure.ai.inference + */ @Deprecated public static final String AZ_AI_INFERENCE = "az.ai.inference"; - /** Azure OpenAI */ + /** + * Azure OpenAI + * + * @deprecated Replaced by azure.ai.openai + */ @Deprecated public static final String AZ_AI_OPENAI = "azure.ai.openai"; /** IBM Watsonx AI */ @@ -412,7 +428,11 @@ public static final class GenAiTokenTypeIncubatingValues { /** Input tokens (prompt, input, etc.) */ public static final String INPUT = "input"; - /** Output tokens (completion, response, etc.) */ + /** + * Output tokens (completion, response, etc.) + * + * @deprecated Replaced by {@code output}. + */ @Deprecated public static final String COMPLETION = "output"; /** Output tokens (completion, response, etc.) */ 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 e81192df..3a7b8df5 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 @@ -375,10 +375,18 @@ public static final class MessagingOperationTypeIncubatingValues { /** One or more messages are settled. */ public static final String SETTLE = "settle"; - /** Deprecated. Use {@code process} instead. */ + /** + * Deprecated. Use {@code process} instead. + * + * @deprecated Replaced by {@code process}. + */ @Deprecated public static final String DELIVER = "deliver"; - /** Deprecated. Use {@code send} instead. */ + /** + * Deprecated. Use {@code send} instead. + * + * @deprecated Replaced by {@code send}. + */ @Deprecated public static final String PUBLISH = "publish"; private MessagingOperationTypeIncubatingValues() {} diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OsIncubatingAttributes.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OsIncubatingAttributes.java index d0e0c7dc..315862bc 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OsIncubatingAttributes.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/OsIncubatingAttributes.java @@ -68,7 +68,11 @@ public static final class OsTypeIncubatingValues { /** SunOS, Oracle Solaris */ public static final String SOLARIS = "solaris"; - /** Deprecated. Use {@code zos} instead. */ + /** + * Deprecated. Use {@code zos} instead. + * + * @deprecated Replaced by {@code zos}. + */ @Deprecated public static final String Z_OS = "z_os"; /** IBM z/OS */ 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 fb4e4672..9844961b 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 @@ -161,7 +161,12 @@ public static final class SystemMemoryStateIncubatingValues { /** free. */ public static final String FREE = "free"; - /** shared. */ + /** + * shared. + * + * @deprecated Removed, report shared memory usage with {@code metric.system.memory.shared} + * metric + */ @Deprecated public static final String SHARED = "shared"; /** buffers. */ 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 a89d7d99..21cef5bd 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 @@ -254,7 +254,11 @@ public static final class VcsProviderNameIncubatingValues { /** GitLab */ public static final String GITLAB = "gitlab"; - /** Deprecated, use {@code gitea} instead. */ + /** + * Deprecated, use {@code gitea} instead. + * + * @deprecated Replaced by {@code gitea}. + */ @Deprecated public static final String GITTEA = "gittea"; /** Gitea */