Skip to content

Commit

Permalink
initial changes, need to figure out monitoring pt parse issue (Azure#…
Browse files Browse the repository at this point in the history 
…42147)
  • Loading branch information
@harsimar
harsimar authored Sep 30, 2024
1 parent bb3d2ce commit 0cff707
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 40 deletions.
11 changes: 4 additions & 7 deletions ...n/java/com/azure/monitor/opentelemetry/exporter/implementation/quickpulse/QuickPulse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class QuickPulse {

public static QuickPulse create(HttpPipeline httpPipeline, Supplier<URL> endpointUrl,
Supplier<String> instrumentationKey, @Nullable String roleName, @Nullable String roleInstance,
boolean useNormalizedValueForNonNormalizedCpuPercentage, String sdkVersion) {
String sdkVersion) {

QuickPulse quickPulse = new QuickPulse();

Expand All @@ -40,8 +40,7 @@ public static QuickPulse create(HttpPipeline httpPipeline, Supplier<URL> endpoin
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
quickPulse.initialize(httpPipeline, endpointUrl, instrumentationKey, roleName, roleInstance,
useNormalizedValueForNonNormalizedCpuPercentage, sdkVersion);
quickPulse.initialize(httpPipeline, endpointUrl, instrumentationKey, roleName, roleInstance, sdkVersion);
});
// the condition below will always be false, but by referencing the executor it ensures the
// executor can't become unreachable in the middle of the execute() method execution above
Expand All @@ -65,8 +64,7 @@ public void add(TelemetryItem telemetryItem) {
}

private void initialize(HttpPipeline httpPipeline, Supplier<URL> endpointUrl, Supplier<String> instrumentationKey,
@Nullable String roleName, @Nullable String roleInstance,
boolean useNormalizedValueForNonNormalizedCpuPercentage, String sdkVersion) {
@Nullable String roleName, @Nullable String roleInstance, String sdkVersion) {

String quickPulseId = UUID.randomUUID().toString().replace("-", "");
ArrayBlockingQueue<HttpRequest> sendQueue = new ArrayBlockingQueue<>(256, true);
Expand All @@ -83,8 +81,7 @@ private void initialize(HttpPipeline httpPipeline, Supplier<URL> endpointUrl, Su
instanceName = "Unknown host";
}

QuickPulseDataCollector collector
= new QuickPulseDataCollector(useNormalizedValueForNonNormalizedCpuPercentage);
QuickPulseDataCollector collector = new QuickPulseDataCollector();

QuickPulsePingSender quickPulsePingSender = new QuickPulsePingSender(httpPipeline, endpointUrl,
instrumentationKey, roleName, instanceName, machineName, quickPulseId, sdkVersion);
Expand Down
28 changes: 11 additions & 17 deletions ...ure/monitor/opentelemetry/exporter/implementation/quickpulse/QuickPulseDataCollector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,12 @@ final class QuickPulseDataCollector {
private final AtomicReference<Counters> counters = new AtomicReference<>(null);
private final CpuPerformanceCounterCalculator cpuPerformanceCounterCalculator
= getCpuPerformanceCounterCalculator();
private final boolean useNormalizedValueForNonNormalizedCpuPercentage;

private volatile QuickPulseStatus quickPulseStatus = QuickPulseStatus.QP_IS_OFF;

private volatile Supplier<String> instrumentationKeySupplier;

QuickPulseDataCollector(boolean useNormalizedValueForNonNormalizedCpuPercentage) {
this.useNormalizedValueForNonNormalizedCpuPercentage = useNormalizedValueForNonNormalizedCpuPercentage;
QuickPulseDataCollector() {
}

private static CpuPerformanceCounterCalculator getCpuPerformanceCounterCalculator() {
Expand Down Expand Up @@ -319,14 +317,14 @@ class FinalCounters {
final long rdds;
final double rddsDuration;
final int unsuccessfulRdds;
final long memoryCommitted;
final double cpuUsage;
final long processPhysicalMemory;
final double processNormalizedCpuUsage;
final List<QuickPulseDocument> documentList = new ArrayList<>();

private FinalCounters(Counters currentCounters) {

memoryCommitted = getMemoryCommitted(memory);
cpuUsage = getNonNormalizedCpuPercentage(cpuPerformanceCounterCalculator);
processPhysicalMemory = getPhysicalMemory(memory);
processNormalizedCpuUsage = getNormalizedCpuPercentage(cpuPerformanceCounterCalculator);
exceptions = currentCounters.exceptions.get();

CountAndDuration countAndDuration
Expand All @@ -344,32 +342,28 @@ private FinalCounters(Counters currentCounters) {
}
}

private long getMemoryCommitted(@Nullable MemoryMXBean memory) {
private long getPhysicalMemory(@Nullable MemoryMXBean memory) {
if (memory == null) {
return -1;
}
MemoryUsage heapMemoryUsage = memory.getHeapMemoryUsage();
if (heapMemoryUsage == null) {
MemoryUsage nonHeapMemoryUsage = memory.getNonHeapMemoryUsage();
if (heapMemoryUsage == null || nonHeapMemoryUsage == null) {
return -1;
}
return heapMemoryUsage.getCommitted();
return heapMemoryUsage.getUsed() + nonHeapMemoryUsage.getUsed();
}

private double
getNonNormalizedCpuPercentage(@Nullable CpuPerformanceCounterCalculator cpuPerformanceCounterCalculator) {
getNormalizedCpuPercentage(@Nullable CpuPerformanceCounterCalculator cpuPerformanceCounterCalculator) {
if (cpuPerformanceCounterCalculator == null) {
return -1;
}
Double cpuDatum = cpuPerformanceCounterCalculator.getCpuPercentage();
if (cpuDatum == null) {
return -1;
}

if (useNormalizedValueForNonNormalizedCpuPercentage) {
// normalize for backwards compatibility even though this is supposed to be non-normalized
cpuDatum /= operatingSystemMxBean.getAvailableProcessors();
}

cpuDatum /= operatingSystemMxBean.getAvailableProcessors();
return cpuDatum;
}
}
Expand Down
10 changes: 8 additions & 2 deletions ...azure/monitor/opentelemetry/exporter/implementation/quickpulse/QuickPulseDataFetcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,14 @@ private String buildPostEntity(QuickPulseDataCollector.FinalCounters counters) t
metricsList.add(new QuickPulseMetrics("\\ApplicationInsights\\Dependency Calls Succeeded/Sec",
counters.rdds - counters.unsuccessfulRdds, 1));
metricsList.add(new QuickPulseMetrics("\\ApplicationInsights\\Exceptions/Sec", counters.exceptions, 1));
metricsList.add(new QuickPulseMetrics("\\Memory\\Committed Bytes", counters.memoryCommitted, 1));
metricsList.add(new QuickPulseMetrics("\\Processor(_Total)\\% Processor Time", counters.cpuUsage, 1));
// TODO: remove old memory counter name when service side makes the UI change
metricsList.add(new QuickPulseMetrics("\\Memory\\Committed Bytes", counters.processPhysicalMemory, 1));
metricsList.add(new QuickPulseMetrics("\\Process\\Physical Bytes", counters.processPhysicalMemory, 1));
// TODO: remove old cpu counter name when service side makes the UI change
metricsList
.add(new QuickPulseMetrics("\\Processor(_Total)\\% Processor Time", counters.processNormalizedCpuUsage, 1));
metricsList.add(
new QuickPulseMetrics("\\% Process\\Processor Time Normalized", counters.processNormalizedCpuUsage, 1));

return metricsList;
}
Expand Down
6 changes: 3 additions & 3 deletions ...e/monitor/opentelemetry/exporter/implementation/quickpulse/QuickPulseCoordinatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ void testOnlyPings() throws InterruptedException {
QuickPulseDataFetcher mockFetcher = mock(QuickPulseDataFetcher.class);
QuickPulseDataSender mockSender = mock(QuickPulseDataSender.class);
QuickPulsePingSender mockPingSender = mock(QuickPulsePingSender.class);
QuickPulseDataCollector collector = new QuickPulseDataCollector(true);
QuickPulseDataCollector collector = new QuickPulseDataCollector();
Mockito.doReturn(new QuickPulseHeaderInfo(QuickPulseStatus.QP_IS_OFF)).when(mockPingSender).ping(null);

QuickPulseCoordinatorInitData initData = new QuickPulseCoordinatorInitDataBuilder().withDataFetcher(mockFetcher)
Expand Down Expand Up @@ -64,7 +64,7 @@ void testOnePingAndThenOnePost() throws InterruptedException {
.thenReturn(new QuickPulseHeaderInfo(QuickPulseStatus.QP_IS_ON),
new QuickPulseHeaderInfo(QuickPulseStatus.QP_IS_OFF));

QuickPulseDataCollector collector = new QuickPulseDataCollector(true);
QuickPulseDataCollector collector = new QuickPulseDataCollector();
QuickPulseCoordinatorInitData initData = new QuickPulseCoordinatorInitDataBuilder().withDataFetcher(mockFetcher)
.withDataSender(mockSender)
.withPingSender(mockPingSender)
Expand Down Expand Up @@ -112,7 +112,7 @@ void testOnePingAndThenOnePostWithRedirectedLink() throws InterruptedException {
QuickPulseCoordinatorInitData initData = new QuickPulseCoordinatorInitDataBuilder().withDataFetcher(mockFetcher)
.withDataSender(mockSender)
.withPingSender(mockPingSender)
.withCollector(new QuickPulseDataCollector(true))
.withCollector(new QuickPulseDataCollector())
.withWaitBetweenPingsInMillis(10L)
.withWaitBetweenPostsInMillis(10L)
.withWaitOnErrorInMillis(10L)
Expand Down
14 changes: 7 additions & 7 deletions ...onitor/opentelemetry/exporter/implementation/quickpulse/QuickPulseDataCollectorTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ class QuickPulseDataCollectorTests {

@Test
void initialStateIsDisabled() {
assertThat(new QuickPulseDataCollector(true).peek()).isNull();
assertThat(new QuickPulseDataCollector().peek()).isNull();
}

@Test
void emptyCountsAndDurationsAfterEnable() {
QuickPulseDataCollector collector = new QuickPulseDataCollector(true);
QuickPulseDataCollector collector = new QuickPulseDataCollector();

collector.enable(FAKE_CONNECTION_STRING::getInstrumentationKey);
QuickPulseDataCollector.FinalCounters counters = collector.peek();
Expand All @@ -37,7 +37,7 @@ void emptyCountsAndDurationsAfterEnable() {

@Test
void nullCountersAfterDisable() {
QuickPulseDataCollector collector = new QuickPulseDataCollector(true);
QuickPulseDataCollector collector = new QuickPulseDataCollector();

collector.enable(FAKE_CONNECTION_STRING::getInstrumentationKey);
collector.disable();
Expand All @@ -46,7 +46,7 @@ void nullCountersAfterDisable() {

@Test
void requestTelemetryIsCounted_DurationIsSum() {
QuickPulseDataCollector collector = new QuickPulseDataCollector(true);
QuickPulseDataCollector collector = new QuickPulseDataCollector();

collector.setQuickPulseStatus(QuickPulseStatus.QP_IS_ON);
collector.enable(FAKE_CONNECTION_STRING::getInstrumentationKey);
Expand Down Expand Up @@ -88,7 +88,7 @@ void requestTelemetryIsCounted_DurationIsSum() {

@Test
void dependencyTelemetryIsCounted_DurationIsSum() {
QuickPulseDataCollector collector = new QuickPulseDataCollector(true);
QuickPulseDataCollector collector = new QuickPulseDataCollector();

collector.setQuickPulseStatus(QuickPulseStatus.QP_IS_ON);
collector.enable(FAKE_CONNECTION_STRING::getInstrumentationKey);
Expand Down Expand Up @@ -130,7 +130,7 @@ void dependencyTelemetryIsCounted_DurationIsSum() {

@Test
void exceptionTelemetryIsCounted() {
QuickPulseDataCollector collector = new QuickPulseDataCollector(true);
QuickPulseDataCollector collector = new QuickPulseDataCollector();

collector.setQuickPulseStatus(QuickPulseStatus.QP_IS_ON);
collector.enable(FAKE_CONNECTION_STRING::getInstrumentationKey);
Expand Down Expand Up @@ -204,7 +204,7 @@ private static void assertCountersReset(QuickPulseDataCollector.FinalCounters co

@Test
void checkDocumentsListSize() {
QuickPulseDataCollector collector = new QuickPulseDataCollector(true);
QuickPulseDataCollector collector = new QuickPulseDataCollector();

collector.setQuickPulseStatus(QuickPulseStatus.QP_IS_ON);
collector.enable(FAKE_CONNECTION_STRING::getInstrumentationKey);
Expand Down
6 changes: 3 additions & 3 deletions .../monitor/opentelemetry/exporter/implementation/quickpulse/QuickPulseDataFetcherTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class QuickPulseDataFetcherTests {
@Test
void testGetCurrentSdkVersion() {
ConnectionString connectionString = ConnectionString.parse("InstrumentationKey=testing-123");
QuickPulseDataFetcher dataFetcher = new QuickPulseDataFetcher(new QuickPulseDataCollector(true), null,
QuickPulseDataFetcher dataFetcher = new QuickPulseDataFetcher(new QuickPulseDataCollector(), null,
connectionString::getLiveEndpoint, connectionString::getInstrumentationKey, null, null, null, null);
String sdkVersion = dataFetcher.getCurrentSdkVersion();
assertThat(sdkVersion).isNotNull();
Expand All @@ -34,7 +34,7 @@ void testGetCurrentSdkVersion() {
@Test
void endpointIsFormattedCorrectlyWhenUsingConfig() throws URISyntaxException {
ConnectionString connectionString = ConnectionString.parse("InstrumentationKey=testing-123");
QuickPulseDataFetcher quickPulseDataFetcher = new QuickPulseDataFetcher(new QuickPulseDataCollector(true), null,
QuickPulseDataFetcher quickPulseDataFetcher = new QuickPulseDataFetcher(new QuickPulseDataCollector(), null,
connectionString::getLiveEndpoint, connectionString::getInstrumentationKey, null, null, null, null);
String quickPulseEndpoint = quickPulseDataFetcher.getQuickPulseEndpoint();
String endpointUrl = quickPulseDataFetcher.getEndpointUrl(quickPulseEndpoint);
Expand All @@ -47,7 +47,7 @@ void endpointIsFormattedCorrectlyWhenUsingConfig() throws URISyntaxException {
@Test
void endpointIsFormattedCorrectlyWhenConfigIsNull() throws URISyntaxException {
ConnectionString connectionString = ConnectionString.parse("InstrumentationKey=testing-123");
QuickPulseDataFetcher quickPulseDataFetcher = new QuickPulseDataFetcher(new QuickPulseDataCollector(true), null,
QuickPulseDataFetcher quickPulseDataFetcher = new QuickPulseDataFetcher(new QuickPulseDataCollector(), null,
connectionString::getLiveEndpoint, connectionString::getInstrumentationKey, null, null, null, null);
String quickPulseEndpoint = quickPulseDataFetcher.getQuickPulseEndpoint();
String endpointUrl = quickPulseDataFetcher.getEndpointUrl(quickPulseEndpoint);
Expand Down
2 changes: 1 addition & 1 deletion .../monitor/opentelemetry/exporter/implementation/quickpulse/QuickPulseIntegrationTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void testPostRequest() throws InterruptedException {
QuickPulseHeaderInfo quickPulseHeaderInfo = pingSender.ping(null);
QuickPulseDataSender dataSender = new QuickPulseDataSender(
getHttpPipeline(new ValidationPolicy(postCountDown, expectedPostRequestBody)), sendQueue);
QuickPulseDataCollector collector = new QuickPulseDataCollector(true);
QuickPulseDataCollector collector = new QuickPulseDataCollector();
QuickPulseDataFetcher dataFetcher
= new QuickPulseDataFetcher(collector, sendQueue, connectionString::getLiveEndpoint,
connectionString::getInstrumentationKey, null, "instance1", "machine1", null);
Expand Down

0 comments on commit 0cff707

Please sign in to comment.