Merge remote-tracking branch 'inspectIT/master' into feat/feature-1398

Author: Daniel Priebe

.circleci/config.yml

@@ -24,8 +24,6 @@ commands:
           path: ~/inspectit/repo/inspectit-ocelot-config/build/test-results
       - store_test_results:
           path: ~/inspectit/repo/components/inspectit-ocelot-configurationserver/build/test-results
-      - store_test_results:
-          path: ~/inspectit/repo/components/inspectit-ocelot-eum-server/build/test-results
       - store_artifacts:
           path: /home/circleci/inspectit/repo/heapdump.bin
 
@@ -52,18 +50,15 @@ jobs:
     working_directory: ~/inspectit
     steps:
       - attach_repo
-      - run: cd repo && ./gradlew assemble bootJarWithFrontend :inspectit-ocelot-core:cyclonedxBom :inspectit-ocelot-configurationserver:cyclonedxBom :inspectit-ocelot-eum-server:cyclonedxBom :inspectit-ocelot-eum-server:bootJar -PbuildVersion=${CIRCLE_TAG}
+      - run: cd repo && ./gradlew assemble bootJarWithFrontend :inspectit-ocelot-core:cyclonedxBom :inspectit-ocelot-configurationserver:cyclonedxBom -PbuildVersion=${CIRCLE_TAG}
       - run: mkdir artifacts
       - run: cp ~/inspectit/repo/inspectit-ocelot-agent/build/inspectit-ocelot-agent-${CIRCLE_TAG}.jar ~/inspectit/artifacts
       - run: cp ~/inspectit/repo/components/inspectit-ocelot-configurationserver/build/libs/inspectit-ocelot-configurationserver-${CIRCLE_TAG}.jar ~/inspectit/artifacts
-      - run: cp ~/inspectit/repo/components/inspectit-ocelot-eum-server/build/libs/inspectit-ocelot-eum-server-${CIRCLE_TAG}.jar ~/inspectit/artifacts
       - run: mkdir boms
       - run: cp ~/inspectit/repo/inspectit-ocelot-core/build/reports/bom.json ~/inspectit/boms/inspectit-ocelot-agent-bom.json
       - run: cp ~/inspectit/repo/inspectit-ocelot-core/build/reports/bom.xml ~/inspectit/boms/inspectit-ocelot-agent-bom.xml
       - run: cp ~/inspectit/repo/components/inspectit-ocelot-configurationserver/build/reports/bom.json ~/inspectit/boms/inspectit-ocelot-configurationserver-bom.json
       - run: cp ~/inspectit/repo/components/inspectit-ocelot-configurationserver/build/reports/bom.xml ~/inspectit/boms/inspectit-ocelot-configurationserver-bom.xml
-      - run: cp ~/inspectit/repo/components/inspectit-ocelot-eum-server/build/reports/bom.json ~/inspectit/boms/inspectit-ocelot-eum-server-bom.json
-      - run: cp ~/inspectit/repo/components/inspectit-ocelot-eum-server/build/reports/bom.xml ~/inspectit/boms/inspectit-ocelot-eum-server-bom.xml
       - run: zip -r ~/inspectit/artifacts/software-bill-of-materials.zip boms
       - run:
           name: Calculate checksums of release artifacts
@@ -127,8 +122,6 @@ jobs:
           docker push inspectit/inspectit-ocelot-agent:latest
           docker push inspectit/inspectit-ocelot-configurationserver:${CIRCLE_TAG}
           docker push inspectit/inspectit-ocelot-configurationserver:latest
-          docker push inspectit/inspectit-ocelot-eum-server:${CIRCLE_TAG}
-          docker push inspectit/inspectit-ocelot-eum-server:latest
 
   # Deploy pre-release documentation
   deploy-master-documentation:

.github/workflows/agent_test.yml

@@ -5,12 +5,15 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
     paths-ignore:
       - 'components/**'
       - 'inspectit-ocelot-documentation/**'
       - 'resources/**'
+      - 'codequality/**'
+      - '**.md'
+      - '**.txt'
+      - '.github/**'
+      - '.circleci/**'
 
 jobs:
   pr-check:

.github/workflows/eumserver_test.yml

