Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TST: trace event migration backward compatibility e2e tests #1264

Merged
merged 7 commits into from
Apr 7, 2022
Merged

TST: trace event migration backward compatibility e2e tests #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9084dad
MAINT: additional 3 e2e tests
chenqi0805 Apr 4, 2022
46869a7
REF: e2e tests task definition and README
chenqi0805 Apr 4, 2022
e355d2a
MAINT: github workflow
chenqi0805 Apr 4, 2022
d10649d
STY: spotless
chenqi0805 Apr 4, 2022
8220b61
FIX: window_duration
chenqi0805 Apr 4, 2022
4564080
CLN: PR comments
chenqi0805 Apr 5, 2022
456fdeb
Merge branch 'main' into tst/trace-event-migration-backward-compatibi…
chenqi0805 Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/data-prepper-trace-analytics-raw-span-compatibility-e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,8 @@ jobs:
java-version: ${{ matrix.java }}
- name: Checkout Data-Prepper
uses: actions/checkout@v2
- name: Run raw-span compatibility end-to-end tests with Gradle
run: ./gradlew :e2e-test:trace:rawSpanCompatibilityEndToEndTest
Copy link
Member

Choose a reason for hiding this comment

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

I propose that we keep the rawSpanCompatibilityEndToEndTest. It can just be a task which depends on the other two tests.

This approach allows for developers to have few test commands to run locally.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

So the current rawSpanCompatibilityEndToEndTest is renamed as rawSpanOTLPLatestReleaseCompatibilityEndToEndTest. I only added a similar test with event type named rawSpanEventLatestReleaseCompatibilityEndToEndTest. Can you specify what two other tests this should depend on?

Copy link
Member

Choose a reason for hiding this comment

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

You have renamed rawSpanCompatibilityEndToEndTest to rawSpanOTLPLatestReleaseCompatibilityEndToEndTest. So keep that.

But, you can also add a task named rawSpanCompatibilityEndToEndTest. Just make it depend on rawSpanOTLPLatestReleaseCompatibilityEndToEndTest and rawSpanEventLatestReleaseCompatibilityEndToEndTest.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Tried the following:

task rawSpanEndToEndTest(type: Test) {
    dependsOn rawSpanOTLPEndToEndTest
    dependsOn rawSpanOTLPAndEventEndToEndTest
    rawSpanOTLPEndToEndTest.doLast {
        sleep(10 * 1000)
    }
    rawSpanOTLPAndEventEndToEndTest.mustRunAfter(rawSpanOTLPEndToEndTest)
}

but unfortunately the container conflict between the two tasks remains:

Status 409: {"message":"Conflict. The container name \"/dataprepper2\" is already in use by container \"d3f18cb07a9ef6625aa830db8dbaf27f85029d5ae7a23967162bec7a3b2c6154\". You have to remove (or rename) that container to be able to reuse that name."}

Copy link
Member

Choose a reason for hiding this comment

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

OK - it appears it isn't quite so easy due to using Docker. Maybe we can improve this later.

# TODO: Event record type only in 2.0 (https://github.com/opensearch-project/data-prepper/issues/1272)
- name: Run raw-span OTLP record type latest release compatibility end-to-end tests with Gradle
run: ./gradlew :e2e-test:trace:rawSpanOTLPLatestReleaseCompatibilityEndToEndTest
- name: Run raw-span Event record type latest release compatibility end-to-end tests with Gradle
run: ./gradlew :e2e-test:trace:rawSpanEventLatestReleaseCompatibilityEndToEndTest
7 changes: 5 additions & 2 deletions .github/workflows/data-prepper-trace-analytics-raw-span-e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,8 @@ jobs:
java-version: ${{ matrix.java }}
- name: Checkout Data-Prepper
uses: actions/checkout@v2
- name: Run raw-span end-to-end tests with Gradle
run: ./gradlew :e2e-test:trace:rawSpanEndToEndTest
# TODO: Event record type only in 2.0 (https://github.com/opensearch-project/data-prepper/issues/1272)
- name: Run raw-span OTLP record type end-to-end tests with Gradle
run: ./gradlew :e2e-test:trace:rawSpanOTLPEndToEndTest
- name: Run raw-span OTLP and Event end-to-end tests with Gradle
run: ./gradlew :e2e-test:trace:rawSpanOTLPAndEventEndToEndTest
7 changes: 5 additions & 2 deletions .github/workflows/data-prepper-trace-analytics-service-map-e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,8 @@ jobs:
java-version: ${{ matrix.java }}
- name: Checkout Data-Prepper
uses: actions/checkout@v2
- name: Run service-map end-to-end tests with Gradle
run: ./gradlew :e2e-test:trace:serviceMapEndToEndTest
# TODO: Event record type only in 2.0 (https://github.com/opensearch-project/data-prepper/issues/1272)
- name: Run service-map OTLP record type end-to-end tests with Gradle
run: ./gradlew :e2e-test:trace:serviceMapOTLPEndToEndTest
- name: Run service-map OTLP and Event end-to-end tests with Gradle
run: ./gradlew :e2e-test:trace:serviceMapOTLPAndEventEndToEndTest
53 changes: 46 additions & 7 deletions e2e-test/trace/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,72 @@ This module includes e2e tests for trace data ingestion supported by data-preppe

