Merge 2.0.0 changes to master #584
Conversation
* Fix null ref check in TelemetryCorrelationUtils * Modifying log level to warning * Updating Changelog
* Handle NaN and +/-Infinity in metrics * Default NaN/Infinity serialization to 0 to be consistent with other AI SDKs and make the code compatible with Java 6
* Initial commit of retry and backoff logic fixes * Fixing warnings on files I touched this round * Fix the eclipse UI from screaming about the docker Contstants * Fixed backoff logic to use existing method. Added more logging to the sender channel. * Added the partial response handler, more logging * Added gson to core. Fixed backoff manager to keep original functionality. Added extension to return the timeout values as expected before. * Added unit tests. * Fixing string typed ArrayList<> to List<> per Dhaval * Missed one * Making tests consistent. * Added javadoc comments, simplified logic for a few methods * Added exception logging per @dhaval24. Fixed formatting on touched files * Updates per last round of commits Moved the Handlers out of the concrete package to the common package to keep the same consistency. Removed a couple of unessecary methods. Added docs. * Latest fixes * Add MaxInstantRetry Added MaxInstantRetry configuration to allow for instantaneous retry on a failed transmission. * Javadoc Updates Javadoc and formatting updates * NumberFormatException fix Added null check * JavaDocs for TPM
…540) Overriding default sampling percentage when programatically specified sampling percentage by user.
* Reliable channel: close resources in finally block. * change logging to warning when closing resources
* Refactor * BUGFIX Logic would never backoff After adding the instant retry amount logic to the code this line of code could cause the transmissions to not back off. * Changes requested
gradle.properties
Outdated
| @@ -1,4 +1,4 @@ | |||
| // Project properties | |||
| version=2.0.0-BETA | |||
| version=2.0.0 | |||
There was a problem hiding this comment.
There are missing STABLE release commits in this PR. Stable branch is at version 2.0.1, for example.
There was a problem hiding this comment.
@littleaj did you pulled the latest stable before merging locally?
| ## Version 2.0.0 | ||
|
|
||
| - Fix #506 Null Reference Check causing Null Pointer Exception in `TelemetryCorrelationUtils.java` | ||
|
|
There was a problem hiding this comment.
There should be more items in this changelog for 2.0.0 - i believe this PR is missing the last commits from Stable branch
|
Also FYI don't delete the stable branch. We might need if we want to do a hot fix. |
grlima
left a comment
grlima
left a comment
There was a problem hiding this comment.
Commits are missing from 2/27 and 2/28
|
@grlima @dhaval24 Fixed. I needed to update my local 2.0.0-STABLE apparently. Also, Since we have a tag on the commit we released, we can delete the branch; but I'll leave it for convenience. If we ever need to do this again, we can just merge the version branch (e.g. 2.0.0-STABLE) straight into master after the release is tagged. We won't lose the commit as long as something is pointing to it. See this post: https://stackoverflow.com/questions/33283350/what-happen-to-git-tags-pointing-to-a-removed-commit |
|
@lhotari thanks for pointing out. Yes we should review this before merge. |
* Fix customizing pom.xml in Gradle build * Insert license after 1. row in pom.xml * Filter artifacts relocated by shadow task from pom dependencies - match artifacts by groupId - fixes #583 * Generate a pom file "beside" the artifact jar file
|
@grlima I think all the issues have been addressed. |
This brings the branches back together after the fork for 2.0.0.