From 55377ad3344bb2a3eb4b5e86aaa746a753e8ceea Mon Sep 17 00:00:00 2001
From: Will Mooreston <97046018+labkey-willm@users.noreply.github.com>
Date: Mon, 16 Dec 2024 06:23:58 -0800
Subject: [PATCH] update for datadog 7.60.0 (#125)

* add recommended -Ddd.trace.remove.integration-service-names.enabled=true

* housekeeping
---
 Dockerfile         | 2 +-
 docker-compose.yml | 1 -
 entrypoint.sh      | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ee703e2..17b183b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG FROM_TAG=17-jre-jammy
 # uncomment for alpine-based eclipse-temurin jre
 # ARG FROM_TAG=17-jre-alpine
 
-FROM ${FROM_REPO_IMAGE}:${FROM_TAG} as base
+FROM ${FROM_REPO_IMAGE}:${FROM_TAG} AS base
 
 LABEL maintainer="LabKey Systems Engineering <ops@labkey.com>"
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 238cdb9..dc42f08 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,4 @@
 ---
-version: "3"
 
 services:
   community:
diff --git a/entrypoint.sh b/entrypoint.sh
index 4cd801d..995eb5e 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -245,7 +245,7 @@ main() {
     export DD_AGENT_HOST=$(curl --max-time 3 -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/local-ipv4);
 
     echo "Adding -javaagent and jmx settings to java command"
-    export DD_JAVA_AGENT="-javaagent:./datadog/dd-java-agent.jar -Ddd.profiling.enabled=true -Ddd.logs.injection=true -XX:FlightRecorderOptions=stackdepth=256"
+    export DD_JAVA_AGENT="-javaagent:./datadog/dd-java-agent.jar -Ddd.profiling.enabled=true -Ddd.logs.injection=true -XX:FlightRecorderOptions=stackdepth=256 -Ddd.trace.remove.integration-service-names.enabled=true"
 
     export DD_JMX="-Dspring.jmx.enabled=true \
         -Dcom.sun.management.jmxremote \