Skip to content

Commit 613e20e

Browse files
committed
Prepare release 0.26
1 parent 228604d commit 613e20e

18 files changed

Lines changed: 59 additions & 59 deletions

README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Main author and contact: Luca.Canali@cern.ch
9595
# Python CLI
9696
# pip install pyspark
9797
pip install sparkmeasure
98-
pyspark --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
98+
pyspark --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
9999
100100
# Import sparkMeasure
101101
from sparkmeasure import StageMetrics
@@ -120,7 +120,7 @@ Main author and contact: Luca.Canali@cern.ch
120120
```
121121
#### Scala CLI
122122
```
123-
spark-shell --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
123+
spark-shell --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
124124
125125
val stageMetrics = ch.cern.sparkmeasure.StageMetrics(spark)
126126
stageMetrics.runAndMeasure(spark.sql("select count(*) from range(1000) cross join range(1000) cross join range(1000)").show())
@@ -203,7 +203,7 @@ Notes:
203203
This is similar but slightly different from the example above as it collects metrics at the Task-level rather than Stage-level
204204
```
205205
# Scala CLI
206-
spark-shell --packages ch.cern.sparkmeasure:spark-measure_2.12:0.25
206+
spark-shell --packages ch.cern.sparkmeasure:spark-measure_2.12:0.26
207207
208208
val taskMetrics = ch.cern.sparkmeasure.TaskMetrics(spark)
209209
taskMetrics.runAndMeasure(spark.sql("select count(*) from range(1000) cross join range(1000) cross join range(1000)").show())
@@ -212,7 +212,7 @@ This is similar but slightly different from the example above as it collects met
212212
# Python CLI
213213
# pip install pyspark
214214
pip install sparkmeasure
215-
pyspark --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
215+
pyspark --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
216216
217217
from sparkmeasure import TaskMetrics
218218
taskmetrics = TaskMetrics(spark)
@@ -226,8 +226,8 @@ This is similar but slightly different from the example above as it collects met
226226

227227
| Spark Version | Recommended SparkMeasure Version | Scala Version |
228228
| -------------- |----------------------------------|---------------------|
229-
| Spark 4.x | 0.25 (latest) | Scala 2.13 |
230-
| Spark 3.x | 0.25 (latest) | Scala 2.12 and 2.13 |
229+
| Spark 4.x | 0.26 (latest) | Scala 2.13 |
230+
| Spark 3.x | 0.26 (latest) | Scala 2.12 and 2.13 |
231231
| Spark 2.4, 2.3 | 0.19 | Scala 2.11 |
232232
| Spark 2.2, 2.1 | 0.16 | Scala 2.11 |
233233

@@ -241,7 +241,7 @@ To get SparkMeasure, choose one of the following options:
241241

242242
2. **Specific Versions:**
243243

244-
* Download JAR files from the [sparkMeasure release notes](https://github.com/LucaCanali/sparkMeasure/releases/tag/v0.25).
244+
* Download JAR files from the [sparkMeasure release notes](https://github.com/LucaCanali/sparkMeasure/releases/tag/v0.26).
245245

246246
3. **Latest Development Builds:**
247247

@@ -255,21 +255,21 @@ To get SparkMeasure, choose one of the following options:
255255

256256
#### Spark 4 with Scala 2.13
257257

258-
* **Scala:** `spark-shell --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25`
258+
* **Scala:** `spark-shell --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26`
259259
* **Python:**
260260

261261
```bash
262-
pyspark --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
262+
pyspark --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
263263
pip install sparkmeasure
264264
```
265265

266266
#### Spark 3 with Scala 2.12
267267

268-
* **Scala:** `spark-shell --packages ch.cern.sparkmeasure:spark-measure_2.12:0.25`
268+
* **Scala:** `spark-shell --packages ch.cern.sparkmeasure:spark-measure_2.12:0.26`
269269
* **Python:**
270270

271271
```bash
272-
pyspark --packages ch.cern.sparkmeasure:spark-measure_2.12:0.25
272+
pyspark --packages ch.cern.sparkmeasure:spark-measure_2.12:0.26
273273
pip install sparkmeasure
274274
```
275275
### Including sparkMeasure in your Spark environment
@@ -279,14 +279,14 @@ Choose your preferred method:
279279
* Use the `--packages` option:
280280

281281
```bash
282-
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
282+
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
283283
```
284284
* Directly reference the JAR file:
285285

286286
```bash
287-
--jars /path/to/spark-measure_2.13-0.25.jar
288-
--jars https://github.com/LucaCanali/sparkMeasure/releases/download/v0.25/spark-measure_2.13-0.25.jar
289-
--conf spark.driver.extraClassPath=/path/to/spark-measure_2.13-0.25.jar
287+
--jars /path/to/spark-measure_2.13-0.26.jar
288+
--jars https://github.com/LucaCanali/sparkMeasure/releases/download/v0.26/spark-measure_2.13-0.26.jar
289+
--conf spark.driver.extraClassPath=/path/to/spark-measure_2.13-0.26.jar
290290
```
291291

292292

build.sbt

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

55
name := "spark-measure"
66

7-
version := "0.26-SNAPSHOT"
8-
isSnapshot := true
7+
version := "0.26"
8+
isSnapshot := false
99

1010
scalaVersion := "2.12.18"
1111
crossScalaVersions := Seq("2.12.18", "2.13.8")

docs/Flight_recorder_mode_FileSink.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Metrics can also be printed to stdout.
1212
## Recording metrics using the Flight Recorder mode with Stage-level granularity
1313
To record metrics at the stage execution level granularity add these configurations to spark-submit:
1414
```
15-
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
15+
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
1616
--conf spark.extraListeners=ch.cern.sparkmeasure.FlightRecorderStageMetrics
1717
```
1818

@@ -25,7 +25,7 @@ The usage is almost the same as for the stage metrics mode described above, just
2525
The configuration parameters applicable to Flight recorder mode for Task granularity are:
2626

2727
```
28-
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
28+
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
2929
--conf spark.extraListeners=ch.cern.sparkmeasure.FlightRecorderTaskMetrics
3030
```
3131

@@ -51,7 +51,7 @@ A Python example
5151
- This runs the pi.py example script
5252
- collects and saves the metrics to `/tmp/stageMetrics_flightRecorder` in json format:
5353
```
54-
bin/spark-submit --master local[*] --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25 \
54+
bin/spark-submit --master local[*] --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26 \
5555
--conf spark.extraListeners=ch.cern.sparkmeasure.FlightRecorderStageMetrics \
5656
examples/src/main/python/pi.py
5757
@@ -63,12 +63,12 @@ A Scala example
6363
- same example as above, in addition use a custom output filename
6464
- print metrics also to stdout
6565
```
66-
bin/spark-submit --master local[*] --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25 \
66+
bin/spark-submit --master local[*] --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26 \
6767
--class org.apache.spark.examples.SparkPi \
6868
--conf spark.extraListeners=ch.cern.sparkmeasure.FlightRecorderStageMetrics \
6969
--conf spark.sparkmeasure.printToStdout=true \
7070
--conf spark.sparkmeasure.outputFilename="/tmp/myoutput_$(date +%s).json" \
71-
examples/jars/spark-examples_2.12-3.3.1.jar 10
71+
examples/jars/spark-examples_2.13-4.0.0.jar 10
7272
7373
# The metrics are printed on stdout and also saved to a file
7474
# Find and read the flight recorder output file:
@@ -80,7 +80,7 @@ This example collected metrics with Task granularity.
8080
(note: source the Hadoop environment before running this)
8181
```
8282
bin/spark-submit --master yarn --deploy-mode cluster \
83-
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.25 \
83+
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.26 \
8484
--conf spark.extraListeners=ch.cern.sparkmeasure.FlightRecorderTaskMetrics \
8585
--conf spark.sparkmeasure.outputFormat=json_to_hadoop \
8686
--conf spark.sparkmeasure.outputFilename="hdfs://myclustername/user/luca/test/myoutput_$(date +%s).json" \
@@ -96,7 +96,7 @@ Example, use Spark 4, Kubernetes, Scala 2.13 and write output to S3:
9696
bin/spark-submit --master k8s://https://XXX.XXX.XXX.XXX --deploy-mode client --conf spark.executor.instances=3 \
9797
--conf spark.executor.cores=2 --executor-memory 6g --driver-memory 8g \
9898
--conf spark.kubernetes.container.image=apache/spark \
99-
--packages org.apache.hadoop:hadoop-aws:3.4.1,ch.cern.sparkmeasure:spark-measure_2.13:0.25 \
99+
--packages org.apache.hadoop:hadoop-aws:3.4.1,ch.cern.sparkmeasure:spark-measure_2.13:0.26 \
100100
--conf spark.hadoop.fs.s3a.secret.key="YYY..." \
101101
--conf spark.hadoop.fs.s3a.access.key="ZZZ..." \
102102
--conf spark.hadoop.fs.s3a.endpoint="https://s3.cern.ch" \
@@ -105,7 +105,7 @@ bin/spark-submit --master k8s://https://XXX.XXX.XXX.XXX --deploy-mode client --c
105105
--conf spark.sparkmeasure.outputFormat=json_to_hadoop \
106106
--conf spark.sparkmeasure.outputFilename="s3a://test/myoutput_$(date +%s).json" \
107107
--class org.apache.spark.examples.SparkPi \
108-
examples/jars/spark-examples_2.13-4.4.0.jar 10
108+
examples/jars/spark-examples_2.13-4.0.0.jar 10
109109
```
110110

111111

@@ -115,7 +115,7 @@ To post-process the saved metrics you will need to deserialize objects saved by
115115
This is an example of how to do that using the supplied helper object sparkmeasure.Utils
116116

117117
```
118-
bin/spark-shell --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
118+
bin/spark-shell --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
119119
120120
val myMetrics = ch.cern.sparkmeasure.IOUtils.readSerializedStageMetricsJSON("/tmp/stageMetrics_flightRecorder")
121121
// use ch.cern.sparkmeasure.IOUtils.readSerializedStageMetrics("/tmp/stageMetrics.serialized") for java serialization

