Skip to content

Commit f777681

Browse files
trasktrask
committed
Update internal semconv classes
1 parent 407e180 commit f777681

27 files changed

+3759
-3780
lines changed

‎sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/AzureMonitorLogRecordExporter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import com.azure.core.util.logging.ClientLogger;
77
import com.azure.monitor.opentelemetry.autoconfigure.implementation.LogDataMapper;
8-
import com.azure.monitor.opentelemetry.autoconfigure.implementation.SemanticAttributes;
8+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.ExceptionAttributes;
99
import com.azure.monitor.opentelemetry.autoconfigure.implementation.logging.OperationLogger;
1010
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem;
1111
import com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryItemExporter;
@@ -64,7 +64,7 @@ public CompletableResultCode export(Collection<LogRecordData> logs) {
6464
}
6565
LOGGER.verbose("exporting log: {}", log);
6666
try {
67-
String stack = log.getAttributes().get(SemanticAttributes.EXCEPTION_STACKTRACE);
67+
String stack = log.getAttributes().get(ExceptionAttributes.EXCEPTION_STACKTRACE);
6868
TelemetryItem telemetryItem = mapper.map(log, stack, null);
6969
telemetryItems.add(telemetryItem);
7070
if (quickPulse != null && quickPulse.isEnabled()) {

‎sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/LogDataMapper.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.ContextTagKeys;
1212
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.SeverityLevel;
1313
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem;
14+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.CodeAttributes;
15+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.CodeIncubatingAttributes;
16+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.ThreadIncubatingAttributes;
1417
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedTime;
1518
import io.opentelemetry.api.common.AttributeKey;
1619
import io.opentelemetry.api.common.Attributes;
@@ -61,10 +64,10 @@ public class LogDataMapper {
6164
.prefix(LOG4J_MAP_MESSAGE_PREFIX, (telemetryBuilder, key, value) -> {
6265
telemetryBuilder.addProperty(key.substring(LOG4J_MAP_MESSAGE_PREFIX.length()), String.valueOf(value));
6366
})
64-
.exactString(SemanticAttributes.CODE_FILEPATH, "FileName")
65-
.exactString(SemanticAttributes.CODE_NAMESPACE, "ClassName")
66-
.exactString(SemanticAttributes.CODE_FUNCTION, "MethodName")
67-
.exactLong(SemanticAttributes.CODE_LINENO, "LineNumber")
67+
.exactString(CodeIncubatingAttributes.CODE_FILEPATH, "FileName")
68+
.exactString(CodeIncubatingAttributes.CODE_NAMESPACE, "ClassName")
69+
.exactString(CodeIncubatingAttributes.CODE_FUNCTION, "MethodName")
70+
.exactLong(CodeIncubatingAttributes.CODE_LINENO, "LineNumber")
6871
.exactString(LOG4J_MARKER, "Marker")
6972
.exactStringArray(LOGBACK_MARKER, "Marker");
7073

@@ -146,7 +149,7 @@ private TelemetryItem createMessageTelemetryItem(LogRecordData log, Attributes a
146149

147150
// set message-specific properties
148151
setLoggerProperties(telemetryBuilder, log.getInstrumentationScopeInfo().getName(),
149-
attributes.get(SemanticAttributes.THREAD_NAME), log.getSeverity());
152+
attributes.get(ThreadIncubatingAttributes.THREAD_NAME), log.getSeverity());
150153

151154
return telemetryBuilder.build();
152155
}
@@ -169,7 +172,7 @@ private TelemetryItem createExceptionTelemetryItem(LogRecordData log, String sta
169172

170173
// set exception-specific properties
171174
setLoggerProperties(telemetryBuilder, log.getInstrumentationScopeInfo().getName(),
172-
attributes.get(SemanticAttributes.THREAD_NAME), log.getSeverity());
175+
attributes.get(ThreadIncubatingAttributes.THREAD_NAME), log.getSeverity());
173176

174177
if (log.getBody() != null) {
175178
telemetryBuilder.addProperty("Logger Message", log.getBody().asString());

‎sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/MetricDataMapper.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem;
1313
import com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.DependencyExtractor;
1414
import com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.RequestExtractor;
15+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.HttpAttributes;
16+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.RpcIncubatingAttributes;
17+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.ServerAttributes;
18+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.UrlAttributes;
19+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.HttpIncubatingAttributes;
20+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.UrlIncubatingAttributes;
1521
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedTime;
1622
import io.opentelemetry.api.common.AttributeKey;
1723
import io.opentelemetry.api.common.Attributes;
@@ -176,7 +182,7 @@ public static void updateMetricPointBuilder(MetricTelemetryBuilder metricTelemet
176182
Attributes attributes = pointData.getAttributes();
177183
if (isPreAggregatedStandardMetric) {
178184
Long statusCode = SpanDataMapper.getStableOrOldAttribute(attributes,
179-
SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, SemanticAttributes.HTTP_STATUS_CODE);
185+
HttpAttributes.HTTP_RESPONSE_STATUS_CODE, HttpIncubatingAttributes.HTTP_STATUS_CODE);
180186
boolean success = isSuccess(metricData.getName(), statusCode, captureHttpServer4xxAsError);
181187
Boolean isSynthetic = attributes.get(AiSemanticAttributes.IS_SYNTHETIC);
182188

@@ -191,9 +197,9 @@ public static void updateMetricPointBuilder(MetricTelemetryBuilder metricTelemet
191197
if (metricData.getName().startsWith("http")) {
192198
dependencyType = "Http";
193199
defaultPort = getDefaultPortForHttpScheme(SpanDataMapper.getStableOrOldAttribute(attributes,
194-
SemanticAttributes.URL_SCHEME, SemanticAttributes.HTTP_SCHEME));
200+
UrlAttributes.URL_SCHEME, UrlIncubatingAttributes.URL_SCHEME));
195201
} else {
196-
dependencyType = attributes.get(SemanticAttributes.RPC_SYSTEM);
202+
dependencyType = attributes.get(RpcIncubatingAttributes.RPC_SYSTEM);
197203
if (dependencyType == null) {
198204
// rpc.system is required by the semantic conventions
199205
dependencyType = "Unknown";

‎sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/RequestChecker.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.util.function.Function;
1313

1414
import static com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes.JOB_SYSTEM;
15+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.MessagingIncubatingAttributes;
1516

1617
public final class RequestChecker {
1718

@@ -34,7 +35,7 @@ public static boolean isRequest(SpanKind kind, SpanContext parentSpanContext,
3435
} else if (kind == SpanKind.CLIENT || kind == SpanKind.PRODUCER) {
3536
return false;
3637
} else if (kind == SpanKind.CONSUMER
37-
&& "receive".equals(attrFn.apply(SemanticAttributes.MESSAGING_OPERATION))) {
38+
&& "receive".equals(attrFn.apply(MessagingIncubatingAttributes.MESSAGING_OPERATION))) {
3839
return false;
3940
} else if (kind == SpanKind.SERVER || kind == SpanKind.CONSUMER) {
4041
return true;

0 commit comments

Comments
 (0)