Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/java/frameworks/client_certificate_mapper.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/java/frameworks/contrast_security_agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion src/java/frameworks/datadog_javaagent.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/java/frameworks/datadog_javaagent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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() {
Expand Down