Skip to content

Update internal semconv classes #46537

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

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Update internal semconv classes #46537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8ddc72f
Update internal semconv classes
trask Aug 29, 2025
fd10df4
consistent
trask Aug 29, 2025
c78b7d7
fix
trask Aug 29, 2025
05105d7
fix
trask Aug 29, 2025
8645ba5
fix
trask Aug 29, 2025
a4cc019
Fix merge conflict
trask Aug 30, 2025
6b25c14
fix
trask Sep 5, 2025
6c5ee47
Merge remote-tracking branch 'upstream/main' into semconv2
trask Sep 5, 2025
e809b90
Merge branch 'main' into semconv2
trask Sep 6, 2025
2159613
fix
trask Sep 6, 2025
41f2ee0
regenerate
trask Sep 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
22 changes: 21 additions & 1 deletion sdk/monitor/azure-monitor-opentelemetry-autoconfigure/checkstyle-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.MetricDataMapper.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.OperationNames.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.RequestChecker.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.SemanticAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.SpanDataMapper.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.AbstractTelemetryBuilder.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.heartbeat.HeartbeatExporter.java" checks="IllegalImportCheck" />
Expand All @@ -108,6 +107,27 @@
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryItemExporterTest.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryPipeline.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryPipelineListener.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.AttributeKeyTemplate.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.ClientAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.CodeAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.DbAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.ExceptionAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.HttpAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.NetworkAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.ServerAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.UrlAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.UserAgentAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.CodeIncubatingAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.DbIncubatingAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.EnduserIncubatingAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.HttpIncubatingAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.MessagingIncubatingAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.NetIncubatingAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.PeerIncubatingAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.RpcIncubatingAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.SessionIncubatingAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.ThreadIncubatingAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.UrlIncubatingAttributes.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.FeatureStatsbeat.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.NetworkStatsbeat.java" checks="IllegalImportCheck" />
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.StatsbeatTelemetryPipelineListener.java" checks="IllegalImportCheck" />
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/com/azure/monitor/opentelemetry/autoconfigure/AzureMonitorLogRecordExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import com.azure.core.util.logging.ClientLogger;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.LogDataMapper;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.SemanticAttributes;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.ExceptionAttributes;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.logging.OperationLogger;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryItemExporter;
Expand Down Expand Up @@ -64,7 +64,7 @@ public CompletableResultCode export(Collection<LogRecordData> logs) {
}
LOGGER.verbose("exporting log: {}", log);
try {
String stack = log.getAttributes().get(SemanticAttributes.EXCEPTION_STACKTRACE);
String stack = log.getAttributes().get(ExceptionAttributes.EXCEPTION_STACKTRACE);
TelemetryItem telemetryItem = mapper.map(log, stack, null);
telemetryItems.add(telemetryItem);
if (quickPulse != null && quickPulse.isEnabled()) {
Expand Down
14 changes: 8 additions & 6 deletions ...main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/LogDataMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.ContextTagKeys;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.SeverityLevel;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.CodeIncubatingAttributes;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.ThreadIncubatingAttributes;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedTime;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
Expand Down Expand Up @@ -61,10 +63,10 @@ public class LogDataMapper {
.prefix(LOG4J_MAP_MESSAGE_PREFIX, (telemetryBuilder, key, value) -> {
telemetryBuilder.addProperty(key.substring(LOG4J_MAP_MESSAGE_PREFIX.length()), String.valueOf(value));
})
.exactString(SemanticAttributes.CODE_FILEPATH, "FileName")
.exactString(SemanticAttributes.CODE_NAMESPACE, "ClassName")
.exactString(SemanticAttributes.CODE_FUNCTION, "MethodName")
.exactLong(SemanticAttributes.CODE_LINENO, "LineNumber")
.exactString(CodeIncubatingAttributes.CODE_FILEPATH, "FileName")
.exactString(CodeIncubatingAttributes.CODE_NAMESPACE, "ClassName")
.exactString(CodeIncubatingAttributes.CODE_FUNCTION, "MethodName")
.exactLong(CodeIncubatingAttributes.CODE_LINENO, "LineNumber")
.exactString(LOG4J_MARKER, "Marker")
.exactStringArray(LOGBACK_MARKER, "Marker");

Expand Down Expand Up @@ -146,7 +148,7 @@ private TelemetryItem createMessageTelemetryItem(LogRecordData log, Attributes a

// set message-specific properties
setLoggerProperties(telemetryBuilder, log.getInstrumentationScopeInfo().getName(),
attributes.get(SemanticAttributes.THREAD_NAME), log.getSeverity());
attributes.get(ThreadIncubatingAttributes.THREAD_NAME), log.getSeverity());

return telemetryBuilder.build();
}
Expand All @@ -169,7 +171,7 @@ private TelemetryItem createExceptionTelemetryItem(LogRecordData log, String sta

// set exception-specific properties
setLoggerProperties(telemetryBuilder, log.getInstrumentationScopeInfo().getName(),
attributes.get(SemanticAttributes.THREAD_NAME), log.getSeverity());
attributes.get(ThreadIncubatingAttributes.THREAD_NAME), log.getSeverity());

if (log.getBody() != null) {
telemetryBuilder.addProperty("Logger Message", log.getBody().asString());
Expand Down
10 changes: 7 additions & 3 deletions ...n/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/MetricDataMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.DependencyExtractor;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.RequestExtractor;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.HttpAttributes;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.RpcIncubatingAttributes;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.UrlAttributes;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.HttpIncubatingAttributes;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedTime;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
Expand Down Expand Up @@ -176,7 +180,7 @@ public static void updateMetricPointBuilder(MetricTelemetryBuilder metricTelemet
Attributes attributes = pointData.getAttributes();
if (isPreAggregatedStandardMetric) {
Long statusCode = SpanDataMapper.getStableOrOldAttribute(attributes,
SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, SemanticAttributes.HTTP_STATUS_CODE);
HttpAttributes.HTTP_RESPONSE_STATUS_CODE, HttpIncubatingAttributes.HTTP_STATUS_CODE);
boolean success = isSuccess(metricData.getName(), statusCode, captureHttpServer4xxAsError);
Boolean isSynthetic = attributes.get(AiSemanticAttributes.IS_SYNTHETIC);

Expand All @@ -191,9 +195,9 @@ public static void updateMetricPointBuilder(MetricTelemetryBuilder metricTelemet
if (metricData.getName().startsWith("http")) {
dependencyType = "Http";
defaultPort = getDefaultPortForHttpScheme(SpanDataMapper.getStableOrOldAttribute(attributes,
SemanticAttributes.URL_SCHEME, SemanticAttributes.HTTP_SCHEME));
UrlAttributes.URL_SCHEME, HttpIncubatingAttributes.HTTP_SCHEME));
} else {
dependencyType = attributes.get(SemanticAttributes.RPC_SYSTEM);
dependencyType = attributes.get(RpcIncubatingAttributes.RPC_SYSTEM);
if (dependencyType == null) {
// rpc.system is required by the semantic conventions
dependencyType = "Unknown";
Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/RequestChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.util.function.Function;

import static com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes.JOB_SYSTEM;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.MessagingIncubatingAttributes;

public final class RequestChecker {

Expand All @@ -34,7 +35,7 @@ public static boolean isRequest(SpanKind kind, SpanContext parentSpanContext,
} else if (kind == SpanKind.CLIENT || kind == SpanKind.PRODUCER) {
return false;
} else if (kind == SpanKind.CONSUMER
&& "receive".equals(attrFn.apply(SemanticAttributes.MESSAGING_OPERATION))) {
&& "receive".equals(attrFn.apply(MessagingIncubatingAttributes.MESSAGING_OPERATION))) {
return false;
} else if (kind == SpanKind.SERVER || kind == SpanKind.CONSUMER) {
return true;
Expand Down
Loading
Loading