Skip to content

Connection string overrides #2471

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

Merged
merged 17 commits into from
Aug 30, 2022
Merged

Connection string overrides #2471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e49cf3b
Add connectionStringOverrides
trask Aug 26, 2022
c76ef22
Constants
trask Aug 26, 2022
7701ac7
more
trask Aug 27, 2022
5e1c40a
Smoke tests
trask Aug 27, 2022
3e79115
More
trask Aug 27, 2022
993c411
Fix
trask Aug 29, 2022
d4b07c3
More ikey -> connection string
trask Aug 29, 2022
020e475
Remove setInstrumentationKey from classic sdk
trask Aug 29, 2022
dee467f
TODO heya
trask Aug 29, 2022
a1767c3
is
trask Aug 29, 2022
a7b07a4
Rename
trask Aug 29, 2022
c68ee8e
Rename
trask Aug 29, 2022
1f090a8
Reuse
trask Aug 29, 2022
2a1cd1d
Review
trask Aug 29, 2022
e06d0f2
Unused
trask Aug 29, 2022
344d7c7
Unused
trask Aug 29, 2022
56ed47c
Rename
trask Aug 30, 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
52 changes: 48 additions & 4 deletions ...otstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/BytecodeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public void trackMetric(
null,
properties,
Collections.emptyMap(),
null,
null);
}
});
Expand All @@ -77,9 +78,11 @@ public static void trackEvent(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> metrics,
@Nullable String connectionString,
@Nullable String instrumentationKey) {
if (delegate != null) {
delegate.trackEvent(timestamp, name, properties, tags, metrics, instrumentationKey);
delegate.trackEvent(
timestamp, name, properties, tags, metrics, connectionString, instrumentationKey);
}
}

