Remove fork, update spotless, and smoke test framework improvements (#2283)

* Move micrometer instrumentation to distro

* Remove fork

* Pipelines - remove Java 11 install

* Add TODOs

* Remove commented out code

* offline

* Better caching

* Less caching for now

* Add TODOs

* More

* fix?

* Revert "fix?"

This reverts commit a312ec0.

* maybe

* wip

* Simplify smoke tests

* Consistent smoke test package naming

* Spotless

* Bring back test

* Rename jre.master.txt

* Remove outdated doc

* Simplify fakeingestion

* Simplify

* Simplify

* chmod

* Simplify

* fix

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

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

* Update buildSrc/build.gradle.kts

* fix

Author: trask

.config/CredScanSuppressions.json

@@ -111,7 +111,7 @@ ij_java_for_statement_wrap = normal
 ij_java_generate_final_locals = false
 ij_java_generate_final_parameters = false
 ij_java_if_brace_force = always
-ij_java_imports_layout = $*,|,*
+ij_java_imports_layout = $*, |, *
 ij_java_indent_case_from_switch = true
 ij_java_insert_inner_class_imports = false
 ij_java_insert_override_annotation = true
@@ -452,12 +452,12 @@ ij_scala_wrap_long_lines = false
 [.editorconfig]
 ij_editorconfig_align_group_field_declarations = false
 ij_editorconfig_space_after_colon = false
-ij_editorconfig_space_after_comma = false
+ij_editorconfig_space_after_comma = true
 ij_editorconfig_space_before_colon = false
 ij_editorconfig_space_before_comma = false
 ij_editorconfig_spaces_around_assignment_operators = true
 
-[{*.ant,*.bpmn,*.fxml,*.jhm,*.jnlp,*.jrxml,*.plan,*.pom,*.rng,*.tld,*.wadl,*.wsdd,*.wsdl,*.xjb,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
+[{*.ant, *.bpmn, *.fxml, *.jhm, *.jnlp, *.jrxml, *.plan, *.pom, *.rng, *.tld, *.wadl, *.wsdd, *.wsdl, *.xjb, *.xml, *.xsd, *.xsl, *.xslt, *.xul}]
 ij_continuation_indent_size = 2
 ij_xml_align_attributes = false
 ij_xml_align_text = false
@@ -477,14 +477,14 @@ ij_xml_space_inside_empty_tag = false
 ij_xml_text_wrap = normal
 ij_xml_use_custom_settings = true
 
-[{*.bash,*.sh,*.zsh}]
+[{*.bash, *.sh, *.zsh}]
 ij_shell_binary_ops_start_line = false
 ij_shell_keep_column_alignment_padding = false
 ij_shell_minify_program = false
 ij_shell_redirect_followed_by_space = false
 ij_shell_switch_cases_indented = false
 
-[{*.gant,*.gradle,*.groovy,*.gson,*.gy}]
+[{*.gant, *.gradle, *.groovy, *.gson, *.gy}]
 ij_continuation_indent_size = 2
 ij_groovy_align_group_field_declarations = false
 ij_groovy_align_multiline_array_initializer_expression = false
@@ -663,7 +663,7 @@ ij_groovy_while_brace_force = never
 ij_groovy_while_on_new_line = false
 ij_groovy_wrap_long_lines = false
 
-[{*.kt,*.kts}]
+[{*.kt, *.kts}]
 ij_continuation_indent_size = 2
 ij_kotlin_align_in_columns_case_branch = false
 ij_kotlin_align_multiline_binary_operation = false
@@ -740,7 +740,7 @@ ij_kotlin_wrap_elvis_expressions = 1
 ij_kotlin_wrap_expression_body_functions = 0
 ij_kotlin_wrap_first_method_in_call_chain = false
 
-[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config}]
+[{*.har, *.jsb2, *.jsb3, *.json, .babelrc, .eslintrc, .stylelintrc, bowerrc, jest.config}]
 ij_json_keep_blank_lines_in_code = 0
 ij_json_keep_indents_on_empty_lines = false
 ij_json_keep_line_breaks = true
@@ -752,12 +752,12 @@ ij_json_spaces_within_braces = false
 ij_json_spaces_within_brackets = false
 ij_json_wrap_long_lines = false
 
-[{*.properties,spring.handlers,spring.schemas}]
+[{*.properties, spring.handlers, spring.schemas}]
 ij_properties_align_group_field_declarations = false
-ij_properties_keep_blank_lines = false
+ij_properties_keep_blank_lines = true
 ij_properties_key_value_delimiter = equals
 ij_properties_spaces_around_key_value_delimiter = false
 
-[{*.yaml,*.yml}]
+[{*.yaml, *.yml}]
 ij_yaml_keep_indents_on_empty_lines = false
 ij_yaml_keep_line_breaks = true

.editorconfig

@@ -25,24 +25,10 @@ jobs:
         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: Cache gradle wrapper
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-      - name: Build otel-fork
-        working-directory: otel
-        # javadoc fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
-        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
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: check
       - name: Upload snapshot
         # only upload from windows since only that build includes etw
         if: matrix.os == 'windows-2019'
@@ -65,7 +51,7 @@ jobs:
           java-version: 11
       - id: set-matrix
         # "grep -v skipWinNative" is used to skip the warning message "Skipping build of :etw:native because skipWinNative=true"
-        run: echo "::set-output name=matrix::{\"module\":[\"$(./gradlew -q :test:smoke:testApps:listTestApps | grep -v skipWinNative | xargs echo | sed 's/ /","/g')\"]}"
+        run: echo "::set-output name=matrix::{\"module\":[\"$(./gradlew -q :smoke-tests:apps:listTestApps | grep -v skipWinNative | xargs echo | sed 's/ /","/g')\"]}"
 
   smoke-test:
     needs: setup-smoke-test-matrix
@@ -82,26 +68,10 @@ jobs:
         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
-        with:
-          read-only: true
-      - name: Cache gradle wrapper
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-      - name: Build otel-fork
-        working-directory: otel
-        # javadoc fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
-        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
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: ${{ matrix.module }}:smokeTest
 
   accept-pr:
     needs: [ build, smoke-test ]

.github/workflows/ci.yaml

@@ -26,24 +26,10 @@ jobs:
         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: Cache gradle wrapper
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-      - name: Build otel-fork
-        working-directory: otel
-        # javadoc fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
-        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 assemble
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: check assemble
       - name: Upload snapshot
         # only upload from windows since only that build includes etw
         if: matrix.os == 'windows-2019'
@@ -66,7 +52,7 @@ jobs:
           java-version: 11
       - id: set-matrix
         # "grep -v skipWinNative" is used to skip the warning message "Skipping build of :etw:native because skipWinNative=true"
-        run: echo "::set-output name=matrix::{\"module\":[\"$(./gradlew -q :test:smoke:testApps:listTestApps | grep -v skipWinNative | xargs echo | sed 's/ /","/g')\"]}"
+        run: echo "::set-output name=matrix::{\"module\":[\"$(./gradlew -q :smoke-tests:apps:listTestApps | grep -v skipWinNative | xargs echo | sed 's/ /","/g')\"]}"
 
   smoke-test:
     needs: setup-smoke-test-matrix
@@ -83,26 +69,10 @@ jobs:
         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
-        with:
-          read-only: true
-      - name: Cache gradle wrapper
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-      - 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
       - name: Test
-        # TODO enable build cache, either --build-cache here, or org.gradle.caching=true in gradle.properties
-        run: ./gradlew ${{ matrix.module }}:smokeTest
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: ${{ matrix.module }}:smokeTest
 
   accept-pr:
     needs: [ build, smoke-test ]

.github/workflows/pr.yaml

@@ -1,4 +0,0 @@
-[submodule "otel"]
-	path = otel
-	url = https://github.com/microsoft/ApplicationInsights-Java.git
-	branch = otel-fork

.gitmodules

@@ -1,15 +1,4 @@
-path_classifiers:
-  submodule:
-    - otel
 extraction:
   java:
     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
-        ./gradlew --no-daemon testClasses

.lgtm.yml

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

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

@@ -14,9 +14,9 @@ build:
           include:
             - '**/*'
     - !!buildcommand
-      name: 'Assemble ApplicationInsights-Java JARs'
+      name: 'Assemble'
       command: '.scripts/gradle.cmd'
-      arguments: 'assemble'
+      arguments: ':agent:agent:assemble --offline'
       artifacts:
         - to: 'Artifacts'
           include:

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

@@ -14,9 +14,9 @@ build:
           include:
             - '**/*'
     - !!defaultcommand
-      name: 'Assemble ApplicationInsights-Java JARs'
+      name: 'Assemble'
       command: '.scripts/gradle.cmd'
-      arguments: 'publishToMavenLocal -DisRelease=true -Pai.etw.native.build=release'
+      arguments: ':agent:agent:publishToMavenLocal -DisRelease=true -Pai.etw.native.build=release --offline'
     - !!buildcommand
       name: 'Copy files from maven local repository'
       command: '.scripts/copy-from-maven-local.cmd'

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

@@ -10,6 +10,7 @@ environment:
 versioning:
   commands:
     - !!defaultcommand
+      # TODO (heya) what is this used for?
       name: 'Generate Version'
       command: '.scripts/version.cmd'
 # excluding our source code from being scanned for code sign validation
@@ -28,6 +29,7 @@ static_analysis_options:
 restore:
   commands:
     - !!defaultcommand
+      # TODO (trask) test if this is needed, or maybe only needed for official release?
       name: 'Install Windows 10 SDK'
       command: '.scripts/installWindows10Sdk.cmd'
       logs:
@@ -36,39 +38,13 @@ restore:
           include:
             - '**/*.log'
     - !!defaultcommand
-      name: 'Install Java 11 JDK'
-      command: '.scripts/installJava11jdk.cmd'
-    - !!defaultcommand
-      name: 'Add OpenTelemetry to MavenLocal'
-      command: '.scripts/ot-gradle.cmd'
-      # javadoc fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
-      arguments: 'publishToMavenLocal -x javadoc'
-      # if connection reset issue continues, try:
-      #   -P org.gradle.internal.http.connectionTimeout=30000
-      #   -P org.gradle.internal.http.socketTimeout=30000
-      #   -P org.gradle.internal.repository.max.retries=10
-      #   -P org.gradle.internal.repository.initial.backoff=500
-    - !!defaultcommand
-      name: 'Download Dependencies'
+      name: 'Download Dependencies and Java Toolchain (Java 11)'
       command: '.scripts/gradle.cmd'
-      arguments: 'downloadDependencies'
-    - !!defaultcommand
-      name: 'List Installation Information'
-      command: '.scripts/dumpInstallationInfo.cmd'
+      arguments: 'test clean'
 test:
   commands:
-    # - !!defaultcommand
-    #   name: 'Gradle Static Analysis'
-    #   command: '.scripts/gradle.cmd'
-    #   arguments: 'check -x test'
-    #   logs:
-    #     - to: 'Checks Reports'
-    #       include:
-    #         - '**/build/reports/**/*'
-    #       exclude:
-    #         - '**/build/reports/tests/**/*'
     - !!testcommand
-      name: 'ApplicationInsights-Java Unit Tests'
+      name: 'Run tests'
       command: '.scripts/gradle.cmd'
       arguments: 'test'
       fail_on_stderr: false