This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git
The following commit(s) were added to refs/heads/main by this push:
new 77e4910 Update OpenTelemetry and Micrometer versions to match
Accumulo 2.1.0 (#201)
77e4910 is described below
commit 77e4910a478ef77d0cc2cc9614f5d6687f9470a8
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Apr 7 14:11:58 2022 -0400
Update OpenTelemetry and Micrometer versions to match Accumulo 2.1.0 (#201)
---
contrib/terraform-testing-infrastructure/README.md | 4 ++--
.../modules/config-files/templates/hadoop_bashrc.tftpl | 2 +-
.../modules/config-files/templates/install_sw.sh.tftpl | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/contrib/terraform-testing-infrastructure/README.md
b/contrib/terraform-testing-infrastructure/README.md
index 693d87f..a4c3fea 100644
--- a/contrib/terraform-testing-infrastructure/README.md
+++ b/contrib/terraform-testing-infrastructure/README.md
@@ -321,11 +321,11 @@ This Terraform configuration:
and builds the software using Maven, then untars the binary tarball to
`${software_root}/accumulo/accumulo-${accumulo_version}`
5. Downloads the [OpenTelemetry](https://opentelemetry.io/) Java Agent jar
file and copies it to
-
`${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-1.7.1.jar`
+
`${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-1.12.1.jar`
6. Copies the Accumulo `test` jar to
`${software_root}/accumulo/accumulo-${accumulo_version}/lib`
so that `org.apache.accumulo.test.metrics.TestStatsDRegistryFactory` is
on the classpath
7. Downloads the [Micrometer](https://micrometer.io/) StatsD Registry jar
file and copies it to
-
`${software_root}/accumulo/accumulo-${accumulo_version}/lib/micrometer-registry-statsd-1.7.4.jar`
+
`${software_root}/accumulo/accumulo-${accumulo_version}/lib/micrometer-registry-statsd-1.8.4.jar`
8. Clones, if necessary, the Apache Accumulo Testing Git repo from
`${accumulo_testing_repo}`
into `${software_root}/sources/accumulo-testing-repo`. It switches to the
`${accumulo_testing_branch_name}` branch and builds the software using
Maven.
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 6343669..11ede3d 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
@@ -9,7 +9,7 @@ export
ACCUMULO_HOME=${software_root}/accumulo/accumulo-${accumulo_version}
export ACCUMULO_LOG_DIR=${accumulo_dir}/logs
export M2_HOME=${software_root}/apache-maven/apache-maven-${maven_version}
-export
ACCUMULO_JAVA_OPTS="-javaagent:${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-1.7.1.jar
-Dotel.traces.exporter=jaeger
-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-1.12.1.jar
-Dotel.traces.exporter=jaeger
-Dotel.exporter.jaeger.endpoint=http://${manager_ip}:14250
-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/install_sw.sh.tftpl
b/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl
index dc3b55a..d8ceac7 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
@@ -85,8 +85,8 @@
${software_root}/accumulo/accumulo-${accumulo_version}/bin/accumulo-util build-n
#
# OpenTelemetry dependencies
#
-if [ ! -f
${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-1.7.1.jar
]; then
- wget
https://search.maven.org/remotecontent?filepath=io/opentelemetry/javaagent/opentelemetry-javaagent/1.7.1/opentelemetry-javaagent-1.7.1.jar
-O
${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-1.7.1.jar
+if [ ! -f
${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-1.12.1.jar
]; then
+ wget
https://search.maven.org/remotecontent?filepath=io/opentelemetry/javaagent/opentelemetry-javaagent/1.12.1/opentelemetry-javaagent-1.12.1.jar
-O
${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-1.12.1.jar
fi
#
# Micrometer dependencies
@@ -98,8 +98,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.7.4.jar
]; then
- wget
https://search.maven.org/remotecontent?filepath=io/micrometer/micrometer-registry-statsd/1.7.4/micrometer-registry-statsd-1.7.4.jar
-O
${software_root}/accumulo/accumulo-${accumulo_version}/lib/micrometer-registry-statsd-1.7.4.jar
+if [ ! -f
${software_root}/accumulo/accumulo-${accumulo_version}/lib/micrometer-registry-statsd-1.8.4.jar
]; then
+ wget
https://search.maven.org/remotecontent?filepath=io/micrometer/micrometer-registry-statsd/1.8.4/micrometer-registry-statsd-1.8.4.jar
-O
${software_root}/accumulo/accumulo-${accumulo_version}/lib/micrometer-registry-statsd-1.8.4.jar
fi
#
