Merge branch 'main' into cardinality-limit-x

open-telemetry · Dec 6, 2023 · 07dc9b9 · 07dc9b9
2 parents cc11cb0 + d37d851
commit 07dc9b9
Show file tree

Hide file tree

Showing 434 changed files with 13,961 additions and 32,605 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -65,16 +65,7 @@ updates:
       interval: weekly
       day: sunday
   - package-ecosystem: gomod
-    directory: /example/fib
-    labels:
-      - dependencies
-      - go
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
-  - package-ecosystem: gomod
-    directory: /example/jaeger
+    directory: /example/dice
     labels:
       - dependencies
       - go
@@ -127,15 +118,6 @@ updates:
     schedule:
       interval: weekly
       day: sunday
-  - package-ecosystem: gomod
-    directory: /example/view
-    labels:
-      - dependencies
-      - go
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
   - package-ecosystem: gomod
     directory: /example/zipkin
     labels:
@@ -145,33 +127,6 @@ updates:
     schedule:
       interval: weekly
       day: sunday
-  - package-ecosystem: gomod
-    directory: /exporters/jaeger
-    labels:
-      - dependencies
-      - go
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
-  - package-ecosystem: gomod
-    directory: /exporters/otlp/internal/retry
-    labels:
-      - dependencies
-      - go
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
-  - package-ecosystem: gomod
-    directory: /exporters/otlp/otlpmetric
-    labels:
-      - dependencies
-      - go
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
   - package-ecosystem: gomod
     directory: /exporters/otlp/otlpmetric/otlpmetricgrpc
     labels:

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -1,21 +1,26 @@
 name: Benchmark
 on:
   push:
-    branches:
-      - main
+    tags:
+      - v1.* 
+  workflow_dispatch: 
+
 env:
-  DEFAULT_GO_VERSION: "1.20"
+  DEFAULT_GO_VERSION: "~1.21.3"
 jobs:
   benchmark:
     name: Benchmarks
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.DEFAULT_GO_VERSION }}
+          check-latest: true
+          cache-dependency-path: "**/go.sum"
       - name: Run benchmarks
-        run: make test-bench | tee output.txt
+        run: make benchmark | tee output.txt
       - name: Download previous benchmark data
         uses: actions/cache@v3
         with:
@@ -28,6 +33,8 @@ jobs:
           tool: 'go'
           output-file-path: output.txt
           external-data-json-path: ./benchmarks/data.json
-          auto-push: false
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          gh-pages-branch: benchmarks
+          auto-push: true
           fail-on-alert: false
           alert-threshold: "400%"
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -16,7 +16,7 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Check for CHANGELOG changes
         run: |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,28 +14,25 @@ env:
   # backwards compatibility with the previous two minor releases and we
   # explicitly test our code for these versions so keeping this at prior
   # versions does not add value.
-  DEFAULT_GO_VERSION: "1.20"
+  DEFAULT_GO_VERSION: "~1.21.3"
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
-      - name: Setup Environment
-        run: |
-          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
-          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
+        uses: actions/checkout@v4
       - name: Install Go
         uses: actions/setup-go@v4
         with:
           go-version: ${{ env.DEFAULT_GO_VERSION }}
+          check-latest: true
           cache-dependency-path: "**/go.sum"
       - name: Tools cache
         uses: actions/cache@v3
         env:
           cache-name: go-tools-cache
         with:
-          path: ~/.tools
+          path: .tools
           key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('./internal/tools/**') }}
       - name: Generate
         run: make generate
@@ -45,12 +42,11 @@ jobs:
         run: make build
       - name: Check clean repository
         run: make check-clean-work-tree
-
-  test-race:
+  test-bench:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
@@ -60,22 +56,33 @@ jobs:
         with:
           go-version: ${{ env.DEFAULT_GO_VERSION }}
           cache-dependency-path: "**/go.sum"
