Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4aa78d3
adding projection functionality, rethink automic double
harsimar Dec 10, 2024
bf15276
atomic double and some other changes
harsimar Dec 11, 2024
4ace19d
merge from master to get p3 changes
harsimar Dec 11, 2024
75718c7
pr comments and some build stuff
harsimar Dec 11, 2024
27d4979
changing guava version
harsimar Dec 11, 2024
619bb47
spotbug fix
harsimar Dec 11, 2024
915d579
starting to add tests
harsimar Dec 12, 2024
9c8fa37
added unit tests for derived metric projection
harsimar Dec 13, 2024
e3377d7
fix conflict from main
harsimar Dec 13, 2024
c599211
reorganize tests
harsimar Dec 13, 2024
a6ab936
fixing inconsistency with main re okio
harsimar Dec 13, 2024
494a1b9
pr comments & small refactorings
harsimar Dec 16, 2024
1351d2b
remove logging, spotless
harsimar Dec 16, 2024
a77adfe
validator
harsimar Dec 17, 2024
68b9c83
minor
harsimar Dec 17, 2024
d80053e
changes to concurrency handling
harsimar Dec 17, 2024
f83c116
moving synchronization to derivedMetricAggregation
harsimar Dec 17, 2024
d8b618f
moving derivedMetricAggregation to its own file
harsimar Dec 17, 2024
77f176a
merge projection into here
harsimar Dec 18, 2024
96e705f
validator round 1 - need to refactor for validator to store errors
harsimar Dec 18, 2024
6e81b55
finish implementation and starting to add tests
harsimar Dec 19, 2024
568f059
merge from main
harsimar Dec 19, 2024
de6bd93
spotless
harsimar Dec 20, 2024
f492237
remove unused classes
harsimar Dec 20, 2024
191783d
pr comments
harsimar Jan 6, 2025
c3c3c49
fix ci errors
harsimar Jan 6, 2025
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
reorganize tests
  • Loading branch information
harsimar committed Dec 13, 2024
commit c599211b466f6c63346b57825b5dc38fda2334cb
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,16 @@
import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.MessageTelemetryBuilder;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.configuration.ConnectionString;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.filtering.DerivedMetricProjections;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.filtering.FilteringConfiguration;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.filtering.KnownExceptionColumns;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.filtering.KnownRequestColumns;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.TelemetryType;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.DocumentIngress;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.CollectionConfigurationInfo;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.DocumentFilterConjunctionGroupInfo;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.DocumentStreamInfo;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.FilterInfo;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.FilterConjunctionGroupInfo;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.DocumentType;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.RemoteDependency;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.PredicateType;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.Request;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.*;
import org.junit.jupiter.api.Test;

import java.time.Duration;
import java.util.Date;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.List;
import java.util.ArrayList;

