Azure-json migration

.github/workflows/build-common.yml

@@ -8,7 +8,7 @@ on:
         required: false
 
 env:
-  EXPORTER_VERSION: 1.0.0-beta.25 # to be updated with the latest version
+  EXPORTER_VERSION: 1.0.0-beta.28 # to be updated with the latest version
 
 jobs:
   spotless:

agent/agent-tooling/build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
   implementation(project(":agent:agent-profiler:agent-diagnostics"))
   implementation(project(":etw:java"))
 
-  implementation("com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.26")
+  implementation("com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.28")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
   compileOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap")
@@ -87,6 +87,11 @@ dependencies {
   testCompileOnly("com.google.code.findbugs:jsr305")
 }
 
+configurations.all {
+  // temporarily overriding version until latest azure-json is part of azure-core
+  resolutionStrategy.force("com.azure:azure-json:1.2.0")
+}
+
 configurations {
   "implementation" {
     exclude(group = "net.bytebuddy", module = "byte-buddy") // we use byte-buddy-dep

agent/agent-tooling/gradle.lockfile

@@ -8,8 +8,8 @@ ch.qos.logback:logback-core:1.3.14=runtimeClasspath
 com.azure:azure-core-http-netty:1.15.2=runtimeClasspath
 com.azure:azure-core:1.50.0=runtimeClasspath
 com.azure:azure-identity:1.13.1=runtimeClasspath
-com.azure:azure-json:1.1.0=runtimeClasspath
-com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.26=runtimeClasspath
+com.azure:azure-json:1.2.0=runtimeClasspath
+com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.28=runtimeClasspath
 com.azure:azure-sdk-bom:1.2.26=runtimeClasspath
 com.azure:azure-storage-blob:12.27.0=runtimeClasspath
 com.azure:azure-storage-common:12.26.0=runtimeClasspath

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryClient.java

@@ -500,14 +500,18 @@ public Builder setConnectionStrings(@Nullable String connectionString) {
     }
 
     public Builder setRoleName(@Nullable String roleName) {
-      this.roleName = roleName;
-      globalTags.put(ContextTagKeys.AI_CLOUD_ROLE.toString(), roleName);
+      if (!Strings.isNullOrEmpty(roleName)) {
+        this.roleName = roleName;
+        globalTags.put(ContextTagKeys.AI_CLOUD_ROLE.toString(), roleName);
+      }
       return this;
     }
 
     public Builder setRoleInstance(@Nullable String roleInstance) {
-      this.roleInstance = roleInstance;
-      globalTags.put(ContextTagKeys.AI_CLOUD_ROLE_INSTANCE.toString(), roleInstance);
+      if (!Strings.isNullOrEmpty(roleInstance)) {
+        this.roleInstance = roleInstance;
+        globalTags.put(ContextTagKeys.AI_CLOUD_ROLE_INSTANCE.toString(), roleInstance);
+      }
       return this;
     }
 

agent/agent/build.gradle.kts

@@ -226,5 +226,7 @@ configurations {
     // excluding unused dependencies for size (~1.8mb)
     exclude("com.fasterxml.jackson.dataformat", "jackson-dataformat-xml")
     exclude("com.fasterxml.woodstox", "woodstox-core")
+    // temporarily overriding version until latest azure-json is part of azure-core
+    resolutionStrategy.force("com.azure:azure-json:1.2.0")
   }
 }

licenses/more-licenses.md

@@ -1,7 +1,7 @@
 
 # agent
 ## Dependency License Report
-_2024-08-07 03:28:41 UTC_
+_2024-08-08 16:29:35 PDT_
 ## Apache License, Version 2.0
 
 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.17.2` 
@@ -358,11 +358,11 @@ _2024-08-07 03:28:41 UTC_
 > - **POM Project URL**: [https://github.com/Azure/azure-sdk-for-java](https://github.com/Azure/azure-sdk-for-java)
 > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
 
-**69** **Group:** `com.azure` **Name:** `azure-json` **Version:** `1.1.0` 
+**69** **Group:** `com.azure` **Name:** `azure-json` **Version:** `1.2.0` 
 > - **POM Project URL**: [https://github.com/Azure/azure-sdk-for-java](https://github.com/Azure/azure-sdk-for-java)
 > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
 
-**70** **Group:** `com.azure` **Name:** `azure-monitor-opentelemetry-exporter` **Version:** `1.0.0-beta.26` 
+**70** **Group:** `com.azure` **Name:** `azure-monitor-opentelemetry-exporter` **Version:** `1.0.0-beta.28` 
 > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
 
 **71** **Group:** `com.azure` **Name:** `azure-storage-blob` **Version:** `12.27.0`