Bump OpenTelemetry and Micrometer versions (#209) main
authorDave Marion <dlmarion@apache.org>
Mon, 27 Jun 2022 11:07:05 +0000 (07:07 -0400)
committerGitHub <noreply@github.com>
Mon, 27 Jun 2022 11:07:05 +0000 (07:07 -0400)
contrib/terraform-testing-infrastructure/modules/config-files/templates/hadoop_bashrc.tftpl
contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl

index 11ede3df266af4b53b01f412aaa874872f7f5fa7..3c2f04a1005df5ff19679c817f0670674855aab7 100644 (file)
@@ -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.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"
+export ACCUMULO_JAVA_OPTS="-javaagent:${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-1.14.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"
 
 # 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
index 411cf066de746bd53c78de5665ee53008143f4bc..0127e233fd0f492ef5975959a0208c1c4096fc06 100644 (file)
@@ -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.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
+if [ ! -f ${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-1.14.0.jar ]; then
+  wget https://search.maven.org/remotecontent?filepath=io/opentelemetry/javaagent/opentelemetry-javaagent/1.14.0/opentelemetry-javaagent-1.14.0.jar -O ${software_root}/accumulo/accumulo-${accumulo_version}/lib/opentelemetry-javaagent-1.14.0.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.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
+if [ ! -f ${software_root}/accumulo/accumulo-${accumulo_version}/lib/micrometer-registry-statsd-1.9.1.jar ]; then
+  wget https://search.maven.org/remotecontent?filepath=io/micrometer/micrometer-registry-statsd/1.9.1/micrometer-registry-statsd-1.9.1.jar -O ${software_root}/accumulo/accumulo-${accumulo_version}/lib/micrometer-registry-statsd-1.9.1.jar
 fi
 
 #