From b2a00bddc82abff3d8927524f495ef4b58927884 Mon Sep 17 00:00:00 2001
From: Anuraag Agrawal <aanuraag@amazon.co.jp>
Date: Fri, 14 Aug 2020 13:59:51 +0900
Subject: [PATCH] Add PR build and update.

---
 .github/workflows/pr-build.yml                | 24 +++++++++++++++++++
 awsagentprovider/build.gradle.kts             |  1 -
 dependencyManagement/build.gradle.kts         |  4 ++--
 .../agentbootstrap/AwsAgentBootstrap.java     |  2 +-
 4 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/pr-build.yml

diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
new file mode 100644
index 0000000..3435f01
--- /dev/null
+++ b/.github/workflows/pr-build.yml
@@ -0,0 +1,24 @@
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Build on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 14
+      - uses: burrunan/gradle-cache-action@v1
+        name: Cache .gradle
+      - name: Build with Gradle
+        run: ./gradlew build
diff --git a/awsagentprovider/build.gradle.kts b/awsagentprovider/build.gradle.kts
index d7e40e0..84968e2 100644
--- a/awsagentprovider/build.gradle.kts
+++ b/awsagentprovider/build.gradle.kts
@@ -58,7 +58,6 @@ tasks {
         relocate("io.opentelemetry.internal", "io.opentelemetry.auto.shaded.io.opentelemetry.internal")
         relocate("io.opentelemetry.metrics", "io.opentelemetry.auto.shaded.io.opentelemetry.metrics")
         relocate("io.opentelemetry.trace", "io.opentelemetry.auto.shaded.io.opentelemetry.trace")
-        relocate("io.opentelemetry.contrib.auto.annotations", "io.opentelemetry.auto.shaded.io.opentelemetry.contrib.auto.annotations")
 
         // relocate OpenTelemetry API dependency
         relocate("io.grpc", "io.opentelemetry.auto.shaded.io.grpc")
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 139637a..4d26b1c 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -33,7 +33,7 @@ val DEPENDENCY_BOMS = listOf(
 val DEPENDENCY_SETS = listOf(
         DependencySet(
                 "io.opentelemetry.instrumentation.auto",
-                "0.7.0-20200804.063403-83",
+                "0.8.0-20200812.182934-26",
                 listOf(
                         "opentelemetry-javaagent",
                         "opentelemetry-auto-exporter-otlp"
@@ -41,7 +41,7 @@ val DEPENDENCY_SETS = listOf(
         ),
         DependencySet(
                 "io.opentelemetry",
-                "0.7.0",
+                "0.8.0-20200812.153234-21",
                 listOf(
                         "opentelemetry-api",
                         "opentelemetry-extension-trace-propagators",
diff --git a/otelagent/src/main/java/com/softwareaws/xray/opentelemetry/agentbootstrap/AwsAgentBootstrap.java b/otelagent/src/main/java/com/softwareaws/xray/opentelemetry/agentbootstrap/AwsAgentBootstrap.java
index a6e613e..51cfffa 100644
--- a/otelagent/src/main/java/com/softwareaws/xray/opentelemetry/agentbootstrap/AwsAgentBootstrap.java
+++ b/otelagent/src/main/java/com/softwareaws/xray/opentelemetry/agentbootstrap/AwsAgentBootstrap.java
@@ -27,7 +27,7 @@ public static void premain(final String agentArgs, final Instrumentation inst) {
     public static void agentmain(final String agentArgs, final Instrumentation inst) {
         System.setProperty("io.opentelemetry.auto.shaded.io.opentelemetry.trace.spi.TracerProviderFactory",
                            "com.softwareaws.xray.opentelemetry.exporters.AwsTracerProviderFactory");
-        System.setProperty("otel.propagators", "xray");
+        System.setProperty("otel.propagators", "tracecontext,b3single,b3,jaeger,xray,ottracer");
         AgentBootstrap.agentmain(agentArgs, inst);
     }
 }