## Raw Span Ingestion Pipeline End-to-end test

### OTLP record type

Run from current directory
```
./gradlew :rawSpanOTLPEndToEndTest
```
or from project root directory
```
./gradlew :e2e-test:trace:rawSpanOTLPEndToEndTest
```

### Event record type compatibility with OTLP record type

Run from current directory
```
./gradlew :rawSpanEndToEndTest
./gradlew :rawSpanOTLPAndEventEndToEndTest
```
or from project root directory
```
./gradlew :e2e-test:trace:rawSpanEndToEndTest
./gradlew :e2e-test:trace:rawSpanOTLPAndEventEndToEndTest
```

## Raw Span Ingestion Pipelines Compatibility End-to-end test
## Raw Span Ingestion Pipelines Latest Release Compatibility End-to-end test

### OTLP record type compatibility with latest release

Run from current directory
```
./gradlew :rawSpanCompatibilityEndToEndTest
./gradlew :rawSpanOTLPLatestReleaseCompatibilityEndToEndTest
```
or from project root directory
```
./gradlew :e2e-test:trace:rawSpanCompatibilityEndToEndTest
./gradlew :e2e-test:trace:rawSpanOTLPLatestReleaseCompatibilityEndToEndTest
```

### Event record type compatibility with latest release

Run from current directory
```
./gradlew :rawSpanEventLatestReleaseCompatibilityEndToEndTest
```
or from project root directory
```
./gradlew :e2e-test:trace:rawSpanEventLatestReleaseCompatibilityEndToEndTest
```

## Service Map Ingestion Pipelines End-to-end test

### OTLP record type

Run from current directory
```
./gradlew :serviceMapOTLPEndToEndTest
```
or from project root directory
```
./gradlew :e2e-test:trace:serviceMapOTLPEndToEndTest
```

### Event record type compatibility with OTLP record type

Run from current directory
```
./gradlew :serviceMapEndToEndTest
./gradlew :serviceMapOTLPAndEventEndToEndTest
```
or from project root directory
```
./gradlew :e2e-test:trace:serviceMapEndToEndTest
./gradlew :e2e-test:trace:serviceMapOTLPAndEventEndToEndTest
```
188 changes: 89 additions & 99 deletions e2e-test/trace/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ task removeDataPrepperNetwork(type: DockerRemoveNetwork) {
}

def RAW_SPAN_PIPELINE_YAML = "raw-span-e2e-pipeline.yml"
def RAW_SPAN_PIPELINE_EVENT_TYPE_YAML = "raw-span-e2e-pipeline-event-type.yml"
def RAW_SPAN_PIPELINE_PEER_FORWARDER_EVENT_TYPE_YAML = "raw-span-e2e-pipeline-peer-forwarder-event-type.yml"
def RAW_SPAN_PIPELINE_LATEST_RELEASE_YAML = "raw-span-e2e-pipeline-latest-release.yml"
def SERVICE_MAP_PIPELINE_YAML = "service-map-e2e-pipeline.yml"
def SERVICE_MAP_PIPELINE_EVENT_TYPE_YAML = "service-map-e2e-pipeline-event-type.yml"