import static com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.QuickPulseTestBase.createRemoteDependencyTelemetry;
import static com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.QuickPulseTestBase.createRequestTelemetry;
Expand Down Expand Up @@ -260,7 +250,7 @@ void honorDefaultConfig() {
collector.setQuickPulseStatus(QuickPulseStatus.QP_IS_ON);
collector.enable(FAKE_CONNECTION_STRING::getInstrumentationKey);

createTelemetryItemsForDocsFiltering(collector);
createTelemetryItemsForFiltering(collector);

QuickPulseDataCollector.FinalCounters counters = collector.peek();
List<DocumentIngress> documents = counters.documentList;
Expand All @@ -277,17 +267,7 @@ void honorDefaultConfig() {
DocumentIngress traceDoc = counters.documentList.get(3);
assertThat(traceDoc.getDocumentType()).isEqualTo(DocumentType.TRACE);

assertThat(counters.rdds).isEqualTo(2);
assertThat(counters.unsuccessfulRdds).isEqualTo(1);
// The below line represents the "\\ApplicationInsights\\Dependency Call Duration" counter, which is meant to be an average in the 1s interval. (500 + 300) / 2 = 400.
// See this same logic used in the QuickPulseDataFetcher when building the monitoring point.
assertThat(counters.rddsDuration / counters.rdds).isEqualTo(400);
assertThat(counters.requests).isEqualTo(2);
assertThat(counters.unsuccessfulRequests).isEqualTo(1);
// The below line represents the "\\ApplicationInsights\\Request Duration" counter, which is meant to be an average in the 1s interval. (500 + 300) / 2 = 400.
// See this same logic used in the QuickPulseDataFetcher when building the monitoring point.
assertThat(counters.requestsDuration / counters.requests).isEqualTo(400);
assertThat(counters.exceptions).isEqualTo(1);
assertDefaultMetrics(counters);

counters = collector.getAndRestart();
assertCountersReset(collector.peek());
Expand All @@ -303,7 +283,7 @@ void honorDifferentMultipleSessionDocConfig() {
collector.setQuickPulseStatus(QuickPulseStatus.QP_IS_ON);
collector.enable(FAKE_CONNECTION_STRING::getInstrumentationKey);

createTelemetryItemsForDocsFiltering(collector);
createTelemetryItemsForFiltering(collector);

QuickPulseDataCollector.FinalCounters counters = collector.peek();
List<DocumentIngress> documents = counters.documentList;
Expand Down Expand Up @@ -346,7 +326,7 @@ void honorDuplicateMultipleSessionDocConfig() {
QuickPulseDataCollector collector = new QuickPulseDataCollector(configuration);
collector.setQuickPulseStatus(QuickPulseStatus.QP_IS_ON);
collector.enable(FAKE_CONNECTION_STRING::getInstrumentationKey);
createTelemetryItemsForDocsFiltering(collector);
createTelemetryItemsForFiltering(collector);

QuickPulseDataCollector.FinalCounters counters = collector.peek();
List<DocumentIngress> documents = counters.documentList;
Expand Down Expand Up @@ -375,7 +355,56 @@ void honorDuplicateMultipleSessionDocConfig() {
assertCountersReset(collector.peek());
}

private void createTelemetryItemsForDocsFiltering(QuickPulseDataCollector collector) {
@Test
void testMetricChartFiltering() {
CollectionConfigurationInfo derivedMetricsConfig = createDerivedMetricConfig();
AtomicReference<FilteringConfiguration> configuration
= new AtomicReference<>(new FilteringConfiguration(derivedMetricsConfig));

QuickPulseDataCollector collector = new QuickPulseDataCollector(configuration);
collector.setQuickPulseStatus(QuickPulseStatus.QP_IS_ON);
collector.enable(FAKE_CONNECTION_STRING::getInstrumentationKey);
createTelemetryItemsForFiltering(collector);

QuickPulseDataCollector.FinalCounters counters = collector.peek();
// The default metrics should not be impacted by derived metric filters
assertDefaultMetrics(counters);
Map<String, Double> finalDerivedMetricValues = counters.projections;

// The config asks to take the avg duration of requests that have response code 200.
// Only one such request came through and that request has a duration of 300.
assertThat(finalDerivedMetricValues.get("request-duration")).isEqualTo(300.0);

// The config asks to count the # of exceptions that contain the message "hi". No
// exceptions contain that message.
assertThat(finalDerivedMetricValues.get("exception-count")).isEqualTo(0.0);

counters = collector.getAndRestart();
QuickPulseDataCollector.FinalCounters resetCounters = collector.peek();
assertCountersReset(resetCounters);

Map<String, Double> resetProjections = new HashMap<>();
resetProjections.put("request-duration", 0.0);
resetProjections.put("exception-count", 0.0);

assertThat(resetCounters.projections).isEqualTo(resetProjections);
}

private void assertDefaultMetrics(QuickPulseDataCollector.FinalCounters counters) {
assertThat(counters.rdds).isEqualTo(2);
assertThat(counters.unsuccessfulRdds).isEqualTo(1);
// The below line represents the "\\ApplicationInsights\\Dependency Call Duration" counter, which is meant to be an average in the 1s interval. (500 + 300) / 2 = 400.
// See this same logic used in the QuickPulseDataFetcher when building the monitoring point.
assertThat(counters.rddsDuration / counters.rdds).isEqualTo(400);
assertThat(counters.requests).isEqualTo(2);
assertThat(counters.unsuccessfulRequests).isEqualTo(1);
// The below line represents the "\\ApplicationInsights\\Request Duration" counter, which is meant to be an average in the 1s interval. (500 + 300) / 2 = 400.
// See this same logic used in the QuickPulseDataFetcher when building the monitoring point.
assertThat(counters.requestsDuration / counters.requests).isEqualTo(400);
assertThat(counters.exceptions).isEqualTo(1);
}

private void createTelemetryItemsForFiltering(QuickPulseDataCollector collector) {
collector.setQuickPulseStatus(QuickPulseStatus.QP_IS_ON);
collector.enable(FAKE_CONNECTION_STRING::getInstrumentationKey);

Expand Down Expand Up @@ -493,4 +522,74 @@ private DocumentStreamInfo createDocumentStream(boolean isDefault) {

return documentStreamInfo;
}

private CollectionConfigurationInfo createDerivedMetricConfig() {
CollectionConfigurationInfo config = new CollectionConfigurationInfo();
List<DocumentStreamInfo> documentStreams = new ArrayList<>();
DocumentStreamInfo defaultStream = createDocumentStream(true);
documentStreams.add(defaultStream);

config.setDocumentStreams(documentStreams);
config.setETag("random-etag");

List<DerivedMetricInfo> metrics = new ArrayList<>();
DerivedMetricInfo requestDuration = createRequestDurationDerivedMetricInfo();
DerivedMetricInfo exceptionCount = createExceptionCountDerivedMetricInfo();
metrics.add(requestDuration);
metrics.add(exceptionCount);

config.setMetrics(metrics);

return config;
}

private DerivedMetricInfo createRequestDurationDerivedMetricInfo() {
DerivedMetricInfo dmi = new DerivedMetricInfo();
dmi.setId("request-duration");
dmi.setTelemetryType("Request");
dmi.setAggregation(AggregationType.AVG);
dmi.setBackEndAggregation(AggregationType.AVG);
dmi.setProjection(KnownRequestColumns.DURATION);

FilterInfo filter = new FilterInfo();
filter.setFieldName(KnownRequestColumns.RESPONSE_CODE);
filter.setPredicate(PredicateType.EQUAL);
filter.setComparand("200");
List<FilterInfo> filters = new ArrayList<>();
filters.add(filter);

FilterConjunctionGroupInfo filterGroup = new FilterConjunctionGroupInfo();
filterGroup.setFilters(filters);

List<FilterConjunctionGroupInfo> filterGroups = new ArrayList<>();
filterGroups.add(filterGroup);
dmi.setFilterGroups(filterGroups);

return dmi;
}

private DerivedMetricInfo createExceptionCountDerivedMetricInfo() {
DerivedMetricInfo dmi = new DerivedMetricInfo();
dmi.setId("exception-count");
dmi.setTelemetryType("Exception");
dmi.setAggregation(AggregationType.SUM);
dmi.setBackEndAggregation(AggregationType.SUM);
dmi.setProjection(DerivedMetricProjections.COUNT);

FilterInfo filter = new FilterInfo();
filter.setFieldName(KnownExceptionColumns.MESSAGE);
filter.setPredicate(PredicateType.CONTAINS);
filter.setComparand("hi");
List<FilterInfo> filters = new ArrayList<>();
filters.add(filter);

FilterConjunctionGroupInfo filterGroup = new FilterConjunctionGroupInfo();
filterGroup.setFilters(filters);

List<FilterConjunctionGroupInfo> filterGroups = new ArrayList<>();
filterGroups.add(filterGroup);
dmi.setFilterGroups(filterGroups);

return dmi;
}
}
Loading
Loading