Merge pull request #2266 from microsoft/merge-vnext-into-main

Merge vnext into main

Author: trask

.config/CredScanSuppressions.json

@@ -5,7 +5,8 @@
       "file": [
         "C:\\source\\otel\\testing-common\\src\\misc\\README.md",
         "C:\\source\\otel\\testing-common\\src\\misc\\testing-keystore.p12",
-        "C:\\source\\otel\\benchmark-overhead\\src\\test\\java\\io\\opentelemetry\\containers\\PostgresContainer.java"
+        "C:\\source\\otel\\benchmark-overhead\\src\\test\\java\\io\\opentelemetry\\containers\\PostgresContainer.java",
+        "C:\\source\\otel\\.github\\dependabot.yml"
       ],
       "_justification": "The secret is used only for testing."
     }

.github/workflows/ci.yaml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - vnext
 
 jobs:
   build:
@@ -38,10 +39,10 @@ jobs:
       - name: Build otel-fork
         working-directory: otel
         # javadoc fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
-        run: ./gradlew publishToMavenLocal -x javadoc --stacktrace
+        run: ./gradlew publishToMavenLocal -x javadoc
       - name: Test
         # TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
-        run: ./gradlew check --stacktrace
+        run: ./gradlew check
       - name: Upload snapshot
         # only upload from windows since only that build includes etw
         if: matrix.os == 'windows-2019'
@@ -97,7 +98,7 @@ jobs:
       - name: Build otel-fork
         working-directory: otel
         # javadoc fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
-        run: ./gradlew publishToMavenLocal -x javadoc --stacktrace
+        run: ./gradlew publishToMavenLocal -x javadoc
       - name: Test
         # TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
         run: ./gradlew ${{ matrix.module }}:smokeTest

.github/workflows/pr.yaml

@@ -40,10 +40,10 @@ jobs:
       - name: Build otel-fork
         working-directory: otel
         # javadoc fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
-        run: ./gradlew publishToMavenLocal -x javadoc --stacktrace
+        run: ./gradlew publishToMavenLocal -x javadoc
       - name: Test
         # TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
-        run: ./gradlew check --stacktrace
+        run: ./gradlew check assemble
       - name: Upload snapshot
         # only upload from windows since only that build includes etw
         if: matrix.os == 'windows-2019'

.lgtm.yml

@@ -6,6 +6,9 @@ extraction:
     index:
       java_version: 11
       build_command: |
+        # fails without this, guessing similar to https://github.com/github/codeql-action/issues/972
+        export JAVA_TOOL_OPTIONS=--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+
         # needs Java 11, otherwise this could be done in before_index
         # javadoc fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
         ./otel/gradlew --project-dir otel publishToMavenLocal -x javadoc

.pipelines/pipeline.user.windows.buddy.yml

@@ -13,9 +13,4 @@ build:
       artifacts:
         - to: 'Artifacts'
           include:
-            - '**/build/libs/*.jar'
-            - '**/build/libs/*-sources.jar'
-            - '**/build/libs/*-javadoc.jar'
-            - '**/build/libs/*.pom'
-          exclude:
-            - 'buildSrc/**/*'
+            - 'agent/agent/build/libs/*.jar'

.pipelines/pipeline.user.windows.official.nonrelease.yml

@@ -20,9 +20,4 @@ build:
       artifacts:
         - to: 'Artifacts'
           include:
-            - '**/build/libs/*.jar'
-            - '**/build/libs/*-sources.jar'
-            - '**/build/libs/*-javadoc.jar'
-            - '**/build/libs/*.pom'
-          exclude:
-            - 'buildSrc/**/*'
+            - 'agent/agent/build/libs/*.jar'

.pipelines/pipeline.user.windows.official.yml

@@ -16,13 +16,11 @@ build:
     - !!buildcommand
       name: 'Assemble ApplicationInsights-Java JARs'
       command: '.scripts/gradle.cmd'
-      arguments: 'assemble copyLibsToGlobalArtifactsFolder -DisRelease=true -Pai.etw.native.build=release'
+      arguments: 'publishToMavenLocal -DisRelease=true -Pai.etw.native.build=release'
       artifacts:
         - to: 'Artifacts'
           include:
