From b0fb249a654cc8d92d98d5c46c632caab3d44ec7 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Fri, 18 Nov 2022 01:55:57 -0800
Subject: [PATCH] Post release updates (#7213)

fyi I added topic for SIG meeting in 2 weeks b/c I'd like to automate
this but have some questions:

* What is the purpose of keeping around old diffs?
* If we need them, what about not including the empty ones?
* Do we diff minor versions against patches (if any), or only against
last minor?
---
 .github/workflows/build-common.yml            |  4 ++--
 ...ntelemetry-instrumentation-annotations.txt | 20 +++++++++++++++++++
 .../opentelemetry-instrumentation-api.txt     |  2 ++
 ...ntelemetry-instrumentation-annotations.txt | 20 +------------------
 4 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 docs/apidiffs/1.20.0_vs_1.19.0/opentelemetry-instrumentation-annotations.txt
 create mode 100644 docs/apidiffs/1.20.0_vs_1.19.0/opentelemetry-instrumentation-api.txt

diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
index 0069caf4e5..128b265f18 100644
--- a/.github/workflows/build-common.yml
+++ b/.github/workflows/build-common.yml
@@ -126,8 +126,8 @@ jobs:
             echo "No diff detected."
           else
             echo "Diff detected - did you run './gradlew jApiCmp'?"
-            echo $(git diff --name-only)
-            echo $(git diff)
+            echo $(git diff --cached --name-only)
+            echo $(git diff --cached)
             exit 1
           fi
 
diff --git a/docs/apidiffs/1.20.0_vs_1.19.0/opentelemetry-instrumentation-annotations.txt b/docs/apidiffs/1.20.0_vs_1.19.0/opentelemetry-instrumentation-annotations.txt
new file mode 100644
index 0000000000..974ac4b683
--- /dev/null
+++ b/docs/apidiffs/1.20.0_vs_1.19.0/opentelemetry-instrumentation-annotations.txt
@@ -0,0 +1,20 @@
+Comparing source compatibility of  against 
++++  NEW ANNOTATION: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.annotations.SpanAttribute  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.annotation.Annotation
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String value()
+	+++  NEW ANNOTATION: java.lang.annotation.Target
+		+++  NEW ELEMENT: value=java.lang.annotation.ElementType.PARAMETER (+)
+	+++  NEW ANNOTATION: java.lang.annotation.Retention
+		+++  NEW ELEMENT: value=java.lang.annotation.RetentionPolicy.RUNTIME (+)
++++  NEW ANNOTATION: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.annotations.WithSpan  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.annotation.Annotation
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.trace.SpanKind kind()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String value()
+	+++  NEW ANNOTATION: java.lang.annotation.Target
+		+++  NEW ELEMENT: value=java.lang.annotation.ElementType.METHOD,java.lang.annotation.ElementType.CONSTRUCTOR (+)
+	+++  NEW ANNOTATION: java.lang.annotation.Retention
+		+++  NEW ELEMENT: value=java.lang.annotation.RetentionPolicy.RUNTIME (+)
diff --git a/docs/apidiffs/1.20.0_vs_1.19.0/opentelemetry-instrumentation-api.txt b/docs/apidiffs/1.20.0_vs_1.19.0/opentelemetry-instrumentation-api.txt
new file mode 100644
index 0000000000..df26146497
--- /dev/null
+++ b/docs/apidiffs/1.20.0_vs_1.19.0/opentelemetry-instrumentation-api.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of  against 
+No changes.
\ No newline at end of file
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt
index 974ac4b683..df26146497 100644
--- a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt
+++ b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt
@@ -1,20 +1,2 @@
 Comparing source compatibility of  against 
-+++  NEW ANNOTATION: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.annotations.SpanAttribute  (not serializable)
-	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
-	+++  NEW INTERFACE: java.lang.annotation.Annotation
-	+++  NEW SUPERCLASS: java.lang.Object
-	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String value()
-	+++  NEW ANNOTATION: java.lang.annotation.Target
-		+++  NEW ELEMENT: value=java.lang.annotation.ElementType.PARAMETER (+)
-	+++  NEW ANNOTATION: java.lang.annotation.Retention
-		+++  NEW ELEMENT: value=java.lang.annotation.RetentionPolicy.RUNTIME (+)
-+++  NEW ANNOTATION: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.annotations.WithSpan  (not serializable)
-	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
-	+++  NEW INTERFACE: java.lang.annotation.Annotation
-	+++  NEW SUPERCLASS: java.lang.Object
-	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.api.trace.SpanKind kind()
-	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String value()
-	+++  NEW ANNOTATION: java.lang.annotation.Target
-		+++  NEW ELEMENT: value=java.lang.annotation.ElementType.METHOD,java.lang.annotation.ElementType.CONSTRUCTOR (+)
-	+++  NEW ANNOTATION: java.lang.annotation.Retention
-		+++  NEW ELEMENT: value=java.lang.annotation.RetentionPolicy.RUNTIME (+)
+No changes.
\ No newline at end of file