From 7741bc5ec250d6120ffef20bccff78c88b388d9e Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 1 Jul 2026 15:48:55 -0700 Subject: [PATCH] rename csa to secureapp --- .../workflows/publish-docker-image-ghcr.yml | 10 +++--- agent-csa-bundle/README.md | 28 ---------------- agent-secureapp-bundle/README.md | 28 ++++++++++++++++ .../build.gradle.kts | 32 +++++++++---------- .../otel-extension-system.properties | 0 scripts/publish-docker-image.sh | 6 ++-- scripts/release.sh | 4 +-- settings.gradle.kts | 2 +- 8 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 agent-csa-bundle/README.md create mode 100644 agent-secureapp-bundle/README.md rename {agent-csa-bundle => agent-secureapp-bundle}/build.gradle.kts (85%) rename {agent-csa-bundle => agent-secureapp-bundle}/otel-extension-system.properties (100%) diff --git a/.github/workflows/publish-docker-image-ghcr.yml b/.github/workflows/publish-docker-image-ghcr.yml index 3be4afa2c..d652a27f9 100644 --- a/.github/workflows/publish-docker-image-ghcr.yml +++ b/.github/workflows/publish-docker-image-ghcr.yml @@ -54,7 +54,7 @@ jobs: ghcr.io/signalfx/splunk-otel-java/splunk-otel-java:${{ env.MAJOR_VERSION }} ghcr.io/signalfx/splunk-otel-java/splunk-otel-java:${{ env.RELEASE_VERSION }} - - name: build and publish CSA container + - name: build and publish SecureApp container uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: push: true @@ -62,8 +62,8 @@ jobs: platforms: linux/amd64,linux/arm64,linux/ppc64le build-args: | RELEASE_VER=${{ env.RELEASE_VERSION }} - JAR_FILE=splunk-otel-javaagent-csa.jar + JAR_FILE=splunk-otel-javaagent-secureapp.jar tags: | - ghcr.io/signalfx/splunk-otel-java/splunk-otel-java-csa:latest - ghcr.io/signalfx/splunk-otel-java/splunk-otel-java-csa:${{ env.MAJOR_VERSION }} - ghcr.io/signalfx/splunk-otel-java/splunk-otel-java-csa:${{ env.RELEASE_VERSION }} + ghcr.io/signalfx/splunk-otel-java/splunk-otel-java-secureapp:latest + ghcr.io/signalfx/splunk-otel-java/splunk-otel-java-secureapp:${{ env.MAJOR_VERSION }} + ghcr.io/signalfx/splunk-otel-java/splunk-otel-java-secureapp:${{ env.RELEASE_VERSION }} diff --git a/agent-csa-bundle/README.md b/agent-csa-bundle/README.md deleted file mode 100644 index 60856d89b..000000000 --- a/agent-csa-bundle/README.md +++ /dev/null @@ -1,28 +0,0 @@ - -# Agent-CSA Bundle - -> :construction:  Status: Experimental - -This directory exists purely to contain scripts/toold to build -and publish a module that contains the Cisco Secure Application (CSA) -extension bundled with `splunk-otel-java`. - -* group: `com.splunk` -* artifact: `splunk-otel-javaagent-csa` - -## Build locally: - -Requirements: -* Internet -* Docker client -* Java `jar` command in path -* common unix tools - -From the root of the project: - -```bash -$ ./gradlew agent-csa-bundle:assemble -``` - -The resulting bundle will be located at -`agent-csa-bundle/build/splunk-otel-javaagent-csa-.jar`. diff --git a/agent-secureapp-bundle/README.md b/agent-secureapp-bundle/README.md new file mode 100644 index 000000000..3eb5ccf33 --- /dev/null +++ b/agent-secureapp-bundle/README.md @@ -0,0 +1,28 @@ + +# Agent-SecureApp Bundle + +> :construction:  Status: Experimental + +This directory exists purely to contain scripts/tools to build +and publish a module that contains the SecureApp +extension bundled with `splunk-otel-java`. + +* group: `com.splunk` +* artifact: `splunk-otel-javaagent-secureapp` + +## Build locally: + +Requirements: +* Internet +* Docker client +* Java `jar` command in path +* common unix tools + +From the root of the project: + +```bash +$ ./gradlew agent-secureapp-bundle:assemble +``` + +The resulting bundle will be located at +`agent-secureapp-bundle/build/libs/splunk-otel-javaagent-secureapp-.jar`. diff --git a/agent-csa-bundle/build.gradle.kts b/agent-secureapp-bundle/build.gradle.kts similarity index 85% rename from agent-csa-bundle/build.gradle.kts rename to agent-secureapp-bundle/build.gradle.kts index 237db847f..347da159e 100644 --- a/agent-csa-bundle/build.gradle.kts +++ b/agent-secureapp-bundle/build.gradle.kts @@ -6,19 +6,19 @@ plugins { id("com.gradleup.shadow") } -// This should be updated for every CSA release, eventually in dependencyManagement? +// This should be updated for every SecureApp release, eventually in dependencyManagement? -val csaVersion = "26.3.0-1440" +val secureAppVersion = "26.3.0-1440" val otelInstrumentationVersion: String = rootProject.extra["otelInstrumentationVersion"] as String -base.archivesName.set("splunk-otel-javaagent-csa") +base.archivesName.set("splunk-otel-javaagent-secureapp") java { withJavadocJar() withSourcesJar() } -val csaReleases = configurations.create("csaReleases") { +val secureAppReleases = configurations.create("secureAppReleases") { isCanBeResolved = true isCanBeConsumed = false } @@ -45,7 +45,7 @@ repositories { dependencies { splunkAgent(project(":agent", configuration = "shadow")) - csaReleases("signalfx:csa-releases:$csaVersion") { + secureAppReleases("signalfx:csa-releases:$secureAppVersion") { artifact { name = "oss-agent-mtagent-extension-deployment" extension = "jar" @@ -55,17 +55,17 @@ dependencies { tasks { // This exists purely to get the extension jar into our build dir - val copyCsaJar = register("copyCsaJar") { + val copySecureAppJar = register("copySecureAppJar") { archiveFileName.set("oss-agent-mtagent-extension-deployment.jar") doFirst { - from(zipTree(csaReleases.singleFile)) + from(zipTree(secureAppReleases.singleFile)) } } // Extract and rename extension classes val extractExtensionClasses = register("extractExtensionClasses") { - dependsOn(copyCsaJar) - from(zipTree(copyCsaJar.get().archiveFile)) + dependsOn(copySecureAppJar) + from(zipTree(copySecureAppJar.get().archiveFile)) into("build/ext-exploded") } @@ -86,8 +86,8 @@ tasks { into("build/ext-exploded/inst/META-INF/services/") } - val shadowCsaClasses = register("shadowCsaClasses") { - archiveFileName.set("shadow-csa-classes.jar") + val shadowSecureAppClasses = register("shadowSecureAppClasses") { + archiveFileName.set("shadow-secureapp-classes.jar") dependsOn(copyServiceFile, renameClasstoClassdata, splunkAgent) doFirst { @@ -117,9 +117,9 @@ tasks { } jar { - dependsOn(shadowCsaClasses) - from(zipTree(shadowCsaClasses.get().archiveFile.get())) - from(copyCsaJar.get().archiveFile.get()) + dependsOn(shadowSecureAppClasses) + from(zipTree(shadowSecureAppClasses.get().archiveFile.get())) + from(copySecureAppJar.get().archiveFile.get()) manifest { attributes( @@ -131,7 +131,7 @@ tasks { "Can-Retransform-Classes" to "true", "Implementation-Vendor" to "Splunk", "Implementation-Version" to "splunk-${project.version}-otel-$otelInstrumentationVersion", - "Cisco-Secure-Application-Version" to csaVersion, + "Cisco-Secure-Application-Version" to secureAppVersion, ) ) } @@ -141,7 +141,7 @@ tasks { publishing { publications { register("maven") { - artifactId = "splunk-otel-javaagent-csa" + artifactId = "splunk-otel-javaagent-secureapp" groupId = "com.splunk" version = project.version.toString() diff --git a/agent-csa-bundle/otel-extension-system.properties b/agent-secureapp-bundle/otel-extension-system.properties similarity index 100% rename from agent-csa-bundle/otel-extension-system.properties rename to agent-secureapp-bundle/otel-extension-system.properties diff --git a/scripts/publish-docker-image.sh b/scripts/publish-docker-image.sh index 20371eee8..9578c14cc 100755 --- a/scripts/publish-docker-image.sh +++ b/scripts/publish-docker-image.sh @@ -65,6 +65,6 @@ build_docker_image splunk-otel-instrumentation-java splunk-otel-javaagent.jar publish_docker_image splunk-otel-instrumentation-java sign_published_docker_image splunk-otel-instrumentation-java -build_docker_image splunk-otel-instrumentation-java-csa splunk-otel-javaagent-csa.jar -publish_docker_image splunk-otel-instrumentation-java-csa -sign_published_docker_image splunk-otel-instrumentation-java-csa +build_docker_image splunk-otel-instrumentation-java-secureapp splunk-otel-javaagent-secureapp.jar +publish_docker_image splunk-otel-instrumentation-java-secureapp +sign_published_docker_image splunk-otel-instrumentation-java-secureapp diff --git a/scripts/release.sh b/scripts/release.sh index 877b9251b..08590f8db 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -47,8 +47,8 @@ build_project() { ./gradlew assemble :metadata-generator:generateMetadata publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon --stacktrace mv "agent/build/libs/splunk-otel-javaagent-${release_version}.jar" dist/splunk-otel-javaagent.jar mv "agent/build/libs/splunk-otel-javaagent-${release_version}.jar.asc" dist/splunk-otel-javaagent.jar.asc - mv "agent-csa-bundle/build/libs/splunk-otel-javaagent-csa-${release_version}.jar" dist/splunk-otel-javaagent-csa.jar - mv "agent-csa-bundle/build/libs/splunk-otel-javaagent-csa-${release_version}.jar.asc" dist/splunk-otel-javaagent-csa.jar.asc + mv "agent-secureapp-bundle/build/libs/splunk-otel-javaagent-secureapp-${release_version}.jar" dist/splunk-otel-javaagent-secureapp.jar + mv "agent-secureapp-bundle/build/libs/splunk-otel-javaagent-secureapp-${release_version}.jar.asc" dist/splunk-otel-javaagent-secureapp.jar.asc mv "metadata-generator/build/splunk-otel-java-metadata.yaml" dist/splunk-otel-java-metadata.yaml echo ">>> Building the cloudfoundry buildpack ..." diff --git a/settings.gradle.kts b/settings.gradle.kts index 79581bf29..a3471d46b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,7 +30,7 @@ rootProject.name = "splunk-otel-java" include(":dependencyManagement") include( "agent", - "agent-csa-bundle", + "agent-secureapp-bundle", "bootstrap", "custom", "opamp",