CORE-2006: removed support for OpenTelemetry

.dockerignore

@@ -4,7 +4,6 @@
 pom.xml
 pom.xml.asc
 *.jar
-!opentelemetry-javaagent.jar
 *.class
 /.lein-*
 /.nrepl-port

.gitignore

@@ -4,7 +4,6 @@
 pom.xml
 pom.xml.asc
 *.jar
-!opentelemetry-javaagent.jar
 *.class
 .eastwood
 /.lein-*

Dockerfile

@@ -1,12 +1,12 @@
-FROM clojure:openjdk-17-lein-alpine
+FROM clojure:temurin-22-lein-jammy
 
 WORKDIR /usr/src/app
 
-RUN apk add --no-cache git
+RUN apt-get update && \
+    apt-get install -y git && \
+    rm -rf /var/lib/apt/lists/*
 
-RUN ln -s "/opt/openjdk-17/bin/java" "/bin/iplant-groups"
-
-ENV OTEL_TRACES_EXPORTER none
+RUN ln -s "/opt/java/openjdk/bin/java" "/bin/iplant-groups"
 
 COPY project.clj /usr/src/app/
 RUN lein deps
@@ -17,7 +17,7 @@ COPY . /usr/src/app
 RUN lein do clean, uberjar && \
     cp target/iplant-groups-standalone.jar .
 
-ENTRYPOINT ["iplant-groups", "-Dlogback.configurationFile=/etc/iplant/de/logging/iplant-groups-logging.xml", "-javaagent:/usr/src/app/opentelemetry-javaagent.jar", "-Dotel.resource.attributes=service.name=iplant-groups", "-cp", ".:iplant-groups-standalone.jar:/", "iplant_groups.core"]
+ENTRYPOINT ["iplant-groups", "-Dlogback.configurationFile=/etc/iplant/de/logging/iplant-groups-logging.xml", "-cp", ".:iplant-groups-standalone.jar:/", "iplant_groups.core"]
 CMD ["--help"]
 
 ARG git_commit=unknown

project.clj

@@ -11,7 +11,7 @@
   :description "A REST front-end for Grouper."
   :url "https://github.com/cyverse-de/iplant-groups"
   :license {:name "BSD"
-            :url "http://iplantcollaborative.org/sites/default/files/iPLANT-LICENSE.txt"}
+            :url "https://cyverse.org/license"}
   :manifest {"Git-Ref" ~(git-ref)}
   :uberjar-name "iplant-groups-standalone.jar"
   :dependencies [[org.clojure/clojure "1.11.3"]
@@ -36,14 +36,11 @@
             [lein-ancient "0.7.0"]
             [lein-ring "0.12.6"]
             [test2junit "1.4.4"]]
-  :profiles {:dev {:resource-paths ["conf/test"]
-                   :jvm-opts ["-Dotel.javaagent.enabled=false"]}
+  :profiles {:dev {:resource-paths ["conf/test"]}
              :uberjar {:aot :all}}
   :main ^:skip-aot iplant-groups.core
   :ring {:handler iplant-groups.routes/app
          :init    iplant-groups.core/init-service
          :port    31310}
   :uberjar-exclusions [#"(?i)META-INF/[^/]*[.](SF|DSA|RSA)"]
-  :jvm-opts ["-Dlogback.configurationFile=/etc/iplant/de/logging/iplant-groups-logging.xml"
-             "-javaagent:./opentelemetry-javaagent.jar"
-             "-Dotel.resource.attributes=service.name=iplant-groups"])
+  :jvm-opts ["-Dlogback.configurationFile=/etc/iplant/de/logging/iplant-groups-logging.xml"])