Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Turn off Statsbeat when proxy is used or any exception from the server #2221

Merged
merged 17 commits into from
Apr 13, 2022
Merged

Turn off Statsbeat when proxy is used or any exception from the server #2221

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3fbf7bc
Turn off statsbeat when proxy used or any exception from the server
heyams Apr 7, 2022
5ed97bf
Fix comment format
heyams Apr 7, 2022
59c17dc
Add a todo
heyams Apr 7, 2022
e53cd2f
Address feedback
heyams Apr 7, 2022
b21e433
Change todo
heyams Apr 8, 2022
1652a6e
Shut down after 3 statsbeat errors
heyams Apr 8, 2022
9b097d9
Reset statsbeat error count on success
heyams Apr 8, 2022
de1e052
Use one time success flag and increment max to 10
heyams Apr 8, 2022
0a2e23c
No need to reset
heyams Apr 9, 2022
a8dae0f
Suppress statbeat error logging
trask Apr 9, 2022
539dca9
Simplify and avoid other unknown cases
trask Apr 9, 2022
9f9050d
move and comment
trask Apr 9, 2022
22ef957
one more logging
trask Apr 9, 2022
1598512
Update to latest spec PR
trask Apr 12, 2022
5f6a1c0
imports
trask Apr 13, 2022
a131213
Add comment
trask Apr 13, 2022
0dfa662
Add TODO
trask Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address feedback
  • Loading branch information
@heyams
heyams committed Apr 7, 2022
commit e53cd2fc5341de1fbf5a5a956c6dcd1edee090cd
8 changes: 6 additions & 2 deletions ...main/java/com/microsoft/applicationinsights/agent/internal/init/AiComponentInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,12 @@ private static AppIdSupplier start(Instrumentation instrumentation) {
}

// initialize StatsbeatModule and don't start Statsbeat when proxy is used
String proxyHost = config.proxy.host;
if (proxyHost == null || proxyHost.isEmpty()) {
String configProxyHost = config.proxy.host;
String systemPropertyProxyHost = System.getProperty("https.proxyHost");
if (configProxyHost == null
|| configProxyHost.isEmpty()
|| systemPropertyProxyHost == null
|| systemPropertyProxyHost.isEmpty()) {
statsbeatModule.start(telemetryClient, config);
}

Expand Down
8 changes: 5 additions & 3 deletions ...ain/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,9 @@ private Consumer<HttpResponse> responseHandler(
}
},
exception -> {
operationLogger.recordFailure("exception retrieving response body", exception);
if (!isStatsbeat) {
operationLogger.recordFailure("exception retrieving response body", exception);
}
onFailure.accept(false);
});
}
Expand All @@ -362,11 +364,11 @@ private Consumer<Throwable> errorHandler(
String instrumentationKey, Consumer<Boolean> onFailure, OperationLogger operationLogger) {

return error -> {
if (isStatsbeat && error instanceof Exception) {
if (isStatsbeat) {
heyams marked this conversation as resolved.
Show resolved Hide resolved
// when sending a Statsbeat request and server returns an Exception, it's
// likely that it's using AMPLS or other private endpoints. In that case, we use the
// kill-switch to turn off Statsbeat.
// TODO (heya) track Statsbeat exception count via a new Statsbeat metric
// TODO (heya) track Statsbeat request exception count via a new Statsbeat metric
statsbeatModule.shutdown();
onFailure.accept(false);
return;
Expand Down