Merge pull request #14 from williamhu99/tracez-zpage

Merge the tracez-zpage branch into the master branch
open-telemetry · Jun 26, 2020 · 6d3236a · 6d3236a
2 parents 42ace25 + bc2bd2c
commit 6d3236a
Show file tree

Hide file tree

Showing 17 changed files with 2,347 additions and 146 deletions.
diff --git a/sdk_contrib/zpages/build.gradle b/sdk_contrib/zpages/build.gradle
@@ -12,5 +12,8 @@ dependencies {
     api project(':opentelemetry-api'),
             project(':opentelemetry-sdk')
 
+    implementation libraries.guava
+    implementation 'com.sun.net.httpserver:http:20070405'
+
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
 }
diff --git a/sdk_contrib/zpages/src/main/java/io/opentelemetry/sdk/contrib/zpages/Config.java b/sdk_contrib/zpages/src/main/java/io/opentelemetry/sdk/contrib/zpages/Config.java
diff --git a/...ntrib/zpages/src/main/java/io/opentelemetry/sdk/contrib/zpages/MetricExporterFactory.java b/...ntrib/zpages/src/main/java/io/opentelemetry/sdk/contrib/zpages/MetricExporterFactory.java
diff --git a/...contrib/zpages/src/main/java/io/opentelemetry/sdk/contrib/zpages/SpanExporterFactory.java b/...contrib/zpages/src/main/java/io/opentelemetry/sdk/contrib/zpages/SpanExporterFactory.java