Merge branch 'main' into empty_telemetry_envelopes

open-telemetry · Feb 19, 2025 · dab9f5d · dab9f5d
2 parents bb8620e + b41217b
commit dab9f5d
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 53 deletions.
diff --git a/.github/workflows/build-check.yaml b/.github/workflows/build-check.yaml
@@ -10,116 +10,139 @@ jobs:
   docker-pull:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - run: make docker-pull
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Run docker pull
+        run: make docker-pull
 
   gen-cpp:
     needs: docker-pull
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - run: make gen-cpp
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Generate C++
+        run: make gen-cpp
 
   gen-csharp:
     needs: docker-pull
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - run: make gen-csharp
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Generate C#
+        run: make gen-csharp
 
   gen-go:
     needs: docker-pull
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - run: make gen-go
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Generate GoLang
+        run: make gen-go
 
   gen-java:
     needs: docker-pull
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - run: make gen-java
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Generate Java
+        run: make gen-java
 
   gen-objc:
     needs: docker-pull
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - run: make gen-objc
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Generate ObjC
+        run: make gen-objc
 
   gen-openapi:
     needs: docker-pull
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - run: make gen-openapi
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Generate OpenAPI
+        run: make gen-openapi
 
   gen-php:
     needs: docker-pull
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - run: make gen-php
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Generate PhP
+        run: make gen-php
 
   gen-python:
     needs: docker-pull
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - run: make gen-python
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Generate Python
+        run: make gen-python
 
   gen-ruby:
     needs: docker-pull
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - run: make gen-ruby
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Generate Ruby
+        run: make gen-ruby
 
   gen-kotlin:
     needs: docker-pull
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - run: make gen-kotlin
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Generate Kotlin
+        run: make gen-kotlin
 
   breaking-change:
     needs: docker-pull
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    # breaking-change checks against last published release which is determined
-    # using the last published tag
-    - name: Get tags
-      run: git fetch --tags origin
-    - name: Run make breaking-change with json output to annotate PR
-      # Formats JSON output into Github workflow commands
-      # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-error-message
-      run: >
-        BUF_FLAGS="--error-format json" make -s breaking-change
-        | jq -rs '.[] | "::error file=\(.path),line=\(.start_line),endLine=\(.end_line),title=Buf detected breaking change \(.type)::\(.message)"'
-        ; (exit ${PIPESTATUS[0]})
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      # breaking-change checks against last published release which is determined
+      # using the last published tag
+      - name: Get tags
+        run: git fetch --tags origin
+      - name: Run make breaking-change with json output to annotate PR
+        # Formats JSON output into Github workflow commands
+       # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-error-message
+        run: >
+          BUF_FLAGS="--error-format json" make -s breaking-change
+          | jq -rs '.[] | "::error file=\(.path),line=\(.start_line),endLine=\(.end_line),title=Buf detected breaking change \(.type)::\(.message)"'
+          ; (exit ${PIPESTATUS[0]})
 
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-    - name: check out code
-      uses: actions/checkout@v2
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-    - name: install dependencies
-      run: npm install
+      - name: install dependencies
+        run: npm install
 
-    - name: run markdown-link-check
-      run: make markdown-link-check
+      - name: run markdown-link-check
+        run: make markdown-link-check
 
   markdownlint:
     runs-on: ubuntu-latest
     steps:
-    - name: check out code
-      uses: actions/checkout@v2
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-    - name: install dependencies
-      run: npm install
+      - name: install dependencies
+        run: npm install
 
-    - name: run markdownlint
-      run: make markdownlint
+      - name: run markdownlint
+        run: make markdownlint
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -0,0 +1,20 @@
+name: FOSSA scanning
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  fossa:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+          team: OpenTelemetry
diff --git a/docs/specification.md b/docs/specification.md
@@ -559,6 +559,9 @@ below about what this field can contain in each specific failure case.
 The server SHOULD use HTTP response status codes to indicate
 retryable and not-retryable errors for a particular erroneous situation. The
 client SHOULD honour HTTP response status codes as retryable or not-retryable.
+
+##### Retryable Response Codes
+
 The requests that receive a response status code listed in following table SHOULD
 be retried.
 All other `4xx` or `5xx` response status codes MUST NOT be retried.
@@ -591,9 +594,10 @@ overloaded, the server SHOULD respond with `HTTP 429 Too Many Requests` or
 recommended time interval in seconds to wait before retrying.
 
 The client SHOULD honour the waiting interval specified in the "Retry-After"
-header if it is present. If the client receives an `HTTP 429` or an `HTTP 503`
-response and the "Retry-After" header is not present in the response, then the
-client SHOULD implement an exponential backoff strategy between retries.
+header if it is present. If the client receives a retryable error code (see
+[table above](#retryable-response-codes)) and the "Retry-After" header is
+not present in the response, then the client SHOULD implement an exponential backoff
+strategy between retries.
 
 ##### All Other Responses
 

diff --git a/opentelemetry/proto/metrics/v1/metrics.proto b/opentelemetry/proto/metrics/v1/metrics.proto
@@ -461,7 +461,9 @@ message HistogramDataPoint {
   // The sum of the bucket_counts must equal the value in the count field.
   //
   // The number of elements in bucket_counts array must be by one greater than
-  // the number of elements in explicit_bounds array.
+  // the number of elements in explicit_bounds array. The exception to this rule
+  // is when the length of bucket_counts is 0, then the length of explicit_bounds
+  // must also be 0.
   repeated fixed64 bucket_counts = 6;
 
   // explicit_bounds specifies buckets with explicitly defined bounds for values.
@@ -477,6 +479,9 @@ message HistogramDataPoint {
   // Histogram buckets are inclusive of their upper boundary, except the last
   // bucket where the boundary is at infinity. This format is intentionally
   // compatible with the OpenMetrics histogram definition.
+  //
+  // If bucket_counts length is 0 then explicit_bounds length must also be 0,
+  // otherwise the data point is invalid.
   repeated double explicit_bounds = 7;
 
   // (Optional) List of exemplars collected from

diff --git a/opentelemetry/proto/profiles/v1development/profiles.proto b/opentelemetry/proto/profiles/v1development/profiles.proto
@@ -231,9 +231,8 @@ message Profile {
   // for human-friendly content. The profile must stay functional if this field
   // is cleaned.
   repeated int32 comment_strindices = 15; // Indices into string table.
-  // Index into the string table of the type of the preferred sample
-  // value. If unset, clients should default to the last sample value.
-  int32 default_sample_type_strindex = 16;
+  // Index into the sample_type array to the default sample type.
+  int32 default_sample_type_index = 16;
 
 
   // A globally unique identifier for a profile. The ID is a 16-byte array. An ID with