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 cc9ff31 Bump OpenTelemetry and Micrometer versions (#209) cc9ff31 is described below commit cc9ff31268d6860025e05fbfefa30c22cbe20284 Author: Dave Marion <dlmar...@apache.org> AuthorDate: Mon Jun 27 07:07:05 2022 -0400 Bump OpenTelemetry and Micrometer versions (#209) --- .../modules/config-files/templates/hadoop_bashrc.tftpl | 2 +- .../modules/config-files/templates/install_sw.sh.tftpl | 8 ++++---- 2 files changed, 5 insertions(+), 5 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 11ede3d..3c2f04a 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.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 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 411cf06..0127e23 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.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 #