Merge branch 'master' into remove-es-max-num-spans

.github/actions/setup-branch/action.yml

@@ -10,7 +10,7 @@ runs:
           pull_request)
             BRANCH=${GITHUB_HEAD_REF}
             ;;
-          push)
+          push | release)
             BRANCH=${GITHUB_REF##*/}
             ;;
         esac

.github/workflows/ci-build-binaries.yml

@@ -0,0 +1,28 @@
+name: Build binaries
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build-binaries:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ^1.15
+
+    - name: Export BRANCH variable
+      uses: ./.github/actions/setup-branch
+
+    - name: Install tools
+      run: make install-ci
+
+    - name: Build binaries
+      run: make build-all-platforms

.github/workflows/ci-docker-build.yml

@@ -0,0 +1,53 @@
+name: Build docker images
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  docker-images:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - name: Fetch git tags
+      run: |
+        git fetch --prune --unshallow --tags
+
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ^1.15
+
+    - uses: actions/setup-node@v2-beta
+      with:
+        node-version: '10'
+
+    - uses: docker/login-action@v1
+      id: dockerhub-login
+      with:
+        username: jaegertracingbot
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+      env:
+        DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      if: env.DOCKERHUB_TOKEN != null
+
+    - name: Export DOCKERHUB_LOGIN variable
+      run: |
+        echo "DOCKERHUB_LOGIN=true" >> $GITHUB_ENV
+      if: steps.dockerhub-login.outcome == 'success'
+
+    - name: Export BRANCH variable
+      uses: ./.github/actions/setup-branch
+
+    - name: Install tools
+      run: make install-ci
+
+    - name: Build docker images
+      run: make docker
+
+    - name: Upload docker images
+      run: bash scripts/travis/upload-all-docker-images.sh

.github/workflows/ci-release.yml

@@ -0,0 +1,75 @@
+name: Publish release
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  publish-release:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - name: Fetch git tags
+      run: |
+        git fetch --prune --unshallow --tags
+
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ^1.15
+
+    - uses: actions/setup-node@v2-beta
+      with:
+        node-version: '10'
+
+    - uses: docker/login-action@v1
+      id: dockerhub-login
+      with:
+        username: jaegertracingbot
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+      env:
+        DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      if: env.DOCKERHUB_TOKEN != null
+
+    - name: Export DOCKERHUB_LOGIN variable
+      run: |
+        echo "DOCKERHUB_LOGIN=true" >> $GITHUB_ENV
+      if: steps.dockerhub-login.outcome == 'success'
+
+    - name: Export BRANCH variable
+      uses: ./.github/actions/setup-branch
+
+    - name: Install tools
+      run: make install-ci
+
+    - name: Build binaries
+      id: build-binaries
+      run: make build-all-platforms
+
+    - name: Package binaries
+      id: package-binaries
+      run: bash scripts/travis/package-deploy.sh
+      if: steps.build-binaries.outcome == 'success'
+
+    - name: Upload binaries
+      uses: svenstaro/upload-release-action@v2
+      with:
+        file: deploy/*.tar.gz
+        file_glob: true
+        tag: ${{ github.ref }}
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+      if: steps.package-binaries.outcome == 'success'
+
+    - name: Build docker images
+      id: build-images
+      run: make docker
+
+    - name: Upload docker images
+      run: bash scripts/travis/upload-all-docker-images.sh
+      if: steps.build-images.outcome == 'success'
+
+    - name: Build, test, and publish all-in-one image
+      run: bash scripts/travis/build-all-in-one-image.sh

README.md

@@ -1,15 +1,16 @@
 <img align="right" width="290" height="290" src="https://www.jaegertracing.io/img/jaeger-vector.svg">
 
 
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1273/badge)](https://bestpractices.coreinfrastructure.org/projects/1273)
-[![Mentioned in Awesome Go](https://awesome.re/mentioned-badge-flat.svg)](https://github.com/avelino/awesome-go#performance)
+[![Gitter chat][gitter-img]][gitter]
+[![Project+Community stats][community-badge]][community-stats]
 [![OpenTracing-1.0][ot-badge]](https://opentracing.io)
+[![Mentioned in Awesome Go](https://awesome.re/mentioned-badge-flat.svg)](https://github.com/avelino/awesome-go#performance)
+[![Unit Tests][ci-img]][ci]
+[![Coverage Status][cov-img]][cov]
+[![FOSSA Status][fossa-img]][ci]
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1273/badge)](https://bestpractices.coreinfrastructure.org/projects/1273)
 
-[![Gitter chat][gitter-img]][gitter] [![Project+Community stats][community-badge]][community-stats]
-
-[![Unit Tests][ci-img]][ci] [![Coverage Status][cov-img]][cov] [![FOSSA Status][fossa-img]][ci]
-
-<img src="https://github.com/cncf/artwork/blob/master/other/cncf-member/graduated/color/cncf-graduated-color.svg" width="205">
+<img src="https://github.com/cncf/artwork/blob/master/other/cncf-member/graduated/color/cncf-graduated-color.svg" width="250">
 
 # Jaeger - a Distributed Tracing System
 

examples/grafana-integration/README.md

@@ -28,14 +28,14 @@ grafana/loki-docker-driver:latest \
 
 ### Explore with Loki
 
-Currently the most powerful way to correlate application logs with traces can be performed via Grafana's Explore interface.
+It is possible to correlate application logs with traces via Grafana's Explore interface.
 
 After setting the datasource to Loki, all the log labels become available, and can be easily filtered using [Loki's LogQL query language](https://grafana.com/docs/loki/latest/logql/).
 
 For example, after selecting the compose project/service under Log labels , errors can be filtered with the following expression:
 
 ```
-{compose-project="grafana-integration"} |= "error"
+{compose_project="grafana-integration"} |= "error"
 ```
 
 which will list the redis timeout events.
@@ -48,7 +48,7 @@ This example includes a dashboard that contains a log panel for the selected ser
 
 There are also panels to display the ratio/percentage of errors in the current timeframe.
 
-Additionally, there are graphs for each service, visualing the rate of the requests and showing latency percentiles.
+Additionally, there are graphs for each service, visualizing the rate of the requests and showing latency percentiles.
 
 ### Clean up
 

examples/grafana-integration/docker-compose.yaml

@@ -7,7 +7,7 @@ services:
       - '3000:3000'
     volumes:
       - ./grafana/datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
-      - ./grafana/dashboards.yml:/etc/grafana/provisioning/dashboards/dashboards.yml
+      - ./grafana/dashboard.yml:/etc/grafana/provisioning/dashboards/dashboard.yml
       - ./grafana/hotrod_metrics_logs.json:/etc/grafana/provisioning/dashboards/hotrod_metrics_logs.json
     logging:
       driver: loki

scripts/travis/package-deploy.sh

@@ -46,12 +46,6 @@ function package {
     rm -rf $PACKAGE_STAGING_DIR
 }
 
-# script start
-if [ "$DEPLOY" != true ]; then
-    echo "Skipping the packaging of binaries as \$DEPLOY was not true."
-    exit 0
-fi
-
 set -e
 
 DEPLOY_STAGING_DIR=./deploy-staging

scripts/travis/upload-all-docker-images.sh

@@ -1,18 +1,14 @@
 #!/bin/bash
 
-# this script should only be run after build-docker-images.sh
+# this script expects all docker images to be already built, it only uploads them to Docker Hub
 
-set -e
+set -euxf -o pipefail
 
 BRANCH=${BRANCH:?'missing BRANCH env var'}
+DOCKERHUB_LOGIN=${DOCKERHUB_LOGIN:-false}
 
-if [[ "$TRAVIS_SECURE_ENV_VARS" == "false" ]]; then
-  echo "skip docker upload, TRAVIS_SECURE_ENV_VARS=$TRAVIS_SECURE_ENV_VARS"
-  exit 0
-fi
-
-# Only push images to Docker Hub for master branch or for release tags vM.N.P
-if [[ "$BRANCH" == "master" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+# Only push images to Docker Hub for master branch or for release tags vM.N.P and when dockerhub login is done
+if [[ ("$BRANCH" == "master" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+$) && "$DOCKERHUB_LOGIN" == "true" ]]; then
   echo "upload to Docker Hub, BRANCH=$BRANCH"
 else
   echo 'skip Docker upload, only allowed for tagged releases or master (latest tag)'