-            - '**/build/libs/*.jar'
-            - '**/build/libs/*-sources.jar'
-            - '**/build/libs/*-javadoc.jar'
-            - '**/build/libs/*.pom'
-          exclude:
-            - 'buildSrc/**/*'
+            - '~/.m2/repository/com/microsoft/azure/applicationinsights-agent/*/*.jar'
+            - '~/.m2/repository/com/microsoft/azure/applicationinsights-agent/*/*-sources.jar'
+            - '~/.m2/repository/com/microsoft/azure/applicationinsights-agent/*/*-javadoc.jar'
+            - '~/.m2/repository/com/microsoft/azure/applicationinsights-agent/*/*.pom'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+# Version 3.3.0-BETA
+* Update OpenTelemetry to 1.13 [#2257](https://github.com/microsoft/ApplicationInsights-Java/pull/2257).
+* Deprecate logs' LoggingLevel custom property [#2254](https://github.com/microsoft/ApplicationInsights-Java/pull/2254).
+* Add support for OpenTelemetry metrics API
+* Lots of refactorings and improvements.
+
 # Version 3.2.11 GA
 * Turn off Statsbeat when unable to reach ingestion service. [#2221](https://github.com/microsoft/ApplicationInsights-Java/pull/2221).
 

agent/agent-bootstrap/build.gradle.kts

@@ -3,22 +3,16 @@ plugins {
   id("ai.sdk-version-file")
 }
 
-val otelInstrumentationAlphaVersion = "1.10.0+ai.patches-alpha"
+val otelInstrumentationAlphaVersion = "1.14.0.1-alpha"
 
 dependencies {
-  implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap") {
-    exclude("org.slf4j", "slf4j-simple")
-  }
-  implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
-  implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support")
-  implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api")
+  // needed to access io.opentelemetry.instrumentation.api.aisdk.MicrometerUtil
+  // TODO (heya) remove this when updating to upstream micrometer instrumentation
+  compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
+
   implementation("ch.qos.logback:logback-classic")
   implementation("ch.qos.logback.contrib:logback-json-classic")
 
-  implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-jaxrs-common-bootstrap:$otelInstrumentationAlphaVersion")
-  implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-kafka-clients-0.11-bootstrap:$otelInstrumentationAlphaVersion")
-  implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-undertow-1.4-bootstrap:$otelInstrumentationAlphaVersion")
-
   // not using gson because it has dependency on java.sql.*, which is not available in Java 9+ bootstrap class loader
   // only complaint so far about moshi is that it doesn"t give line numbers when there are json formatting errors
   implementation("com.squareup.moshi:moshi")

agent/agent-bootstrap/gradle.lockfile

@@ -9,20 +9,9 @@ com.google.guava:guava-bom:31.0.1-jre=runtimeClasspath
 com.squareup.moshi:moshi:1.11.0=runtimeClasspath
 com.squareup.okio:okio:1.17.5=runtimeClasspath
 io.netty:netty-bom:4.1.72.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:1.10.0+ai.patches-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.10.0+ai.patches-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.10.0+ai.patches-alpha=runtimeClasspath
-io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-jaxrs-common-bootstrap:1.10.0+ai.patches-alpha=runtimeClasspath
-io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-kafka-clients-0.11-bootstrap:1.10.0+ai.patches-alpha=runtimeClasspath
-io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:1.10.0+ai.patches-alpha=runtimeClasspath
-io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-undertow-1.4-bootstrap:1.10.0+ai.patches-alpha=runtimeClasspath
-io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.10.0+ai.patches-alpha=runtimeClasspath
-io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.10.0+ai.patches-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-api:1.10.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath
-io.opentelemetry:opentelemetry-context:1.10.0=runtimeClasspath
-io.opentelemetry:opentelemetry-semconv:1.10.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0.1-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.13.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.13.0=runtimeClasspath
 org.junit:junit-bom:5.7.2=runtimeClasspath
-org.slf4j:slf4j-api:1.7.32=runtimeClasspath
+org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 empty=