/**
* DataPrepper Docker tasks
Expand All @@ -45,8 +48,11 @@ task createDataPrepperDockerFile(type: Dockerfile) {
workingDir("/app")
copyFile("${dataPrepperJarFilepath}", "/app/data-prepper.jar")
copyFile("src/integrationTest/resources/${RAW_SPAN_PIPELINE_YAML}", "/app/${RAW_SPAN_PIPELINE_YAML}")
copyFile("src/integrationTest/resources/${RAW_SPAN_PIPELINE_EVENT_TYPE_YAML}", "/app/${RAW_SPAN_PIPELINE_EVENT_TYPE_YAML}")
copyFile("src/integrationTest/resources/${RAW_SPAN_PIPELINE_PEER_FORWARDER_EVENT_TYPE_YAML}", "/app/${RAW_SPAN_PIPELINE_PEER_FORWARDER_EVENT_TYPE_YAML}")
copyFile("src/integrationTest/resources/${RAW_SPAN_PIPELINE_LATEST_RELEASE_YAML}", "/app/${RAW_SPAN_PIPELINE_LATEST_RELEASE_YAML}")
copyFile("src/integrationTest/resources/${SERVICE_MAP_PIPELINE_YAML}", "/app/${SERVICE_MAP_PIPELINE_YAML}")
copyFile("src/integrationTest/resources/${SERVICE_MAP_PIPELINE_EVENT_TYPE_YAML}", "/app/${SERVICE_MAP_PIPELINE_EVENT_TYPE_YAML}")
copyFile("src/integrationTest/resources/data_prepper.yml", "/app/data_prepper.yml")
defaultCommand("java", "-jar", "data-prepper.jar", "/app/${RAW_SPAN_PIPELINE_YAML}", "/app/data_prepper.yml")
}
Expand Down Expand Up @@ -148,120 +154,104 @@ task stopOpenSearchDockerContainer(type: DockerStopContainer) {
* End to end test. Spins up OpenSearch and DataPrepper docker containers, then runs the integ test
* Stops the docker containers when finished
*/
task rawSpanEndToEndTest(type: Test) {
dependsOn build
dependsOn startOpenSearchDockerContainer
def createDataPrepper1Task = createDataPrepperDockerContainer(
"rawSpanDataPrepper1", "dataprepper1", 21890, 4900, "/app/${RAW_SPAN_PIPELINE_YAML}")
def createDataPrepper2Task = createDataPrepperDockerContainer(
"rawSpanDataPrepper2", "dataprepper2", 21891, 4901, "/app/${RAW_SPAN_PIPELINE_YAML}")
def startDataPrepper1Task = startDataPrepperDockerContainer(createDataPrepper1Task as DockerCreateContainer)
def startDataPrepper2Task = startDataPrepperDockerContainer(createDataPrepper2Task as DockerCreateContainer)
dependsOn startDataPrepper1Task
dependsOn startDataPrepper2Task
startDataPrepper1Task.mustRunAfter 'startOpenSearchDockerContainer'
startDataPrepper2Task.mustRunAfter 'startOpenSearchDockerContainer'
// wait for data-preppers to be ready
doFirst {
sleep(10*1000)
def createEndToEndTest(final String testName, final String includeTestsMatchPattern,
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice work removing the repetitive code blocks.

final DockerCreateContainer createDataPrepper1Task, final DockerCreateContainer createDataPrepper2Task) {
return tasks.create(testName, Test) {
dependsOn build
dependsOn startOpenSearchDockerContainer
def startDataPrepper1Task = startDataPrepperDockerContainer(createDataPrepper1Task as DockerCreateContainer)
def startDataPrepper2Task = startDataPrepperDockerContainer(createDataPrepper2Task as DockerCreateContainer)
dependsOn startDataPrepper1Task
dependsOn startDataPrepper2Task
startDataPrepper1Task.mustRunAfter 'startOpenSearchDockerContainer'
startDataPrepper2Task.mustRunAfter 'startOpenSearchDockerContainer'
// wait for data-preppers to be ready
doFirst {
sleep(10*1000)
}

description = 'Runs the raw span integration tests.'
group = 'verification'
testClassesDirs = sourceSets.integrationTest.output.classesDirs
classpath = sourceSets.integrationTest.runtimeClasspath

filter {
includeTestsMatching includeTestsMatchPattern
}

finalizedBy stopOpenSearchDockerContainer
def stopDataPrepper1Task = stopDataPrepperDockerContainer(startDataPrepper1Task as DockerStartContainer)
def stopDataPrepper2Task = stopDataPrepperDockerContainer(startDataPrepper2Task as DockerStartContainer)
finalizedBy stopDataPrepper1Task
finalizedBy stopDataPrepper2Task
finalizedBy removeDataPrepperDockerContainer(stopDataPrepper1Task as DockerStopContainer)
finalizedBy removeDataPrepperDockerContainer(stopDataPrepper2Task as DockerStopContainer)
finalizedBy removeDataPrepperNetwork
}
}

description = 'Runs the raw span integration tests.'
group = 'verification'
testClassesDirs = sourceSets.integrationTest.output.classesDirs
classpath = sourceSets.integrationTest.runtimeClasspath
def includeRawSpanTestsMatchPattern = "com.amazon.dataprepper.integration.trace.EndToEndRawSpanTest.testPipelineEndToEnd*"

filter {
includeTestsMatching "com.amazon.dataprepper.integration.trace.EndToEndRawSpanTest.testPipelineEndToEnd*"
}
def createRawSpanDataPrepperOTLP1Task = createDataPrepperDockerContainer(
"rawSpanDataPrepper1", "dataprepper1", 21890, 4900, "/app/${RAW_SPAN_PIPELINE_YAML}")
def createRawSpanDataPrepperOTLP2Task = createDataPrepperDockerContainer(
"rawSpanDataPrepper2", "dataprepper2", 21891, 4901, "/app/${RAW_SPAN_PIPELINE_YAML}")

finalizedBy stopOpenSearchDockerContainer
def stopDataPrepper1Task = stopDataPrepperDockerContainer(startDataPrepper1Task as DockerStartContainer)
def stopDataPrepper2Task = stopDataPrepperDockerContainer(startDataPrepper2Task as DockerStartContainer)
finalizedBy stopDataPrepper1Task
finalizedBy stopDataPrepper2Task
finalizedBy removeDataPrepperDockerContainer(stopDataPrepper1Task as DockerStopContainer)
finalizedBy removeDataPrepperDockerContainer(stopDataPrepper2Task as DockerStopContainer)
finalizedBy removeDataPrepperNetwork
}
// TODO: replace with Event type in 2.0 (https://github.com/opensearch-project/data-prepper/issues/1272)
def rawSpanOTLPEndToEndTest = createEndToEndTest("rawSpanOTLPEndToEndTest", includeRawSpanTestsMatchPattern,
createRawSpanDataPrepperOTLP1Task, createRawSpanDataPrepperOTLP2Task)

task rawSpanCompatibilityEndToEndTest(type: Test) {
dependsOn build
dependsOn startOpenSearchDockerContainer
def createDataPrepper1Task = createDataPrepperDockerContainer(
"rawSpanDataPrepperFromBuild", "dataprepper1", 21890, 4900, "/app/${RAW_SPAN_PIPELINE_LATEST_RELEASE_YAML}")
def createDataPrepper2Task = createDataPrepperDockerContainerFromPullImage(
"rawSpanDataPrepperFromPull", "dataprepper2", 21891, 4901, "src/integrationTest/resources/${RAW_SPAN_PIPELINE_LATEST_RELEASE_YAML}")
def startDataPrepper1Task = startDataPrepperDockerContainer(createDataPrepper1Task as DockerCreateContainer)
def startDataPrepper2Task = startDataPrepperDockerContainer(createDataPrepper2Task as DockerCreateContainer)
dependsOn startDataPrepper1Task
dependsOn startDataPrepper2Task
startDataPrepper1Task.mustRunAfter 'startOpenSearchDockerContainer'
startDataPrepper2Task.mustRunAfter 'startOpenSearchDockerContainer'
// wait for data-preppers to be ready
doFirst {
sleep(10*1000)
}
def createRawSpanDataPrepperOTLPTask = createDataPrepperDockerContainer(
"rawSpanDataPrepperOTLP", "dataprepper1", 21890, 4900, "/app/${RAW_SPAN_PIPELINE_YAML}")
def createRawSpanDataPrepperEventTask = createDataPrepperDockerContainer(
"rawSpanDataPrepperEvent", "dataprepper2", 21891, 4901, "/app/${RAW_SPAN_PIPELINE_EVENT_TYPE_YAML}")

description = 'Runs the raw span compatibility integration tests.'
group = 'verification'
testClassesDirs = sourceSets.integrationTest.output.classesDirs
classpath = sourceSets.integrationTest.runtimeClasspath
// TODO: remove in 2.0 (https://github.com/opensearch-project/data-prepper/issues/1272)
def rawSpanOTLPAndEventEndToEndTest = createEndToEndTest("rawSpanOTLPAndEventEndToEndTest", includeRawSpanTestsMatchPattern,
createRawSpanDataPrepperOTLPTask, createRawSpanDataPrepperEventTask)

filter {
includeTestsMatching "com.amazon.dataprepper.integration.trace.EndToEndRawSpanTest.testPipelineEndToEnd*"
}
def rawSpanDataPrepperOTLPFromBuild = createDataPrepperDockerContainer(
"rawSpanDataPrepperOTLPFromBuild", "dataprepper1", 21890, 4900, "/app/${RAW_SPAN_PIPELINE_LATEST_RELEASE_YAML}")
def rawSpanDataPrepperOTLPFromPull = createDataPrepperDockerContainerFromPullImage(
"rawSpanDataPrepperOTLPFromPull", "dataprepper2", 21891, 4901, "src/integrationTest/resources/${RAW_SPAN_PIPELINE_LATEST_RELEASE_YAML}")

finalizedBy stopOpenSearchDockerContainer
def stopDataPrepper1Task = stopDataPrepperDockerContainer(startDataPrepper1Task as DockerStartContainer)
def stopDataPrepper2Task = stopDataPrepperDockerContainer(startDataPrepper2Task as DockerStartContainer)
finalizedBy stopDataPrepper1Task
finalizedBy stopDataPrepper2Task
finalizedBy removeDataPrepperDockerContainer(stopDataPrepper1Task as DockerStopContainer)
finalizedBy removeDataPrepperDockerContainer(stopDataPrepper2Task as DockerStopContainer)
finalizedBy removeDataPrepperNetwork
}
// TODO: remove in 2.0 (https://github.com/opensearch-project/data-prepper/issues/1272)
def rawSpanOTLPLatestReleaseCompatibilityEndToEndTest = createEndToEndTest("rawSpanOTLPLatestReleaseCompatibilityEndToEndTest",
includeRawSpanTestsMatchPattern,
rawSpanDataPrepperOTLPFromBuild, rawSpanDataPrepperOTLPFromPull)

task serviceMapEndToEndTest(type: Test) {
dependsOn build
dependsOn startOpenSearchDockerContainer
def createDataPrepper1Task = createDataPrepperDockerContainer(
"serviceMapDataPrepper1", "dataprepper1", 21890, 4900, "/app/${SERVICE_MAP_PIPELINE_YAML}")
def createDataPrepper2Task = createDataPrepperDockerContainer(
"serviceMapDataPrepper2", "dataprepper2", 21891, 4901, "/app/${SERVICE_MAP_PIPELINE_YAML}")
def startDataPrepper1Task = startDataPrepperDockerContainer(createDataPrepper1Task as DockerCreateContainer)
def startDataPrepper2Task = startDataPrepperDockerContainer(createDataPrepper2Task as DockerCreateContainer)
dependsOn startDataPrepper1Task
dependsOn startDataPrepper2Task
startDataPrepper1Task.mustRunAfter 'startOpenSearchDockerContainer'
startDataPrepper2Task.mustRunAfter 'startOpenSearchDockerContainer'
// wait for data-preppers to be ready
doFirst {
sleep(10*1000)
}
def rawSpanDataPrepperEventFromBuild = createDataPrepperDockerContainer(
"rawSpanDataPrepperEventFromBuild", "dataprepper1", 21890, 4900, "/app/${RAW_SPAN_PIPELINE_PEER_FORWARDER_EVENT_TYPE_YAML}")
def rawSpanDataPrepperLatestFromPull = createDataPrepperDockerContainerFromPullImage(
"rawSpanDataPrepperLatestFromPull", "dataprepper2", 21891, 4901, "src/integrationTest/resources/${RAW_SPAN_PIPELINE_LATEST_RELEASE_YAML}")

description = 'Runs the service-map integration tests.'
group = 'verification'
testClassesDirs = sourceSets.integrationTest.output.classesDirs
classpath = sourceSets.integrationTest.runtimeClasspath
def rawSpanEventLatestReleaseCompatibilityEndToEndTest = createEndToEndTest("rawSpanEventLatestReleaseCompatibilityEndToEndTest",
includeRawSpanTestsMatchPattern,
rawSpanDataPrepperEventFromBuild, rawSpanDataPrepperLatestFromPull)

filter {
includeTestsMatching "com.amazon.dataprepper.integration.trace.EndToEndServiceMapTest*"
}
def includeServiceMapTestsMatchPattern = "com.amazon.dataprepper.integration.trace.EndToEndServiceMapTest*"

finalizedBy stopOpenSearchDockerContainer
def stopDataPrepper1Task = stopDataPrepperDockerContainer(startDataPrepper1Task as DockerStartContainer)
def stopDataPrepper2Task = stopDataPrepperDockerContainer(startDataPrepper2Task as DockerStartContainer)
finalizedBy stopDataPrepper1Task
finalizedBy stopDataPrepper2Task
finalizedBy removeDataPrepperDockerContainer(stopDataPrepper1Task as DockerStopContainer)
finalizedBy removeDataPrepperDockerContainer(stopDataPrepper2Task as DockerStopContainer)
finalizedBy removeDataPrepperNetwork
}
def createServiceMapDataPrepperOTLP1Task = createDataPrepperDockerContainer(
"serviceMapDataPrepper1", "dataprepper1", 21890, 4900, "/app/${SERVICE_MAP_PIPELINE_YAML}")
def createServiceMapDataPrepperOTLP2Task = createDataPrepperDockerContainer(
"serviceMapDataPrepper2", "dataprepper2", 21891, 4901, "/app/${SERVICE_MAP_PIPELINE_YAML}")

// TODO: replace with Event type in 2.0 (https://github.com/opensearch-project/data-prepper/issues/1272)
def serviceMapOTLPEndToEndTest = createEndToEndTest("serviceMapOTLPEndToEndTest", includeServiceMapTestsMatchPattern,
createServiceMapDataPrepperOTLP1Task, createServiceMapDataPrepperOTLP2Task)

def serviceMapDataPrepperOTLP = createDataPrepperDockerContainer(
"serviceMapDataPrepperOTLP", "dataprepper1", 21890, 4900, "/app/${SERVICE_MAP_PIPELINE_YAML}")
def serviceMapDataPrepperEvent = createDataPrepperDockerContainer(
"serviceMapDataPrepperEvent", "dataprepper2", 21891, 4901, "/app/${SERVICE_MAP_PIPELINE_EVENT_TYPE_YAML}")

// TODO: remove in 2.0 (https://github.com/opensearch-project/data-prepper/issues/1272)
def serviceMapOTLPAndEventEndToEndTest = createEndToEndTest("serviceMapOTLPAndEventEndToEndTest", includeServiceMapTestsMatchPattern,
serviceMapDataPrepperOTLP, serviceMapDataPrepperEvent)

dependencies {
integrationTestImplementation project(':data-prepper-plugins:opensearch')
integrationTestImplementation project(':data-prepper-plugins:otel-trace-group-prepper')
integrationTestImplementation project(':data-prepper-plugins:otel-trace-group-processor')
integrationTestImplementation "org.awaitility:awaitility:4.1.1"
integrationTestImplementation "io.opentelemetry:opentelemetry-proto:${versionMap.opentelemetryProto}"
integrationTestImplementation 'com.google.protobuf:protobuf-java-util:3.19.4'
Expand Down
Loading