@@ -13,6 +13,12 @@ When using the Save Actions Plugin, you have to copy the *saveactions_settings.x
 
 Furthermore, please import the `/codequality/idea/code_style.xml` file into the project's settings of IntelliJ in order to match the code style we're using.
 
+### Frontend Developing
+
+If developing JavaScript in IntelliJ Ultimate, check that Settings.Languages & Frameworks.JavaScript.Code Quality Tools.ESLint is activated for correct linting.
+
+In the same location, check the checkbox for running `eslint --fix on save`.
+
 ## Process
 
 The first step in order to contribute is to fork this repository into your account.

CONTRIBUTING.md

@@ -6,7 +6,6 @@
 [![Code Coverage](https://codecov.io/gh/inspectit/inspectit-ocelot/branch/master/graph/badge.svg)](https://codecov.io/gh/inspectIT/inspectit-ocelot)
 [![Java Agent Tests](https://github.com/inspectIT/inspectit-ocelot/workflows/Java%20Agent%20Tests/badge.svg?branch=master)](https://github.com/inspectIT/inspectit-ocelot/actions?query=workflow%3A"Java+Agent+Tests")
 [![Configuration Server Tests](https://github.com/inspectIT/inspectit-ocelot/workflows/Configuration%20Server%20Tests/badge.svg?branch=master)](https://github.com/inspectIT/inspectit-ocelot/actions?query=workflow%3A"Configuration+Server+Tests")
-[![EUM Server Tests](https://github.com/inspectIT/inspectit-ocelot/workflows/EUM%20Server%20Tests/badge.svg?branch=master)](https://github.com/inspectIT/inspectit-ocelot/actions?query=workflow%3A"EUM+Server+Tests")
 
 [inspectIT Ocelot](https://inspectit.rocks/) is a zero-configuration Java agent for dynamically collecting application performance,
  tracing and behavior data based on the [OpenCensus library](https://opencensus.io/).

README.md

@@ -14,10 +14,6 @@ allprojects {
 
     repositories {
         mavenCentral()
-        maven {
-            name 'Nexus@NT'
-            url "https://repository.novatec-gmbh.de/content/repositories/3rd_party_libs/"
-        }
     }
 
     apply plugin: 'java'

build.gradle

@@ -1,5 +1,6 @@
 <code_scheme name="Ocelot" version="173">
   <option name="LINE_SEPARATOR" value="&#xA;" />
+  <option name="FORMATTER_TAGS_ENABLED" value="true" />
   <JavaCodeStyleSettings>
     <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
     <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
@@ -25,4 +26,11 @@
     <option name="FOR_BRACE_FORCE" value="3" />
     <option name="WRAP_ON_TYPING" value="0" />
   </codeStyleSettings>
-</code_scheme>
+  <codeStyleSettings language="JavaScript">
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
+</code_scheme>

codequality/idea/code_style.xml

@@ -52,5 +52,6 @@ tasks.named('test') {
     // Use JUnit Platform for unit tests.
     useJUnitPlatform()
 }
-
-sourceCompatibility = 1.8
+//to guarantee that the Configuration Server is compatible with Java 8 runtime environments
+sourceCompatibility = 1.8 // Java version compatibility to use when compiling Java source.
+targetCompatibility = 1.8 // Java version to generate classes for.

components/inspectit-ocelot-configdocsgenerator/build.gradle

@@ -14,12 +14,16 @@
         "plugin:react/recommended",
         "plugin:prettier/recommended"
     ],
-    "parser": "babel-eslint",
+    "parser": "@babel/eslint-parser",
     "parserOptions": {
         "sourceType": "module",
         "ecmaVersion": 2018,
         "ecmaFeatures": {
             "jsx": true
+        },
+        "requireConfigFile": false,
+        "babelOptions": {
+            "presets": ["@babel/preset-react"]
         }
     },
     "settings": {
@@ -42,6 +46,8 @@
         "no-multi-spaces": "error",
         "import/first": "error",
         "import/no-useless-path-segments": "error",
-        "react/prop-types": "warn"
+        "react/prop-types": "warn",
+        "prettier/prettier": ["error", { "endOfLine": "auto" }],
+        "react/no-unknown-property": ["error", { "ignore": ["jsx", "global", "align"] }]
     }
-}
+}