This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git
The following commit(s) were added to refs/heads/2.1 by this push:
new 5d7d713 Bumped OpenTelemetry and Micrometer dependencies in Terraform
config (#293)
5d7d713 is described below
commit 5d7d7134001bf88b9da9b694e3599db292dac621
Author: Dave Marion <[email protected]>
AuthorDate: Mon Jan 5 15:19:40 2026 -0500
Bumped OpenTelemetry and Micrometer dependencies in Terraform config (#293)
---
.../modules/config-files/templates/hadoop_bashrc.tftpl | 2 +-
.../config-files/templates/initialize_accumulo.sh.tftpl | 11 +++++------
.../modules/config-files/templates/install_sw.sh.tftpl | 8 ++++----
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git
a/contrib/terraform-testing-infrastructure/modules/config-files/templates/hadoop_bashrc.tftpl
b/contrib/terraform-testing-infrastructure/modules/config-files/templates/hadoop_bashrc.tftpl
index 82c32e4..de21d00 100644
---
a/contrib/terraform-testing-infrastructure/modules/config-files/templates/hadoop_bashrc.tftpl
+++
b/contrib/terraform-testing-infrastructure/modules/config-files/templates/hadoop_bashrc.tftpl
@@ -10,7 +10,7 @@ export ACCUMULO_LOG_DIR=${accumulo_dir}/logs
export M2_HOME=${software_root}/apache-maven/apache-maven-${maven_version}
export PDSH_RCMD_TYPE=ssh
-export
ACCUMULO_JAVA_OPTS="-javaagent:${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-1.32.0.jar
-Dotel.traces.exporter=jaeger -Dotel.metrics.exporter=none
-Dotel.logs.exporter=none
-Dotel.exporter.jaeger.endpoint=http://${manager_ip}:14250
-Dtest.meter.registry.host=${manager_ip} -Dtest.meter.registry.port=8125"
+export
ACCUMULO_JAVA_OPTS="-javaagent:${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-2.14.0.jar
-Dotel.traces.exporter=otlp -Dotel.metrics.exporter=none
-Dotel.logs.exporter=none
-Dotel.exporter.otlp.endpoint=http://${manager_ip}:4317
-Dotel.exporter.otlp.protocol=grpc -Dtest.meter.registry.host=${manager_ip}
-Dtest.meter.registry.port=8125"
# User specific environment and startup programs
PATH=$PATH:$HOME/.local/bin:$HOME/bin:$ZOOKEEPER_HOME/bin:$HADOOP_HOME/bin:$HADOOP_HOME/sbin:$ACCUMULO_HOME/bin:$M2_HOME/bin
diff --git
a/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_accumulo.sh.tftpl
b/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_accumulo.sh.tftpl
index 04592ff..7dd3cc8 100755
---
a/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_accumulo.sh.tftpl
+++
b/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_accumulo.sh.tftpl
@@ -44,12 +44,11 @@ sudo systemctl start docker
docker run -d --name jaeger \
--restart always \
- -e COLLECTOR_ZIPKIN_HOST_PORT=:9411 \
- -p 5775:5775/udp -p 6831:6831/udp \
- -p 6832:6832/udp -p 5778:5778 \
- -p 16686:16686 -p 14268:14268 \
- -p 14250:14250 -p 9411:9411 \
- jaegertracing/all-in-one:1.29
+ -e COLLECTOR_OTLP_ENABLED=true \
+ -p 16686:16686 \
+ -p 4317:4317 \
+ -p 4318:4318 \
+ jaegertracing/jaeger:2.14.1
docker run --ulimit nofile=66000:66000 -d \
--restart always \
diff --git
a/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl
b/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl
index 3872013..f73ec91 100644
---
a/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl
+++
b/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl
@@ -116,8 +116,8 @@ openssl rand -out
${software_root}/accumulo/accumulo-${accumulo_version}/conf/pe
#
# OpenTelemetry dependencies
#
-if [ ! -f
${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-1.32.0.jar
]; then
- wget
https://search.maven.org/remotecontent?filepath=io/opentelemetry/javaagent/opentelemetry-javaagent/1.32.0/opentelemetry-javaagent-1.32.0.jar
-O
${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-1.32.0.jar
+if [ ! -f
${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-2.14.0.jar
]; then
+ wget
https://search.maven.org/remotecontent?filepath=io/opentelemetry/javaagent/opentelemetry-javaagent/2.14.0/opentelemetry-javaagent-2.14.0.jar
-O
${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-2.14.0.jar
fi
#
# Micrometer dependencies
@@ -129,8 +129,8 @@ if [ ! -f
${software_root}/accumulo/accumulo-${accumulo_version}/lib/accumulo-te
echo "accumulo-test-${accumulo_version}.jar not found, metrics won't
work..."
fi
fi
-if [ ! -f
${software_root}/accumulo/accumulo-${accumulo_version}/lib/micrometer-registry-statsd-1.12.1.jar
]; then
- wget
https://search.maven.org/remotecontent?filepath=io/micrometer/micrometer-registry-statsd/1.12.1/micrometer-registry-statsd-1.12.1.jar
-O
${software_root}/accumulo/accumulo-${accumulo_version}/lib/micrometer-registry-statsd-1.12.1.jar
+if [ ! -f
${software_root}/accumulo/accumulo-${accumulo_version}/lib/micrometer-registry-statsd-1.14.5.jar
]; then
+ wget
https://search.maven.org/remotecontent?filepath=io/micrometer/micrometer-registry-statsd/1.14.5/micrometer-registry-statsd-1.14.5.jar
-O
${software_root}/accumulo/accumulo-${accumulo_version}/lib/micrometer-registry-statsd-1.14.5.jar
fi
#