docs/Flight_recorder_mode_InfluxDBSink.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ bin/spark-shell \
8787
--conf spark.sparkmeasure.influxdbURL="http://localhost:8086" \
8888
--conf spark.extraListeners=ch.cern.sparkmeasure.InfluxDBSink,ch.cern.sparkmeasure.InfluxDBSinkExtended \
8989
--conf spark.sparkmeasure.influxdbStagemetrics=true
90-
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
90+
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
9191
9292
// run a Spark job, this will produce metrics
9393
spark.sql("select count(*) from range(1000) cross join range(1000) cross join range(1000)").show

docs/Flight_recorder_mode_KafkaSink.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ in spark-submit as in:
5555
- Start Apache Kafka.
5656
- This example uses Kafka configured as in the getting started instructions at
5757
[Apache Kafka quickstart](https://kafka.apache.org/quickstart)
58-
- for example run from Docker image: `docker run -p 9092:9092 apache/kafka:4.0.0`
58+
- for example run from Docker image: `docker run -p 9092:9092 apache/kafka:latest`
5959

6060
- Start Spark with sparkMeasure and attach the KafkaSink Listener
6161

@@ -67,7 +67,7 @@ bin/spark-shell \
6767
--conf spark.extraListeners=ch.cern.sparkmeasure.KafkaSink \
6868
--conf spark.sparkmeasure.kafkaBroker=localhost:9092 \
6969
--conf spark.sparkmeasure.kafkaTopic=metrics
70-
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
70+
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
7171
```
7272

7373
- Look at the metrics being written into Kafka:

docs/Flight_recorder_mode_PrometheusPushgatewaySink.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Examples:
6060
bin/spark-shell \
6161
--conf spark.extraListeners=ch.cern.sparkmeasure.PushGatewaySink \
6262
--conf spark.sparkmeasure.pushgateway=localhost:9091 \
63-
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
63+
--packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
6464
```
6565

6666
- Look at the metrics being written to the Pushgateway

docs/Instrument_Python_code.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ You can find an example of how to instrument a Scala application running Apache
1111

1212
How to run the example:
1313
```
14-
bin/spark-submit --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25 <path_to_examples>/test_sparkmeasure_python.py
14+
bin/spark-submit --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26 <path_to_examples>/test_sparkmeasure_python.py
1515
```
1616

1717
Some relevant snippet of code are:
@@ -54,10 +54,10 @@ The details are discussed in the [examples for Python shell and notebook](https:
5454

5555
- This is how to run sparkMeasure using a packaged version in Maven Central
5656
```
57-
bin/spark-submit --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25 your_python_code.py
57+
bin/spark-submit --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26 your_python_code.py
5858
5959
// alternative: just download and use the jar (it is only needed in the driver) as in:
60-
bin/spark-submit --conf spark.driver.extraClassPath=<path>/spark-measure_2.13-0.25.jar ...
60+
bin/spark-submit --conf spark.driver.extraClassPath=<path>/spark-measure_2.13-0.26.jar ...
6161
```
6262

6363
### Download and build sparkMeasure (optional)
@@ -73,8 +73,8 @@ The details are discussed in the [examples for Python shell and notebook](https:
7373
pip install .
7474
7575
# Run as in one of these examples:
76-
bin/spark-submit --jars path>/spark-measure_2.13-0.26-SNAPSHOT.jar ...
76+
bin/spark-submit --jars path>/spark-measure_2.13-0.27-SNAPSHOT.jar ...
7777
7878
# alternative, set classpath for the driver (sparkmeasure code runs only in the driver)
79-
bin/spark-submit --conf spark.driver.extraClassPath=<path>/spark-measure_2.13-0.26-SNAPSHOT.jar ...
79+
bin/spark-submit --conf spark.driver.extraClassPath=<path>/spark-measure_2.13-0.27-SNAPSHOT.jar ...
8080
```

docs/Instrument_Scala_code.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ How to run the example:
1313
# build the example jar
1414
sbt package
1515
16-
bin/spark-submit --master local[*] --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25 --class ch.cern.testSparkMeasure.testSparkMeasure <path_to_the_example_jar>/testsparkmeasurescala_2.13-0.1.jar
16+
bin/spark-submit --master local[*] --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26 --class ch.cern.testSparkMeasure.testSparkMeasure <path_to_the_example_jar>/testsparkmeasurescala_2.13-0.1.jar
1717
```
1818

1919
### Collect and save Stage Metrics
@@ -72,10 +72,10 @@ You have the option to export aggregated stage metrics and/or task metrics to:
7272

7373
- This is how to run sparkMeasure using a packaged version in Maven Central
7474
```
75-
bin/spark-submit --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
75+
bin/spark-submit --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
7676

7777
// or just download and use the jar (it is only needed in the driver) as in:
78-
bin/spark-submit --conf spark.driver.extraClassPath=<path>/spark-measure_2.13-0.25.jar ...
78+
bin/spark-submit --conf spark.driver.extraClassPath=<path>/spark-measure_2.13-0.26.jar ...
7979
```
8080
- The alternative, see paragraph above, is to build a jar from master (See below).
8181

@@ -89,8 +89,8 @@ You have the option to export aggregated stage metrics and/or task metrics to:
8989
ls -l target/scala-2.12/spark-measure*.jar # location of the compiled jar
9090
9191
# Run as in one of these examples:
92-
bin/spark-submit --jars path>/spark-measure_2.13-0.26-SNAPSHOT.jar
92+
bin/spark-submit --jars path>/spark-measure_2.13-0.27-SNAPSHOT.jar
9393
9494
# alternative, set classpath for the driver (it is only needed in the driver)
95-
bin/spark-submit --conf spark.driver.extraClassPath=<path>/spark-measure_2.13-0.26-SNAPSHOT.jar ...
95+
bin/spark-submit --conf spark.driver.extraClassPath=<path>/spark-measure_2.13-0.27-SNAPSHOT.jar ...
9696
```

docs/Prometheus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ https://prometheus.io/docs/instrumenting/exposition_formats/
3535

3636
1. Measure metrics at the Stage level (example in Scala):
3737
```
38-
bin/spark-shell --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
38+
bin/spark-shell --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
3939
4040
val stageMetrics = ch.cern.sparkmeasure.StageMetrics(spark)
4141
stageMetrics.begin()

docs/Python_shell_and_Jupyter.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ See also [README](../README.md) for an introduction to sparkMeasure and its arch
1010
```
1111
pip install pyspark # Spark 4
1212
pip install sparkmeasure
13-
bin/pyspark --packages ch.cern.sparkmeasure:spark-measure_2.13:0.25
13+
bin/pyspark --packages ch.cern.sparkmeasure:spark-measure_2.13:0.26
1414
```
1515
- If you prefer to build from the latest development version:
1616
```
@@ -24,10 +24,10 @@ See also [README](../README.md) for an introduction to sparkMeasure and its arch
2424
pip install .
2525
2626
# Run as in one of these examples:
27-
bin/pyspark --jars path>/spark-measure_2.13-0.26-SNAPSHOT.jar
27+
bin/pyspark --jars path>/spark-measure_2.13-0.27-SNAPSHOT.jar
2828
2929
#Alternative:
30-
bin/pyspark --conf spark.driver.extraClassPath=<path>/spark-measure_2.13-0.26-SNAPSHOT.jar
30+
bin/pyspark --conf spark.driver.extraClassPath=<path>/spark-measure_2.13-0.27-SNAPSHOT.jar
3131
```
3232
3333

0 commit comments

Comments
 (0)