New preview flag (#1601)

* Better debug logs

* Fix sporadic docker networking failure

* Update dependency

* Build script improvements

* Fix test message

* Support gradle build with skipWinNative

Author: trask

.github/workflows/pr.yaml

@@ -7,6 +7,31 @@ on:
       - master
 
 jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Java 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Init and update otel submodule
+        run: |
+          git submodule init
+          git submodule update
+      - name: Restore cache
+        uses: burrunan/gradle-cache-action@v1
+      - name: Build otel-fork
+        run: |
+          cd otel
+          # TODO why does this error only happen in GHA, without "-x signMavenPublication"?
+          #   "Cannot perform signing task ':instrumentation-api:signMavenPublication' because it has no configured signatory"
+          ./gradlew publishToMavenLocal -x signMavenPublication
+      - name: Test
+        # TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
+        # TODO enable tests (currently a couple don't pass on linux)
+        run: ./gradlew check -x test --stacktrace
+
   setup-smoke-test-matrix:
     runs-on: ubuntu-latest
     outputs:
@@ -40,6 +65,8 @@ jobs:
           git submodule update
       - name: Restore cache
         uses: burrunan/gradle-cache-action@v1
+        with:
+          read-only: true
       - name: Build otel-fork
         run: |
           cd otel
@@ -48,10 +75,10 @@ jobs:
           ./gradlew publishToMavenLocal -x signMavenPublication
       - name: Test
         # TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
-        run: ./gradlew ${{ matrix.module }}:smokeTest --no-daemon
+        run: ./gradlew ${{ matrix.module }}:smokeTest
 
   accept-pr:
-    needs: smoke-test
+    needs: [ build, smoke-test ]
     runs-on: ubuntu-latest
     if: always()
     steps:

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

@@ -9,7 +9,7 @@ build:
     - !!buildcommand
       name: 'Assemble ApplicationInsights-Java JARs'
       command: '.scripts/gradle.cmd'
-      arguments: 'assemble prepare'
+      arguments: 'assemble copyLibsToGlobalArtifactsFolder'
       artifacts:
         - to: 'Artifacts'
           include:

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

@@ -8,7 +8,7 @@ build:
     - !!buildcommand
       name: 'Assemble ApplicationInsights-Java JARs'
       command: '.scripts/gradle.cmd'
-      arguments: 'assemble prepare -DisRelease=true -Pai.etw.native.build=release'
+      arguments: 'assemble copyLibsToGlobalArtifactsFolder -DisRelease=true -Pai.etw.native.build=release'
       artifacts:
         - to: 'Artifacts'
           include:

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/AppIdSupplier.java

@@ -91,7 +91,7 @@ public String get() {
         //it's possible the appId returned is null (e.g. async task is still pending or has failed). In this case, just
         //return and let the next request resolve the ikey.
         if (appId == null) {
-            logger.debug("appId has not been retrived yet (e.g. task may be pending or failed)");
+            logger.debug("appId has not been retrieved yet (e.g. task may be pending or failed)");
             return "";
         }
         return appId;

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/wasbootstrap/OpenTelemetryConfigurer.java

@@ -54,8 +54,8 @@ public void configure(SdkTracerProviderBuilder tracerProvider) {
 
                 if (currExporter == null) {
                     currExporter = processorConfig.type == ProcessorType.attribute ?
-                            new ExporterWithAttributeProcessor(processorConfig, new Exporter(telemetryClient)) :
-                            new ExporterWithSpanProcessor(processorConfig, new Exporter(telemetryClient));
+                            new ExporterWithAttributeProcessor(processorConfig, new Exporter(telemetryClient, config.preview.httpMethodInOperationName)) :
+                            new ExporterWithSpanProcessor(processorConfig, new Exporter(telemetryClient, config.preview.httpMethodInOperationName));
 
                 } else {
                     currExporter = processorConfig.type == ProcessorType.attribute ?
@@ -67,7 +67,7 @@ public void configure(SdkTracerProviderBuilder tracerProvider) {
             tracerProvider.addSpanProcessor(SimpleSpanProcessor.create(currExporter));
 
         } else {
-            tracerProvider.addSpanProcessor(SimpleSpanProcessor.create(new Exporter(telemetryClient)));
+            tracerProvider.addSpanProcessor(SimpleSpanProcessor.create(new Exporter(telemetryClient, config.preview.httpMethodInOperationName)));
         }
     }
 }

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/wasbootstrap/configuration/Configuration.java

@@ -175,6 +175,8 @@ public static class PreviewConfiguration {
         // ignoreRemoteParentNotSampled is currently needed
         // because .NET SDK always propagates trace flags "00" (not sampled)
         public boolean ignoreRemoteParentNotSampled = true;
+        // TODO consider turning this on by default in 3.1.0
+        public boolean httpMethodInOperationName;
         public LiveMetrics liveMetrics = new LiveMetrics();
 
         public ProfilerConfiguration profiler = new ProfilerConfiguration();

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/LazyConfigurationAccessorTest.java

@@ -41,8 +41,7 @@ public class LazyConfigurationAccessorTest {
      *                             VALID                 NULL               Enabled
      *                             NULL                  TRUE/FALSE/NULL    Disabled
      */
-    private static final String CONNECTION_STRING =
-            "InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606/";
+    private static final String CONNECTION_STRING = "InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF";
 
     private static final String INSTRUMENTATION_KEY = "00000000-0000-0000-0000-0FEEDDADBEEF";
     private static final String WEBSITE_SITE_NAME = "fake_site_name";

agent/exporter/src/main/java/com/microsoft/applicationinsights/agent/Exporter.java

@@ -128,8 +128,11 @@ public class Exporter implements SpanExporter {
 
     private final TelemetryClient telemetryClient;
 
-    public Exporter(TelemetryClient telemetryClient) {
+    private final boolean httpMethodInOperationName;
+
+    public Exporter(TelemetryClient telemetryClient, boolean httpMethodInOperationName) {
         this.telemetryClient = telemetryClient;
+        this.httpMethodInOperationName = httpMethodInOperationName;
     }
 
     /**
@@ -204,7 +207,7 @@ private void exportRemoteDependency(SpanData span, boolean inProc) {
         RemoteDependencyTelemetry remoteDependencyData = new RemoteDependencyTelemetry();
 
         addLinks(remoteDependencyData.getProperties(), span.getLinks());
-        remoteDependencyData.setName(span.getName());
+        remoteDependencyData.setName(getTelemetryName(span));
 
         Attributes attributes = span.getAttributes();
 
@@ -562,7 +565,7 @@ private void exportRequest(SpanData span) {
             requestData.setUrl(httpUrl);
         }
 
-        String name = span.getName();
+        String name = getTelemetryName(span);
         requestData.setName(name);
         requestData.getContext().getOperation().setName(name);
         requestData.setId(span.getSpanId());
@@ -604,6 +607,18 @@ private void exportRequest(SpanData span) {
         exportEvents(span, samplingPercentage);
     }
 
+    private String getTelemetryName(SpanData span) {
+        String name = span.getName();
+        if (!httpMethodInOperationName || !name.startsWith("/")) {
+            return name;
+        }
+        String httpMethod = span.getAttributes().get(SemanticAttributes.HTTP_METHOD);
+        if (Strings.isNullOrEmpty(httpMethod)) {
+            return name;
+        }
+        return httpMethod + " " + name;
+    }
+
     private static String nullAwareConcat(String str1, String str2, String separator) {
         if (str1 == null) {
             return str2;

build.gradle

@@ -29,6 +29,8 @@ plugins {
     id "org.owasp.dependencycheck" version "6.1.2"
     id "com.diffplug.spotless" version "5.8.2"
     id "com.github.spotbugs" version "4.6.0" apply false
+
+    id "com.github.ben-manes.versions" version "0.38.0"
 }
 
 ext.buildScriptsDir = "$rootDir/gradle"

core/src/main/java/com/microsoft/applicationinsights/channel/concrete/TelemetryChannelBase.java

@@ -230,8 +230,8 @@ public void send(Telemetry telemetry) {
             logger.debug("items sent till now: {}", itemsSent.get());
         }
 
-        if (isDeveloperMode()) {
-            writeTelemetryToDebugOutput(telemetry);
+        if (logger.isTraceEnabled()) {
+            logger.trace("{} sending telemetry: {}", this.getClass().getSimpleName(), telemetry.toString());
         }
     }
 
@@ -242,10 +242,6 @@ public void send(Telemetry telemetry) {
      */
     protected abstract boolean doSend(Telemetry telemetry);
 
-    private void writeTelemetryToDebugOutput(Telemetry telemetry) {
-        logger.trace("{} sending telemetry: {}", this.getClass().getSimpleName(), telemetry.toString());
-    }
-
     protected abstract ConfiguredTransmitterFactory<T> createTransmitterFactory();
 
     protected LimitsEnforcer createDefaultMaxTelemetryBufferCapacityEnforcer(Integer currentValue) {