+      - name: Run benchmarks to check functionality
+        run: make test-bench
+
+  test-race:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+      - name: Install Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ env.DEFAULT_GO_VERSION }}
+          check-latest: true
+          cache-dependency-path: "**/go.sum"
       - name: Run tests with race detector
         run: make test-race
 
   test-coverage:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
-      - name: Setup Environment
-        run: |
-          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
-          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
+        uses: actions/checkout@v4
       - name: Install Go
         uses: actions/setup-go@v4
         with:
           go-version: ${{ env.DEFAULT_GO_VERSION }}
+          check-latest: true
           cache-dependency-path: "**/go.sum"
       - name: Run coverage tests
         run: |
@@ -99,7 +106,7 @@ jobs:
   compatibility-test:
     strategy:
       matrix:
-        go-version: ["1.20", 1.19]
+        go-version: ["~1.21.3", "~1.20.10"]
         os: [ubuntu-latest, macos-latest, windows-latest]
         # GitHub Actions does not support arm* architectures on default
         # runners. It is possible to accomplish this with a self-hosted runner
@@ -113,16 +120,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Setup Environment
-        run: |
-          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
-          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
-        shell: bash
+        uses: actions/checkout@v4
       - name: Install Go
         uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
+          check-latest: true
           cache-dependency-path: "**/go.sum"
       - name: Run tests
         env:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,14 +13,17 @@ on:
     #        │  │ │ │ │
     #        *  * * * *
     - cron: '30 1 * * *'
+  push:
+    branches: [ main ]
+  pull_request:
 
 jobs:
   CodeQL-Build:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/codespell.yaml b/.github/workflows/codespell.yaml
@@ -9,6 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Codespell
         run: make codespell
diff --git a/.github/workflows/create-dependabot-pr.yml b/.github/workflows/create-dependabot-pr.yml
@@ -10,9 +10,11 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: "~1.21.3"
+          check-latest: true
+          cache-dependency-path: "**/go.sum"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install zsh
         run: sudo apt-get update; sudo apt-get install zsh

diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
@@ -8,18 +8,20 @@ jobs:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'dependencies') }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         ref: ${{ github.head_ref }}
     - uses: actions/setup-go@v4
       with:
-        go-version: '^1.20.0'
+        go-version: "~1.21.3"
+        check-latest: true
+        cache-dependency-path: "**/go.sum"
     - uses: evantorrie/mott-the-tidier@v1-beta
       id: modtidy
       with:
         gomods: '**/go.mod'
         gomodsum_only: true
-    - uses: stefanzweifel/git-auto-commit-action@v4
+    - uses: stefanzweifel/git-auto-commit-action@v5
       id: autocommit
       with:
         commit_message: Auto-fix go.sum changes in dependent modules

diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml
diff --git a/.github/workflows/links-fail-fast.yml b/.github/workflows/links-fail-fast.yml
@@ -8,7 +8,7 @@ jobs:
   check-links:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Link Checker
         uses: lycheeverse/[email protected]

diff --git a/.github/workflows/links.yml b/.github/workflows/links.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Link Checker
       id: lychee

diff --git a/.github/workflows/markdown-fail-fast.yml b/.github/workflows/markdown-fail-fast.yml
@@ -12,7 +12,7 @@ jobs:
       md: ${{ steps.changes.outputs.md }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Get changed files
@@ -27,7 +27,7 @@ jobs:
     if: ${{needs.changedfiles.outputs.md}}
     steps:
     - name: Checkout Repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Run linter
       uses: docker://avtodev/markdown-lint:v1
       with:

diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Run linter
       id: markdownlint

diff --git a/.gitignore b/.gitignore
@@ -13,12 +13,10 @@ go.work.sum
 
 gen/
 
-/example/fib/fib
-/example/fib/traces.txt
-/example/jaeger/jaeger
+/example/dice/dice
 /example/namedtracer/namedtracer
+/example/otel-collector/otel-collector
 /example/opencensus/opencensus
 /example/passthrough/passthrough
 /example/prometheus/prometheus
 /example/zipkin/zipkin
-/example/otel-collector/otel-collector