Skip to content

Commit

Permalink
Merge branch 'main' into prepare-1.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
arminru committed Jun 28, 2024
2 parents bec245f + bd7cf55 commit 2040cc1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ enum AggregationTemporality {
11. A request is received, the system measures 1 request.
12. The 1 second collection cycle ends. A metric is exported for the
number of requests received over the interval of time t_1 to
t_0+1 with a value of 1.
t_1+1 with a value of 1.
Note: Even though, when reporting changes since last report time, using
CUMULATIVE is valid, it is not recommended. */
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry/proto/profiles/v1experimental/profiles.proto
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ option go_package = "go.opentelemetry.io/proto/otlp/profiles/v1experimental";
// ┌──────────────────┐
// │ Profile │
// └──────────────────┘
// │ 1-n
// │ n-1
// │ 1-n ┌───────────────────────────────────────┐
// ▼ │ ▽
// ┌──────────────────┐ 1-n ┌──────────────┐ ┌──────────┐
Expand Down

0 comments on commit 2040cc1

Please sign in to comment.