Merge branch 'master' into oauth

open-telemetry · Apr 29, 2021 · 883ac54 · 883ac54
2 parents af0ba4c + 1d40a12
commit 883ac54
Show file tree

Hide file tree

Showing 245 changed files with 6,586 additions and 4,489 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ orbs:
 executors:
   golang:
     docker:
-      - image: cimg/go:1.15
+      - image: cimg/go:1.16
 
 commands:
   verify_dist_files_exist:
@@ -111,18 +111,6 @@ workflows:
           filters:
             tags:
               only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
-      - correctness:
-          requires:
-            - cross-compile
-          filters:
-            tags:
-              only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
-      - correctness-metrics:
-          requires:
-            - cross-compile
-          filters:
-            tags:
-              only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
       - test:
           requires:
             - setup-environment
@@ -144,8 +132,6 @@ workflows:
       - publish-check:
           requires:
             - cross-compile
-            - correctness
-            - correctness-metrics
             - loadtest
             - test
             - coverage
@@ -155,8 +141,6 @@ workflows:
       - publish-stable:
           requires:
             - cross-compile
-            - correctness
-            - correctness-metrics
             - loadtest
             - test
             - coverage
@@ -171,8 +155,6 @@ workflows:
       - publish-dev:
           requires:
             - cross-compile
-            - correctness
-            - correctness-metrics
             - loadtest
             - test
             - coverage
@@ -228,6 +210,9 @@ jobs:
       - run:
           name: Build collector for all archs
           command: grep ^binaries-all-sys Makefile|fmt -w 1|tail -n +2|circleci tests split|xargs make
+      - run:
+          name: Log checksums to console
+          command: shasum -a 256 bin/*
       - persist_to_workspace:
           root: ~/
           paths: project/bin
@@ -249,29 +234,6 @@ jobs:
           path: testbed/tests/results/junit
       - github_issue_generator
 
-  correctness:
-    executor: golang
-    environment:
-      TEST_RESULTS: testbed/tests/results/junit/results.xml
-    parallelism: 4
-    resource_class: medium+
-    steps:
-      - attach_to_workspace
-      - run:
-          name: Loadtest
-          command: TEST_ARGS="-test.run=$(make -s testbed-list-correctness | circleci tests split|xargs echo|sed 's/ /|/g')" make testbed-correctness
-      - github_issue_generator
-
-  correctness-metrics:
-    executor: golang
-    parallelism: 4
-    resource_class: medium+
-    steps:
-      - attach_to_workspace
-      - run:
-          name: Metrics correctness tests
-          command: TEST_ARGS="-test.run=$(make -s testbed-list-correctness-metrics | circleci tests split|xargs echo|sed 's/ /|/g')" make testbed-correctness-metrics
-
   test:
     executor: golang
     environment:
@@ -301,13 +263,14 @@ jobs:
       - run:
           name: Coverage tests
           command: make gotest-with-cover
-      - run:
-          name: Code coverage
-          command: bash <(curl -s https://codecov.io/bash)
+# DISABLE CODECOV UNTIL THE SCRIPT IS AUDITED AND WE ARE CERTAIN IT IS OK TO TO EXECUTE IT.
+#      - run:
+#          name: Code coverage
+#          command: bash <(curl -s https://codecov.io/bash)
 
   publish-check:
     docker:
-      - image: cimg/go:1.15
+      - image: cimg/go:1.16
     steps:
       - attach_to_workspace
       - setup_remote_docker
@@ -323,7 +286,7 @@ jobs:
 
   publish-stable:
     docker:
-      - image: cimg/go:1.15
+      - image: cimg/go:1.16
     steps:
       - attach_to_workspace
       - verify_dist_files_exist
@@ -344,7 +307,7 @@ jobs:
 
   publish-dev:
     docker:
-      - image: cimg/go:1.15
+      - image: cimg/go:1.16
     steps:
       - attach_to_workspace
       - verify_dist_files_exist

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.16
       - name: Setup Go Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
@@ -48,7 +48,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.16
       - name: Setup Go Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
@@ -91,7 +91,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.16
       - name: Setup Go Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
@@ -133,7 +133,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.16
       - name: Setup Go Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
@@ -177,7 +177,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.16
       - name: Setup Go Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
@@ -221,7 +221,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.16
       - name: Setup Go Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
@@ -264,7 +264,7 @@ jobs:
         if: ${{ failure() && github.ref == 'ref/head/main' }}
         run: |
           go run cmd/issuegenerator/main.go $TEST_RESULTS
-  correctness:
+  correctness-traces:
     runs-on: ubuntu-latest
     needs: [setup-environment]
     steps:
@@ -273,7 +273,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.16
       - name: Setup Go Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
@@ -296,8 +296,46 @@ jobs:
         with:
           path: /home/runner/go/bin
           key: tools-${{ runner.os }}-${{ hashFiles('./internal/tools/go.mod', './cmd/mdatagen/go.mod', './cmd/mdatagen/*.go') }}
-      - name: Loadtest
-        run: make testbed-correctness
+      - name: Correctness
+        run: make testbed-correctness-traces
+      - name: GitHub Issue Generator
+        if: ${{ failure() && github.ref == 'ref/head/main' }}
+        run: |
+          go run cmd/issuegenerator/main.go $TEST_RESULTS
+  correctness-metrics:
+    runs-on: ubuntu-latest
+    needs: [setup-environment]
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+      - name: Setup Go
+        uses: actions/setup-go@v2.1.3
+        with:
+          go-version: 1.16
+      - name: Setup Go Environment
+        run: |
+          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
+          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
+      - name: Cache Go
+        id: module-cache
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-go-modules
+        with:
+          path: |
+            /home/runner/go/pkg/mod
+            /home/runner/.cache/go-build
+          key: go-pkg-mod-${{ runner.os }}-${{ hashFiles('**/go.mod', '**/go.sum') }}
+      - name: Cache Tools
+        id: tool-cache
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-tool-binaries
+        with:
+          path: /home/runner/go/bin
+          key: tools-${{ runner.os }}-${{ hashFiles('./internal/tools/go.mod', './cmd/mdatagen/go.mod', './cmd/mdatagen/*.go') }}
+      - name: Correctness
+        run: make testbed-correctness-metrics
       - name: GitHub Issue Generator
         if: ${{ failure() && github.ref == 'ref/head/main' }}
         run: |
