Merge branch 'opensearch-project:main' into fix-issue-5106

Author: saketh-pallempati

.github/workflows/data-prepper-trace-analytics-raw-span-e2e-tests.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         java: [11, 17, 21, docker]
-        otelVersion: ['0.9.0-alpha', '0.16.0-alpha']
+        otelVersion: ['0.16.0-alpha', '1.3.2-alpha']
       fail-fast: false
 
     runs-on: ubuntu-latest

build.gradle

@@ -269,7 +269,7 @@ subprojects {
 
 configure(subprojects.findAll {it.name != 'data-prepper-api'}) {
     dependencies {
-        implementation platform('software.amazon.awssdk:bom:2.25.11')
+        implementation platform('software.amazon.awssdk:bom:2.30.23')
         implementation 'jakarta.validation:jakarta.validation-api:3.0.2'
     }
 }

data-prepper-api/build.gradle

@@ -14,6 +14,7 @@ dependencies {
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
     implementation libs.parquet.common
     implementation libs.commons.lang3
+    implementation 'jakarta.validation:jakarta.validation-api:3.0.2'
     testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
     testImplementation project(':data-prepper-test-common')
     testImplementation 'org.skyscreamer:jsonassert:1.5.3'

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/acknowledgements/AcknowledgementSet.java

@@ -9,6 +9,7 @@
 import org.opensearch.dataprepper.model.event.EventHandle;
 
 import java.time.Duration;
+import java.time.Instant;
 import java.util.function.Consumer;
 
 /**
@@ -83,4 +84,10 @@ default void add(Event event) {
      * @since 2.6
      */
     public void addProgressCheck(final Consumer<ProgressCheck> progressCheckCallback, final Duration progressCheckInterval);
+
+    void increaseExpiry(final Duration expiryIncreaseTime);
+
+    Instant getExpirationTime();
+
+    void cancel();
 }

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/annotations/ValidRegex.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.dataprepper.model.annotations;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import org.opensearch.dataprepper.model.validation.RegexValueValidator;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Constraint(validatedBy = RegexValueValidator.class)
+@Target({ElementType.FIELD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ValidRegex {
+    String message() default "Invalid regular expression pattern";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+}

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/InvalidPluginConfigurationException.java

@@ -15,4 +15,8 @@ public class InvalidPluginConfigurationException extends RuntimeException {
     public InvalidPluginConfigurationException(final String message) {
         super(message);
     }
+
+    public InvalidPluginConfigurationException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
 }

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/validation/RegexValueValidator.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.dataprepper.model.validation;
+
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import org.opensearch.dataprepper.model.annotations.ValidRegex;
+
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+public class RegexValueValidator implements ConstraintValidator<ValidRegex, String> {
+    @Override
+    public boolean isValid(final String pattern, final ConstraintValidatorContext constraintValidatorContext) {
+        if (pattern != null && !pattern.isEmpty()) {
+            try {
+                Pattern.compile(pattern);
+            } catch (PatternSyntaxException e) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

data-prepper-api/src/test/java/org/opensearch/dataprepper/model/plugin/InvalidPluginConfigurationExceptionTest.java

@@ -7,13 +7,20 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.UUID;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+@ExtendWith(MockitoExtension.class)
 class InvalidPluginConfigurationExceptionTest {
+    @Mock
+    private Throwable cause;
+
     private String message;
 
     @BeforeEach
@@ -30,4 +37,11 @@ void getMessage_returns_message() {
         assertThat(createObjectUnderTest().getMessage(),
                 equalTo(message));
     }
+
+    @Test
+    void getCause_returns_cause() {
+        final InvalidPluginConfigurationException objectUnderTest = new InvalidPluginConfigurationException(
+                message, cause);
+        assertThat(objectUnderTest.getCause(), equalTo(cause));
+    }
 }

data-prepper-api/src/test/java/org/opensearch/dataprepper/model/validation/RegexValueValidatorTest.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.dataprepper.model.validation;
+
+import jakarta.validation.ConstraintValidatorContext;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.stream.Stream;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
+@ExtendWith(MockitoExtension.class)
+class RegexValueValidatorTest {
+    @Mock
+    private ConstraintValidatorContext constraintValidatorContext;
+
+    @ParameterizedTest
+    @MethodSource("provideRegexAndExpectedResult")
+    void testValidateRegex(final String delimiterRegex, final boolean isValid) {
+        final RegexValueValidator objectUnderTest = new RegexValueValidator();
+        assertThat(objectUnderTest.isValid(delimiterRegex, constraintValidatorContext), is(isValid));
+    }
+
+    private static Stream<Arguments> provideRegexAndExpectedResult() {
+        return Stream.of(
+                arguments(null, true),
+                arguments("", true),
+                arguments("abc", true),
+                arguments("(abc", false)
+        );
+    }
+}

data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java

@@ -21,6 +21,7 @@
 import org.opensearch.dataprepper.model.plugin.InvalidPluginConfigurationException;
 import org.opensearch.dataprepper.model.plugin.NoPluginFoundException;
 import org.opensearch.dataprepper.model.source.Source;
+import org.opensearch.dataprepper.pipeline.parser.DataPrepperDeserializationProblemHandler;
 import org.opensearch.dataprepper.plugins.TestObjectPlugin;
 import org.opensearch.dataprepper.plugins.configtest.TestComponentWithConfigInject;
 import org.opensearch.dataprepper.plugins.configtest.TestDISourceWithConfig;
@@ -82,6 +83,7 @@ private DefaultPluginFactory createObjectUnderTest() {
         coreContext.register(PluginBeanFactoryProvider.class);
         coreContext.registerBean(PluginErrorCollector.class, PluginErrorCollector::new);
         coreContext.registerBean(PluginErrorsHandler.class, LoggingPluginErrorsHandler::new);
+        coreContext.registerBean(DataPrepperDeserializationProblemHandler.class, DataPrepperDeserializationProblemHandler::new);
         coreContext.registerBean(ExtensionsConfiguration.class, () -> extensionsConfiguration);
         coreContext.registerBean(PipelinesDataFlowModel.class, () -> pipelinesDataFlowModel);
         coreContext.registerBean(ExperimentalConfigurationContainer.class, () -> experimentalConfigurationContainer);