Prepare 2.25.1 patch release (#2657)

* CSA build updates (#2648)

* use appdynamics artifactory instead of github hackery

* update to latest

* only build a jar on gitlab

* never not fighting gradle

* spotless

* tests that use autoconfigure need to reset

* spotless

* trying to simplify where this gitlab condition is actually needed...

* Revert "trying to simplify where this gitlab condition is actually needed..."

This reverts commit 1a102de.

(cherry picked from commit 5215ef4)

* update CSA for 2.25.1 patch release

Author: breedx-splk

CHANGELOG.md

@@ -8,6 +8,10 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.
 
 ## Unreleased
 
+## v2.25.1 - 2026-02-26
+
+- Update CSA to version 26.2.1-1436.
+
 ## v2.25.0 - 2026-02-20
 
 ### General

README.md

@@ -107,7 +107,7 @@ To extend the instrumentation with the OpenTelemetry Instrumentation for Java,
 you have to use a compatible API version.
 
 <!-- IMPORTANT: do not change comments or break those lines below -->
-The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.25.0<!--SPLUNK_VERSION--> is compatible
+The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.25.1<!--SPLUNK_VERSION--> is compatible
 with:
 
 * OpenTelemetry API version <!--OTEL_VERSION-->1.57.0<!--OTEL_VERSION-->

agent-csa-bundle/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 
 // This should be updated for every CSA release, eventually in dependencyManagement?
 
-val csaVersion = "25.12.0-1409"
+val csaVersion = "26.2.1-1436"
 val otelInstrumentationVersion: String by rootProject.extra
 
 base.archivesName.set("splunk-otel-javaagent-csa")
@@ -29,33 +29,27 @@ val splunkAgent: Configuration by configurations.creating {
 }
 
 repositories {
-  ivy {
-    // Required to source artifact directly from github release page
-    // https://github.com/signalfx/csa-releases/releases/download/<version>/oss-agent-mtagent-extension-deployment.jar
-    url = uri("https://github.com/")
-    metadataSources {
-      artifact()
-    }
-    patternLayout {
-      ivy("[organisation]/[module]/releases/download/[revision]/[artifact].[ext]")
-      artifact("[organisation]/[module]/releases/download/[revision]/[artifact].[ext]")
-    }
+  maven {
+    url = uri("https://artifactory.bare.appdynamics.com/artifactory/maven-releases/")
   }
 }
 
 dependencies {
   splunkAgent(project(":agent", configuration = "shadow"))
-  csaReleases("signalfx:csa-releases:$csaVersion") {
+  csaReleases("com.cisco.security:secureapp-otel-java-extension:$csaVersion") {
     artifact {
-      name = "oss-agent-mtagent-extension-deployment"
-      extension = "jar"
+      name = "secureapp-otel-java-extension"
+      extension = "zip"
     }
   }
 }
 
 tasks {
   // This exists purely to get the extension jar into our build dir
   val copyCsaJar by registering(Jar::class) {
+    onlyIf("csa is only built from gitlab") {
+      System.getenv("GITLAB_CI") != null
+    }
     archiveFileName.set("oss-agent-mtagent-extension-deployment.jar")
     doFirst {
       from(zipTree(csaReleases.singleFile))
@@ -64,13 +58,19 @@ tasks {
 
   // Extract and rename extension classes
   val extractExtensionClasses by registering(Copy::class) {
+    onlyIf("csa is only built from gitlab") {
+      System.getenv("GITLAB_CI") != null
+    }
     dependsOn(copyCsaJar)
     from(zipTree(copyCsaJar.get().archiveFile))
     into("build/ext-exploded")
   }
 
   // Rename class to classdata
   val renameClasstoClassdata by registering(Copy::class) {
+    onlyIf("csa is only built from gitlab") {
+      System.getenv("GITLAB_CI") != null
+    }
     dependsOn(extractExtensionClasses)
     from("build/ext-exploded/com/cisco/mtagent/adaptors/")
     into("build/ext-exploded/com/cisco/mtagent/adaptors/")
@@ -81,12 +81,18 @@ tasks {
 
   // Copy service file so path on disk matches path in jar
   val copyServiceFile by registering(Copy::class) {
+    onlyIf("csa is only built from gitlab") {
+      System.getenv("GITLAB_CI") != null
+    }
     dependsOn(extractExtensionClasses)
     from("build/ext-exploded/META-INF/services/")
     into("build/ext-exploded/inst/META-INF/services/")
   }
 
   val shadowCsaClasses by registering(ShadowJar::class) {
+    onlyIf("csa is only built from gitlab") {
+      System.getenv("GITLAB_CI") != null
+    }
     archiveFileName.set("shadow-csa-classes.jar")
     dependsOn(copyServiceFile, renameClasstoClassdata, splunkAgent)
 
@@ -117,6 +123,9 @@ tasks {
   }
 
   jar {
+    onlyIf("csa is only built from gitlab") {
+      System.getenv("GITLAB_CI") != null
+    }
     dependsOn(shadowCsaClasses)
     from(zipTree(shadowCsaClasses.get().archiveFile.get()))
     from(copyCsaJar.get().archiveFile.get())

deployments/cloudfoundry/buildpack/README.md

@@ -40,7 +40,7 @@ If you want to use a specific version of the Java agent in your application, you
 environment variable before application deployment, either using `cf set-env` or the `manifest.yml` file:
 
 ```sh
-$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.25.0
+$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.25.1
 ```
 
 By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used.

version.gradle.kts

@@ -1,5 +1,5 @@
 // do NOT update that variable manually - it is managed by the pre/post release scripts
-val distroVersion = "2.25.0"
+val distroVersion = "2.25.1"
 
 allprojects {
   version = distroVersion