Merge pull request #1853 from microsoft/update-submodule

trask · web-flow · commit 2dcff14ae38a · 2021-08-17T08:37:00.000-07:00
Bump submodule
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -37,8 +37,9 @@ jobs:
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
       - name: Build otel-fork
         run: |
-          cd otel
-          ./gradlew publishToMavenLocal
+          ./otel/gradlew --project-dir otel/gradle-plugins publishToMavenLocal
+          ./otel/gradlew --project-dir otel :muzzle:publishToMavenLocal
+          ./otel/gradlew --project-dir otel publishToMavenLocal
       - name: Test
         # TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
         run: ./gradlew check --stacktrace
@@ -90,8 +91,9 @@ jobs:
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
       - name: Build otel-fork
         run: |
-          cd otel
-          ./gradlew publishToMavenLocal
+          ./otel/gradlew --project-dir otel/gradle-plugins publishToMavenLocal
+          ./otel/gradlew --project-dir otel :muzzle:publishToMavenLocal
+          ./otel/gradlew --project-dir otel publishToMavenLocal
       - name: Test
         # TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
         run: ./gradlew ${{ matrix.module }}:smokeTest
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -39,8 +39,9 @@ jobs:
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
       - name: Build otel-fork
         run: |
-          cd otel
-          ./gradlew publishToMavenLocal
+          ./otel/gradlew --project-dir otel/gradle-plugins publishToMavenLocal
+          ./otel/gradlew --project-dir otel :muzzle:publishToMavenLocal
+          ./otel/gradlew --project-dir otel publishToMavenLocal
       - name: Test
         # TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
         run: ./gradlew check --stacktrace
@@ -92,8 +93,9 @@ jobs:
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
       - name: Build otel-fork
         run: |
-          cd otel
-          ./gradlew publishToMavenLocal
+          ./otel/gradlew --project-dir otel/gradle-plugins publishToMavenLocal
+          ./otel/gradlew --project-dir otel :muzzle:publishToMavenLocal
+          ./otel/gradlew --project-dir otel publishToMavenLocal
       - name: Test
         # TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
         run: ./gradlew ${{ matrix.module }}:smokeTest
diff --git a/.lgtm.yml b/.lgtm.yml
@@ -7,5 +7,6 @@ extraction:
       java_version: 11
       build_command: |
         # needs Java 11, otherwise this could be done in before_index
-        ./otel/gradlew --project-dir ./otel --no-daemon publishToMavenLocal
+        ./otel/gradlew --project-dir otel/gradle-plugins publishToMavenLocal
+        ./otel/gradlew --project-dir otel publishToMavenLocal
         ./gradlew --no-daemon testClasses
diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml
@@ -38,6 +38,14 @@ restore:
     - !!defaultcommand
       name: 'Install Java 11 JDK'
       command: '.scripts/installJava11jdk.cmd'
+    - !!defaultcommand
+      name: 'Add OpenTelemetry to MavenLocal (pre-1)'
+      command: '.scripts/ot-gradle.cmd'
+      arguments: '--project-dir gradle-plugins publishToMavenLocal'
+    - !!defaultcommand
+      name: 'Add OpenTelemetry to MavenLocal (pre-2)'
+      command: '.scripts/ot-gradle.cmd'
+      arguments: ':muzzle:publishToMavenLocal'
     - !!defaultcommand
       name: 'Add OpenTelemetry to MavenLocal'
       command: '.scripts/ot-gradle.cmd'
diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile
@@ -8,11 +8,11 @@ ch.qos.logback:logback-core:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
 com.squareup.moshi:moshi:1.11.0=runtimeClasspath
 com.squareup.okio:okio:1.17.5=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.4.0+ai.patch.1-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.5.0-alpha-SNAPSHOT=runtimeClasspath
 io.opentelemetry:opentelemetry-api-metrics:1.4.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-api:1.4.1=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 com.google.errorprone:error_prone_annotations:2.7.1=runtimeClasspath
 com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.4.0+ai.patch.1-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
 org.junit:junit-bom:5.7.2=runtimeClasspath
diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 com.google.errorprone:error_prone_annotations:2.7.1=runtimeClasspath
 com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.4.0+ai.patch.1-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
 org.junit:junit-bom:5.7.2=runtimeClasspath
diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
@@ -2,7 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.4.0+ai.patch.1-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
 org.junit:junit-bom:5.7.2=runtimeClasspath
diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile
@@ -2,7 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.4.0+ai.patch.1-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
 org.junit:junit-bom:5.7.2=runtimeClasspath
diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile
@@ -2,7 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.4.0+ai.patch.1-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
 org.junit:junit-bom:5.7.2=runtimeClasspath
diff --git a/agent/agent-profiler/agent-profiler-api/gradle.lockfile b/agent/agent-profiler/agent-profiler-api/gradle.lockfile
@@ -14,7 +14,7 @@ com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
 com.squareup.moshi:moshi:1.11.0=runtimeClasspath
 com.squareup.okio:okio:1.17.5=runtimeClasspath
 io.netty:netty-tcnative-boringssl-static:2.0.39.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.4.0+ai.patch.1-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
 io.projectreactor:reactor-core:3.4.6=runtimeClasspath
diff --git a/agent/agent-profiler/agent-service-profiler/gradle.lockfile b/agent/agent-profiler/agent-service-profiler/gradle.lockfile
@@ -36,7 +36,7 @@ io.netty:netty-transport-native-epoll:4.1.65.Final=runtimeClasspath
 io.netty:netty-transport-native-kqueue:4.1.65.Final=runtimeClasspath
 io.netty:netty-transport-native-unix-common:4.1.65.Final=runtimeClasspath
 io.netty:netty-transport:4.1.65.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.4.0+ai.patch.1-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.4.1=runtimeClasspath
 io.projectreactor.netty:reactor-netty-core:1.0.7=runtimeClasspath
diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile
@@ -55,14 +55,14 @@ io.netty:netty-transport-native-epoll:4.1.65.Final=runtimeClasspath
 io.netty:netty-transport-native-kqueue:4.1.65.Final=runtimeClasspath
 io.netty:netty-transport-native-unix-common:4.1.65.Final=runtimeClasspath
 io.netty:netty-transport:4.1.65.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.javaagent:opentelemetry-muzzle:1.4.0+ai.patch.1-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.javaagent:opentelemetry-muzzle:1.5.0-alpha-SNAPSHOT=runtimeClasspath
 io.opentelemetry:opentelemetry-api-metrics:1.4.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-api:1.4.1=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile
@@ -8,11 +8,11 @@ ch.qos.logback:logback-core:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath
 com.squareup.moshi:moshi:1.11.0=runtimeClasspath
 com.squareup.okio:okio:1.17.5=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.4.0+ai.patch.1-alpha=runtimeClasspath
-io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.4.0+ai.patch.1-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.5.0-alpha-SNAPSHOT=runtimeClasspath
+io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.5.0-alpha-SNAPSHOT=runtimeClasspath
 io.opentelemetry:opentelemetry-api-metrics:1.4.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-api:1.4.1=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha=runtimeClasspath
diff --git a/agent/instrumentation/build.gradle.kts b/agent/instrumentation/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
   id("com.github.johnrengelman.shadow")
 }
 
-val otelInstrumentationAlphaVersion = "1.4.0+ai.patch.1-alpha"
+val otelInstrumentationAlphaVersion = "1.5.0-alpha-SNAPSHOT"
 
 configurations {
   // exclude bootstrap dependencies from shadowJar
@@ -48,6 +48,7 @@ dependencies {
   implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-async-http-client-2.0:${otelInstrumentationAlphaVersion}")
   implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-functions:${otelInstrumentationAlphaVersion}")
   implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-core-1.14:${otelInstrumentationAlphaVersion}")
+  implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-core-1.19:${otelInstrumentationAlphaVersion}")
   implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-cassandra-3.0:${otelInstrumentationAlphaVersion}")
   implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-cassandra-4.0:${otelInstrumentationAlphaVersion}")
   implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-executors:${otelInstrumentationAlphaVersion}")
diff --git a/agent/instrumentation/gradle.lockfile b/agent/instrumentation/gradle.lockfile
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile
diff --git a/otel b/otel
