diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java index c141e52a8b2..b26e2b69a85 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java @@ -5,7 +5,6 @@ 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; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonProcessingException; @@ -304,11 +303,6 @@ private static void overlayConfiguration( configurationLogger.info( "Some telemetry may be sampled out because a default sampling configuration was added in version 3.4.0 to reduce the default billing cost. You can set the sampling configuration explicitly: https://learn.microsoft.com/azure/azure-monitor/app/java-standalone-config#sampling"); } - // only set role instance to host name as a last resort - if (config.role.instance == null) { - String hostname = HostName.get(); - config.role.instance = hostname == null ? "unknown" : hostname; - } supportTelemetryProcessorsOldSemConv(config); } diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryClient.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryClient.java index b31f24107c3..b0dfc0ace95 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryClient.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryClient.java @@ -345,7 +345,7 @@ public void populateDefaults(AbstractTelemetryBuilder telemetryBuilder, Resource telemetryBuilder.addProperty(entry.getKey(), entry.getValue()); } } - new ResourceParser().updateRoleNameAndInstance(telemetryBuilder, resource); + new ResourceParser().updateRoleNameAndInstanceAndVersion(telemetryBuilder, resource); } @Nullable diff --git a/azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.1.jar b/azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.1.jar new file mode 100644 index 00000000000..08b81b87199 Binary files /dev/null and b/azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.1.jar differ diff --git a/azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.1.pom b/azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.1.pom new file mode 100644 index 00000000000..ef94452e464 --- /dev/null +++ b/azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.1.pom @@ -0,0 +1,210 @@ + + + + 4.0.0 + + + com.azure + azure-client-sdk-parent + 1.7.0 + ../../parents/azure-client-sdk-parent + + + com.azure + azure-monitor-opentelemetry-autoconfigure + 1.0.0-beta.1 + + Azure Monitor OpenTelemetry SDK Autoconfigure Distro + This package contains Azure Monitor OpenTelemetry SDK Autoconfigure Distro. + + + + azure-java-build-docs + ${site.url}/site/${project.artifactId} + + + + + https://github.com/Azure/azure-sdk-for-java + + + + 0.30 + 0.20 + + + --add-opens com.azure.monitor.opentelemetry.autoconfigure/com.azure.monitor.opentelemetry.autoconfigure=ALL-UNNAMED + + + checkstyle-suppressions.xml + false + spotbugs-exclude.xml + + + + + com.azure + azure-core + 1.54.1 + + + com.azure + azure-json + 1.3.0 + + + com.azure + azure-core-http-netty + 1.15.7 + + + io.opentelemetry + opentelemetry-api + 1.43.0 + + + io.opentelemetry + opentelemetry-sdk + 1.43.0 + + + io.opentelemetry + opentelemetry-sdk-metrics + 1.43.0 + + + io.opentelemetry + opentelemetry-sdk-logs + 1.43.0 + + + io.opentelemetry + opentelemetry-sdk-extension-autoconfigure-spi + 1.43.0 + + + io.opentelemetry + opentelemetry-sdk-extension-autoconfigure + 1.43.0 + + + io.opentelemetry.semconv + opentelemetry-semconv-incubating + 1.26.0-alpha + + + + + com.google.code.findbugs + jsr305 + 3.0.2 + provided + + + + + org.assertj + assertj-core + 3.22.0 + test + + + org.mockito + mockito-core + 4.11.0 + test + + + + + net.bytebuddy + byte-buddy + 1.15.5 + test + + + net.bytebuddy + byte-buddy-agent + 1.15.5 + test + + + io.opentelemetry + opentelemetry-sdk-testing + 1.43.0 + test + + + com.azure + azure-data-appconfiguration + 1.7.3 + test + + + com.azure + azure-messaging-eventhubs + 5.19.2 + test + + + com.azure + azure-core-tracing-opentelemetry + 1.0.0-beta.52 + test + + + com.azure + azure-core-test + 1.27.0-beta.4 + test + + + com.azure + azure-messaging-eventhubs-checkpointstore-blob + 1.20.2 + test + + + com.azure + azure-identity + 1.14.2 + test + + + io.github.hakky54 + logcaptor + 2.9.3 + test + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.5.0 + + + + + io.opentelemetry:opentelemetry-api:[1.43.0] + io.opentelemetry:opentelemetry-sdk:[1.43.0] + io.opentelemetry:opentelemetry-sdk-metrics:[1.43.0] + io.opentelemetry:opentelemetry-sdk-logs:[1.43.0] + io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:[1.43.0] + io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:[1.43.0] + io.opentelemetry.semconv:opentelemetry-semconv-incubating:[1.26.0-alpha] + com.squareup.okio:okio:[3.9.1] + + + + + + + +