diff --git a/buildscripts/templates/registry/incubating_java/IncubatingSemanticEvents.java.j2 b/buildscripts/templates/registry/incubating_java/IncubatingSemanticEvents.java.j2 index 8edc936..2fe0d59 100644 --- a/buildscripts/templates/registry/incubating_java/IncubatingSemanticEvents.java.j2 +++ b/buildscripts/templates/registry/incubating_java/IncubatingSemanticEvents.java.j2 @@ -1,7 +1,5 @@ {%- set my_class_name = ctx.root_namespace | pascal_case ~ "IncubatingEvents" -%} -{# Uncomment when stable event constants are enabled in buildscripts/templates/registry/java/weaver.yaml: {%- set stable_class_name = ctx.root_namespace | pascal_case ~ "Events" -%} -#} /* * Copyright The OpenTelemetry Authors @@ -13,9 +11,7 @@ package io.opentelemetry.semconv.incubating; @SuppressWarnings("unused") public final class {{ my_class_name }} { {%- for event in ctx.events -%} - {# When stable event constants are enabled, change `event is experimental or event is stable` - to `event is experimental` and uncomment the elif block below. #} - {%- if event is experimental or event is stable -%} + {%- if event is experimental -%} {%- if event is deprecated -%} {%- if event.deprecated.note == "Uncategorized." -%} {%- set deprecated_javadoc = "@deprecated" -%} @@ -30,12 +26,10 @@ public final class {{ my_class_name }} { @Deprecated {% endif %} public static final String {{ event.name | screaming_snake_case }} = "{{ event.name }}"; - {# Uncomment when stable event constants are enabled in buildscripts/templates/registry/java/weaver.yaml: {% elif event is stable %} {%- set stable_class_link = "io.opentelemetry.semconv." ~ stable_class_name ~ "#" ~ (event.name | screaming_snake_case) -%} {{ [event.brief, concat_if("\n\nNotes:\n\n", event.note), "@deprecated deprecated in favor of stable {@link " ~ stable_class_link ~ "} event."] | comment }} @Deprecated public static final String {{ event.name | screaming_snake_case }} = "{{ event.name }}"; - #} {% endif %} {% endfor %} diff --git a/buildscripts/templates/registry/java/weaver.yaml b/buildscripts/templates/registry/java/weaver.yaml index 27e9eb0..adee94f 100644 --- a/buildscripts/templates/registry/java/weaver.yaml +++ b/buildscripts/templates/registry/java/weaver.yaml @@ -29,19 +29,19 @@ templates: }) application_mode: each file_name: "{{ctx.root_namespace | pascal_case}}Attributes.java" - # - pattern: SemanticEvents.java.j2 - # filter: > - # semconv_signal("event"; { - # "exclude_root_namespace": $excluded_namespaces, - # "exclude_stability": ["experimental", "deprecated"] - # }) - # | group_by(.root_namespace) - # | map({ - # root_namespace: .[0].root_namespace, - # events: sort_by(.name) - # }) - # application_mode: each - # file_name: "{{ctx.root_namespace | pascal_case}}Events.java" + - pattern: SemanticEvents.java.j2 + filter: > + semconv_signal("event"; { + "exclude_root_namespace": $excluded_namespaces, + "exclude_stability": ["experimental", "deprecated"] + }) + | group_by(.root_namespace) + | map({ + root_namespace: .[0].root_namespace, + events: sort_by(.name) + }) + application_mode: each + file_name: "{{ctx.root_namespace | pascal_case}}Events.java" # - pattern: SemanticMetrics.java.j2 # filter: > # semconv_grouped_metrics({ diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-semconv.txt b/docs/apidiffs/current_vs_latest/opentelemetry-semconv.txt index 26bef55..820b6bc 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-semconv.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-semconv.txt @@ -1,2 +1,5 @@ Comparing source compatibility of opentelemetry-semconv-1.42.0-SNAPSHOT.jar against opentelemetry-semconv-1.42.0.jar -No changes. \ No newline at end of file ++++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.semconv.ExceptionEvents (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String EXCEPTION diff --git a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ExceptionIncubatingEvents.java b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ExceptionIncubatingEvents.java index f5dcb26..239009f 100644 --- a/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ExceptionIncubatingEvents.java +++ b/semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ExceptionIncubatingEvents.java @@ -9,8 +9,13 @@ // buildscripts/templates/registry/incubating_java/IncubatingSemanticEvents.java.j2 @SuppressWarnings("unused") public final class ExceptionIncubatingEvents { - /** This event describes a single exception. */ - public static final String EXCEPTION = "exception"; + /** + * This event describes a single exception. + * + * @deprecated deprecated in favor of stable {@link + * io.opentelemetry.semconv.ExceptionEvents#EXCEPTION} event. + */ + @Deprecated public static final String EXCEPTION = "exception"; private ExceptionIncubatingEvents() {} } diff --git a/semconv/src/main/java/io/opentelemetry/semconv/ExceptionEvents.java b/semconv/src/main/java/io/opentelemetry/semconv/ExceptionEvents.java new file mode 100644 index 0000000..ec72b86 --- /dev/null +++ b/semconv/src/main/java/io/opentelemetry/semconv/ExceptionEvents.java @@ -0,0 +1,16 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.semconv; + +// DO NOT EDIT, this is an Auto-generated file from +// buildscripts/templates/registry/java/SemanticEvents.java.j2 +@SuppressWarnings("unused") +public final class ExceptionEvents { + /** This event describes a single exception. */ + public static final String EXCEPTION = "exception"; + + private ExceptionEvents() {} +}