Rename csa to secureapp

.github/workflows/publish-docker-image-ghcr.yml

@@ -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 }}

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-<version>.jar`.

agent-csa-bundle/build.gradle.kts → 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<Jar>("copyCsaJar") {
+  val copySecureAppJar = register<Jar>("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<Copy>("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<ShadowJar>("shadowCsaClasses") {
-    archiveFileName.set("shadow-csa-classes.jar")
+  val shadowSecureAppClasses = register<ShadowJar>("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<MavenPublication>("maven") {
-        artifactId = "splunk-otel-javaagent-csa"
+        artifactId = "splunk-otel-javaagent-secureapp"
         groupId = "com.splunk"
         version = project.version.toString()
 

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

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 ..."

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",