Merge branch 'main' into copilot/fix-88

Author: trask

agent/agent-bootstrap/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java

@@ -39,7 +39,7 @@
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 
-// copied from OpenTelemetry Instrumentation 2.6.0
+// copied from OpenTelemetry Instrumentation 2.17.1
 
 /**
  * A builder of an {@link Instrumenter}.

agent/agent-tooling/build.gradle.kts

@@ -83,7 +83,6 @@ dependencies {
   testImplementation("org.assertj:assertj-core")
   testImplementation("org.awaitility:awaitility")
   testImplementation("org.mockito:mockito-core")
-  testImplementation("io.github.hakky54:logcaptor")
 
   testCompileOnly("com.google.code.findbugs:jsr305")
 }

build.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
   id("idea")
 
-  id("com.github.ben-manes.versions") version "0.51.0"
   id("ai.spotless-conventions")
 }
 

classic-sdk/core/src/main/java/com/microsoft/applicationinsights/telemetry/BaseTelemetry.java

@@ -39,8 +39,8 @@ public TelemetryContext getContext() {
   }
 
   /**
-   * Gets a map of application-defined property names and values providing additional
-   * information about this event.
+   * Gets a map of application-defined property names and values providing additional information
+   * about this event.
    */
   @Override
   public Map<String, String> getProperties() {

dependencyManagement/build.gradle.kts

@@ -1,9 +1,5 @@
-import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
-
 plugins {
   `java-platform`
-
-  id("com.github.ben-manes.versions") version "0.51.0"
 }
 
 data class DependencySet(val group: String, val version: String, val modules: List<String>)
@@ -64,14 +60,12 @@ val CORE_DEPENDENCIES = listOf(
 val DEPENDENCIES = listOf(
   "ch.qos.logback:logback-classic:1.3.15", // logback 1.4+ requires Java 11+
   "ch.qos.logback.contrib:logback-json-classic:0.1.5",
-  "com.uber.nullaway:nullaway:0.12.7",
   "commons-codec:commons-codec:1.18.0",
   "org.apache.commons:commons-text:1.13.1",
   "com.google.code.gson:gson:2.13.1",
   "com.azure:azure-core-test:1.26.2", // this is not included in azure-sdk-bom
   "org.assertj:assertj-core:3.27.3",
   "org.awaitility:awaitility:4.3.0",
-  "io.github.hakky54:logcaptor:2.11.0",
   "io.opentelemetry.contrib:opentelemetry-jfr-connection:${otelContribVersion}-alpha",
   "io.opentelemetry.contrib:opentelemetry-runtime-attach-core:${otelContribVersion}-alpha",
   "com.google.code.findbugs:jsr305:3.0.2",
@@ -103,22 +97,3 @@ dependencies {
     }
   }
 }
-
-fun isNonStable(version: String): Boolean {
-  val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
-  val regex = "^[0-9,.v-]+(-r)?$".toRegex()
-  val isGuava = version.endsWith("-jre")
-  val isStable = stableKeyword || regex.matches(version) || isGuava
-  return isStable.not()
-}
-
-tasks {
-  named<DependencyUpdatesTask>("dependencyUpdates") {
-    revision = "release"
-    checkConstraints = true
-
-    rejectVersionIf {
-      isNonStable(candidate.version)
-    }
-  }
-}