MAINT: refactoring existing e2e tests on trace data ingestion #512
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # Data Prepper End-to-end Tests | ||
|
|
||
| This module includes all e2e tests for data-prepper. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| subprojects { | ||
| buildscript { | ||
| repositories { | ||
| maven { | ||
| url "https://plugins.gradle.org/m2/" | ||
| } | ||
| } | ||
| dependencies { | ||
| classpath 'com.bmuschko:gradle-docker-plugin:7.0.0' | ||
| } | ||
| } | ||
|
|
||
| sourceSets { | ||
| integrationTest { | ||
| java { | ||
| compileClasspath += main.output + test.output | ||
| runtimeClasspath += main.output + test.output | ||
| srcDir file('src/integrationTest/java') | ||
| } | ||
| resources.srcDir file('src/integrationTest/resources') | ||
| } | ||
| } | ||
|
|
||
| configurations { | ||
| integrationTestImplementation.extendsFrom testImplementation | ||
| integrationTestRuntime.extendsFrom testRuntime | ||
| } | ||
|
|
||
| def DATA_PREPPER_CORE_JAR = project(':data-prepper-core').jar | ||
|
|
||
| task copyDataPrepperJar(type: Copy) { | ||
| dependsOn DATA_PREPPER_CORE_JAR | ||
| from("${project(':data-prepper-core').jar.archivePath}") | ||
| into 'build/bin' | ||
| } | ||
|
|
||
| ext { | ||
| data_prepper_jar_filepath = "build/bin/${DATA_PREPPER_CORE_JAR.archiveName}" | ||
|
There was a problem hiding this comment. We use Groovy for Gradle build files and should follow the correct coding standards. This should be camelCase: Also, this value should be scoped correctly. I'm guessing this should be the root project. In which case it should look more like There was a problem hiding this comment. Actually it should be the scope of qa-test project, I will replace it with project(':qa-test').buildDir There was a problem hiding this comment. Instead of that, please use |
||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| # Trace Data Ingestion End-to-end Tests | ||
|
|
||
| This module includes e2e tests for trace data ingestion supported by data-prepper. | ||
|
|
||
| ## Raw Span Ingestion Pipeline End-to-end test | ||
|
|
||
| Run from current directory | ||
| ``` | ||
| ./gradlew :rawSpanEndToEndTest | ||
| ``` | ||
| or from project root directory | ||
| ``` | ||
| ./gradlew :e2e:trace:rawSpanEndToEndTest | ||
| ``` | ||
|
|
||
| ## Raw Span Ingestion Pipelines Compatibility End-to-end test | ||
|
|
||
| Run from current directory | ||
| ``` | ||
| ./gradlew :rawSpanCompatibilityEndToEndTest | ||
| ``` | ||
| or from project root directory | ||
| ``` | ||
| ./gradlew :e2e:trace:rawSpanCompatibilityEndToEndTest | ||
| ``` | ||
|
|
||
| ## Service Map Ingestion Pipelines End-to-end test | ||
|
|
||
| Run from current directory | ||
| ``` | ||
| ./gradlew :serviceMapEndToEndTest | ||
| ``` | ||
| or from project root directory | ||
| ``` | ||
| ./gradlew :e2e:trace:serviceMapEndToEndTest | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package com.amazon.dataprepper.integration.trace; | ||
|
|
||
| import io.opentelemetry.proto.trace.v1.Span; | ||
|
|
||
|
|
||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,4 +38,6 @@ include 'data-prepper-plugins:blocking-buffer' | |
| include 'data-prepper-plugins:http-source' | ||
| include 'data-prepper-plugins:grok-prepper' | ||
| include 'data-prepper-logstash-configuration' | ||
| include 'e2e' | ||
|
There was a problem hiding this comment. I want to raise the question of what name to use here. This uses I don't like the name Also, the core OpenSearch project uses There was a problem hiding this comment. @dlvenable I also went back and forth between qa and e2e. I think qa-test looks good to me. There was a problem hiding this comment. @cmanning09 @graytaylor0 , Any thoughts on the name? There was a problem hiding this comment. Actually e2e-test might be better since e2e is already populated in the repo 😄 |
||
| include 'e2e:trace' | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I try to avoid
defs in Gradle builds. Is there a way to clean this up?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it is not bad practice since it appeared in docs: https://docs.gradle.org/current/userguide/more_about_tasks.html
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think it is bad practice, but I do try to avoid them when possible. But, if there isn't a better way, that is fine too.
Also, this isn't a constant, so it should probably also be camelCase:
dataPrepperCoreJar.