-
Notifications
You must be signed in to change notification settings - Fork 205
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge 2.0.0 changes to master (#584)
* Fix null ref check in telemetry correlation Utils (#541) * Fix null ref check in TelemetryCorrelationUtils * Modifying log level to warning * Updating Changelog * Fix handling of NaN and +/-Infinity in JSON serializer (#499) * 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 * fixed javadoc errors and added section to generate pom.xml with all builds (#551) * Updating version number to 2.0.0 * Implementing Retry logic [Reliable Channel] [STABLE Branch] (#561) * 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 * Fixing FixedRateSampling to work in old and new version of sampling (#540) Overriding default sampling percentage when programatically specified sampling percentage by user. * upgrade to logback v1.2.3 (#565) * Reliable channel: replacing logAlways "TRACE" statements with "info" (#571) * Reliable channel: close resources in finally block. (#572) * Reliable channel: close resources in finally block. * change logging to warning when closing resources * Bugfix against retry logic (#576) * 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 * Fixed javadocs tags, that caused build errors while executing `javadoc` gradle task (#578) * Update Changelog * Fix link in changelog * Fix another link in changelog * Update gradle.properties * Fix customizing pom.xml in Gradle build (#582) * 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
- Loading branch information
Showing
38 changed files
with
1,663 additions
and
418 deletions.
There are no files selected for viewing
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
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
166 changes: 97 additions & 69 deletions
166
...m/microsoft/applicationinsights/channel/concrete/inprocess/InProcessTelemetryChannel.java
Large diffs are not rendered by default.
Oops, something went wrong.
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
16 changes: 16 additions & 0 deletions
16
...src/main/java/com/microsoft/applicationinsights/internal/channel/TransmissionHandler.java
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 |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.microsoft.applicationinsights.internal.channel; | ||
|
|
||
| /** | ||
| * An interface that is used to create a concrete class that is called by the the {@link TransmissionHandlerObserver} | ||
| * <p> | ||
| * This is used to implement classes like {@link com.microsoft.applicationinsights.internal.channel.common.ErrorHandler} | ||
| * and {@link com.microsoft.applicationinsights.internal.channel.common.PartialSuccessHandler}. | ||
| * @author jamdavi | ||
| */ | ||
| public interface TransmissionHandler { | ||
| /** | ||
| * Called when a transmission is sent by the {@link TransmissionOutput}. | ||
| * @param args The {@link TransmissionHandlerArgs} for this handler. | ||
| */ | ||
| void onTransmissionSent(TransmissionHandlerArgs args); | ||
| } |
87 changes: 87 additions & 0 deletions
87
...main/java/com/microsoft/applicationinsights/internal/channel/TransmissionHandlerArgs.java
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 |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package com.microsoft.applicationinsights.internal.channel; | ||
|
|
||
| import org.apache.http.Header; | ||
|
|
||
| import com.microsoft.applicationinsights.internal.channel.common.Transmission; | ||
|
|
||
| /** | ||
| * This class is used to store information between the transmission sender and the transmission handlers | ||
| * <p> | ||
| * An example class that uses this are {@link com.microsoft.applicationinsights.internal.channel.common.ErrorHandler} | ||
| * @author jamdavi | ||
| * | ||
| */ | ||
| public class TransmissionHandlerArgs { | ||
| private String responseBody; | ||
| /** | ||
| * Set the response body. | ||
| * @param body The HTTP Response from the sender | ||
| */ | ||
| public void setResponseBody(String body) { this.responseBody = body;} | ||
| /** | ||
| * Get the response body | ||
| * @return The HTTP Response from the sender | ||
| */ | ||
| public String getResponseBody() { return this.responseBody;} | ||
|
|
||
|
|
||
| private TransmissionDispatcher transmissionDispatcher; | ||
| /** | ||
| * Set the {@link TransmissionDispatcher} used by the sender | ||
| * @param dispatcher The {@link TransmissionDispatcher} used by the sender | ||
| */ | ||
| public void setTransmissionDispatcher(TransmissionDispatcher dispatcher) { this.transmissionDispatcher = dispatcher;} | ||
| /** | ||
| * Get the {@link TransmissionDispatcher} used by the sender | ||
| * @return The {@link TransmissionDispatcher} used by the sender | ||
| */ | ||
| public TransmissionDispatcher getTransmissionDispatcher() { return this.transmissionDispatcher;} | ||
|
|
||
| private Transmission transmission; | ||
| /** | ||
| * Set the transmission that needs to be passed to the handler. | ||
| * @param transmission The transmission that needs to be passed to the handler. | ||
| */ | ||
| public void setTransmission(Transmission transmission) { this.transmission = transmission;} | ||
| /** | ||
| * Get the transmission that needs to be passed to the handler. | ||
| * @return The transmission used by the handler. | ||
| */ | ||
| public Transmission getTransmission() { return this.transmission;} | ||
|
|
||
| private int responseCode; | ||
| /** | ||
| * Set the response code to be passed to the handler. | ||
| * @param code The HTTP response code. | ||
| */ | ||
| public void setResponseCode(int code) { this.responseCode = code;} | ||
| /** | ||
| * Get the response code for the handler to use. | ||
| * @return The HTTP response code. | ||
| */ | ||
| public int getResponseCode() { return this.responseCode;} | ||
|
|
||
| private Throwable exception; | ||
| /** | ||
| * Set the exception thrown by the sender to be passed the handler. | ||
| * @param ex The exception | ||
| */ | ||
| public void setException(Throwable ex) { this.exception = ex;} | ||
| /** | ||
| * Get the exception thrown by the sender to be used by the handler. | ||
| * @return The exception | ||
| */ | ||
| public Throwable getException() { return this.exception;} | ||
|
|
||
| private Header retryHeader; | ||
| /** | ||
| * Set the Retry-After header to be passed to the handler. | ||
| * @param head The Retry-After header | ||
| */ | ||
| public void setRetryHeader(Header head) { this.retryHeader = head;} | ||
| /** | ||
| * Get the Retry-After header to be passed to the handler. | ||
| * @return The Retry-After header | ||
| */ | ||
| public Header getRetryHeader() { return this.retryHeader;} | ||
| } |
19 changes: 19 additions & 0 deletions
19
.../java/com/microsoft/applicationinsights/internal/channel/TransmissionHandlerObserver.java
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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package com.microsoft.applicationinsights.internal.channel; | ||
|
|
||
|
|
||
| /** | ||
| * Enables the {@link com.microsoft.applicationinsights.internal.channel.common.TransmissionPolicyManager} to handle transmission states. | ||
| * <p> | ||
| * This interface extends {@link TransmissionHandler} to add the ability to observe when the transmission is completed. | ||
| * @author jamdavi | ||
| * | ||
| */ | ||
| public interface TransmissionHandlerObserver extends TransmissionHandler { | ||
|
|
||
| /** | ||
| * Used to add a {@link TransmissionHandler} to the collection stored by the | ||
| * {@link com.microsoft.applicationinsights.internal.channel.common.TransmissionPolicyManager}. | ||
| * @param handler The handler to add to the collection. | ||
| */ | ||
| void addTransmissionHandler(TransmissionHandler handler); | ||
| } |
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
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
20 changes: 20 additions & 0 deletions
20
.../main/java/com/microsoft/applicationinsights/internal/channel/common/BackendResponse.java
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 |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package com.microsoft.applicationinsights.internal.channel.common; | ||
|
|
||
| /** | ||
| * Utility class used by the {@link PartialSuccessHandler} | ||
| * | ||
| * @author jamdavi | ||
| * | ||
| */ | ||
| class BackendResponse { | ||
|
|
||
| int itemsReceived; | ||
| int itemsAccepted; | ||
| Error[] errors; | ||
|
|
||
| class Error { | ||
| public int index; | ||
| public int statusCode; | ||
| public String message; | ||
| } | ||
| } |
70 changes: 70 additions & 0 deletions
70
...src/main/java/com/microsoft/applicationinsights/internal/channel/common/ErrorHandler.java
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 |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package com.microsoft.applicationinsights.internal.channel.common; | ||
|
|
||
| import com.microsoft.applicationinsights.internal.channel.TransmissionHandler; | ||
| import com.microsoft.applicationinsights.internal.channel.TransmissionHandlerArgs; | ||
| import com.microsoft.applicationinsights.internal.logger.InternalLogger; | ||
|
|
||
| /** | ||
| * This class implements the retry logic for transmissions with the results of a | ||
| * 408, 500, and 503 result. | ||
| * <p> | ||
| * It does not handle any error codes such as 400, 401, 403, 404, etc. | ||
| * | ||
| * @author jamdavi | ||
| * | ||
| */ | ||
| public class ErrorHandler implements TransmissionHandler { | ||
|
|
||
| private TransmissionPolicyManager transmissionPolicyManager; | ||
|
|
||
| /** | ||
| * Ctor | ||
| * | ||
| * Constructs the ErrorHandler object. | ||
| * | ||
| * @param policy | ||
| * The {@link TransmissionPolicyManager} object that is needed to | ||
| * control the back off policy | ||
| */ | ||
| public ErrorHandler(TransmissionPolicyManager policy) { | ||
| this.transmissionPolicyManager = policy; | ||
| } | ||
|
|
||
| @Override | ||
| public void onTransmissionSent(TransmissionHandlerArgs args) { | ||
|
|
||
| validateTransmissionAndSend(args); | ||
| } | ||
|
|
||
| boolean validateTransmissionAndSend(TransmissionHandlerArgs args) { | ||
| if (args.getTransmission() != null && args.getTransmissionDispatcher() != null) { | ||
| args.getTransmission().incrementNumberOfSends(); | ||
| switch (args.getResponseCode()) { | ||
| case TransmissionSendResult.REQUEST_TIMEOUT: | ||
| case TransmissionSendResult.INTERNAL_SERVER_ERROR: | ||
| case TransmissionSendResult.SERVICE_UNAVAILABLE: | ||
| backoffAndSendTransmission(args); | ||
| return true; | ||
| default: | ||
| InternalLogger.INSTANCE.trace("Http response code %s not handled by %s", args.getResponseCode(), | ||
| this.getClass().getName()); | ||
| return false; | ||
| } | ||
| } else if (args.getException() != null) { | ||
| backoffAndSendTransmission(args); | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private void backoffAndSendTransmission(TransmissionHandlerArgs args) { | ||
| // It is possible for us to have a temporary blip in transmission | ||
| // this setting will allow us to control how many instant retries we perform | ||
| // before backing off the send | ||
| if (args.getTransmission() != null && (args.getTransmission().getNumberOfSends() > transmissionPolicyManager.getMaxInstantRetries())) | ||
| { | ||
| this.transmissionPolicyManager.backoff(); | ||
| } | ||
| args.getTransmissionDispatcher().dispatch(args.getTransmission()); | ||
| } | ||
| } |
Oops, something went wrong.