From 075203427e364c985d6cdf145c446b20de05f21c Mon Sep 17 00:00:00 2001
From: Vasi Vasireddy <41936996+vasireddy99@users.noreply.github.com>
Date: Thu, 15 Feb 2024 12:46:17 -0800
Subject: [PATCH] Update Dependency to 1.32.1 and remove patch (#749)

---
 .../opentelemetry-java-instrumentation.patch  | 25 -------------------
 .github/patches/release/v1.32.x/versions      |  1 -
 dependencyManagement/build.gradle.kts         |  2 +-
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 .github/patches/release/v1.32.x/opentelemetry-java-instrumentation.patch
 delete mode 100644 .github/patches/release/v1.32.x/versions

diff --git a/.github/patches/release/v1.32.x/opentelemetry-java-instrumentation.patch b/.github/patches/release/v1.32.x/opentelemetry-java-instrumentation.patch
deleted file mode 100644
index 9babc3c1dc..0000000000
--- a/.github/patches/release/v1.32.x/opentelemetry-java-instrumentation.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsImpl.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsImpl.java
-index a3e2d0e770..41c772692d 100644
---- a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsImpl.java
-+++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsImpl.java
-@@ -137,7 +137,7 @@ final class SqsImpl {
-   }
- 
-   static String getMessageId(Response<?> response) {
--    if (response.getAwsResponse() instanceof SendMessageResult) {
-+    if (response != null && response.getAwsResponse() instanceof SendMessageResult) {
-       return ((SendMessageResult) response.getAwsResponse()).getMessageId();
-     }
-     return null;
-diff --git a/version.gradle.kts b/version.gradle.kts
-index a2bacc6f04..0890062291 100644
---- a/version.gradle.kts
-+++ b/version.gradle.kts
-@@ -1,5 +1,5 @@
--val stableVersion = "1.32.0"
--val alphaVersion = "1.32.0-alpha"
-+val stableVersion = "1.32.0-adot1"
-+val alphaVersion = "1.32.0-adot1-alpha"
- 
- allprojects {
-   if (findProperty("otel.stable") != "true") {
diff --git a/.github/patches/release/v1.32.x/versions b/.github/patches/release/v1.32.x/versions
deleted file mode 100644
index 617f207102..0000000000
--- a/.github/patches/release/v1.32.x/versions
+++ /dev/null
@@ -1 +0,0 @@
-OTEL_JAVA_INSTRUMENTATION_VERSION=v1.32.0
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 700ee8d8f3..567418961a 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -27,7 +27,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
 // This is the version of the upstream instrumentation BOM
-val otelVersion = "1.32.0-adot1"
+val otelVersion = "1.32.1"
 val otelSnapshotVersion = "1.33.0"
 val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
 val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"