Skip to content

Update to azure sdk latest #4472

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

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Update to azure sdk latest #4472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d5ea3c
enduser.id and enduser.pseudo.id
trask Aug 29, 2025
8e06ec7
session.id
trask Aug 28, 2025
54db0e9
Remove dependency on autoconfigure SemanticAttributes copy
trask Aug 29, 2025
b86ed3e
Update to Azure SDK latest snapshot
trask Aug 29, 2025
18c760b
test
trask Sep 20, 2025
e549eb4
Fix
trask Sep 20, 2025
6933c4f
Fix sporadically failing JmxMetricTest
trask Sep 20, 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
2 changes: 1 addition & 1 deletion .github/workflows/build-common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
env:
# set this to <repo>:<branch/sha> to build and test with an unreleased
# version of the azure-monitor-opentelemetry-autoconfigure dependency
AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT:
AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT: Azure/azure-sdk-for-java:main

jobs:
spotless:
Expand Down
60 changes: 33 additions & 27 deletions .../com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

package com.microsoft.applicationinsights.agent.internal.configuration;

import com.azure.monitor.opentelemetry.autoconfigure.implementation.SemanticAttributes;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.RpAttachType;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.HostName;
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings;
Expand All @@ -22,6 +21,13 @@
import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.SamplingOverride;
import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.semconv.ClientAttributes;
import io.opentelemetry.semconv.HttpAttributes;
import io.opentelemetry.semconv.NetworkAttributes;
import io.opentelemetry.semconv.ServerAttributes;
import io.opentelemetry.semconv.UrlAttributes;
import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes;
import io.opentelemetry.semconv.incubating.NetIncubatingAttributes;
import java.io.IOException;
import java.net.URL;
import java.net.URLDecoder;
Expand Down Expand Up @@ -359,44 +365,44 @@ private static void supportTelemetryProcessorsOldSemConv(Configuration config) {
private static String mapAttributeKey(String oldAttributeKey) {
String result = null;
// Common attributes across HTTP client and server spans
if (oldAttributeKey.equals(SemanticAttributes.HTTP_METHOD.getKey())) {
result = SemanticAttributes.HTTP_REQUEST_METHOD.getKey();
} else if (oldAttributeKey.equals(SemanticAttributes.HTTP_STATUS_CODE.getKey())) {
result = SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.getKey();
if (oldAttributeKey.equals(HttpIncubatingAttributes.HTTP_METHOD.getKey())) {
result = HttpAttributes.HTTP_REQUEST_METHOD.getKey();
} else if (oldAttributeKey.equals(HttpIncubatingAttributes.HTTP_STATUS_CODE.getKey())) {
result = HttpAttributes.HTTP_RESPONSE_STATUS_CODE.getKey();
} else if (oldAttributeKey.startsWith("http.request.header.")
|| oldAttributeKey.startsWith("http.response.header.")) {
result = oldAttributeKey.replace('_', '-');
} else if (oldAttributeKey.equals(SemanticAttributes.NET_PROTOCOL_NAME.getKey())) {
result = SemanticAttributes.NETWORK_PROTOCOL_NAME.getKey();
} else if (oldAttributeKey.equals(SemanticAttributes.NET_PROTOCOL_VERSION.getKey())) {
result = SemanticAttributes.NETWORK_PROTOCOL_VERSION.getKey();
} else if (oldAttributeKey.equals(SemanticAttributes.NET_SOCK_PEER_ADDR.getKey())) {
result = SemanticAttributes.NETWORK_PEER_ADDRESS.getKey();
} else if (oldAttributeKey.equals(SemanticAttributes.NET_SOCK_PEER_PORT.getKey())) {
result = SemanticAttributes.NETWORK_PEER_PORT.getKey();
} else if (oldAttributeKey.equals(NetIncubatingAttributes.NET_PROTOCOL_NAME.getKey())) {
result = NetworkAttributes.NETWORK_PROTOCOL_NAME.getKey();
} else if (oldAttributeKey.equals(NetIncubatingAttributes.NET_PROTOCOL_VERSION.getKey())) {
result = NetworkAttributes.NETWORK_PROTOCOL_VERSION.getKey();
} else if (oldAttributeKey.equals(NetIncubatingAttributes.NET_SOCK_PEER_ADDR.getKey())) {
result = NetworkAttributes.NETWORK_PEER_ADDRESS.getKey();
} else if (oldAttributeKey.equals(NetIncubatingAttributes.NET_SOCK_PEER_PORT.getKey())) {
result = NetworkAttributes.NETWORK_PEER_PORT.getKey();
}

// HTTP client span attributes
// http.url is handled via LazyHttpUrl
if (oldAttributeKey.equals(SemanticAttributes.HTTP_RESEND_COUNT.getKey())) {
result = SemanticAttributes.HTTP_REQUEST_RESEND_COUNT.getKey();
if (oldAttributeKey.equals("http.resend_count")) {
result = HttpAttributes.HTTP_REQUEST_RESEND_COUNT.getKey();
// becomes available.
} else if (oldAttributeKey.equals(SemanticAttributes.NET_PEER_NAME.getKey())) {
result = SemanticAttributes.SERVER_ADDRESS.getKey();
} else if (oldAttributeKey.equals(SemanticAttributes.NET_PEER_PORT.getKey())) {
result = SemanticAttributes.SERVER_PORT.getKey();
} else if (oldAttributeKey.equals(NetIncubatingAttributes.NET_PEER_NAME.getKey())) {
result = ServerAttributes.SERVER_ADDRESS.getKey();
} else if (oldAttributeKey.equals(NetIncubatingAttributes.NET_PEER_PORT.getKey())) {
result = ServerAttributes.SERVER_PORT.getKey();
}

// HTTP server span attributes
// http.target is handled via LazyHttpTarget
if (oldAttributeKey.equals(SemanticAttributes.HTTP_SCHEME.getKey())) {
result = SemanticAttributes.URL_SCHEME.getKey();
} else if (oldAttributeKey.equals(SemanticAttributes.HTTP_CLIENT_IP.getKey())) {
result = SemanticAttributes.CLIENT_ADDRESS.getKey();
} else if (oldAttributeKey.equals(SemanticAttributes.NET_HOST_NAME.getKey())) {
result = SemanticAttributes.SERVER_ADDRESS.getKey();
} else if (oldAttributeKey.equals(SemanticAttributes.NET_HOST_PORT.getKey())) {
result = SemanticAttributes.SERVER_PORT.getKey();
if (oldAttributeKey.equals(HttpIncubatingAttributes.HTTP_SCHEME.getKey())) {
result = UrlAttributes.URL_SCHEME.getKey();
} else if (oldAttributeKey.equals(HttpIncubatingAttributes.HTTP_CLIENT_IP.getKey())) {
result = ClientAttributes.CLIENT_ADDRESS.getKey();
} else if (oldAttributeKey.equals(NetIncubatingAttributes.NET_HOST_NAME.getKey())) {
result = ServerAttributes.SERVER_ADDRESS.getKey();
} else if (oldAttributeKey.equals(NetIncubatingAttributes.NET_HOST_PORT.getKey())) {
result = ServerAttributes.SERVER_PORT.getKey();
}

if (result == null) {
Expand Down
6 changes: 3 additions & 3 deletions .../test/java/com/microsoft/applicationinsights/agent/internal/PreAggregatedMetricsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void generateHttpClientMetrics() {
MetricTelemetryBuilder builder = MetricTelemetryBuilder.create();
MetricData metricData = metricDataCollection.iterator().next();
MetricDataMapper.updateMetricPointBuilder(
builder, metricData, metricData.getData().getPoints().iterator().next(), true, true);
builder, metricData, metricData.getData().getPoints().iterator().next(), true, true, false);
TelemetryItem telemetryItem = builder.build();
MetricsData metricsData = (MetricsData) telemetryItem.getData().getBaseData();

Expand Down Expand Up @@ -211,7 +211,7 @@ void generateRpcClientMetrics() {
MetricTelemetryBuilder builder = MetricTelemetryBuilder.create();
MetricData metricData = metricDataCollection.iterator().next();
MetricDataMapper.updateMetricPointBuilder(
builder, metricData, metricData.getData().getPoints().iterator().next(), true, true);
builder, metricData, metricData.getData().getPoints().iterator().next(), true, true, false);
TelemetryItem telemetryItem = builder.build();
MetricsData metricsData = (MetricsData) telemetryItem.getData().getBaseData();

Expand Down Expand Up @@ -291,7 +291,7 @@ void generateHttpServerMetrics() {
MetricTelemetryBuilder builder = MetricTelemetryBuilder.create();
MetricData metricData = target;
MetricDataMapper.updateMetricPointBuilder(
builder, metricData, metricData.getData().getPoints().iterator().next(), true, true);
builder, metricData, metricData.getData().getPoints().iterator().next(), true, true, false);
TelemetryItem telemetryItem = builder.build();
MetricsData metricsData = (MetricsData) telemetryItem.getData().getBaseData();

Expand Down
2 changes: 1 addition & 1 deletion ...elemetry/javaagent/instrumentation/applicationinsightsweb/UserContextInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static void methodEnter(
@Advice.This UserContext userContext, @Advice.Argument(0) String name) {
Span span = VirtualField.find(UserContext.class, Span.class).get(userContext);
if (span != null) {
span.setAttribute("enduser.id", name);
span.setAttribute("enduser.pseudo.id", name);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...instrumentation/applicationinsights-web-2.3/src/test/java/ApplicationInsightsWebTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void setRequestUser() {
.hasAttributesSatisfyingExactly(
equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, "Code"),
equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "setUser"),
equalTo(EnduserIncubatingAttributes.ENDUSER_ID, "myuser")),
equalTo(EnduserIncubatingAttributes.ENDUSER_PSEUDO_ID, "myuser")),
span ->
span.hasName("Code.internalSetUser")
.hasKind(INTERNAL)
Expand Down
27 changes: 4 additions & 23 deletions ...xMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmxMetricTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@
import com.microsoft.applicationinsights.smoketest.schemav2.MetricData;
import io.opentelemetry.proto.metrics.v1.Metric;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -107,27 +105,10 @@ private void verifyJmxMetricsSentToOtlpEndpoint() {
List<Metric> metrics =
testing.mockedOtlpIngestion.extractMetricsFromRequests(requests);

Map<String, Integer> occurrences = new HashMap<>();

// counting all occurrences of the jmx metrics that are applicable to all java
// versions
for (Metric metric : metrics) {
String metricName = metric.getName();
if (jmxMetricsAllJavaVersionsOtlp.contains(metricName)) {
if (occurrences.containsKey(metricName)) {
occurrences.put(metricName, occurrences.get(metricName) + 1);
} else {
occurrences.put(metricName, 1);
}
}
}

// confirm that those metrics received once or twice
// (the collector seems to run for 5-10 sec)
assertThat(occurrences.keySet()).hasSize(jmxMetricsAllJavaVersionsOtlp.size());
for (int value : occurrences.values()) {
assertThat(value).isBetween(1, 8);
}
// check the jmx metrics that are applicable to all java versions
assertThat(metrics)
.extracting(Metric::getName)
.containsAll(jmxMetricsAllJavaVersionsOtlp);
});
}

Expand Down
2 changes: 2 additions & 0 deletions ...iSupport/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public String testApi() {
Span.current().setAttribute("myattr1", "myvalue1");
Span.current().setAttribute("myattr2", "myvalue2");
Span.current().setAttribute("enduser.id", "myuser");
Span.current().setAttribute("enduser.pseudo.id", "mypseudo");
Span.current().setAttribute("session.id", "mysession");
Span.current().updateName("myspanname");
return "OK!";
}
Expand Down
4 changes: 3 additions & 1 deletion ...soft/applicationinsights/smoketest/OpenTelemetryApiSupportControllerSpansEnabledTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ void testApi() throws Exception {
.isEqualTo("testroleinstance");
assertThat(telemetry.rddEnvelope1.getTags())
.hasEntrySatisfying("ai.internal.sdkVersion", v -> assertThat(v).startsWith("java:3."));
assertThat(telemetry.rddEnvelope1.getTags()).containsEntry("ai.user.id", "myuser");
assertThat(telemetry.rddEnvelope1.getTags()).containsEntry("ai.user.authUserId", "myuser");
assertThat(telemetry.rddEnvelope1.getTags()).containsEntry("ai.user.id", "mypseudo");
assertThat(telemetry.rddEnvelope1.getTags()).containsEntry("ai.session.id", "mysession");

SmokeTestExtension.assertParentChild(
telemetry.rd,
Expand Down
4 changes: 3 additions & 1 deletion ...okeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ void testApi() throws Exception {

assertThat(telemetry.rdEnvelope.getTags())
.hasEntrySatisfying("ai.internal.sdkVersion", v -> assertThat(v).startsWith("java:3."));
assertThat(telemetry.rdEnvelope.getTags()).containsEntry("ai.user.id", "myuser");
assertThat(telemetry.rdEnvelope.getTags()).containsEntry("ai.user.authUserId", "myuser");
assertThat(telemetry.rdEnvelope.getTags()).containsEntry("ai.user.id", "mypseudo");
assertThat(telemetry.rdEnvelope.getTags()).containsEntry("ai.session.id", "mysession");
}

@Test
Expand Down
Loading