Skip to content

Commit 5c1415e

Browse files
committed
account for null connection string
1 parent bd6f48a commit 5c1415e

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
202202
statsbeatModule.start(
203203
AzureMonitorHelper.createStatsbeatTelemetryItemExporter(
204204
LazyHttpClient.newHttpPipeLine(
205-
null, telemetryClient.getConnectionString().getAadAudienceWithScope()),
205+
null, telemetryClient.getAadAudienceWithScope()),
206206
statsbeatModule,
207207
tempDir),
208208
telemetryClient::getStatsbeatConnectionString,
@@ -229,8 +229,8 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
229229
QuickPulse.create(
230230
LazyHttpClient.newHttpPipeLineWithDefaultRedirect(
231231
configuration.authentication,
232-
telemetryClient.getConnectionString().getAadAudienceWithScope()),
233-
() -> {
232+
telemetryClient.getAadAudienceWithScope()),
233+
() -> {
234234
ConnectionString connectionString = telemetryClient.getConnectionString();
235235
return connectionString == null ? null : connectionString.getLiveEndpoint();
236236
},

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private synchronized void performInit() {
121121
httpPipeline =
122122
LazyHttpClient.newHttpPipeLine(
123123
telemetryClient.getAadAuthentication(),
124-
telemetryClient.getConnectionString().getAadAudienceWithScope(),
124+
telemetryClient.getAadAudienceWithScope(),
125125
new RedirectPolicy(
126126
new DefaultRedirectStrategy(
127127
3,

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryClient.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ public class TelemetryClient {
8585
@Nullable private volatile BatchItemProcessor metricsBatchItemProcessor;
8686
@Nullable private volatile BatchItemProcessor statsbeatBatchItemProcessor;
8787

88+
private static final String APPLICATIONINSIGHTS_AUTHENTICATION_SCOPE =
89+
"https://monitor.azure.com//.default";
90+
8891
public static TelemetryClient.Builder builder() {
8992
return new TelemetryClient.Builder();
9093
}
@@ -223,11 +226,12 @@ public BatchItemProcessor getMetricsBatchItemProcessor() {
223226

224227
private BatchItemProcessor initBatchItemProcessor(
225228
int exportQueueCapacity, int maxExportBatchSize, String queueName) {
226-
229+
//logger.info("Connection string telemetryclient: {}", connectionString.getOriginalString());
230+
//logger.info("Statsbeat connection string telemetryclient: {}", statsbeatConnectionString.getInstrumentationKey());
227231
HttpPipeline httpPipeline =
228232
LazyHttpClient.newHttpPipeLine(
229233
aadAuthentication,
230-
connectionString.getAadAudienceWithScope(),
234+
getAadAudienceWithScope(),
231235
new NetworkStatsbeatHttpPipelinePolicy(statsbeatModule.getNetworkStatsbeat()));
232236
// TODO (heya) refactor the following by using AzureMonitorHelper.createTelemetryItemExporter by
233237
// passing in getNonessentialStatsbeat
@@ -354,6 +358,13 @@ public ConnectionString getConnectionString() {
354358
return connectionString;
355359
}
356360

361+
public String getAadAudienceWithScope() {
362+
if (connectionString == null) {
363+
return APPLICATIONINSIGHTS_AUTHENTICATION_SCOPE;
364+
}
365+
return connectionString.getAadAudienceWithScope();
366+
}
367+
357368
@Nullable
358369
public String getRoleName() {
359370
return roleName;

0 commit comments

Comments
 (0)