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

Add alpha1 qualifier and JDK 17 for backend #607

Merged
merged 10 commits into from
Mar 30, 2022
Merged

Add alpha1 qualifier and JDK 17 for backend #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5af2afa
Remove ref to jdk 8
joshuali925 Mar 28, 2022
703170c
Add alpha1 qualifier and JDK 17
joshuali925 Mar 28, 2022
232ee72
Fix creating index with yml mappings
joshuali925 Mar 29, 2022
aa61e09
Fix JDK 17 build issues
joshuali925 Mar 29, 2022
70a0a6b
Remove unused variables
joshuali925 Mar 29, 2022
3bafdc7
Merge branch 'alpha1-jdk17' of github.com:joshuali925/observability i…
joshuali925 Mar 29, 2022
7cdeaeb
Update frontend jest snapshots
joshuali925 Mar 29, 2022
3af4921
Update opensearch_version
joshuali925 Mar 29, 2022
d383ec5
Remove env vars in CI
joshuali925 Mar 29, 2022
74eff3a
Regex fix for multi digit versions
joshuali925 Mar 29, 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
9 changes: 2 additions & 7 deletions .github/workflows/opensearch-observability-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,13 @@ name: Test and Build OpenSearch Observability Backend Plugin

on: [pull_request, push]

env:
OPENSEARCH_VERSION: '2.0.0-SNAPSHOT'
OPENSEARCH_BRANCH: '2.0'
COMMON_UTILS_BRANCH: 'main'

jobs:
build:
strategy:
matrix:
java:
- 11
- 14
- 17

runs-on: ubuntu-latest

Expand All @@ -34,7 +29,7 @@ jobs:
- name: Build with Gradle
run: |
cd opensearch-observability
./gradlew build -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
./gradlew build

- name: Upload coverage
uses: codecov/codecov-action@v1
Expand Down
5 changes: 1 addition & 4 deletions DEVELOPER_GUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ OpenSearch builds using Java 11 at a minimum. This means you must have a JDK 11
installed with the environment variable `JAVA_HOME` referencing the path to Java home
for your JDK 11 installation, e.g. `JAVA_HOME=/usr/lib/jvm/jdk-11`.

By default, tests use the same runtime as `JAVA_HOME`. However, since OpenSearch
supports JDK 8, the build supports compiling with JDK 11 and testing on a different
version of JDK runtime. To do this, set `RUNTIME_JAVA_HOME` pointing to the Java home of
another JDK installation, e.g. `RUNTIME_JAVA_HOME=/usr/lib/jvm/jdk-8`.
By default, tests use the same runtime as `JAVA_HOME`.

### Setup

Expand Down
3,242 changes: 1,702 additions & 1,540 deletions ...lity/public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap
View file
Open in desktop

Large diffs are not rendered by default.

60 changes: 50 additions & 10 deletions .../public/components/application_analytics/__tests__/__snapshots__/log_config.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ exports[`Log Config component renders empty log config 1`] = `
size="s"
>
<EuiButtonDisplay
baseClassName="euiButton"
disabled={true}
element="button"
isDisabled={true}
Expand All @@ -190,6 +191,11 @@ exports[`Log Config component renders empty log config 1`] = `
className="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
disabled={true}
onClick={[Function]}
style={
Object {
"minWidth": undefined,
}
}
type="button"
>
<EuiButtonContent
Expand Down Expand Up @@ -217,8 +223,11 @@ exports[`Log Config component renders empty log config 1`] = `
</div>
</div>
<div
aria-labelledby="random_html_id"
className="euiAccordion__childWrapper"
id="logSource"
role="region"
tabIndex={-1}
>
<EuiResizeObserver
onResize={[Function]}
Expand Down Expand Up @@ -248,12 +257,22 @@ exports[`Log Config component renders empty log config 1`] = `
id="baseQueryCallout"
>
<EuiText
color="default"
size="xs"
>
<div
className="euiText euiText--extraSmall"
>
You can't change the base query after the application is created.
<EuiTextColor
color="default"
component="div"
>
<div
className="euiTextColor euiTextColor--default"
>
You can't change the base query after the application is created.
</div>
</EuiTextColor>
</div>
</EuiText>
</div>
Expand Down Expand Up @@ -299,7 +318,7 @@ exports[`Log Config component renders empty log config 1`] = `
className="euiFormRow__fieldWrapper"
>
<EuiFlexItem
aria-describedby="random_html_id-help"
aria-describedby="random_html_id-help-0"
className="query-area"
grow={false}
id="random_html_id"
Expand All @@ -308,7 +327,7 @@ exports[`Log Config component renders empty log config 1`] = `
onFocus={[Function]}
>
<div
aria-describedby="random_html_id-help"
aria-describedby="random_html_id-help-0"
className="euiFlexItem euiFlexItem--flexGrowZero query-area"
id="random_html_id"
onBlur={[Function]}
Expand Down Expand Up @@ -448,11 +467,12 @@ exports[`Log Config component renders empty log config 1`] = `
</EuiFlexItem>
<EuiFormHelpText
className="euiFormRow__text"
id="random_html_id-help"
id="random_html_id-help-0"
key="The default logs view in the application will be filtered by this query."
>
<div
className="euiFormHelpText euiFormRow__text"
id="random_html_id-help"
id="random_html_id-help-0"
>
The default logs view in the application will be filtered by this query.
</div>
Expand Down Expand Up @@ -658,6 +678,7 @@ exports[`Log Config component renders with query 1`] = `
size="s"
>
<EuiButtonDisplay
baseClassName="euiButton"
disabled={true}
element="button"
isDisabled={true}
Expand All @@ -669,6 +690,11 @@ exports[`Log Config component renders with query 1`] = `
className="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
disabled={true}
onClick={[Function]}
style={
Object {
"minWidth": undefined,
}
}
type="button"
>
<EuiButtonContent
Expand Down Expand Up @@ -696,8 +722,11 @@ exports[`Log Config component renders with query 1`] = `
</div>
</div>
<div
aria-labelledby="random_html_id"
className="euiAccordion__childWrapper"
id="logSource"
role="region"
tabIndex={-1}
>
<EuiResizeObserver
onResize={[Function]}
Expand Down Expand Up @@ -727,12 +756,22 @@ exports[`Log Config component renders with query 1`] = `
id="baseQueryCallout"
>
<EuiText
color="default"
size="xs"
>
<div
className="euiText euiText--extraSmall"
>
You can't change the base query after the application is created.
<EuiTextColor
color="default"
component="div"
>
<div
className="euiTextColor euiTextColor--default"
>
You can't change the base query after the application is created.
</div>
</EuiTextColor>
</div>
</EuiText>
</div>
Expand Down Expand Up @@ -778,7 +817,7 @@ exports[`Log Config component renders with query 1`] = `
className="euiFormRow__fieldWrapper"
>
<EuiFlexItem
aria-describedby="random_html_id-help"
aria-describedby="random_html_id-help-0"
className="query-area"
grow={false}
id="random_html_id"
Expand All @@ -787,7 +826,7 @@ exports[`Log Config component renders with query 1`] = `
onFocus={[Function]}
>
<div
aria-describedby="random_html_id-help"
aria-describedby="random_html_id-help-0"
className="euiFlexItem euiFlexItem--flexGrowZero query-area"
id="random_html_id"
onBlur={[Function]}
Expand Down Expand Up @@ -927,11 +966,12 @@ exports[`Log Config component renders with query 1`] = `
</EuiFlexItem>
<EuiFormHelpText
className="euiFormRow__text"
id="random_html_id-help"
id="random_html_id-help-0"
key="The default logs view in the application will be filtered by this query."
>
<div
className="euiFormHelpText euiFormRow__text"
id="random_html_id-help"
id="random_html_id-help-0"
>
The default logs view in the application will be filtered by this query.
</div>
Expand Down
Loading