Skip to content

Commit ba23064

Browse files
committed
post 2.25.1 release
1 parent 5215ef4 commit ba23064

File tree

5 files changed

+23
-27
lines changed

5 files changed

+23
-27
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.
88

99
## Unreleased
1010

11+
## v2.25.1 - 2026-02-26
12+
13+
- Update CSA to version 26.2.1-1436.
14+
1115
## v2.25.0 - 2026-02-20
1216

1317
### General

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ see [Migrate from the SignalFx Java Agent](https://help.splunk.com/en/splunk-obs
7777
<!-- Comments, spacing, empty and new lines in the section below are intentional, please do not modify them! -->
7878
<!--DEV_DOCS_WARNING-->
7979
<!--DEV_DOCS_WARNING_START-->
80-
The following documentation refers to the in-development version of `splunk-otel-java`. Docs for the latest version ([v2.25.0](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v2.25.0/README.md).
80+
The following documentation refers to the in-development version of `splunk-otel-java`. Docs for the latest version ([v2.25.1](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v2.25.1/README.md).
8181

8282
---
8383
<!--DEV_DOCS_WARNING_END-->
@@ -112,7 +112,7 @@ To extend the instrumentation with the OpenTelemetry Instrumentation for Java,
112112
you have to use a compatible API version.
113113

114114
<!-- IMPORTANT: do not change comments or break those lines below -->
115-
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.25.0<!--SPLUNK_VERSION--> is compatible
115+
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.25.1<!--SPLUNK_VERSION--> is compatible
116116
with:
117117

118118
* OpenTelemetry API version <!--OTEL_VERSION-->1.57.0<!--OTEL_VERSION-->

agent-csa-bundle/build.gradle.kts

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
// This should be updated for every CSA release, eventually in dependencyManagement?
1010

11-
val csaVersion = "26.2.0-1416"
11+
val csaVersion = "26.2.1-1436"
1212
val otelInstrumentationVersion: String by rootProject.extra
1313

1414
base.archivesName.set("splunk-otel-javaagent-csa")
@@ -29,27 +29,33 @@ val splunkAgent: Configuration by configurations.creating {
2929
}
3030

3131
repositories {
32-
maven {
33-
url = uri("https://artifactory.bare.appdynamics.com/artifactory/maven-releases/")
32+
ivy {
33+
// Required to source artifact directly from github release page
34+
// https://github.com/signalfx/csa-releases/releases/download/<version>/oss-agent-mtagent-extension-deployment.jar
35+
url = uri("https://github.com/")
36+
metadataSources {
37+
artifact()
38+
}
39+
patternLayout {
40+
ivy("[organisation]/[module]/releases/download/[revision]/[artifact].[ext]")
41+
artifact("[organisation]/[module]/releases/download/[revision]/[artifact].[ext]")
42+
}
3443
}
3544
}
3645

3746
dependencies {
3847
splunkAgent(project(":agent", configuration = "shadow"))
39-
csaReleases("com.cisco.security:secureapp-otel-java-extension:$csaVersion") {
48+
csaReleases("signalfx:csa-releases:$csaVersion") {
4049
artifact {
41-
name = "secureapp-otel-java-extension"
42-
extension = "zip"
50+
name = "oss-agent-mtagent-extension-deployment"
51+
extension = "jar"
4352
}
4453
}
4554
}
4655

4756
tasks {
4857
// This exists purely to get the extension jar into our build dir
4958
val copyCsaJar by registering(Jar::class) {
50-
onlyIf("csa is only built from gitlab") {
51-
System.getenv("GITLAB_CI") != null
52-
}
5359
archiveFileName.set("oss-agent-mtagent-extension-deployment.jar")
5460
doFirst {
5561
from(zipTree(csaReleases.singleFile))
@@ -58,19 +64,13 @@ tasks {
5864

5965
// Extract and rename extension classes
6066
val extractExtensionClasses by registering(Copy::class) {
61-
onlyIf("csa is only built from gitlab") {
62-
System.getenv("GITLAB_CI") != null
63-
}
6467
dependsOn(copyCsaJar)
6568
from(zipTree(copyCsaJar.get().archiveFile))
6669
into("build/ext-exploded")
6770
}
6871

6972
// Rename class to classdata
7073
val renameClasstoClassdata by registering(Copy::class) {
71-
onlyIf("csa is only built from gitlab") {
72-
System.getenv("GITLAB_CI") != null
73-
}
7474
dependsOn(extractExtensionClasses)
7575
from("build/ext-exploded/com/cisco/mtagent/adaptors/")
7676
into("build/ext-exploded/com/cisco/mtagent/adaptors/")
@@ -81,18 +81,12 @@ tasks {
8181

8282
// Copy service file so path on disk matches path in jar
8383
val copyServiceFile by registering(Copy::class) {
84-
onlyIf("csa is only built from gitlab") {
85-
System.getenv("GITLAB_CI") != null
86-
}
8784
dependsOn(extractExtensionClasses)
8885
from("build/ext-exploded/META-INF/services/")
8986
into("build/ext-exploded/inst/META-INF/services/")
9087
}
9188

9289
val shadowCsaClasses by registering(ShadowJar::class) {
93-
onlyIf("csa is only built from gitlab") {
94-
System.getenv("GITLAB_CI") != null
95-
}
9690
archiveFileName.set("shadow-csa-classes.jar")
9791
dependsOn(copyServiceFile, renameClasstoClassdata, splunkAgent)
9892

@@ -123,9 +117,6 @@ tasks {
123117
}
124118

125119
jar {
126-
onlyIf("csa is only built from gitlab") {
127-
System.getenv("GITLAB_CI") != null
128-
}
129120
dependsOn(shadowCsaClasses)
130121
from(zipTree(shadowCsaClasses.get().archiveFile.get()))
131122
from(copyCsaJar.get().archiveFile.get())

deployments/cloudfoundry/buildpack/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ If you want to use a specific version of the Java agent in your application, you
4040
environment variable before application deployment, either using `cf set-env` or the `manifest.yml` file:
4141

4242
```sh
43-
$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.25.0
43+
$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.25.1
4444
```
4545

4646
By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used.

deployments/cloudfoundry/index.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,4 @@
5353
2.23.0: https://github.com/signalfx/splunk-otel-java/releases/download/v2.23.0/splunk-otel-javaagent.jar
5454
2.24.0: https://github.com/signalfx/splunk-otel-java/releases/download/v2.24.0/splunk-otel-javaagent.jar
5555
2.25.0: https://github.com/signalfx/splunk-otel-java/releases/download/v2.25.0/splunk-otel-javaagent.jar
56+
2.25.1: https://github.com/signalfx/splunk-otel-java/releases/download/v2.25.1/splunk-otel-javaagent.jar

0 commit comments

Comments
 (0)