Skip to content

Commit 38af015

Browse files
committed
spotless apply and autoconfigure jar
1 parent 7a0847e commit 38af015

File tree

4 files changed

+20
-21
lines changed

4 files changed

+20
-21
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# CHANGELOG
2+
## Version 3.7.2 GA (Unreleased)
3+
* Support for using the AAD Audience from the connection string ([#4121](https://github.com/microsoft/ApplicationInsights-Java/pull/4121))
24

35
## Version 3.7.1 GA (02/26/2025)
46

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/httpclient/LazyHttpClient.java

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ private static HttpClient init() {
110110
}
111111

112112
public static HttpPipeline newHttpPipeLineWithDefaultRedirect(
113-
@Nullable Configuration.AadAuthentication aadConfiguration,
114-
String aadAudienceWithScope) {
115-
return newHttpPipeLine(aadConfiguration, aadAudienceWithScope, new RedirectPolicy(new DefaultRedirectStrategy()));
113+
@Nullable Configuration.AadAuthentication aadConfiguration, String aadAudienceWithScope) {
114+
return newHttpPipeLine(
115+
aadConfiguration, aadAudienceWithScope, new RedirectPolicy(new DefaultRedirectStrategy()));
116116
}
117117

118118
public static HttpPipeline newHttpPipeLine(
@@ -143,8 +143,7 @@ public Mono<HttpResponse> send(HttpRequest request, Context context) {
143143
}
144144

145145
private static HttpPipelinePolicy getAuthenticationPolicy(
146-
Configuration.AadAuthentication configuration,
147-
String aadAudienceWithScope) {
146+
Configuration.AadAuthentication configuration, String aadAudienceWithScope) {
148147
switch (configuration.type) {
149148
case UAMI:
150149
return getAuthenticationPolicyWithUami(configuration, aadAudienceWithScope);
@@ -160,17 +159,15 @@ private static HttpPipelinePolicy getAuthenticationPolicy(
160159
}
161160

162161
private static HttpPipelinePolicy getAuthenticationPolicyWithUami(
163-
Configuration.AadAuthentication configuration,
164-
String aadAudienceWithScope) {
162+
Configuration.AadAuthentication configuration, String aadAudienceWithScope) {
165163
ManagedIdentityCredentialBuilder managedIdentityCredential =
166164
new ManagedIdentityCredentialBuilder().clientId(configuration.clientId);
167165
return new BearerTokenAuthenticationPolicy(
168166
managedIdentityCredential.build(), aadAudienceWithScope);
169167
}
170168

171169
private static HttpPipelinePolicy getAuthenticationPolicyWithClientSecret(
172-
Configuration.AadAuthentication configuration,
173-
String aadAudienceWithScope) {
170+
Configuration.AadAuthentication configuration, String aadAudienceWithScope) {
174171
ClientSecretCredentialBuilder credential =
175172
new ClientSecretCredentialBuilder()
176173
.tenantId(configuration.tenantId)
@@ -179,23 +176,18 @@ private static HttpPipelinePolicy getAuthenticationPolicyWithClientSecret(
179176
if (configuration.authorityHost != null) {
180177
credential.authorityHost(configuration.authorityHost);
181178
}
182-
return new BearerTokenAuthenticationPolicy(
183-
credential.build(), aadAudienceWithScope);
179+
return new BearerTokenAuthenticationPolicy(credential.build(), aadAudienceWithScope);
184180
}
185181

186-
private static HttpPipelinePolicy getAuthenticationPolicyWithVsCode(
187-
String aadAudienceWithScope) {
182+
private static HttpPipelinePolicy getAuthenticationPolicyWithVsCode(String aadAudienceWithScope) {
188183
VisualStudioCodeCredential visualStudioCodeCredential =
189184
new VisualStudioCodeCredentialBuilder().build();
190-
return new BearerTokenAuthenticationPolicy(
191-
visualStudioCodeCredential, aadAudienceWithScope);
185+
return new BearerTokenAuthenticationPolicy(visualStudioCodeCredential, aadAudienceWithScope);
192186
}
193187

194-
private static HttpPipelinePolicy getAuthenticationPolicyWithSami(
195-
String aadAudienceWithScope) {
188+
private static HttpPipelinePolicy getAuthenticationPolicyWithSami(String aadAudienceWithScope) {
196189
ManagedIdentityCredential managedIdentityCredential =
197190
new ManagedIdentityCredentialBuilder().build();
198-
return new BearerTokenAuthenticationPolicy(
199-
managedIdentityCredential, aadAudienceWithScope);
191+
return new BearerTokenAuthenticationPolicy(managedIdentityCredential, aadAudienceWithScope);
200192
}
201193
}

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,10 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
201201
if (telemetryClient.getConnectionString() != null) {
202202
statsbeatModule.start(
203203
AzureMonitorHelper.createStatsbeatTelemetryItemExporter(
204-
LazyHttpClient.newHttpPipeLine(null, telemetryClient.getConnectionString().getAadAudienceWithScope()), statsbeatModule, tempDir),
204+
LazyHttpClient.newHttpPipeLine(
205+
null, telemetryClient.getConnectionString().getAadAudienceWithScope()),
206+
statsbeatModule,
207+
tempDir),
205208
telemetryClient::getStatsbeatConnectionString,
206209
telemetryClient::getInstrumentationKey,
207210
configuration.internal.statsbeat.disabledAll,
@@ -224,7 +227,9 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
224227
if (configuration.preview.liveMetrics.enabled) {
225228
quickPulse =
226229
QuickPulse.create(
227-
LazyHttpClient.newHttpPipeLineWithDefaultRedirect(configuration.authentication, telemetryClient.getConnectionString().getAadAudienceWithScope()),
230+
LazyHttpClient.newHttpPipeLineWithDefaultRedirect(
231+
configuration.authentication,
232+
telemetryClient.getConnectionString().getAadAudienceWithScope()),
228233
() -> {
229234
ConnectionString connectionString = telemetryClient.getConnectionString();
230235
return connectionString == null ? null : connectionString.getLiveEndpoint();
517 KB
Binary file not shown.

0 commit comments

Comments
 (0)