@@ -317,7 +355,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.16
       - name: Setup Go Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
@@ -373,7 +411,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.16
       - name: Setup Go Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
@@ -408,7 +446,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.16
       - name: Setup Go Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
@@ -468,7 +506,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.16
       - name: Setup Go Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV

diff --git a/.github/workflows/contrib-tests.yml b/.github/workflows/contrib-tests.yml
@@ -10,7 +10,7 @@ jobs:
   contrib_tests:
     runs-on: ubuntu-latest
     container:
-      image: cimg/go:1.15
+      image: cimg/go:1.16
     steps:
       - name: Setup Permissions
         run: sudo chmod -R 777 $GITHUB_WORKSPACE /github /__w/_temp

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,26 @@
 
 ## Unreleased
 
+- `zipkin` translator: Handle missing starttime case for zipkin json v2 format spans (#2506)
+
 ## 🛑 Breaking changes 🛑
 
+- Change `With*Unmarshallers` signatures in Kafka exporter/receiver (#2973)
+- Rename `marshall` to `marshal` in all the occurrences (#2977)
+- Remove `componenterror.ErrAlreadyStarted` and `componenterror.ErrAlreadyStopped`, components should not protect against this, Service will start/stop once.
+- Rename `ApplicationStartInfo` to `BuildInfo`
+
+## 💡 Enhancements 💡
+
+## 🧰 Bug fixes 🧰
+
+- Fix Jaeger receiver to honor TLS Settings (#2866)
+
+## v0.25.0 Beta
+
+## 🛑 Breaking changes 🛑
+
+- Rename ForEach (in pdata) with Range to be consistent with sync.Map (#2931)
 - Rename `componenthelper.Start` to `componenthelper.StartFunc` (#2880)
 - Rename `componenthelper.Stop` to `componenthelper.StopFunc` (#2880)
 - Remove `exporterheleper.WithCustomUnmarshaler`, `processorheleper.WithCustomUnmarshaler`, `receiverheleper.WithCustomUnmarshaler`, `extensionheleper.WithCustomUnmarshaler`, implement `config.CustomUnmarshaler` interface instead (#2867)
@@ -15,11 +33,31 @@
 - Remove testutil.WaitForPort, users can use testify.Eventually (#2926)
 - Rename `processorhelper.NewTraceProcessor` to `processorhelper.NewTracesProcessor` (#2935)
 - Rename `exporterhelper.NewTraceExporter` to `exporterhelper.NewTracesExporter` (#2937)
+- Remove InitEmptyWithCapacity, add EnsureCapacity and Clear (#2845)
+- Rename traces methods/objects to include Traces in Kafka receiver (#2966)
 
 ## 💡 Enhancements 💡
 
 - Add `validatable` interface with `Validate()` to all `config.<component>` (#2898)
   - add the empty `Validate()` implementation for all component configs
+- **Experimental**: Add a config source manager that wraps the interaction with config sources (#2857, #2903, #2948)
+- `kafka` exporter: Key jaeger messages on traceid (#2855)
+- `scraperhelper`: Don't try to count metrics if scraper returns an error (#2902)
+- Extract ConfigFactory in a ParserProvider interface (#2868)
+- `prometheus` exporter: Allows Summary metrics to be exported to Prometheus (#2900)
+- `prometheus` receiver: Optimize `dpgSignature` function (#2945)
+- `kafka` receiver: Add logs support (#2944)
+
+## 🧰 Bug fixes 🧰
+
+- `prometheus` receiver:
+  - Treat Summary and Histogram metrics without "_sum" counter as valid metric (#2812)
+  - Add `job` and `instance` as well-known labels (#2897)
+- `prometheusremotewrite` exporter:
+  - Sort Sample by Timestamp to avoid out of order errors (#2941)
+  - Remove incompatible queued retry (#2951)
+- `kafka` receiver: Fix data race with batchprocessor (#2957)
+- `jaeger` receiver: Jaeger agent should not report ErrServerClosed (#2965)
 
 ## v0.24.0 Beta
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -107,7 +107,7 @@ section of general project contributing guide.
 Working with the project sources requires the following tools:
 
 1. [git](https://git-scm.com/)
-2. [go](https://golang.org/) (version 1.15 and up)
+2. [go](https://golang.org/) (version 1.16 and up)
 3. [make](https://www.gnu.org/software/make/)
 4. [docker](https://www.docker.com/)
 
@@ -116,13 +116,13 @@ Working with the project sources requires the following tools:
 Fork the repo, checkout the upstream repo to your GOPATH by:
 
 ```
-$ GO111MODULE="" go get -d go.opentelemetry.io/collector
+$ git clone git@github.com:open-telemetry/opentelemetry-collector.git
 ```
 
 Add your fork as an origin:
 
 ```shell
-$ cd $(go env GOPATH)/src/go.opentelemetry.io/collector
+$ cd opentelemetry-collector
 $ git remote add fork git@github.com:YOUR_GITHUB_USERNAME/opentelemetry-collector.git
 ```