From 6f876722de10292742cbadf66b3a314b2c844014 Mon Sep 17 00:00:00 2001
From: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
Date: Mon, 11 Mar 2024 18:26:51 +0000
Subject: [PATCH 1/6] fix ci and benchmark
---
opentelemetry/Cargo.toml | 2 +-
opentelemetry/benches/noop_metrics.rs | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opentelemetry/Cargo.toml b/opentelemetry/Cargo.toml
index ae198db3d9..0b9db7ebb3 100644
--- a/opentelemetry/Cargo.toml
+++ b/opentelemetry/Cargo.toml
@@ -42,7 +42,7 @@ otel_unstable = []
[dev-dependencies]
opentelemetry_sdk = { path = "../opentelemetry-sdk" } # for documentation tests
-criterion = { version = "0.4", features = ["html_reports"] }
+criterion = { version = "0.3" }
[[bench]]
name = "noop_metrics"
diff --git a/opentelemetry/benches/noop_metrics.rs b/opentelemetry/benches/noop_metrics.rs
index ba258293c0..7b3910832f 100644
--- a/opentelemetry/benches/noop_metrics.rs
+++ b/opentelemetry/benches/noop_metrics.rs
@@ -1,4 +1,4 @@
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
use opentelemetry::{
metrics::{noop::NoopMeterProvider, Counter, MeterProvider as _},
KeyValue,
@@ -67,24 +67,24 @@ fn noop_counter_add(c: &mut Criterion) {
#[allow(clippy::useless_vec)]
c.bench_function("CreateVector_KeyValue", |b| {
b.iter(|| {
- let _v1 = vec![
+ let _v1 = black_box(vec![
KeyValue::new("attribute1", "value1"),
KeyValue::new("attribute2", "value2"),
KeyValue::new("attribute3", "value3"),
KeyValue::new("attribute4", "value4"),
- ];
+ ]);
});
});
#[allow(clippy::useless_vec)]
c.bench_function("CreateDynamicVector_StringPair", |b| {
b.iter(|| {
- let _v1 = vec![
+ let _v1 = black_box(vec![
("attribute1", "value1"),
("attribute2", "value2"),
("attribute3", "value3"),
("attribute4", "value4"),
- ];
+ ]);
});
});
}
From a5a7802184d53fdd08a5aea77a79c5ce1bf3fc60 Mon Sep 17 00:00:00 2001
From: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
Date: Mon, 11 Mar 2024 13:41:04 -0700
Subject: [PATCH 2/6] reverted blackbox benchmark
---
opentelemetry/benches/noop_metrics.rs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/opentelemetry/benches/noop_metrics.rs b/opentelemetry/benches/noop_metrics.rs
index 7b3910832f..a7d35fb8dc 100644
--- a/opentelemetry/benches/noop_metrics.rs
+++ b/opentelemetry/benches/noop_metrics.rs
@@ -67,24 +67,24 @@ fn noop_counter_add(c: &mut Criterion) {
#[allow(clippy::useless_vec)]
c.bench_function("CreateVector_KeyValue", |b| {
b.iter(|| {
- let _v1 = black_box(vec![
+ let _v1 = vec![
KeyValue::new("attribute1", "value1"),
KeyValue::new("attribute2", "value2"),
KeyValue::new("attribute3", "value3"),
KeyValue::new("attribute4", "value4"),
- ]);
+ ];
});
});
#[allow(clippy::useless_vec)]
c.bench_function("CreateDynamicVector_StringPair", |b| {
b.iter(|| {
- let _v1 = black_box(vec![
+ let _v1 = vec![
("attribute1", "value1"),
("attribute2", "value2"),
("attribute3", "value3"),
("attribute4", "value4"),
- ]);
+ ];
});
});
}
From 6f2ace173a535c3acbf2a3b046137be395e62c09 Mon Sep 17 00:00:00 2001
From: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
Date: Mon, 11 Mar 2024 13:48:48 -0700
Subject: [PATCH 3/6] remove unused package
---
opentelemetry/benches/noop_metrics.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/opentelemetry/benches/noop_metrics.rs b/opentelemetry/benches/noop_metrics.rs
index a7d35fb8dc..ba258293c0 100644
--- a/opentelemetry/benches/noop_metrics.rs
+++ b/opentelemetry/benches/noop_metrics.rs
@@ -1,4 +1,4 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{criterion_group, criterion_main, Criterion};
use opentelemetry::{
metrics::{noop::NoopMeterProvider, Counter, MeterProvider as _},
KeyValue,
From d893b129940056063e8069a9a135684c20aaa93d Mon Sep 17 00:00:00 2001
From: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
Date: Mon, 11 Mar 2024 13:55:11 -0700
Subject: [PATCH 4/6] use last successful version of markdown link check module
---
.github/workflows/markdown-link-check.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml
index 53d7847108..6736091a83 100644
--- a/.github/workflows/markdown-link-check.yml
+++ b/.github/workflows/markdown-link-check.yml
@@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install markdown-link-check
- run: npm install -g markdown-link-check
+ run: npm install -g markdown-link-check#3.12.0
- name: Run markdown-link-check
run: |
From 06acd50a3a1713e4112bf9ad611919d96fa43bf8 Mon Sep 17 00:00:00 2001
From: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
Date: Mon, 11 Mar 2024 13:56:17 -0700
Subject: [PATCH 5/6] use last successful version of markdown link check module
- retry
---
.github/workflows/markdown-link-check.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml
index 6736091a83..fb43ab4b1c 100644
--- a/.github/workflows/markdown-link-check.yml
+++ b/.github/workflows/markdown-link-check.yml
@@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install markdown-link-check
- run: npm install -g markdown-link-check#3.12.0
+ run: npm install -g markdown-link-check@3.12.0
- name: Run markdown-link-check
run: |
From 6b3d14466db962a3586248f4f021bded4e0fa316 Mon Sep 17 00:00:00 2001
From: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
Date: Mon, 11 Mar 2024 14:00:50 -0700
Subject: [PATCH 6/6] use last successful version of markdown link check module
- retry 2
---
.github/workflows/markdown-link-check.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml
index fb43ab4b1c..2d25ac7933 100644
--- a/.github/workflows/markdown-link-check.yml
+++ b/.github/workflows/markdown-link-check.yml
@@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install markdown-link-check
- run: npm install -g markdown-link-check@3.12.0
+ run: npm install -g markdown-link-check@3.11.2
- name: Run markdown-link-check
run: |