Skip to content
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

Apply exception type and message #3148

Merged
merged 12 commits into from
Jul 6, 2023
Merged

Apply exception type and message #3148

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b7ae9a6
Inherite exception type and message
heyams Jun 20, 2023
2d66e97
Address comments
heyams Jun 27, 2023
5445ae1
Add smoke test
heyams Jun 27, 2023
a6ccd94
Address comments
heyams Jun 27, 2023
ff0c130
Fix spotless
heyams Jun 27, 2023
84707e9
Merge remote-tracking branch 'origin/main' into heya/fix-exception.ty…
trask Jul 5, 2023
af58145
Fix module name
trask Jul 5, 2023
c319e26
Add assertion
trask Jul 5, 2023
39852f0
Fix
trask Jul 5, 2023
e058209
Comments
heyams Jul 5, 2023
fc492de
Fix
heyams Jul 6, 2023
784bcf8
Fix spotbug
heyams Jul 6, 2023
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
12 changes: 11 additions & 1 deletion ...main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentLogExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,17 @@ public CompletableResultCode export(Collection<LogRecordData> logs) {
itemCount = Math.round(100.0 / samplingPercentage);
}

TelemetryItem telemetryItem = mapper.map(log, stack, itemCount);
heyams marked this conversation as resolved.
Show resolved Hide resolved
String type =
log.getAttributes()
.get(
com.azure.monitor.opentelemetry.exporter.implementation.SemanticAttributes
.EXCEPTION_TYPE);
String message =
log.getAttributes()
.get(
com.azure.monitor.opentelemetry.exporter.implementation.SemanticAttributes
.EXCEPTION_MESSAGE);
TelemetryItem telemetryItem = mapper.map(log, stack, type, message, itemCount);
heyams marked this conversation as resolved.
Show resolved Hide resolved
telemetryItemConsumer.accept(telemetryItem);

exportingLogLogger.recordSuccess();
Expand Down
8 changes: 6 additions & 2 deletions ...src/main/java/com/azure/monitor/opentelemetry/exporter/AzureMonitorLogRecordExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@ public CompletableResultCode export(Collection<LogRecordData> logs) {
for (LogRecordData log : logs) {
LOGGER.verbose("exporting log: {}", log);
try {
String stack = log.getAttributes().get(SemanticAttributes.EXCEPTION_STACKTRACE);
telemetryItems.add(mapper.map(log, stack, null));
String exceptionStacktace =
log.getAttributes().get(SemanticAttributes.EXCEPTION_STACKTRACE);
String exceptionType = log.getAttributes().get(SemanticAttributes.EXCEPTION_TYPE);
String exceptionMessage = log.getAttributes().get(SemanticAttributes.EXCEPTION_MESSAGE);
telemetryItems.add(
mapper.map(log, exceptionStacktace, exceptionType, exceptionMessage, null));
OPERATION_LOGGER.recordSuccess();
} catch (Throwable t) {
OPERATION_LOGGER.recordFailure(t.getMessage(), t, EXPORTER_MAPPING_ERROR);
Expand Down
22 changes: 18 additions & 4 deletions .../src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/LogDataMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import com.azure.core.util.logging.ClientLogger;
import com.azure.monitor.opentelemetry.exporter.implementation.builders.AbstractTelemetryBuilder;
import com.azure.monitor.opentelemetry.exporter.implementation.builders.ExceptionDetailBuilder;
import com.azure.monitor.opentelemetry.exporter.implementation.builders.ExceptionTelemetryBuilder;
import com.azure.monitor.opentelemetry.exporter.implementation.builders.Exceptions;
import com.azure.monitor.opentelemetry.exporter.implementation.builders.MessageTelemetryBuilder;
Expand All @@ -21,6 +22,7 @@
import io.opentelemetry.api.trace.SpanContext;
import io.opentelemetry.sdk.logs.data.LogRecordData;
import io.opentelemetry.sdk.resources.Resource;
import java.util.Collections;
import java.util.List;
import java.util.function.BiConsumer;
import reactor.util.annotation.Nullable;
Expand Down Expand Up @@ -100,11 +102,16 @@ public LogDataMapper(
this.telemetryInitializer = telemetryInitializer;
}

public TelemetryItem map(LogRecordData log, @Nullable String stack, @Nullable Long itemCount) {
public TelemetryItem map(
LogRecordData log,
@Nullable String stack,
@Nullable String type,
@Nullable String message,
@Nullable Long itemCount) {
if (stack == null) {
return createMessageTelemetryItem(log, itemCount);
} else {
return createExceptionTelemetryItem(log, itemCount, stack);
return createExceptionTelemetryItem(log, itemCount, stack, type, message);
}
}
heyams marked this conversation as resolved.
Show resolved Hide resolved

Expand Down Expand Up @@ -138,7 +145,7 @@ private TelemetryItem createMessageTelemetryItem(LogRecordData log, @Nullable Lo
}

private TelemetryItem createExceptionTelemetryItem(
LogRecordData log, @Nullable Long itemCount, String stack) {
LogRecordData log, @Nullable Long itemCount, String stack, String type, String message) {
ExceptionTelemetryBuilder telemetryBuilder = ExceptionTelemetryBuilder.create();
telemetryInitializer.accept(telemetryBuilder, log.getResource());

Expand All @@ -151,7 +158,14 @@ private TelemetryItem createExceptionTelemetryItem(
Attributes attributes = log.getAttributes();
MAPPINGS.map(attributes, telemetryBuilder);

telemetryBuilder.setExceptions(Exceptions.minimalParse(stack));
ExceptionDetailBuilder exceptionDetailBuilder = Exceptions.minimalParse(stack).get(0);
heyams marked this conversation as resolved.
Show resolved Hide resolved
if (type != null && !type.isEmpty()) {
exceptionDetailBuilder.setTypeName(type);
}
if (message != null && !message.isEmpty()) {
exceptionDetailBuilder.setMessage(message);
}
telemetryBuilder.setExceptions(Collections.singletonList(exceptionDetailBuilder));
heyams marked this conversation as resolved.
Show resolved Hide resolved
telemetryBuilder.setSeverityLevel(toSeverityLevel(log.getSeverity()));

// set exception-specific properties
Expand Down