Merge branch 'main' into cijothomas/metric-test-fix2

Author: cijothomas

.github/workflows/ci.yml

@@ -40,6 +40,8 @@ jobs:
     - name: "Set rustup profile"
       run: rustup set profile minimal
     - uses: arduino/setup-protoc@v3
+      with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Test
       run: bash ./scripts/test.sh
   lint:
@@ -52,6 +54,8 @@ jobs:
       with:
         components: rustfmt
     - uses: arduino/setup-protoc@v3
+      with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
     - uses: actions-rs/cargo@v1
       with:
         command: fmt
@@ -88,6 +92,8 @@ jobs:
       with:
         components: rustfmt
     - uses: arduino/setup-protoc@v3
+      with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Build
       run: |
         cd ${{ matrix.example }}
@@ -126,6 +132,8 @@ jobs:
         with:
           components: rustfmt
       - uses: arduino/setup-protoc@v3
+        with:
+            repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: doc
         run: cargo doc --no-deps --all-features
         env:
@@ -144,6 +152,8 @@ jobs:
           toolchain: stable
           components: rustfmt,llvm-tools-preview
       - uses: arduino/setup-protoc@v3
+        with:
+            repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: cargo install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - name: cargo generate-lockfile

opentelemetry-otlp/examples/basic-otlp-http/README.md

@@ -32,12 +32,24 @@ docker-compose down
 If you don't want to use `docker-compose`, you can manually run the `otel/opentelemetry-collector` container
 and inspect the logs to see traces being transferred.
 
+On Unix based systems use:
+
 ```shell
 # From the current directory, run `opentelemetry-collector`
-$ docker run --rm -it -p 4318:4318 -v $(pwd):/cfg otel/opentelemetry-collector:latest --config=/cfg/otel-collector-config.yaml
+docker run --rm -it -p 4318:4318 -v $(pwd):/cfg otel/opentelemetry-collector:latest --config=/cfg/otel-collector-config.yaml
+```
+
+On Windows use:
 
-# Run the app which exports logs, metrics and traces via OTLP to the collector.
-$ cargo run
+```shell
+# From the current directory, run `opentelemetry-collector`
+docker run --rm -it -p 4318:4318 -v "%cd%":/cfg otel/opentelemetry-collector:latest --config=/cfg/otel-collector-config.yaml
+```
+
+Run the app which exports logs, metrics and traces via OTLP to the collector
+
+```shell
+cargo run
 ```
 
 ## View results

opentelemetry-otlp/examples/basic-otlp/README.md

@@ -32,12 +32,24 @@ docker-compose down
 If you don't want to use `docker-compose`, you can manually run the `otel/opentelemetry-collector` container
 and inspect the logs to see traces being transferred.
 
+On Unix based systems use:
+
 ```shell
 # From the current directory, run `opentelemetry-collector`
-$ docker run --rm -it -p 4317:4317 -v $(pwd):/cfg otel/opentelemetry-collector:latest --config=/cfg/otel-collector-config.yaml
+docker run --rm -it -p 4317:4317 -v $(pwd):/cfg otel/opentelemetry-collector:latest --config=/cfg/otel-collector-config.yaml
+```
+
+On Windows use:
 
-# Run the app which exports logs, metrics and traces via OTLP to the collector.
-$ cargo run
+```shell
+# From the current directory, run `opentelemetry-collector`
+docker run --rm -it -p 4317:4317 -v "%cd%":/cfg otel/opentelemetry-collector:latest --config=/cfg/otel-collector-config.yaml
+```
+
+Run the app which exports logs, metrics and traces via OTLP to the collector
+
+```shell
+cargo run
 ```
 
 ## View results

opentelemetry-otlp/examples/basic-otlp/src/main.rs

@@ -114,7 +114,6 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     for _ in 0..10 {
         counter.add(1, &[KeyValue::new("test_key", "test_value")]);
     }
-    counter.add(1, &[KeyValue::new("test_key", "test_value")]);
 
     tracer.in_span("Main operation", |cx| {
         let span = cx.span();

opentelemetry-sdk/CHANGELOG.md

@@ -7,6 +7,9 @@
   [1612](https://github.com/open-telemetry/opentelemetry-rust/pull/1612/files)
 - [#1422](https://github.com/open-telemetry/opentelemetry-rust/pull/1422)
   Fix metrics aggregation bug when using Views to drop attributes.
+- [#1766](https://github.com/open-telemetry/opentelemetry-rust/pull/1766)
+  Fix Metrics PeriodicReader to trigger first collect/export at the first interval
+  instead of doing it right away.
 - [#1623](https://github.com/open-telemetry/opentelemetry-rust/pull/1623) Add Drop implementation for SdkMeterProvider,
   which shuts down metricreaders, thereby allowing metrics still in memory to be flushed out.
 - **Breaking** [#1624](https://github.com/open-telemetry/opentelemetry-rust/pull/1624) Remove `OsResourceDetector` and

opentelemetry-sdk/src/metrics/periodic_reader.rs

@@ -132,6 +132,7 @@ where
             let ticker = self
                 .runtime
                 .interval(self.interval)
+                .skip(1) // The ticker is fired immediately, so we should skip the first one to align with the interval.
                 .map(|_| Message::Export);
 
             let messages = Box::pin(stream::select(message_receiver, ticker));