Integration of recent changes on main

CODE_OF_CONDUCT.md

@@ -0,0 +1,86 @@
+# SAP Open Source Code of Conduct
+
+SAP adopts the [Contributor's Covenant 2.1](https://www.contributor-covenant.org/version/2/1/code_of_conduct/)
+across our open source projects to ensure a welcoming and open culture for everyone involved.
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [ospo@sap.com](mailto:ospo@sap.com) (SAP Open Source Program Office). All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.1, available at [https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at [https://www.contributor-covenant.org/faq][FAQ]. Translations are available at [https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

CONTRIBUTING.md

@@ -1,3 +1,34 @@
+# Contributing to an SAP Open Source Project
+
+## General Remarks
+
+You are welcome to contribute content (code, documentation etc.) to this open source project.
+
+There are some important things to know:
+
+1. You must **comply to the license of this project**, **accept the Developer Certificate of Origin** (see below) before being able to contribute. The acknowledgement to the DCO will usually be requested from you as part of your first pull request to this project.
+2. Please **adhere to our [Code of Conduct](CODE_OF_CONDUCT.md)**.
+3. If you plan to use **generative AI for your contribution**, please see our guideline below.
+4. **Not all proposed contributions can be accepted**. Some features may fit another project better or doesn't fit the general direction of this project. Of course, this doesn't apply to most bug fixes, but a major feature implementation for instance needs to be discussed with one of the maintainers first. Possibly, one who touched the related code or module recently. The more effort you invest, the better you should clarify in advance whether the contribution will match the project's direction. The best way would be to just open an issue to discuss the feature you plan to implement (make it clear that you intend to contribute). We will then forward the proposal to the respective code owner. This avoids disappointment.
+
 ## Developer Certificate of Origin (DCO)
 
-Due to legal reasons, contributors will be asked to accept a DCO when they create the first pull request to this project. This happens in an automated fashion during the submission process. SAP uses [the standard DCO text of the Linux Foundation](https://developercertificate.org/).
+Contributors will be asked to accept a DCO before they submit the first pull request to this projects, this happens in an automated fashion during the submission process. SAP uses [the standard DCO text of the Linux Foundation](https://developercertificate.org/).
+
+## Contributing with AI-generated code
+
+As artificial intelligence evolves, AI-generated code is becoming valuable for many software projects, including open-source initiatives. While we recognize the potential benefits of incorporating AI-generated content into our open-source projects there a certain requirements that need to be reflected and adhered to when making contributions.
+
+Please see our [guideline for AI-generated code contributions to SAP Open Source Software Projects](CONTRIBUTING_USING_GENAI.md) for these requirements.
+
+## How to Contribute
+
+1. Make sure the change is welcome (see [General Remarks](#general-remarks)).
+2. Create a branch by forking the repository and apply your change.
+3. Commit and push your change on that branch.
+4. Create a pull request in the repository using this branch.
+5. Follow the link posted by the CLA assistant to your pull request and accept it, as described above.
+6. Wait for our code review and approval, possibly enhancing your change on request.
+    - Note that the maintainers have many duties. So, depending on the required effort for reviewing, testing, and clarification, this may take a while.
+7. Once the change has been approved and merged, we will inform you in a comment.
+8. Celebrate!

CONTRIBUTING_USING_GENAI.md

@@ -0,0 +1,12 @@
+# Guideline for AI-generated code contributions to SAP Open Source Software Projects
+
+As artificial intelligence evolves, AI-generated code is becoming valuable for many software projects, including open-source initiatives. While we recognize the potential benefits of incorporating AI-generated content into our open-source projects there are certain requirements that need to be reflected and adhered to when making contributions.
+
+When using AI-generated code contributions in OSS Projects, their usage needs to align with Open-Source Software values and legal requirements. We have established these essential guidelines to help contributors navigate the complexities of using AI tools while maintaining compliance with open-source licenses and the broader [Open-Source Definition](https://opensource.org/osd).
+
+AI-generated code or content can be contributed to SAP Open Source Software projects if the following conditions are met:
+
+1. **Compliance with AI Tool Terms and Conditions**: Contributors must ensure that the AI tool's terms and conditions do not impose any restrictions on the tool's output that conflict with the project's open-source license or intellectual property policies. This includes ensuring that the AI-generated content adheres to the [Open-Source Definition](https://opensource.org/osd).
+2. **Filtering Similar Suggestions**: Contributors must use features provided by AI tools to suppress responses that are similar to third-party materials or flag similarities. We only accept contributions from AI tools with such filtering options. If the AI tool flags any similarities, contributors must review and ensure compliance with the licensing terms of such materials before including them in the project.
+3. **Management of Third-Party Materials**: If the AI tool's output includes pre-existing copyrighted materials, including open-source code authored or owned by third parties, contributors must verify that they have the necessary permissions from the original owners. This typically involves ensuring that there is an open-source license or public domain declaration that is compatible with the project's licensing policies. Contributors must also provide appropriate notice and attribution for these third-party materials, along with relevant information about the applicable license terms.
+4. **Employer Policies Compliance**: If AI-generated content is contributed in the context of employment, contributors must also adhere to their employer’s policies. This ensures that all contributions are made with proper authorization and respect for relevant corporate guidelines.

SECURITY.md

@@ -0,0 +1,42 @@
+<!-- START SAP SECURITY.MD V0.0.1 BLOCK -->
+<!-- Please do not remove the version header, this is needed for automatic updates of the SECURITY.md -->
+# SAP Open Source Security Policy
+
+SAP takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, including our primary [SAP](https://github.com/SAP), [SAP-docs](https://github.com/SAP-docs) organizations as well as [our other GitHub organizations and projects](https://opensource.sap.com).
+
+If you believe you have found a security vulnerability in any SAP-owned repository, please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them via the SAP Trust Center at [https://www.sap.com/about/trust-center/security/incident-management.html](https://www.sap.com/about/trust-center/security/incident-management.html).
+
+If you prefer to submit via email, please send an email to [secure@sap.com](mailto:secure@sap.com). If possible, encrypt your message with our PGP key; please download it from the [SAP Trust Center](https://www.sap.com/keyblock).
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  - The repository name or URL
+  - Type of issue (buffer overflow, SQL injection, cross-site scripting, etc.)
+  - Full paths of the source file(s) related to the manifestation of the issue
+  - The location of the affected source code (tag/branch/commit or direct URL)
+  - Any particular configuration required to reproduce the issue
+  - Step-by-step instructions to reproduce the issue
+  - Proof-of-concept or exploit code (if possible)
+  - Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Disclosure Guidelines
+
+We like to ask you to follow the [Disclosure Guidelines for SAP Security Advisories](https://www.sap.com/documents/2022/02/9ccd9ca0-167e-0010-bca6-c68f7e60039b.html).
+
+## SAP Internal Response Process
+
+As an SAP employee, please check our internal open source security response process ([go/oss-security-response](https://go.sap.corp/oss-security-response)) for further details on how to handle security incidents.
+
+<!-- END SAP SECURITY.MD V0.0.1 BLOCK -->

cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/exporter/DynatraceMetricsExporterProvider.java

@@ -16,6 +16,7 @@
 import io.pivotal.cfenv.core.CfService;
 
 import java.time.Duration;
+import java.util.Locale;
 import java.util.function.Function;
 import java.util.logging.Logger;
 
@@ -46,6 +47,24 @@ private static Duration getTimeOut(ConfigProperties config) {
         return timeout != null ? timeout : config.getDuration("otel.exporter.dynatrace.timeout");
     }
 
+    private static AggregationTemporalitySelector getAggregationTemporalitySelector(ConfigProperties config) {
+        String temporalityStr = config.getString("otel.exporter.dynatrace.metrics.temporality.preference");
+        if (temporalityStr == null) {
+            return AggregationTemporalitySelector.deltaPreferred();
+        }
+        AggregationTemporalitySelector temporalitySelector;
+        switch (temporalityStr.toLowerCase(Locale.ROOT)) {
+        case "cumulative":
+            return AggregationTemporalitySelector.alwaysCumulative();
+        case "delta":
+            return AggregationTemporalitySelector.deltaPreferred();
+        case "lowmemory":
+            return AggregationTemporalitySelector.lowMemory();
+        default:
+            throw new ConfigurationException("Unrecognized aggregation temporality: " + temporalityStr);
+        }
+    }
+
     private static DefaultAggregationSelector getDefaultAggregationSelector(ConfigProperties config) {
         String defaultHistogramAggregation =
                 config.getString("otel.exporter.dynatrace.metrics.default.histogram.aggregation");
@@ -108,7 +127,7 @@ public MetricExporter createExporter(ConfigProperties config) {
         OtlpHttpMetricExporterBuilder builder = OtlpHttpMetricExporter.builder();
         builder.setEndpoint(apiUrl + DT_APIURL_METRICS_SUFFIX).setCompression(getCompression(config))
                .addHeader("Authorization", "Api-Token " + apiToken).setRetryPolicy(RetryPolicy.getDefault())
-               .setAggregationTemporalitySelector(AggregationTemporalitySelector.alwaysCumulative())
+               .setAggregationTemporalitySelector(getAggregationTemporalitySelector(config))
                .setDefaultAggregationSelector(getDefaultAggregationSelector(config));
 
         Duration timeOut = getTimeOut(config);

cf-java-logging-support-servlet/src/main/java/com/sap/hcp/cf/logging/servlet/filter/AddHttpHeadersToLogContextFilter.java

@@ -9,7 +9,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Stream;
 
 import static java.util.Collections.unmodifiableList;
@@ -21,8 +20,8 @@
  */
 public class AddHttpHeadersToLogContextFilter extends AbstractLoggingFilter {
 
-    private List<HttpHeader> headers;
-    private List<String> fields;
+    private final List<HttpHeader> headers;
+    private final List<String> fields;
 
     /**
      * The default constructor uses {@link HttpHeaders#propagated()} to define the HTTP headers, that are added to the
@@ -48,16 +47,16 @@ public AddHttpHeadersToLogContextFilter(HttpHeader... headers) {
      */
     public AddHttpHeadersToLogContextFilter(List<? extends HttpHeader> list, HttpHeader... custom) {
         Stream<HttpHeader> allHeaders = Stream.concat(list.stream(), Arrays.stream(custom));
-        this.headers = unmodifiableList(allHeaders.filter(HttpHeader::isPropagated).collect(toList()));
-        this.fields =
-                unmodifiableList(headers.stream().map(HttpHeader::getField).filter(Objects::nonNull).collect(toList()));
+        this.headers = unmodifiableList(allHeaders
+                .filter(HttpHeader::isPropagated).filter(h -> h.getField() != null).collect(toList()));
+        this.fields = unmodifiableList(headers.stream().map(HttpHeader::getField).collect(toList()));
     }
 
     @Override
     protected void beforeFilter(HttpServletRequest request, HttpServletResponse response) {
         for (HttpHeader header: headers) {
             String headerValue = HttpHeaderUtilities.getHeaderValue(request, header);
-            if (header.getField() != null && headerValue != null) {
+            if (headerValue != null) {
                 LogContext.add(header.getField(), headerValue);
             }
         }