-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b10f2ae
commit 81ea55e
Showing
1 changed file
with
7 additions
and
5 deletions.
There are no files selected for viewing
12 changes: 7 additions & 5 deletions
12
.github/patches/release/v1.32.x/opentelemetry-java-instrumentation.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,25 @@ | ||
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 | ||
index a3e2d0e770..26eafed05a 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) { | ||
+ 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..bb339641f2 100644 | ||
index a2bacc6f04..0890062291 100644 | ||
--- a/version.gradle.kts | ||
+++ b/version.gradle.kts | ||
@@ -1,4 +1,4 @@ | ||
@@ -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-alpha" | ||
+val alphaVersion = "1.32.0-adot1-alpha" | ||
|
||
allprojects { | ||
if (findProperty("otel.stable") != "true") { |