Skip to content

Conversation

KarstenSchnitter
Copy link
Contributor

This is the first PR on the way to #164. It contains the following major changes:

  • deletion of custom metrics feature
  • removal of Jersey support and old sample app
  • remove javax.servlet support in favour of Jakarta
  • migrate to Java 17 (at Java 11 code level)
  • upgrade to SLF4J 2.x and Logback/Log4j2 to latest versions
  • upgrade JUnit and Mockito to v5
  • replacement of Hamcrest by AssertJ

Metrics are no longer supported by this library. You can utilize the
OpenTelemetry Java Agent extension to ship metrics via OTLP.

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
Jersey instrumentation is no longer supported. Since the sample app
uses this feature it is removed as well.

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
Replace javax.servlet classes with jakarta only support.
This breaks the current Spring Boot sample app. It will be migrated to Spring Boot 3.x
in a later step.

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
Build the entire project with Java 11 to prepare for Java 17. Some components
already were built with 11, this is now aligned throughout the entire code base.
The animal sniffer plugin was dropped in the process.
Upgrades Logback and Log4j to latests versions.

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
Remove references to custom metrics, Java 8 and javax.servlet.

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
Replace JUnit dependency and introduce Assert4J.
Migrate core tests to new frameworks.
Remove Hamcrest.

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
Adaptations to Spring Security 6 Basic Authentication.

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
Copy link
Contributor

@nicklas-dohrn nicklas-dohrn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good as far as I can tell by looking briefly into all the changes.
Some minor remarks are added.

"\"version\":\"92720bd3-2735-489d-bf4b-e5bb05c752e7\" " +
"}";
public static final String VCAP_APPLICATION =
"{" + "\"application_id\":\"" + VCAP_APP_ID + "\", " + "\"application_name\":\"" + VCAP_APP_NAME + "\", " + "\"application_uris\":[ " + "\"testapp.testdomain.com\" " + "], " + "\"application_version\":\"92720bd3-2735-489d-bf4b-e5bb05c752e7\", " + "\"cf_api\":\"https://api.cf.sap.hana.ondemand.com\", " + "\"host\":\"0.0.0.0\", " + "\"instance_id\":\"34b12c70-5443-426f-75c4-3260\", " + "\"instance_index\":\"" + VCAP_INSTANCE_IDX + "\", " + "\"limits\":{ " + "\"disk\":1024, " + "\"fds\":16384, " + "\"mem\":1024 " + "}, " + "\"name\":\"d048888-logging-sample-app\", " + "\"organization_id\":\"" + VCAP_ORGANIZATION_ID + "\", " + "\"organization_name\":\"" + VCAP_ORGANIZATION_NAME + "\", " + "\"port\":8080, " + "\"process_id\":\"a6026141-8d69-4e9d-b62d-8e1d982f7953\", " + "\"process_type\":\"web\", " + "\"space_id\":\"" + VCAP_SPACE_ID + "\", " + "\"space_name\":\"" + VCAP_SPACE_NAME + "\", " + "\"uris\":[ " + "\"testapp.testdomain.com\" " + "], " + "\"version\":\"92720bd3-2735-489d-bf4b-e5bb05c752e7\" " + "}";

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the benefit of "onelining" all this fields?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No benefit. Automatic code-formatting.

<email>martin.nikolov@sap.com</email>
<organization>SAP SE</organization>
<organizationUrl>https://github.com/SAP</organizationUrl>
</developer>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some people are missing here, for example christian dinse.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants