Skip to content

Commit 94fad06

Browse files
authored
Merge pull request #84 from cisco-open/fix/master/add-events-jdk-support
Add events examples, update tests and update to use JDK 17
2 parents b4a1fb0 + 7535594 commit 94fad06

File tree

15 files changed

+524
-51
lines changed

15 files changed

+524
-51
lines changed

.github/workflows/gradle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121

2222
steps:
2323
- uses: actions/checkout@v2
24-
- name: Set up JDK 11
24+
- name: Set up JDK 17
2525
uses: actions/setup-java@v1
2626
with:
27-
java-version: '11'
27+
java-version: '17'
2828
- name: Build with Gradle
2929
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
3030
with:

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
We love pull requests from everyone, especially if they are to expand the available functionality or address one of the [open issues](https://github.com/cisco-open/test-telemetry-generator/issues). You will need the following to start with:
44
* Github access, obviously
5-
* JDK 11
6-
* Gradle 5.6.4 or above
5+
* JDK 17
6+
* Gradle 7.5.1 or above
77

88
Once you have the above setup:
99
* Clone the project

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jacocoTestReport {
6363

6464
task fatJar(type: Jar) {
6565
classifier("all")
66+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
6667
manifest {
6768
attributes 'Main-Class': 'io.opentelemetry.contrib.generator.telemetry.cli.CLIProcessor'
6869
}

example-definitions/json/log-definition.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,20 @@
3131
"ec2": 4,
3232
"container": 150
3333
}
34+
},
35+
{
36+
"severityOrderFunction": "severityDistributionCount([\"Normal\", \"Warning\"], [4, 1])",
37+
"payloadFrequencySeconds": 10,
38+
"payloadCount": 5,
39+
"reportingResourcesCounts": {
40+
"pod": 30
41+
},
42+
"attributes": {
43+
"event.name": "roundRobin([\"native_event\"])",
44+
"event.domain": "roundRobin([\"k8s\"])",
45+
"event.reason": "roundRobin([\"Pulling\", \"Pulled\", \"Created\", \"Pulling\", \"Backoff\"])",
46+
"event.message": "roundRobin([\"Pulling image k8s.gcr.io/echoserver:1.8\", \"Image downloaded\", \"Created container\", \"Pulling image cjknsjc/ccsdc:fff\", \"Error: ImagePullBackoff\"])"
47+
}
3448
}
3549
]
3650
}

0 commit comments

Comments
 (0)