Skip to content

Commit c4c9de2

Browse files
jacumtimure
jacum
and
timure
authored
Bump (#62)
* push * dashboards fixed * v8 * bump build versions * cache bump * scoverage disabled for 2.12 Co-authored-by: timure <[email protected]>
1 parent b86f535 commit c4c9de2

File tree

16 files changed

+68
-99
lines changed

16 files changed

+68
-99
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ Sensors' bundled dashboards will be imported.
106106
```
107107
libraryDependencies ++=
108108
Seq(
109-
"nl.pragmasoft.sensors" %% "sensors-core" % "0.1.0",
110-
"nl.pragmasoft.sensors" %% "sensors-cassandra" % "0.1.0"
109+
"nl.pragmasoft.sensors" %% "sensors-core" % "0.1.1",
110+
"nl.pragmasoft.sensors" %% "sensors-cassandra" % "0.1.1"
111111
)
112112
```
113113

‎azure-build.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ variables:
1515
- name: IVY_HOME
1616
value: $(Pipeline.Workspace)/.ivy2
1717
- name: CACHE_RUN_ID
18-
value: "201009"
18+
value: "210411"
1919

2020
steps:
2121

@@ -33,7 +33,7 @@ steps:
3333

3434
- task: JavaToolInstaller@0
3535
inputs:
36-
versionSpec: '11'
36+
versionSpec: '8'
3737
jdkArchitectureOption: 'x64'
3838
jdkSourceOption: 'PreInstalled'
3939
cleanDestinationDirectory: false
@@ -43,13 +43,15 @@ steps:
4343
inputs:
4444
targetType: 'inline'
4545
script: |
46-
sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.12.12; coverage; test; coverageReport" && bash <(curl -s https://codecov.io/bash)
46+
# coverage disabled due to https://github.com/scoverage/sbt-scoverage/issues/319
47+
# sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.12.13; coverage; test; coverageReport" && bash <(curl -s https://codecov.io/bash)
48+
sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.12.13; test; "
4749
failOnStderr: false
4850

4951
- task: Bash@3
5052
displayName: 'Building and testing 2.13'
5153
inputs:
5254
targetType: 'inline'
5355
script: |
54-
sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.13.4; coverage; test; coverageReport" && bash <(curl -s https://codecov.io/bash)
56+
sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.13.5; clean; coverage; test; coverageReport" && bash <(curl -s https://codecov.io/bash)
5557
failOnStderr: false

‎azure-release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ steps:
3636
git config --global user.email "tim@@pragmasoft.nl"
3737
git config --global user.name "Azure Devops release pipeline"
3838
39-
sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.12.12; test"
40-
sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.13.4; test"
39+
sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.12.13; test"
40+
sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.13.5; test"
4141
sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "release with-defaults"
4242
4343
rm -rf $(secring.secureFilePath)

‎build.sbt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import sbt.file
44

55
val commonSettings = Defaults.coreDefaultSettings ++ Seq(
66
organization := "nl.pragmasoft.sensors",
7-
crossScalaVersions := Seq("2.13.4", "2.12.13"),
8-
scalaVersion := "2.13.4",
7+
crossScalaVersions := Seq("2.13.5", "2.12.13"),
8+
scalaVersion := "2.13.5",
99
testOptions += Tests.Argument(TestFrameworks.JUnit, "-v"),
1010
parallelExecution in Test := false,
1111
Test / fork := true,
@@ -82,3 +82,4 @@ lazy val `app` = project.in(file("examples/app"))
8282
lazy val `root` = project.in(file("."))
8383
.aggregate(app, `sensors-core`, `sensors-cassandra`)
8484
.settings(commonSettings ++ noPublishSettings)
85+
.settings(name := "Akka Sensors")

‎examples/app/src/main/resources/application.conf‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ akka {
7878
cassandra {
7979

8080
session-provider = "akka.sensors.cassandra.InstrumentedCassandraSessionProvider"
81-
session-provider-config = "sensors-cassandra-session-provider"
8281

8382
session-dispatcher = "akka.persistence.cassandra.default-dispatcher"
8483
datastax-java-driver-config = "datastax-java-driver"
@@ -158,18 +157,13 @@ akka {
158157
}
159158
}
160159

161-
sensors-cassandra-session-provider {
162-
profile = "akka-persistence-cassandra-profile"
163-
username = "admin"
164-
password = "admin"
165-
local-datacenter = "datacenter1"
166-
contact-points = "localhost"
167-
port = 9042
168-
}
169-
170-
171160
datastax-java-driver {
172-
load-balancing-policy.local-datacenter = "datacenter1"
161+
basic {
162+
username = "admin"
163+
password = "admin"
164+
contact-points = ["localhost"]
165+
load-balancing-policy.local-datacenter = "datacenter1"
166+
}
173167
advanced.metrics {
174168
session.enabled = [ connected-nodes, cql-requests, bytes-sent, bytes-received, cql-client-timeouts ]
175169
}

‎examples/app/src/main/scala/nl/pragmasoft/app/Main.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ object Main extends IOApp with LazyLogging {
2222

2323
val mainResource: Resource[IO, Server[IO]] =
2424
for {
25-
_ <- Resource.liftF(IO.async[Unit] { callback =>
25+
_ <- Resource.eval(IO.async[Unit] { callback =>
2626
Cluster(system).registerOnMemberUp {
2727
logger.info("Akka cluster is now up")
2828
callback(Right(()))
2929
}
3030
})
3131
_ <- MetricService.resource(
32-
InetSocketAddress.createUnresolved("0.0.0.0", 8081)
32+
InetSocketAddress.createUnresolved("0.0.0.0", 9095)
3333
)
3434
apiService <- ApiService.resource(
3535
InetSocketAddress.createUnresolved("0.0.0.0", 8080),

‎examples/observability/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3"
33
services:
44
app:
55
image: app:latest
6-
ports: ["8080:8080", "8081:8081"]
6+
ports: ["8080:8080", "9095:9095"]
77
networks: [observability]
88

99
prometheus:

‎examples/observability/grafana/plugins/sensors-prometheus-app/dashboards/cassandra.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"bars": false,
2525
"dashLength": 10,
2626
"dashes": false,
27-
"datasource": "Prometheus-local",
27+
"datasource": "Prometheus-Local",
2828
"description": "",
2929
"editable": true,
3030
"error": false,
@@ -128,7 +128,7 @@
128128
"bars": false,
129129
"dashLength": 10,
130130
"dashes": false,
131-
"datasource": "Prometheus-local",
131+
"datasource": "Prometheus-Local",
132132
"description": "",
133133
"editable": true,
134134
"error": false,
@@ -237,7 +237,7 @@
237237
"bars": false,
238238
"dashLength": 10,
239239
"dashes": false,
240-
"datasource": "Prometheus-local",
240+
"datasource": "Prometheus-Local",
241241
"description": "",
242242
"editable": true,
243243
"error": false,
@@ -349,7 +349,7 @@
349349
"text": "Sensors",
350350
"value": "Sensors"
351351
},
352-
"datasource": "Prometheus-local",
352+
"datasource": "Prometheus-Local",
353353
"definition": "label_values(jvm_info,job)",
354354
"error": null,
355355
"hide": 0,

‎examples/observability/grafana/plugins/sensors-prometheus-app/dashboards/dispatchers.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"bars": false,
2525
"dashLength": 10,
2626
"dashes": false,
27-
"datasource": "Prometheus-local",
27+
"datasource": "Prometheus-Local",
2828
"description": "",
2929
"editable": true,
3030
"error": false,
@@ -127,7 +127,7 @@
127127
"bars": false,
128128
"dashLength": 10,
129129
"dashes": false,
130-
"datasource": "Prometheus-local",
130+
"datasource": "Prometheus-Local",
131131
"description": "",
132132
"editable": true,
133133
"error": false,
@@ -230,7 +230,7 @@
230230
"bars": false,
231231
"dashLength": 10,
232232
"dashes": false,
233-
"datasource": "Prometheus-local",
233+
"datasource": "Prometheus-Local",
234234
"description": "",
235235
"editable": true,
236236
"error": false,
@@ -333,7 +333,7 @@
333333
"bars": false,
334334
"dashLength": 10,
335335
"dashes": false,
336-
"datasource": "Prometheus-local",
336+
"datasource": "Prometheus-Local",
337337
"description": "",
338338
"editable": true,
339339
"error": false,
@@ -449,7 +449,7 @@
449449
"bars": false,
450450
"dashLength": 10,
451451
"dashes": false,
452-
"datasource": "Prometheus-local",
452+
"datasource": "Prometheus-Local",
453453
"description": "",
454454
"editable": true,
455455
"error": false,
@@ -553,7 +553,7 @@
553553
"bars": false,
554554
"dashLength": 10,
555555
"dashes": false,
556-
"datasource": "Prometheus-local",
556+
"datasource": "Prometheus-Local",
557557
"description": "",
558558
"editable": true,
559559
"error": false,
@@ -673,7 +673,7 @@
673673
"text": "Sensors",
674674
"value": "Sensors"
675675
},
676-
"datasource": "Prometheus-local",
676+
"datasource": "Prometheus-Local",
677677
"definition": "label_values(jvm_info,job)",
678678
"error": null,
679679
"hide": 0,

0 commit comments

Comments
 (0)