Examples: Uncomment OcAgentExportersQuickStart. (#1826)

Author: songy23

examples/build.gradle

@@ -51,13 +51,13 @@ dependencies {
             "io.opencensus:opencensus-contrib-http-util:${opencensusVersion}",
             "io.opencensus:opencensus-contrib-http-servlet:${opencensusVersion}",
             "io.opencensus:opencensus-contrib-http-jetty-client:${opencensusVersion}",
-            // "io.opencensus:opencensus-exporter-metrics-ocagent:${opencensusVersion}",
+            "io.opencensus:opencensus-exporter-metrics-ocagent:${opencensusVersion}",
             "io.opencensus:opencensus-exporter-stats-prometheus:${opencensusVersion}",
             "io.opencensus:opencensus-exporter-stats-stackdriver:${opencensusVersion}",
             "io.opencensus:opencensus-exporter-trace-jaeger:${opencensusVersion}",
             "io.opencensus:opencensus-exporter-trace-stackdriver:${opencensusVersion}",
             "io.opencensus:opencensus-exporter-trace-logging:${opencensusVersion}",
-            // "io.opencensus:opencensus-exporter-trace-ocagent:${opencensusVersion}",
+            "io.opencensus:opencensus-exporter-trace-ocagent:${opencensusVersion}",
             "io.grpc:grpc-protobuf:${grpcVersion}",
             "io.grpc:grpc-stub:${grpcVersion}",
             "io.grpc:grpc-netty-shaded:${grpcVersion}",
@@ -105,7 +105,6 @@ sourceSets {
     main {
         java {
             srcDir 'src'
-            exclude { FileTreeElement e -> e.path.contains('ocagent/') }
             srcDirs 'build/generated/source/proto/main/grpc'
             srcDirs 'build/generated/source/proto/main/java'
         }
@@ -240,13 +239,12 @@ task httpJettyClient(type: CreateStartScripts) {
     classpath = jar.outputs.files + project.configurations.runtime
 }
 
-// TODO(songy23): uncomment this when Agent exporters are released.
-//task ocAgentExportersQuickStart(type: CreateStartScripts) {
-//    mainClassName = 'io.opencensus.examples.ocagent.OcAgentExportersQuickStart'
-//    applicationName = 'OcAgentExportersQuickStart'
-//    outputDir = new File(project.buildDir, 'tmp')
-//    classpath = jar.outputs.files + project.configurations.runtime
-//}
+task ocAgentExportersQuickStart(type: CreateStartScripts) {
+    mainClassName = 'io.opencensus.examples.ocagent.OcAgentExportersQuickStart'
+    applicationName = 'OcAgentExportersQuickStart'
+    outputDir = new File(project.buildDir, 'tmp')
+    classpath = jar.outputs.files + project.configurations.runtime
+}
 
 
 applicationDistribution.into('bin') {
@@ -266,6 +264,6 @@ applicationDistribution.into('bin') {
     from(longGaugeQuickstart)
     from(httpJettyServer)
     from(httpJettyClient)
-    // from(ocAgentExportersQuickStart)
+    from(ocAgentExportersQuickStart)
     fileMode = 0755
 }

examples/pom.xml

@@ -13,7 +13,7 @@
     <!-- change to the version you want to use. -->
     <jetty.version>9.4.12.v20180830</jetty.version>
     <opencensus.version>0.20.0</opencensus.version><!-- LATEST_OPENCENSUS_RELEASE_VERSION -->
-    <grpc.version>1.17.1</grpc.version><!-- CURRENT_GRPC_VERSION -->
+    <grpc.version>1.19.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
   </properties>
   <dependencies>
     <dependency>
@@ -46,15 +46,21 @@
       <artifactId>opencensus-contrib-zpages</artifactId>
       <version>${opencensus.version}</version>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>io.opencensus</groupId>-->
-      <!--<artifactId>opencensus-exporter-metrics-ocagent</artifactId>-->
-      <!--<version>${opencensus.version}</version>-->
-    <!--</dependency>-->
+    <dependency>
+      <groupId>io.opencensus</groupId>
+      <artifactId>opencensus-exporter-metrics-ocagent</artifactId>
+      <version>${opencensus.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.opencensus</groupId>
       <artifactId>opencensus-exporter-stats-stackdriver</artifactId>
       <version>${opencensus.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>io.grpc</groupId>
+          <artifactId>grpc-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.opencensus</groupId>
@@ -76,16 +82,21 @@
       <artifactId>opencensus-exporter-trace-logging</artifactId>
       <version>${opencensus.version}</version>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>io.opencensus</groupId>-->
-      <!--<artifactId>opencensus-exporter-trace-ocagent</artifactId>-->
-      <!--<version>${opencensus.version}</version>-->
-    <!--</dependency>-->
+    <dependency>
+      <groupId>io.opencensus</groupId>
+      <artifactId>opencensus-exporter-trace-ocagent</artifactId>
+      <version>${opencensus.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-core</artifactId>
       <version>${grpc.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-netty</artifactId>
+      <version>${grpc.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-netty-shaded</artifactId>
@@ -236,11 +247,10 @@
               <id>HttpJettyServer</id>
               <mainClass>io.opencensus.examples.http.jetty.server.HelloWorldServer</mainClass>
             </program>
-            <!--TODO(songy23): uncomment this when Agent exporters are released.-->
-            <!--<program>-->
-              <!--<id>OcAgentExportersQuickStart</id>-->
-              <!--<mainClass>io.opencensus.examples.ocagent.OcAgentExportersQuickStart</mainClass>-->
-            <!--</program>-->
+            <program>
+              <id>OcAgentExportersQuickStart</id>
+              <mainClass>io.opencensus.examples.ocagent.OcAgentExportersQuickStart</mainClass>
+            </program>
           </programs>
         </configuration>
       </plugin>
@@ -265,15 +275,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/ocagent/**/*.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>