Skip to content

Commit d041e13

Browse files
traskrajkumar-rangaraj
trask
and
rajkumar-rangaraj
authored
Update internal semconv classes (Azure#46537)
* Update internal semconv classes * consistent * fix * fix * fix * Fix merge conflict * fix * fix * regenerate --------- Co-authored-by: Rajkumar Rangaraj <[email protected]>
1 parent 22ad79a commit d041e13

29 files changed

+3813
-3782
lines changed

‎sdk/monitor/azure-monitor-opentelemetry-autoconfigure/checkstyle-suppressions.xml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.MetricDataMapper.java" checks="IllegalImportCheck" />
9494
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.OperationNames.java" checks="IllegalImportCheck" />
9595
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.RequestChecker.java" checks="IllegalImportCheck" />
96-
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.SemanticAttributes.java" checks="IllegalImportCheck" />
9796
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.SpanDataMapper.java" checks="IllegalImportCheck" />
9897
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.AbstractTelemetryBuilder.java" checks="IllegalImportCheck" />
9998
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.heartbeat.HeartbeatExporter.java" checks="IllegalImportCheck" />
@@ -108,6 +107,27 @@
108107
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryItemExporterTest.java" checks="IllegalImportCheck" />
109108
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryPipeline.java" checks="IllegalImportCheck" />
110109
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryPipelineListener.java" checks="IllegalImportCheck" />
110+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.AttributeKeyTemplate.java" checks="IllegalImportCheck" />
111+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.ClientAttributes.java" checks="IllegalImportCheck" />
112+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.CodeAttributes.java" checks="IllegalImportCheck" />
113+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.DbAttributes.java" checks="IllegalImportCheck" />
114+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.ExceptionAttributes.java" checks="IllegalImportCheck" />
115+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.HttpAttributes.java" checks="IllegalImportCheck" />
116+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.NetworkAttributes.java" checks="IllegalImportCheck" />
117+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.ServerAttributes.java" checks="IllegalImportCheck" />
118+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.UrlAttributes.java" checks="IllegalImportCheck" />
119+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.UserAgentAttributes.java" checks="IllegalImportCheck" />
120+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.CodeIncubatingAttributes.java" checks="IllegalImportCheck" />
121+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.DbIncubatingAttributes.java" checks="IllegalImportCheck" />
122+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.EnduserIncubatingAttributes.java" checks="IllegalImportCheck" />
123+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.HttpIncubatingAttributes.java" checks="IllegalImportCheck" />
124+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.MessagingIncubatingAttributes.java" checks="IllegalImportCheck" />
125+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.NetIncubatingAttributes.java" checks="IllegalImportCheck" />
126+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.PeerIncubatingAttributes.java" checks="IllegalImportCheck" />
127+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.RpcIncubatingAttributes.java" checks="IllegalImportCheck" />
128+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.SessionIncubatingAttributes.java" checks="IllegalImportCheck" />
129+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.ThreadIncubatingAttributes.java" checks="IllegalImportCheck" />
130+
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.UrlIncubatingAttributes.java" checks="IllegalImportCheck" />
111131
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.FeatureStatsbeat.java" checks="IllegalImportCheck" />
112132
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.NetworkStatsbeat.java" checks="IllegalImportCheck" />
113133
<suppress files="com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.StatsbeatTelemetryPipelineListener.java" checks="IllegalImportCheck" />

‎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: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
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.incubating.CodeIncubatingAttributes;
15+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.ThreadIncubatingAttributes;
1416
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedTime;
1517
import io.opentelemetry.api.common.AttributeKey;
1618
import io.opentelemetry.api.common.Attributes;
@@ -61,10 +63,10 @@ public class LogDataMapper {
6163
.prefix(LOG4J_MAP_MESSAGE_PREFIX, (telemetryBuilder, key, value) -> {
6264
telemetryBuilder.addProperty(key.substring(LOG4J_MAP_MESSAGE_PREFIX.length()), String.valueOf(value));
6365
})
64-
.exactString(SemanticAttributes.CODE_FILEPATH, "FileName")
65-
.exactString(SemanticAttributes.CODE_NAMESPACE, "ClassName")
66-
.exactString(SemanticAttributes.CODE_FUNCTION, "MethodName")
67-
.exactLong(SemanticAttributes.CODE_LINENO, "LineNumber")
66+
.exactString(CodeIncubatingAttributes.CODE_FILEPATH, "FileName")
67+
.exactString(CodeIncubatingAttributes.CODE_NAMESPACE, "ClassName")
68+
.exactString(CodeIncubatingAttributes.CODE_FUNCTION, "MethodName")
69+
.exactLong(CodeIncubatingAttributes.CODE_LINENO, "LineNumber")
6870
.exactString(LOG4J_MARKER, "Marker")
6971
.exactStringArray(LOGBACK_MARKER, "Marker");
7072

@@ -146,7 +148,7 @@ private TelemetryItem createMessageTelemetryItem(LogRecordData log, Attributes a
146148

147149
// set message-specific properties
148150
setLoggerProperties(telemetryBuilder, log.getInstrumentationScopeInfo().getName(),
149-
attributes.get(SemanticAttributes.THREAD_NAME), log.getSeverity());
151+
attributes.get(ThreadIncubatingAttributes.THREAD_NAME), log.getSeverity());
150152

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

170172
// set exception-specific properties
171173
setLoggerProperties(telemetryBuilder, log.getInstrumentationScopeInfo().getName(),
172-
attributes.get(SemanticAttributes.THREAD_NAME), log.getSeverity());
174+
attributes.get(ThreadIncubatingAttributes.THREAD_NAME), log.getSeverity());
173175

174176
if (log.getBody() != null) {
175177
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: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
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.UrlAttributes;
18+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.HttpIncubatingAttributes;
1519
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedTime;
1620
import io.opentelemetry.api.common.AttributeKey;
1721
import io.opentelemetry.api.common.Attributes;
@@ -176,7 +180,7 @@ public static void updateMetricPointBuilder(MetricTelemetryBuilder metricTelemet
176180
Attributes attributes = pointData.getAttributes();
177181
if (isPreAggregatedStandardMetric) {
178182
Long statusCode = SpanDataMapper.getStableOrOldAttribute(attributes,
179-
SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, SemanticAttributes.HTTP_STATUS_CODE);
183+
HttpAttributes.HTTP_RESPONSE_STATUS_CODE, HttpIncubatingAttributes.HTTP_STATUS_CODE);
180184
boolean success = isSuccess(metricData.getName(), statusCode, captureHttpServer4xxAsError);
181185
Boolean isSynthetic = attributes.get(AiSemanticAttributes.IS_SYNTHETIC);
182186

@@ -191,9 +195,9 @@ public static void updateMetricPointBuilder(MetricTelemetryBuilder metricTelemet
191195
if (metricData.getName().startsWith("http")) {
192196
dependencyType = "Http";
193197
defaultPort = getDefaultPortForHttpScheme(SpanDataMapper.getStableOrOldAttribute(attributes,
194-
SemanticAttributes.URL_SCHEME, SemanticAttributes.HTTP_SCHEME));
198+
UrlAttributes.URL_SCHEME, HttpIncubatingAttributes.HTTP_SCHEME));
195199
} else {
196-
dependencyType = attributes.get(SemanticAttributes.RPC_SYSTEM);
200+
dependencyType = attributes.get(RpcIncubatingAttributes.RPC_SYSTEM);
197201
if (dependencyType == null) {
198202
// rpc.system is required by the semantic conventions
199203
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)