Merge pull request #218 from KarstenSchnitter/release-4

Port minor changes to release-4

Author: KarstenSchnitter

.reuse/dep5

@@ -0,0 +1,11 @@
+version = 1
+SPDX-PackageName = "CF Java Logging Support"
+SPDX-PackageSupplier = "<k.schnitter@sap.com>"
+SPDX-PackageDownloadLocation = "https://github.com/SAP/cf-java-logging-support"
+SPDX-PackageComment = "The code in this project may include calls to APIs (“API Calls”) of\n SAP or third-party products or services developed outside of this project\n (“External Products”).\n “APIs” means application programming interfaces, as well as their respective\n specifications and implementing code that allows software to communicate with\n other software.\n API Calls to External Products are not licensed under the open source license\n that governs this project. The use of such API Calls and related External\n Products are subject to applicable additional agreements with the relevant\n provider of the External Products. In no event shall the open source license\n that governs this project grant any rights in or to any External Products,or\n alter, expand or supersede any terms of the applicable additional agreements.\n If you have a valid license agreement with SAP for the use of a particular SAP\n External Product, then you may make use of any API Calls included in this\n project’s code for that SAP External Product, subject to the terms of such\n license agreement. If you do not have a valid license agreement for the use of\n a particular SAP External Product, then you may only make use of any API Calls\n in this project for that SAP External Product for your internal, non-productive\n and non-commercial test and evaluation of such API Calls. Nothing herein grants\n you any rights to use or access any SAP External Product, or provide any third\n parties the right to use of access any SAP External Product, through API Calls."
+
+[[annotations]]
+path = "**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2020 SAP SE or an SAP affiliate company and CF Java Logging Support contributors"
+SPDX-License-Identifier = "Apache-2.0"

REUSE.toml

@@ -498,16 +498,16 @@ type: object
 
 example: "#cf": {
   "string": [
-    {"l":"some_label", "v":"some_value", "i": 0},
-    {"l":"other_label", "v":"other_value", "i": 1}
+    {"k":"some_key", "v":"some_value", "i": 0},
+    {"k":"other_key", "v":"other_value", "i": 1}
   ]
 }
 
 
 required: False
 
 An object containing collections of non-standard fields.
-The field "string" contains custom fields with label "l", value "v" and an index "i".
+The field "string" contains custom fields with key "k", value "v" and an index "i".
 The index can be used for field order during parsing.
 
 NOTE: As this is "custom" there are no predefined fields here!

cf-java-logging-support-core/beats/app-logs/docs/fields.asciidoc

@@ -348,13 +348,13 @@ app-logs:
       example: |
         "#cf": {
           "string": [
-            {"l":"some_label", "v":"some_value", "i": 0},
-            {"l":"other_label", "v":"other_value", "i": 1}
+            {"k":"some_key", "v":"some_value", "i": 0},
+            {"k":"other_key", "v":"other_value", "i": 1}
           ]
         }
       description: |
         An object containing collections of non-standard fields.
-        The field "string" contains custom fields with label "l", value "v" and an index "i".
+        The field "string" contains custom fields with key "k", value "v" and an index "i".
         The index can be used for field order during parsing.
 
         NOTE: As this is "custom" there are no predefined fields here!

cf-java-logging-support-core/beats/app-logs/etc/fields.yml

@@ -9,6 +9,7 @@
 import io.opentelemetry.sdk.common.export.RetryPolicy;
 import io.opentelemetry.sdk.metrics.Aggregation;
 import io.opentelemetry.sdk.metrics.InstrumentType;
+import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector;
 import io.opentelemetry.sdk.metrics.export.DefaultAggregationSelector;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
@@ -27,6 +28,7 @@ public class DynatraceMetricsExporterProvider implements ConfigurableMetricExpor
     public static final String CRED_DYNATRACE_APIURL = "apiurl";
     public static final String DT_APIURL_METRICS_SUFFIX = "/v2/otlp/v1/metrics";
     private static final Logger LOG = Logger.getLogger(DynatraceMetricsExporterProvider.class.getName());
+    private static final AggregationTemporalitySelector ALWAYS_DELTA = instrumentType -> AggregationTemporality.DELTA;
     private final Function<ConfigProperties, CfService> serviceProvider;
 
     public DynatraceMetricsExporterProvider() {
@@ -50,7 +52,7 @@ private static Duration getTimeOut(ConfigProperties config) {
     private static AggregationTemporalitySelector getAggregationTemporalitySelector(ConfigProperties config) {
         String temporalityStr = config.getString("otel.exporter.dynatrace.metrics.temporality.preference");
         if (temporalityStr == null) {
-            return AggregationTemporalitySelector.deltaPreferred();
+            return ALWAYS_DELTA;
         }
         AggregationTemporalitySelector temporalitySelector;
         switch (temporalityStr.toLowerCase(Locale.ROOT)) {
@@ -60,6 +62,8 @@ private static AggregationTemporalitySelector getAggregationTemporalitySelector(
             return AggregationTemporalitySelector.deltaPreferred();
         case "lowmemory":
             return AggregationTemporalitySelector.lowMemory();
+        case "always_delta":
+            return ALWAYS_DELTA;
         default:
             throw new ConfigurationException("Unrecognized aggregation temporality: " + temporalityStr);
         }

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

@@ -10,11 +10,9 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.UUID;
-import java.util.function.Predicate;
 
 import static com.sap.hcp.cf.logging.common.customfields.CustomField.customField;
 import static com.sap.hcp.cf.logging.common.request.HttpHeaders.W3C_TRACEPARENT;
-import static java.util.Optional.ofNullable;
 
 /**
  * The {@link CorrelationIdFilter} extracts a correlation id according to {@link HttpHeaders#CORRELATION_ID}. It will
@@ -24,8 +22,8 @@
 public class CorrelationIdFilter extends AbstractLoggingFilter {
 
     private static final Logger LOG = LoggerFactory.getLogger(CorrelationIdFilter.class);
-    private HttpHeader correlationHeader;
-    private HttpHeader traceparentHeader;
+    private final HttpHeader correlationHeader;
+    private final HttpHeader traceparentHeader;
 
     public CorrelationIdFilter() {
         this(HttpHeaders.CORRELATION_ID);
@@ -62,22 +60,26 @@ private String determineCorrelationId(HttpServletRequest request) {
         return correlationId;
     }
 
-    private boolean isBlankOrDefault(String value) {
+    private static boolean isBlankOrDefault(String value) {
         return value == null || value.isEmpty() || value.equals(Defaults.UNKNOWN);
     }
 
     private String getCorrelationIdFromTraceparent(HttpServletRequest request) {
         String traceparent = HttpHeaderUtilities.getHeaderValue(request, traceparentHeader);
-        return ofNullable(traceparent).filter(not(this::isBlankOrDefault)).map(this::parseTraceparent).orElse(null);
+        return isBlankOrDefault(traceparent) ? null : parseTraceparent(traceparent);
     }
 
-    private <T> Predicate<T> not(Predicate<T> p) {
-        return p.negate();
-    }
-
-    private String parseTraceparent(String value) {
-        String[] tokens = value.split("-");
-        return tokens.length >= 2 ? tokens[1] : null;
+    private static String parseTraceparent(String value) {
+        int idx1 = value.indexOf('-');
+        if (idx1 != -1) {
+            ++idx1;
+            int idx2 = value.indexOf('-', idx1);
+            if (idx2 != -1) {
+                // return string between first and second '-'.
+                return value.substring(idx1, idx2);
+            }
+        }
+        return null;
     }
 
     private void addCorrelationIdHeader(HttpServletResponse response, String correlationId) {