Skip to content

Commit 237f63d

Browse files
renovate[bot]trask
andauthored
chore(deps): update otel/weaver docker tag to v0.17.1 (#269)
* chore(deps): update otel/weaver docker tag to v0.17.1 * regenerate * fix --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Trask Stalnaker <[email protected]>
1 parent 9a0b08e commit 237f63d

File tree

8 files changed

+97
-32
lines changed

8 files changed

+97
-32
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ fun generateTask(taskName: String, incubating: Boolean) {
117117
"--mount", "type=bind,source=${modelPath},target=/home/weaver/source,readonly",
118118
"--mount", "type=bind,source=$projectDir/buildscripts/templates,target=/home/weaver/templates,readonly",
119119
"--mount", "type=bind,source=$projectDir/$outputDir,target=/home/weaver/target",
120-
"otel/weaver:v0.16.1@sha256:5ca4901b460217604ddb83feaca05238e2b016a226ecfb9b87a95555918a03af",
120+
"otel/weaver:v0.17.1@sha256:32523b5e44fb44418786347e9f7dde187d8797adb6d57a2ee99c245346c3cdfe",
121121
"registry", "generate",
122122
"--registry=/home/weaver/source",
123123
"--templates=/home/weaver/templates",

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@ public final class {{ my_class_name }} {
8989
{% endif %}
9090
public static final class {{ attribute.name | pascal_case }}IncubatingValues {
9191
{%- for member in attribute.type.members %}
92-
{% if member is experimental or enum_deprecated_in_favor_of_stable.value %}{{ [member.brief or (member.id ~ '.')] | comment }}
92+
{%- if member is experimental and member is deprecated -%}
93+
{{ [member.brief or (member.id ~ '.'), "@deprecated " ~ member.deprecated.note] | comment }}
94+
@Deprecated public static final {{ attribute.type | instantiated_type | map_text("java_enum_type") }} {{ member.id | screaming_snake_case }} = {{ member.value | print_member_value }};
95+
{% elif member is experimental or enum_deprecated_in_favor_of_stable.value %}
96+
{{ [member.brief or (member.id ~ '.')] | comment }}
9397
{%- if member is deprecated -%}
9498
@Deprecated
9599
{%- endif -%}

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

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -721,8 +721,12 @@ 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. */
725-
public static final String CACHE = "cache";
724+
/**
725+
* Deprecated, use {@code intersystems_cache} instead.
726+
*
727+
* @deprecated Replaced by {@code intersystems_cache}.
728+
*/
729+
@Deprecated public static final String CACHE = "cache";
726730

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

736-
/** Deprecated, use {@code other_sql} instead. */
737-
public static final String CLOUDSCAPE = "cloudscape";
740+
/**
741+
* Deprecated, use {@code other_sql} instead.
742+
*
743+
* @deprecated Replaced by {@code other_sql}.
744+
*/
745+
@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. */
743-
public static final String COLDFUSION = "coldfusion";
750+
/**
751+
* Deprecated, no replacement at this time.
752+
*
753+
* @deprecated Removed.
754+
*/
755+
@Deprecated public static final String COLDFUSION = "coldfusion";
744756

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

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

778794
/** Apache Geode */
779795
public static final String GEODE = "geode";
@@ -823,8 +839,12 @@ 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. */
827-
public static final String MSSQLCOMPACT = "mssqlcompact";
842+
/**
843+
* Deprecated, Microsoft SQL Server Compact is discontinued.
844+
*
845+
* @deprecated Removed, use {@code other_sql} instead.
846+
*/
847+
@Deprecated public static final String MSSQLCOMPACT = "mssqlcompact";
828848

829849
/** MySQL */
830850
public static final String MYSQL = "mysql";

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

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

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

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

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

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

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

386402
/** IBM Watsonx AI */
387403
public static final String IBM_WATSONX_AI = "ibm.watsonx.ai";
@@ -412,8 +428,12 @@ 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.) */
416-
public static final String COMPLETION = "output";
431+
/**
432+
* Output tokens (completion, response, etc.)
433+
*
434+
* @deprecated Replaced by {@code output}.
435+
*/
436+
@Deprecated public static final String COMPLETION = "output";
417437

418438
/** Output tokens (completion, response, etc.) */
419439
public static final String OUTPUT = "output";

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,19 @@ 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. */
379-
public static final String DELIVER = "deliver";
378+
/**
379+
* Deprecated. Use {@code process} instead.
380+
*
381+
* @deprecated Replaced by {@code process}.
382+
*/
383+
@Deprecated public static final String DELIVER = "deliver";
380384

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

384392
private MessagingOperationTypeIncubatingValues() {}
385393
}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,12 @@ public static final class OsTypeIncubatingValues {
6868
/** SunOS, Oracle Solaris */
6969
public static final String SOLARIS = "solaris";
7070

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

7478
/** IBM z/OS */
7579
public static final String ZOS = "zos";

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

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

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

167172
/** buffers. */
168173
public static final String BUFFERS = "buffers";

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,12 @@ 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. */
258-
public static final String GITTEA = "gittea";
257+
/**
258+
* Deprecated, use {@code gitea} instead.
259+
*
260+
* @deprecated Replaced by {@code gitea}.
261+
*/
262+
@Deprecated public static final String GITTEA = "gittea";
259263

260264
/** <a href="https://gitea.io">Gitea</a> */
261265
public static final String GITEA = "gitea";

0 commit comments

Comments
 (0)