Skip to content

Commit 7e04b37

Browse files
Bump play2.version from 3.0.5 to 3.0.7 (#764)
* Bump play2.version from 3.0.5 to 3.0.7 Bumps `play2.version` from 3.0.5 to 3.0.7. Updates `org.playframework:play_2.13` from 3.0.5 to 3.0.7 - [Release notes](https://github.com/playframework/playframework/releases) - [Commits](playframework/playframework@3.0.5...3.0.7) Updates `org.playframework:play-guice_2.13` from 3.0.5 to 3.0.7 - [Release notes](https://github.com/playframework/playframework/releases) - [Commits](playframework/playframework@3.0.5...3.0.7) Updates `org.playframework:play-ws_2.13` from 3.0.5 to 3.0.7 - [Release notes](https://github.com/playframework/playframework/releases) - [Commits](playframework/playframework@3.0.5...3.0.7) Updates `org.playframework:play-filters-helpers_2.13` from 3.0.5 to 3.0.7 - [Release notes](https://github.com/playframework/playframework/releases) - [Commits](playframework/playframework@3.0.5...3.0.7) Updates `org.playframework:play-java_2.13` from 3.0.5 to 3.0.7 - [Release notes](https://github.com/playframework/playframework/releases) - [Commits](playframework/playframework@3.0.5...3.0.7) Updates `org.playframework:play-pekko-http-server_2.13` from 3.0.5 to 3.0.7 - [Release notes](https://github.com/playframework/playframework/releases) - [Commits](playframework/playframework@3.0.5...3.0.7) Updates `org.playframework:play-ahc-ws_2.13` from 3.0.5 to 3.0.7 - [Release notes](https://github.com/playframework/playframework/releases) - [Commits](playframework/playframework@3.0.5...3.0.7) Updates `org.playframework:play-jdbc_2.13` from 3.0.5 to 3.0.7 - [Release notes](https://github.com/playframework/playframework/releases) - [Commits](playframework/playframework@3.0.5...3.0.7) Updates `org.playframework:play-logback_2.13` from 3.0.5 to 3.0.7 - [Release notes](https://github.com/playframework/playframework/releases) - [Commits](playframework/playframework@3.0.5...3.0.7) Updates `org.playframework:play-test_2.13` from 3.0.5 to 3.0.7 - [Release notes](https://github.com/playframework/playframework/releases) - [Commits](playframework/playframework@3.0.5...3.0.7) --- updated-dependencies: - dependency-name: org.playframework:play_2.13 dependency-version: 3.0.7 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.playframework:play-guice_2.13 dependency-version: 3.0.7 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.playframework:play-ws_2.13 dependency-version: 3.0.7 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.playframework:play-filters-helpers_2.13 dependency-version: 3.0.7 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.playframework:play-java_2.13 dependency-version: 3.0.7 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.playframework:play-pekko-http-server_2.13 dependency-version: 3.0.7 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.playframework:play-ahc-ws_2.13 dependency-version: 3.0.7 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.playframework:play-jdbc_2.13 dependency-version: 3.0.7 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.playframework:play-logback_2.13 dependency-version: 3.0.7 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.playframework:play-test_2.13 dependency-version: 3.0.7 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * increase default chrome timeout to 30s * add debugging for flakey test * update build for new coverage tools * delay event triggering for a bit longer * more muckery --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brandon Arp <[email protected]>
1 parent 2d4da93 commit 7e04b37

File tree

3 files changed

+25
-11
lines changed

3 files changed

+25
-11
lines changed

Jenkinsfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ pipeline {
1212
stage('Init') {
1313
steps {
1414
checkout scm
15-
script {
16-
def m = (env.GIT_URL =~ /(\/|:)(([^\/]+)\/)?(([^\/]+?)(\.git)?)$/)
17-
if (m) {
18-
org = m.group(3)
19-
repo = m.group(5)
20-
}
21-
}
15+
script {
16+
def m = (env.GIT_URL =~ /(\/|:)(([^\/]+)\/)?(([^\/]+?)(\.git)?)$/)
17+
if (m) {
18+
org = m.group(3)
19+
repo = m.group(5)
20+
}
21+
}
22+
discoverReferenceBuild()
2223
}
2324
}
2425
stage('Setup build') {
@@ -73,6 +74,7 @@ pipeline {
7374
}
7475
post('Analysis') {
7576
always {
77+
recordCoverage(tools: [[parser: 'JACOCO']])
7678
recordIssues(
7779
enabledForFailure: true, aggregatingResults: true,
7880
tools: [java(), checkStyle(reportEncoding: 'UTF-8'), spotBugs()])

app/com/arpnetworking/metrics/portal/reports/impl/chrome/grafana/BaseGrafanaScreenshotRenderer.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,21 @@ public URI getUri(final GrafanaReportPanelReportSource source) {
124124

125125
final CompletableFuture<?> failureFuture = devToolsService.nowOrOnEvent(
126126
"reportrenderfailed",
127-
() -> false
128-
// TODO(spencerpearson): ^ this might miss a very fast failure.
129-
// How can we avoid this race condition?
127+
() -> {
128+
// TODO(spencerpearson): ^ this might miss a very fast failure.
129+
// How can we avoid this race condition?
130+
final Object rawHtml;
131+
try {
132+
rawHtml = devToolsService.evaluate("document.documentElement.outerHTML").get();
133+
} catch (final InterruptedException | ExecutionException e) {
134+
throw new CompletionException(e);
135+
}
136+
LOGGER.debug()
137+
.setMessage("snapshot of html looking for failiure")
138+
.addData("bodySrc", rawHtml)
139+
.log();
140+
return false;
141+
}
130142
).thenApply(whatever -> {
131143
LOGGER.debug()
132144
.setMessage("browser fired reportrenderfailed event")

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<metrics.incubator.extra.version>0.13.0</metrics.incubator.extra.version>
104104
<metrics.jvm.extra.version>0.13.1</metrics.jvm.extra.version>
105105
<oval.version>3.2.1</oval.version>
106-
<play2.version>3.0.5</play2.version>
106+
<play2.version>3.0.7</play2.version>
107107
<play2-json.version>3.0.4</play2-json.version>
108108
<play2-ebean.version>8.3.0</play2-ebean.version>
109109
<play2-jdbc-evolutions.version>3.0.5</play2-jdbc-evolutions.version>

0 commit comments

Comments
 (0)