Expand All @@ -94,6 +97,7 @@ public static void trackMetric(
@Nullable Double stdDev,
Map<String, String> properties,
Map<String, String> tags,
@Nullable String connectionString,
@Nullable String instrumentationKey) {
if (delegate != null) {
delegate.trackMetric(
Expand All @@ -107,6 +111,7 @@ public static void trackMetric(
stdDev,
properties,
tags,
connectionString,
instrumentationKey);
}
}
Expand All @@ -124,6 +129,7 @@ public static void trackDependency(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> metrics,
@Nullable String connectionString,
@Nullable String instrumentationKey) {
if (delegate != null) {
delegate.trackDependency(
Expand All @@ -139,6 +145,7 @@ public static void trackDependency(
properties,
tags,
metrics,
connectionString,
instrumentationKey);
}
}
Expand All @@ -151,10 +158,19 @@ public static void trackPageView(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> metrics,
@Nullable String connectionString,
@Nullable String instrumentationKey) {
if (delegate != null) {
delegate.trackPageView(
timestamp, name, uri, totalMillis, properties, tags, metrics, instrumentationKey);
timestamp,
name,
uri,
totalMillis,
properties,
tags,
metrics,
connectionString,
instrumentationKey);
}
}

Expand All @@ -164,9 +180,17 @@ public static void trackTrace(
int severityLevel,
Map<String, String> properties,
Map<String, String> tags,
@Nullable String connectionString,
@Nullable String instrumentationKey) {
if (delegate != null) {
delegate.trackTrace(timestamp, message, severityLevel, properties, tags, instrumentationKey);
delegate.trackTrace(
timestamp,
message,
severityLevel,
properties,
tags,
connectionString,
instrumentationKey);
}
}

Expand All @@ -182,6 +206,7 @@ public static void trackRequest(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> metrics,
@Nullable String connectionString,
@Nullable String instrumentationKey) {
if (delegate != null) {
delegate.trackRequest(
Expand All @@ -196,6 +221,7 @@ public static void trackRequest(
properties,
tags,
metrics,
connectionString,
instrumentationKey);
}
}
Expand All @@ -207,10 +233,18 @@ public static void trackException(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> metrics,
@Nullable String connectionString,
@Nullable String instrumentationKey) {
if (delegate != null) {
delegate.trackException(
timestamp, throwable, severityLevel, properties, tags, metrics, instrumentationKey);
timestamp,
throwable,
severityLevel,
properties,
tags,
metrics,
connectionString,
instrumentationKey);
}
}

Expand All @@ -225,6 +259,7 @@ public static void trackAvailability(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> metrics,
@Nullable String connectionString,
@Nullable String instrumentationKey) {
if (delegate != null) {
delegate.trackAvailability(
Expand All @@ -238,6 +273,7 @@ public static void trackAvailability(
properties,
tags,
metrics,
connectionString,
instrumentationKey);
}
}
Expand Down Expand Up @@ -322,6 +358,7 @@ void trackEvent(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> metrics,
@Nullable String connectionString,
@Nullable String instrumentationKey);

void trackMetric(
Expand All @@ -335,6 +372,7 @@ void trackMetric(
@Nullable Double stdDev,
Map<String, String> properties,
Map<String, String> tags,
@Nullable String connectionString,
@Nullable String instrumentationKey);

void trackDependency(
Expand All @@ -350,6 +388,7 @@ void trackDependency(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> metrics,
@Nullable String connectionString,
@Nullable String instrumentationKey);

void trackPageView(
Expand All @@ -360,6 +399,7 @@ void trackPageView(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> metrics,
@Nullable String connectionString,
@Nullable String instrumentationKey);

void trackTrace(
Expand All @@ -368,6 +408,7 @@ void trackTrace(
int severityLevel,
Map<String, String> properties,
Map<String, String> tags,
@Nullable String connectionString,
@Nullable String instrumentationKey);

void trackRequest(
Expand All @@ -382,6 +423,7 @@ void trackRequest(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> metrics,
@Nullable String connectionString,
@Nullable String instrumentationKey);

void trackException(
Expand All @@ -391,6 +433,7 @@ void trackException(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> metrics,
@Nullable String connectionString,
@Nullable String instrumentationKey);

void trackAvailability(
Expand All @@ -404,6 +447,7 @@ void trackAvailability(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> metrics,
@Nullable String connectionString,
@Nullable String instrumentationKey);

void flush();
Expand Down
3 changes: 1 addition & 2 deletions ...com/microsoft/applicationinsights/agent/bootstrap/diagnostics/status/StatusFileTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@
import uk.org.webcompere.systemstubs.jupiter.SystemStub;
import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension;

// FIXME (trask) failing in CI on deleting the the @TempDir
@Disabled
@Disabled("failing on CI when deleted the @TempDir")
@ExtendWith(SystemStubsExtension.class)
class StatusFileTests {

Expand Down
52 changes: 28 additions & 24 deletions ...in/java/com/microsoft/applicationinsights/agent/internal/classicsdk/BytecodeUtilImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public void trackEvent(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> measurements,
@Nullable String connectionString,
@Nullable String instrumentationKey) {

if (Strings.isNullOrEmpty(name)) {
Expand All @@ -97,9 +98,7 @@ public void trackEvent(
telemetryBuilder.setTime(FormattedTime.offSetDateTimeFromNow());
}
selectivelySetTags(telemetryBuilder, tags);
if (instrumentationKey != null) {
telemetryBuilder.setInstrumentationKey(instrumentationKey);
}
setConnectionString(telemetryBuilder, connectionString, instrumentationKey);

track(telemetryBuilder, tags, true);
}
Expand All @@ -117,6 +116,7 @@ public void trackMetric(
@Nullable Double stdDev,
Map<String, String> properties,
Map<String, String> tags,
@Nullable String connectionString,
@Nullable String instrumentationKey) {

if (Strings.isNullOrEmpty(name)) {
Expand Down Expand Up @@ -145,9 +145,7 @@ public void trackMetric(
telemetryBuilder.setTime(FormattedTime.offSetDateTimeFromNow());
}
selectivelySetTags(telemetryBuilder, tags);
if (instrumentationKey != null) {
telemetryBuilder.setInstrumentationKey(instrumentationKey);
}
setConnectionString(telemetryBuilder, connectionString, instrumentationKey);

track(telemetryBuilder, tags, false);
}
Expand All @@ -166,6 +164,7 @@ public void trackDependency(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> measurements,
@Nullable String connectionString,
@Nullable String instrumentationKey) {

if (Strings.isNullOrEmpty(name)) {
Expand Down Expand Up @@ -201,9 +200,7 @@ public void trackDependency(
telemetryBuilder.setTime(FormattedTime.offSetDateTimeFromNow());
}
selectivelySetTags(telemetryBuilder, tags);
if (instrumentationKey != null) {
telemetryBuilder.setInstrumentationKey(instrumentationKey);
}
setConnectionString(telemetryBuilder, connectionString, instrumentationKey);

track(telemetryBuilder, tags, true);
}
Expand All @@ -217,6 +214,7 @@ public void trackPageView(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> measurements,
@Nullable String connectionString,
@Nullable String instrumentationKey) {

if (Strings.isNullOrEmpty(name)) {
Expand All @@ -243,9 +241,7 @@ public void trackPageView(
telemetryBuilder.setTime(FormattedTime.offSetDateTimeFromNow());
}
selectivelySetTags(telemetryBuilder, tags);
if (instrumentationKey != null) {
telemetryBuilder.setInstrumentationKey(instrumentationKey);
}
setConnectionString(telemetryBuilder, connectionString, instrumentationKey);

track(telemetryBuilder, tags, true);
}
Expand All @@ -257,6 +253,7 @@ public void trackTrace(
int severityLevel,
Map<String, String> properties,
Map<String, String> tags,
@Nullable String connectionString,
@Nullable String instrumentationKey) {
if (message == null) {
return;
Expand All @@ -279,9 +276,7 @@ public void trackTrace(
telemetryBuilder.setTime(FormattedTime.offSetDateTimeFromNow());
}
selectivelySetTags(telemetryBuilder, tags);
if (instrumentationKey != null) {
telemetryBuilder.setInstrumentationKey(instrumentationKey);
}
setConnectionString(telemetryBuilder, connectionString, instrumentationKey);

track(telemetryBuilder, tags, true);
}
Expand All @@ -299,6 +294,7 @@ public void trackRequest(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> measurements,
@Nullable String connectionString,
@Nullable String instrumentationKey) {
if (Strings.isNullOrEmpty(name)) {
return;
Expand Down Expand Up @@ -334,9 +330,7 @@ public void trackRequest(
telemetryBuilder.setTime(FormattedTime.offSetDateTimeFromNow());
}
selectivelySetTags(telemetryBuilder, tags);
if (instrumentationKey != null) {
telemetryBuilder.setInstrumentationKey(instrumentationKey);
}
setConnectionString(telemetryBuilder, connectionString, instrumentationKey);

track(telemetryBuilder, tags, true);
}
Expand All @@ -349,6 +343,7 @@ public void trackException(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> measurements,
@Nullable String connectionString,
@Nullable String instrumentationKey) {
if (throwable == null) {
return;
Expand All @@ -375,9 +370,7 @@ public void trackException(
telemetryBuilder.setTime(FormattedTime.offSetDateTimeFromNow());
}
selectivelySetTags(telemetryBuilder, tags);
if (instrumentationKey != null) {
telemetryBuilder.setInstrumentationKey(instrumentationKey);
}
setConnectionString(telemetryBuilder, connectionString, instrumentationKey);

track(telemetryBuilder, tags, true);
}
Expand All @@ -394,6 +387,7 @@ public void trackAvailability(
Map<String, String> properties,
Map<String, String> tags,
Map<String, Double> measurements,
@Nullable String connectionString,
@Nullable String instrumentationKey) {

if (Strings.isNullOrEmpty(name)) {
Expand Down Expand Up @@ -427,9 +421,7 @@ public void trackAvailability(
telemetryBuilder.setTime(FormattedTime.offSetDateTimeFromNow());
}
selectivelySetTags(telemetryBuilder, tags);
if (instrumentationKey != null) {
telemetryBuilder.setInstrumentationKey(instrumentationKey);
}
setConnectionString(telemetryBuilder, connectionString, instrumentationKey);

track(telemetryBuilder, tags, false);
}
Expand Down Expand Up @@ -544,6 +536,18 @@ private static void setOperationTagsFromTheCurrentSpan(
}
}

private static void setConnectionString(
AbstractTelemetryBuilder telemetryBuilder,
@Nullable String connectionString,
@Nullable String instrumentationKey) {
if (connectionString == null && instrumentationKey != null) {
connectionString = "InstrumentationKey=" + instrumentationKey;
}
if (connectionString != null) {
telemetryBuilder.setConnectionString(connectionString);
}
}

private static boolean sample(String operationId, double samplingPercentage) {
if (samplingPercentage == 100) {
// just an optimization
Expand Down
Loading