Skip to content

Commit 15d18a7

Browse files
authored
Merge branch 'main' into cijothomas/resourcekeyref
2 parents 54fc419 + 4f472a8 commit 15d18a7

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

.cspell.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"deque",
3838
"Dirkjan",
3939
"EPYC",
40+
"flamegraph",
4041
"hasher",
4142
"Isobel",
4243
"jaegertracing",
@@ -53,6 +54,7 @@
5354
"OTELCOL",
5455
"OTLP",
5556
"periodicreader",
57+
"pprof",
5658
"prost",
5759
"protoc",
5860
"quantile",

.github/workflows/integration_tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ jobs:
99
integration_tests:
1010
runs-on: ubuntu-latest
1111
timeout-minutes: 10
12-
if: ${{ github.event.label.name == 'integration tests' || contains(github.event.pull_request.labels.*.name, 'integration tests') }}
1312
steps:
1413
- name: Free disk space
1514
run: |

opentelemetry-appender-tracing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ criterion = { workspace = true }
2828
tokio = { workspace = true, features = ["full"]}
2929

3030
[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
31-
pprof = { version = "0.13", features = ["flamegraph", "criterion"] }
31+
pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
3232

3333
[features]
3434
experimental_metadata_attributes = ["dep:tracing-log"]

opentelemetry-sdk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ rstest = "0.23.0"
3939
temp-env = { workspace = true }
4040

4141
[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
42-
pprof = { version = "0.13", features = ["flamegraph", "criterion"] }
42+
pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
4343

4444
[features]
4545
default = ["trace", "metrics", "logs", "internal-logs"]

0 commit comments

Comments
 (0)