Using 0.9.0 spi change from open telemetry (#49)

GoogleCloudPlatform · Nov 5, 2020 · 1eb5385 · 1eb5385
1 parent fb7b39a
commit 1eb5385
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ subprojects {
         googleCloudVersion = '1.0.2'
         cloudMonitoringVersion = '2.0.1'
         openTelemetryVersion = '0.9.1'
-        openTelemetryInstrumentationVersion = '0.8.0'
+        openTelemetryInstrumentationVersion = '0.9.0'
         junitVersion = '4.13'
         mockitoVersion = '3.5.10'
         opentelemetryOperationsVersion = "0.9.1"  // CURRENT_RELEASE_VERSION
@@ -42,7 +42,7 @@ subprojects {
                 slf4j                        : "org.slf4j:slf4j-api:${slf4jVersion}",
                 opentelemetry_api            : "io.opentelemetry:opentelemetry-api:${openTelemetryVersion}",
                 opentelemetry_sdk            : "io.opentelemetry:opentelemetry-sdk:${openTelemetryVersion}",
-                opentelemetry_auto           : "io.opentelemetry.instrumentation.auto:opentelemetry-javaagent-tooling:${openTelemetryInstrumentationVersion}",
+                opentelemetry_auto           : "io.opentelemetry.javaagent:opentelemetry-javaagent-spi:${openTelemetryInstrumentationVersion}",
                 opentelemetry_operations_java: "com.google.cloud.opentelemetry:exporter-trace:${opentelemetryOperationsVersion}"
         ]
         testLibraries = [

diff --git a/...o/src/main/java/com/google/cloud/opentelemetry/auto/GoogleCloudMetricExporterFactory.java b/...o/src/main/java/com/google/cloud/opentelemetry/auto/GoogleCloudMetricExporterFactory.java
@@ -2,15 +2,15 @@
 
 import com.google.auto.service.AutoService;
 import com.google.cloud.opentelemetry.metric.MetricExporter;
-import io.opentelemetry.javaagent.tooling.exporter.ExporterConfig;
-import io.opentelemetry.javaagent.tooling.exporter.MetricExporterFactory;
+import io.opentelemetry.javaagent.spi.exporter.MetricExporterFactory;
 
 import java.io.IOException;
+import java.util.Properties;
 
 @AutoService(MetricExporterFactory.class)
 public class GoogleCloudMetricExporterFactory implements MetricExporterFactory {
     @Override
-    public MetricExporter fromConfig(ExporterConfig _config) {
+    public MetricExporter fromConfig(Properties _config) {
         try {
             return MetricExporter.createWithDefaultConfiguration();
         } catch (IOException ex) {

diff --git a/...uto/src/main/java/com/google/cloud/opentelemetry/auto/GoogleCloudSpanExporterFactory.java b/...uto/src/main/java/com/google/cloud/opentelemetry/auto/GoogleCloudSpanExporterFactory.java
@@ -2,15 +2,15 @@
 
 import com.google.auto.service.AutoService;
 import com.google.cloud.opentelemetry.trace.TraceExporter;
-import io.opentelemetry.javaagent.tooling.exporter.ExporterConfig;
-import io.opentelemetry.javaagent.tooling.exporter.SpanExporterFactory;
+import io.opentelemetry.javaagent.spi.exporter.SpanExporterFactory;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import java.io.IOException;
+import java.util.Properties;
 
 @AutoService(SpanExporterFactory.class)
 public class GoogleCloudSpanExporterFactory implements SpanExporterFactory {
     @Override
-    public SpanExporter fromConfig(ExporterConfig _config) {
+    public SpanExporter fromConfig(Properties _config) {
         try {
             return TraceExporter.createWithDefaultConfiguration();
         } catch (IOException ex) {