From 36b506682a3994d58a3bacab01e20169fca68c9c Mon Sep 17 00:00:00 2001 From: Kiril Keranov <114745615+kiril-keranov@users.noreply.github.com> Date: Fri, 22 May 2026 15:03:59 +0300 Subject: [PATCH 1/2] Update manifest.yml --- manifest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.yml b/manifest.yml index fc2c6b36b..abf9e4054 100644 --- a/manifest.yml +++ b/manifest.yml @@ -429,6 +429,7 @@ dependencies: sha256: 0f8b092a6c02035b29e9af6d0f025efe5f8ce95e0cc655b30e93d1c436d5d137 cf_stacks: - cflinuxfs4 + - cflinuxfs5 - name: newrelic version: 9.2.0 uri: https://buildpacks.cloudfoundry.org/dependencies/newrelic/newrelic_9.2.0_linux_noarch_any-stack_befb6434.zip From 69aaf07361978523cd218a0b6a691f63bf4c6cfb Mon Sep 17 00:00:00 2001 From: Kiril Keranov Date: Fri, 22 May 2026 15:07:46 +0300 Subject: [PATCH 2/2] Adjust frameworks to pipeline changes for cflinuxfs5 --- src/java/frameworks/client_certificate_mapper.go | 2 +- src/java/frameworks/contrast_security_agent.go | 2 +- src/java/frameworks/datadog_javaagent.go | 2 +- src/java/frameworks/datadog_javaagent_test.go | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/java/frameworks/client_certificate_mapper.go b/src/java/frameworks/client_certificate_mapper.go index 60e820730..482208d8c 100644 --- a/src/java/frameworks/client_certificate_mapper.go +++ b/src/java/frameworks/client_certificate_mapper.go @@ -61,7 +61,7 @@ func (c *ClientCertificateMapperFramework) Supply() error { func (c *ClientCertificateMapperFramework) Finalize() error { // Find the installed JAR mapperDir := filepath.Join(c.context.Stager.DepDir(), "client_certificate_mapper") - jarPattern := filepath.Join(mapperDir, "client-certificate-mapper-*.jar") + jarPattern := filepath.Join(mapperDir, "client-certificate-mapper*.jar") matches, err := filepath.Glob(jarPattern) if err != nil || len(matches) == 0 { diff --git a/src/java/frameworks/contrast_security_agent.go b/src/java/frameworks/contrast_security_agent.go index ab17f1865..7bf2eda1f 100644 --- a/src/java/frameworks/contrast_security_agent.go +++ b/src/java/frameworks/contrast_security_agent.go @@ -48,7 +48,7 @@ func (c *ContrastSecurityAgentFramework) findContrastAgent(frameworkDir string) } // Try specific pattern first, then fallback to generic - path, err := FindFileByPattern(frameworkDir, "contrast-security-*.jar", []string{""}) + path, err := FindFileByPattern(frameworkDir, "contrast-security*.jar", []string{""}) if err == nil { return path, nil } diff --git a/src/java/frameworks/datadog_javaagent.go b/src/java/frameworks/datadog_javaagent.go index 06954e74d..fabb6108a 100644 --- a/src/java/frameworks/datadog_javaagent.go +++ b/src/java/frameworks/datadog_javaagent.go @@ -305,7 +305,7 @@ func (d *DatadogJavaagentFramework) getApplicationVersion() string { func (d *DatadogJavaagentFramework) constructJarPathAndFixClassCount(datadogDir string) error { // Find the installed JAR - jarPattern := filepath.Join(datadogDir, "dd-java-agent*.jar") + jarPattern := filepath.Join(datadogDir, d.DependencyIdentifier()+"*.jar") matches, err := filepath.Glob(jarPattern) if err != nil { return fmt.Errorf("failed to search for Datadog agent JAR: %w", err) diff --git a/src/java/frameworks/datadog_javaagent_test.go b/src/java/frameworks/datadog_javaagent_test.go index d5ce9da7a..57c15a7e2 100644 --- a/src/java/frameworks/datadog_javaagent_test.go +++ b/src/java/frameworks/datadog_javaagent_test.go @@ -63,7 +63,7 @@ func installDatadogAgent(depsDir, version string, withClassdata bool) { agentDir := filepath.Join(depsDir, "0", "datadog_javaagent") Expect(os.MkdirAll(agentDir, 0755)).To(Succeed()) - jarPath := filepath.Join(agentDir, "dd-java-agent-"+version+".jar") + jarPath := filepath.Join(agentDir, "datadog-javaagent_"+version+"_linux_noarch_any-stack_def0ebd6.jar") f, err := os.Create(jarPath) Expect(err).NotTo(HaveOccurred()) @@ -254,7 +254,7 @@ var _ = Describe("Datadog JavaAgent", func() { content, err := os.ReadFile(filepath.Join(depsDir, "0", "java_opts", "19_datadog_javaagent.opts")) Expect(err).NotTo(HaveOccurred()) Expect(string(content)).To(ContainSubstring("-javaagent:")) - Expect(string(content)).To(ContainSubstring("$DEPS_DIR/0/datadog_javaagent/dd-java-agent-1.28.0.jar")) + Expect(string(content)).To(ContainSubstring("$DEPS_DIR/0/datadog_javaagent/datadog-javaagent_1.28.0_linux_noarch_any-stack_def0ebd6.jar")) }) It("opts file does not embed the staging-time absolute path", func() {