Skip to content

Commit d9c4784

Browse files
authored
Stabilize annotations (#7046)
Resolves #6494
1 parent 1a91fce commit d9c4784

File tree

4 files changed

+25
-1
lines changed

4 files changed

+25
-1
lines changed

.github/workflows/build-common.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ jobs:
119119

120120
- name: Check for jApiCmp diffs
121121
run: |
122-
if git diff --quiet
122+
# need to "git add" in case any generated files did not already exist
123+
git add docs/apidiffs
124+
if git diff --cached --quiet
123125
then
124126
echo "No diff detected."
125127
else
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Comparing source compatibility of against
2+
+++ NEW ANNOTATION: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.annotations.SpanAttribute (not serializable)
3+
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
4+
+++ NEW INTERFACE: java.lang.annotation.Annotation
5+
+++ NEW SUPERCLASS: java.lang.Object
6+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String value()
7+
+++ NEW ANNOTATION: java.lang.annotation.Target
8+
+++ NEW ELEMENT: value=java.lang.annotation.ElementType.PARAMETER (+)
9+
+++ NEW ANNOTATION: java.lang.annotation.Retention
10+
+++ NEW ELEMENT: value=java.lang.annotation.RetentionPolicy.RUNTIME (+)
11+
+++ NEW ANNOTATION: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.annotations.WithSpan (not serializable)
12+
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
13+
+++ NEW INTERFACE: java.lang.annotation.Annotation
14+
+++ NEW SUPERCLASS: java.lang.Object
15+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.trace.SpanKind kind()
16+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String value()
17+
+++ NEW ANNOTATION: java.lang.annotation.Target
18+
+++ NEW ELEMENT: value=java.lang.annotation.ElementType.METHOD,java.lang.annotation.ElementType.CONSTRUCTOR (+)
19+
+++ NEW ANNOTATION: java.lang.annotation.Retention
20+
+++ NEW ELEMENT: value=java.lang.annotation.RetentionPolicy.RUNTIME (+)

instrumentation-annotations/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id("otel.java-conventions")
3+
id("otel.japicmp-conventions")
34
id("otel.publish-conventions")
45

56
id("otel.animalsniffer-conventions")
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
otel.stable=true

0 commit comments

Comments
 (0)