Merge branch 'prfromdeki' into 'main'

Prfromdeki See merge request observability-bd-projects/one-observability-demo!36
git-jayj · Aug 18, 2021 · 15ceafb · 15ceafb
2 parents 20e507d + cc1ce54
commit 15ceafb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/PetAdoptions/petsearch-java/Dockerfile b/PetAdoptions/petsearch-java/Dockerfile
@@ -11,7 +11,7 @@ RUN gradle build -DexcludeTags='integration'
 FROM amazoncorretto:15-alpine
 WORKDIR /app
 
-ADD https://github.com/aws-observability/aws-otel-java-instrumentation/releases/download/v0.18.0-aws.1/aws-opentelemetry-agent.jar /app/aws-opentelemetry-agent.jar
+ADD https://github.com/aws-observability/aws-otel-java-instrumentation/releases/download/v1.2.0/aws-opentelemetry-agent.jar /app/aws-opentelemetry-agent.jar
 ENV JAVA_TOOL_OPTIONS "-javaagent:/app/aws-opentelemetry-agent.jar"
 
 ARG JAR_FILE=build/libs/\*.jar

diff --git a/PetAdoptions/petsearch-java/build.gradle b/PetAdoptions/petsearch-java/build.gradle
@@ -16,7 +16,7 @@ repositories {
 ext {
     set('springCloudVersion', "Hoxton.SR10")
     set('testContainerVersion', '1.13.0')
-    set('opentelemetryVersion', '1.0.1')
+    set('opentelemetryVersion', '1.3.0')
 }
 
 dependencies {
@@ -30,8 +30,8 @@ dependencies {
     implementation 'com.amazonaws:aws-java-sdk-ssm'
     implementation 'com.amazonaws:aws-java-sdk-sqs'
 
-    implementation "io.opentelemetry:opentelemetry-api:${opentelemetryVersion}"
-    implementation "io.opentelemetry:opentelemetry-api-metrics:${opentelemetryVersion}-alpha"
+    implementation "io.opentelemetry:opentelemetry-api"
+    implementation "io.opentelemetry:opentelemetry-api-metrics"
 
     testImplementation('org.springframework.boot:spring-boot-starter-test') {
         exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
@@ -46,6 +46,8 @@ dependencyManagement {
     imports {
         mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
         mavenBom "com.amazonaws:aws-xray-recorder-sdk-bom:2.4.0"
+        mavenBom "io.opentelemetry:opentelemetry-bom:${opentelemetryVersion}"
+        mavenBom "io.opentelemetry:opentelemetry-bom-alpha:${opentelemetryVersion}-alpha"
         mavenBom 'com.amazonaws:aws-java-sdk-bom:1.11.946'
     }
 }

diff --git a/PetAdoptions/petsearch-java/src/main/java/ca/petsearch/MetricEmitter.java b/PetAdoptions/petsearch-java/src/main/java/ca/petsearch/MetricEmitter.java
@@ -1,6 +1,6 @@
 package ca.petsearch;
 
-import io.opentelemetry.api.metrics.GlobalMetricsProvider;
+import io.opentelemetry.api.metrics.GlobalMeterProvider;
 import io.opentelemetry.api.metrics.LongCounter;
 import io.opentelemetry.api.metrics.LongValueRecorder;
 import io.opentelemetry.api.metrics.Meter;
@@ -28,7 +28,7 @@ public class MetricEmitter {
     private Tracer tracer;
 
     public MetricEmitter(Tracer tracer) {
-        Meter meter = GlobalMetricsProvider.getMeter("aws-otel", "1.0");
+        Meter meter = GlobalMeterProvider.getMeter("aws-otel", "1.0");
 
         this.tracer = tracer;