Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 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
0ee6032
initial implementation
harsimar Jan 7, 2025
73f4cc7
merge conflicts and starting to add some logging
harsimar Jan 8, 2025
0c5aae9
logging and testing
harsimar Jan 9, 2025
f1ba015
restructure of error tracking in validator
harsimar Jan 10, 2025
76d8577
pr comments
harsimar Jan 10, 2025
0555332
minor
harsimar Jan 10, 2025
648bc10
some pr comments
harsimar Jan 13, 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
logging and testing
  • Loading branch information
harsimar committed Jan 9, 2025
commit 0c5aae987ae4becfa9260c5056e1ab55597f0ca5
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,17 @@
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.filtering.Filter;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.filtering.TraceDataColumns;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.filtering.DerivedMetricProjections;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.*;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.RemoteDependency;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.Request;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.KeyValuePairString;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.DocumentIngress;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.Exception;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.FilterConjunctionGroupInfo;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.DerivedMetricInfo;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.Trace;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.TelemetryType;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.AggregationType;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.CollectionConfigurationError;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.CpuPerformanceCounterCalculator;
import reactor.util.annotation.Nullable;

Expand Down Expand Up @@ -84,7 +93,8 @@ synchronized QuickPulseStatus getQuickPulseStatus() {
@Nullable
synchronized FinalCounters getAndRestart() {
FilteringConfiguration config = configuration.get();
Counters currentCounters = counters.getAndSet(new Counters(config.getValidProjectionInitInfo(), config.getErrors()));
Counters currentCounters
= counters.getAndSet(new Counters(config.getValidProjectionInitInfo(), config.getErrors()));
if (currentCounters != null) {
return new FinalCounters(currentCounters);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,13 @@ public void run() {
long transmissionTimeInTicks = currentDate.getTime() * 10000 + TICKS_AT_EPOCH;
String etag = configuration.get().getETag();

logger.verbose("Attempting to send data points to quickpulse with etag {}: {}",
etag,
logger.verbose("Attempting to send data points to quickpulse with etag {}: {}", etag,
printListOfMonitoringPoints(dataPointList));

try {
Response<CollectionConfigurationInfo> responseMono = liveMetricsRestAPIsForClientSDKs
.publishNoCustomHeadersWithResponseAsync(endpointPrefix, instrumentationKey.get(),
etag, transmissionTimeInTicks, dataPointList)
.publishNoCustomHeadersWithResponseAsync(endpointPrefix, instrumentationKey.get(), etag,
transmissionTimeInTicks, dataPointList)
.block();
if (responseMono == null) {
// this shouldn't happen, the mono should complete with a response or a failure
Expand All @@ -111,7 +110,8 @@ public void run() {
if (body != null && !etag.equals(body.getETag())) {
configuration.set(new FilteringConfiguration(body));
try {
logger.verbose("Received a new live metrics filtering configuration from post response: {}", body.toJsonString());
logger.verbose("Received a new live metrics filtering configuration from post response: {}",
body.toJsonString());
} catch (IOException e) {
logger.verbose(e.getMessage());
}
Expand Down Expand Up @@ -140,11 +140,11 @@ private void onPostError(long sendTime) {

private String printListOfMonitoringPoints(List<MonitoringDataPoint> points) {
StringBuilder dataPointsPrint = new StringBuilder("[");
for (MonitoringDataPoint p: points) {
for (MonitoringDataPoint p : points) {
try {
dataPointsPrint.append(p.toJsonString());
dataPointsPrint.append("\n");
} catch (IOException e){
} catch (IOException e) {
logger.verbose(e.getMessage());
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,9 @@ IsSubscribedHeaders ping(String redirectedEndpoint) {
CollectionConfigurationInfo body = responseMono.getValue();
if (body != null && !configuration.get().getETag().equals(body.getETag())) {
try {
logger.verbose("Received a new live metrics filtering configuration from ping response: {}", body.toJsonString());
} catch (IOException e){
logger.verbose("Received a new live metrics filtering configuration from ping response: {}",
body.toJsonString());
} catch (IOException e) {
logger.verbose(e.getMessage());
}
configuration.set(new FilteringConfiguration(body));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
// Licensed under the MIT License.
package com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.filtering;

import com.azure.core.util.logging.ClientLogger;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.FilterInfo;

import java.util.HashMap;
import java.util.Map;

public class CustomDimensions {
private final Map<String, String> customDimensions;
private static ClientLogger logger = new ClientLogger(CustomDimensions.class);

public CustomDimensions(Map<String, String> customDimensions, Map<String, Double> customMeasurements) {
Map<String, String> resultMap = new HashMap<>();
Expand Down Expand Up @@ -47,9 +49,13 @@ public double getCustomDimValueForProjection(String key) {
try {
return Double.parseDouble(value);
} catch (NumberFormatException e) {

logger.verbose(
"The value for the custom dimension could not be converted to a numeric value for a derived metric projection");
}
return Double.NaN;
}
logger.verbose(
"The custom dimension could not be found in this telemetry item when calculating a derived metric.");
return Double.NaN;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,21 @@ public class DependencyDataColumns implements TelemetryColumns {
public DependencyDataColumns(RemoteDependencyData rdData) {
customDims = new CustomDimensions(rdData.getProperties(), rdData.getMeasurements());
mapping.put(KnownDependencyColumns.TARGET, rdData.getTarget());
mapping.put(KnownDependencyColumns.DURATION,
FormattedDuration.getDurationFromTelemetryItemDurationString(rdData.getDuration()));

if (mapping.get(KnownDependencyColumns.DURATION).equals(-1)) {
logger.verbose("The timestamp from the RemoteDependencyData could not be converted to microseconds: {}", rdData.getDuration());
long durationMicroSec = FormattedDuration.getDurationFromTelemetryItemDurationString(rdData.getDuration());
if (durationMicroSec == -1) {
logger.verbose("The provided timestamp could not be converted to microseconds: {}", rdData.getDuration());
}
mapping.put(KnownDependencyColumns.DURATION, durationMicroSec);

mapping.put(KnownDependencyColumns.SUCCESS, rdData.isSuccess());
mapping.put(KnownDependencyColumns.NAME, rdData.getName());
int resultCode;
try {
resultCode = Integer.parseInt(rdData.getResultCode());
} catch (NumberFormatException e) {
logger.verbose("The result code in the RemoteDependencyData object could not be converted to a numeric value so setting the value to -1: {}", rdData.getResultCode());
logger.verbose("The provided result code could not be converted to a numeric value: {}",
rdData.getResultCode());
resultCode = -1;
}
mapping.put(KnownDependencyColumns.RESULT_CODE, resultCode);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class DerivedMetricProjections {
public static final String COUNT = "Count()";
private final Map<String, DerivedMetricAggregation> derivedMetricValues = new HashMap<>();

private static final ClientLogger logger = new ClientLogger(DerivedMetricProjections.class);
private static final ClientLogger LOGGER = new ClientLogger(DerivedMetricProjections.class);

public DerivedMetricProjections(Map<String, AggregationType> projectionInfo) {
for (Map.Entry<String, AggregationType> entry : projectionInfo.entrySet()) {
Expand Down Expand Up @@ -65,10 +65,8 @@ public void calculateProjection(DerivedMetricInfo derivedMetricInfo, TelemetryCo
}

if (Double.isNaN(incrementBy)) {
logger.verbose("The {} column in the incoming telemetry item was either not present or could not be parsed to a numeric value. " +
"This telemetry item will not be counted in derived metric projections.",
derivedMetricInfo.getProjection().equals(KnownRequestColumns.DURATION) ?
"Duration" : derivedMetricInfo.getProjection().substring(Filter.CUSTOM_DIM_FIELDNAME_PREFIX.length()));
LOGGER.verbose(
"This telemetry item will not be counted in derived metric projections because the Duration or a CustomDimension column could not be interpreted as a numeric value.");
} else {
calculateAggregation(derivedMetricInfo.getId(), incrementBy);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,13 @@ public FilteringConfiguration() {
validDocumentFilterConjunctionGroupInfos = new HashMap<>();
etag = "";
validProjectionInfo = new HashMap<>();
logger.verbose("Initializing an empty live metrics filtering configuration - did not yet receive a configuration from ping or post.");
logger.verbose(
"Initializing an empty live metrics filtering configuration - did not yet receive a configuration from ping or post.");
}

public FilteringConfiguration(CollectionConfigurationInfo configuration) {
logger.verbose("About to parse and validate a new live metrics filtering configuration with etag {}", configuration.getETag());
logger.verbose("About to parse and validate a new live metrics filtering configuration with etag {}",
configuration.getETag());
validDerivedMetricInfos = parseMetricFilterConfiguration(configuration);
validDocumentFilterConjunctionGroupInfos = parseDocumentFilterConfiguration(configuration);
etag = configuration.getETag();
Expand Down Expand Up @@ -92,7 +94,8 @@ public List<CollectionConfigurationError> getErrors() {
.getDocumentFilterGroups()) {
TelemetryType telemetryType = documentFilterGroupInfo.getTelemetryType();
FilterConjunctionGroupInfo filterGroup = documentFilterGroupInfo.getFilters();
if (validator.isValidDocConjunctionGroupInfo(documentFilterGroupInfo, configuration.getETag(), documentStreamId)) {
if (validator.isValidDocConjunctionGroupInfo(documentFilterGroupInfo, configuration.getETag(),
documentStreamId)) {
if (!result.containsKey(telemetryType)) {
result.put(telemetryType, new HashMap<>());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

package com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.filtering;

import com.azure.core.util.logging.ClientLogger;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.RequestData;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.FilterInfo;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedDuration;
Expand All @@ -16,18 +17,28 @@ public class RequestDataColumns implements TelemetryColumns {
private final Map<String, Object> mapping = new HashMap<>();
private final CustomDimensions customDims;

private static ClientLogger logger = new ClientLogger(RequestDataColumns.class);

public RequestDataColumns(RequestData requestData) {
customDims = new CustomDimensions(requestData.getProperties(), requestData.getMeasurements());
mapping.put(KnownRequestColumns.URL, requestData.getUrl());
mapping.put(KnownRequestColumns.SUCCESS, requestData.isSuccess());
mapping.put(KnownRequestColumns.DURATION,
FormattedDuration.getDurationFromTelemetryItemDurationString(requestData.getDuration()));

long durationMicroSec = FormattedDuration.getDurationFromTelemetryItemDurationString(requestData.getDuration());
if (durationMicroSec == -1) {
logger.verbose("The provided timestamp could not be converted to microseconds: {}",
requestData.getDuration());
}

mapping.put(KnownRequestColumns.DURATION, durationMicroSec);
mapping.put(KnownRequestColumns.NAME, requestData.getName());
int responseCode;
try {
responseCode = Integer.parseInt(requestData.getResponseCode());
} catch (NumberFormatException e) {
responseCode = -1;
logger.verbose("The provided response code could not be converted to a numeric value: {}",
requestData.getResponseCode());
}
mapping.put(KnownRequestColumns.RESPONSE_CODE, responseCode);
}
Expand Down
Loading
Loading