Merge pull request #1109 from microsoft/bugfix/content-length

- adds default clause for content length logic
microsoft · Mar 4, 2024 · 41bafdb · 41bafdb
2 parents 3486a8e + 7892120
commit 41bafdb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [1.0.6] - 2023-03-04
+
+### Changed 
+
+- Fixed a regression with the content length request header from 1.0.5.
+
 ## [1.0.5] - 2023-02-28
 
 ### Changed 

diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java
@@ -901,7 +901,7 @@ public MediaType contentType() {
                                 }
 
                                 @Override
-                                public long contentLength() {
+                                public long contentLength() throws IOException {
                                     long length;
                                     final Set<String> contentLength =
                                             requestInfo.headers.getOrDefault(
@@ -917,6 +917,9 @@ public long contentLength() {
                                                 Long.parseLong(
                                                         contentLength.toArray(new String[] {})[0]);
                                     }
+                                    if (length <= 0) {
+                                        length = super.contentLength();
+                                    }
                                     if (length > 0) {
                                         spanForAttributes.setAttribute(
                                                 SemanticAttributes.HTTP_REQUEST_BODY_SIZE, length);

diff --git a/...ttp/src/main/java/com/microsoft/kiota/http/middleware/options/UserAgentHandlerOption.java b/...ttp/src/main/java/com/microsoft/kiota/http/middleware/options/UserAgentHandlerOption.java
@@ -13,7 +13,7 @@ public UserAgentHandlerOption() {}
 
     private boolean enabled = true;
     @Nonnull private String productName = "kiota-java";
-    @Nonnull private String productVersion = "1.0.5";
+    @Nonnull private String productVersion = "1.0.6";
 
     /**
      * Gets the product name to be used in the user agent header

diff --git a/gradle.properties b/gradle.properties
@@ -26,7 +26,7 @@ org.gradle.caching=true
 mavenGroupId         = com.microsoft.kiota
 mavenMajorVersion = 1
 mavenMinorVersion = 0
-mavenPatchVersion = 5
+mavenPatchVersion = 6
 mavenArtifactSuffix = 
 
 #These values are used to run functional tests