Merge branch 'master' into jpkrohling/fix-mixin

.github/workflows/ci-all-in-one-build.yml

@@ -10,7 +10,7 @@ jobs:
   all-in-one:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
       with:
         submodules: true
 

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

@@ -26,7 +26,7 @@ jobs:
           task: build-binaries-ppc64le
     name: build binaries for ${{ matrix.platform.name }}
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
       with:
         submodules: true
 

.github/workflows/ci-cassandra.yml

@@ -22,7 +22,7 @@ jobs:
           schema: v004
     name: ${{ matrix.version.distribution }} ${{ matrix.version.major }}
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
 
     - uses: actions/setup-go@v2
       with:

.github/workflows/ci-crossdock.yml

@@ -16,7 +16,7 @@ jobs:
           cmd: bash scripts/build-crossdock.sh
     name: ${{ matrix.steps.name }}
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
       with:
         submodules: true
 

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

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
       with:
         submodules: true
 

.github/workflows/ci-elasticsearch.yml

@@ -26,7 +26,7 @@ jobs:
           distribution: opensearch
     name: ${{ matrix.version.distribution }} ${{ matrix.version.major }}
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
       with:
         submodules: true
 

.github/workflows/ci-hotrod.yml

@@ -10,7 +10,7 @@ jobs:
   hotrod:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
       with:
         submodules: true
 

.github/workflows/ci-kafka.yml

@@ -10,7 +10,7 @@ jobs:
   kafka:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
 
     - uses: actions/setup-go@v2
       with:

.github/workflows/ci-memory-badger.yml

@@ -10,7 +10,7 @@ jobs:
   memory-badger:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
 
     - uses: actions/setup-go@v2
       with:

.github/workflows/ci-protogen-tests.yml

@@ -10,7 +10,7 @@ jobs:
   protogen:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
       with:
         submodules: true
 

.github/workflows/ci-release.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
       with:
         submodules: true
 

.github/workflows/ci-unit-tests.yml

@@ -10,7 +10,7 @@ jobs:
   unit-tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
 
     - uses: actions/setup-go@v2
       with:

.github/workflows/codeql.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2.3.5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/fossa.yml

@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2.3.5
 
       - uses: actions/setup-go@v2
         with:
-          go-version: ^1.14.x
+          go-version: ^1.17
 
       - name: Add GOPATH
         run: |

CHANGELOG.md

@@ -5,7 +5,30 @@ next release
 -------------------
 ### Backend Changes
 #### New Features
-* Add support for adaptive sampling with a Cassandra backend. ([#2966](https://github.com/jaegertracing/jaeger/pull/2966), [@joe-elliott](https://github.com/joe-elliott))
+
+1.27.0 (2021-10-06)
+-------------------
+### Backend Changes
+* Migrate elasticsearch rollover to go ([#3242](https://github.com/jaegertracing/jaeger/pull/3242), [@rubenvp8510](https://github.com/rubenvp8510))
+* Add 'opensearch' as a supported value for SPAN_STORAGE_TYPE ([#3255](https://github.com/jaegertracing/jaeger/pull/3255), [@yurishkuro](https://github.com/yurishkuro))
+
+#### New Features
+* Add support for adaptive sampling with a Cassandra backend. ([#2966](https://github.com/jaegertracing/jaeger/pull/2966), [@joe-elliott](https://github.com/joe-elliott), [@Ashmita152](https://github.com/Ashmita152))
+
+#### Bug fixes, Minor Improvements
+* Support graceful shutdown in grpc plugin ([#3249](https://github.com/jaegertracing/jaeger/pull/3249), [@slon](https://github.com/slon))
+* Enable gzip compression for collector grpc endpoint. ([#3236](https://github.com/jaegertracing/jaeger/pull/3236), [@slon](https://github.com/slon))
+* Use UTC in es-index-cleaner ([#3261](https://github.com/jaegertracing/jaeger/pull/3261), [@pavolloffay](https://github.com/pavolloffay))
+* Upgrade to alpine-3.14 ([#3304](https://github.com/jaegertracing/jaeger/pull/3304), [@nontw](https://github.com/nontw))
+* refactor: move from io/ioutil to io and os package ([#3294](https://github.com/jaegertracing/jaeger/pull/3294), [@Juneezee](https://github.com/Juneezee))
+* Changed sampling type env var and updated collector help text ([#3302](https://github.com/jaegertracing/jaeger/pull/3302), [@joe-elliott](https://github.com/joe-elliott))
+* Close #3270: Prevent rollover lookback from passing the Unix epoch ([#3299](https://github.com/jaegertracing/jaeger/pull/3299), [@ctreatma](https://github.com/ctreatma))
+* Fixing otel configuration in docker compose ([#3286](https://github.com/jaegertracing/jaeger/pull/3286), [@Ashmita152](https://github.com/Ashmita152))
+* Added ability to pass config file to grpc plugin in integration tests ([#3253](https://github.com/jaegertracing/jaeger/pull/3253), [@EinKrebs](https://github.com/EinKrebs))
+
+### UI Changes
+
+* UI pinned to version 1.17.0. The changelog is available here [v1.17.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v1170-oct-6-2021)
 
 
 1.26.0 (2021-09-06)

CONTRIBUTING.md

@@ -15,6 +15,7 @@ We gratefully welcome improvements to documentation as well as to code.
 
 ### Pre-requisites
 * Install [Go](https://golang.org/doc/install) and setup GOPATH and add $GOPATH/bin in PATH
+* Install [Yarn](https://yarnpkg.com/) for running local build with the UI
 
 This library uses Go modules to manage dependencies.
 

Makefile

@@ -365,7 +365,7 @@ build-crossdock-fresh: build-crossdock-linux
 
 .PHONY: changelog
 changelog:
-	@echo "Set env variable OAUTH_TOKEN before invoking, https://github.com/settings/tokens/new?description=GitHub%20Changelog%20Generator%20token"
+	@echo "Set env variable OAUTH_TOKEN before invoking, https://github.com/settings/tokens/new?description=GitHub%20Changelog%20Generator%20token. The token only needs default permissions."
 	docker run --rm  -v "${PWD}:/app" pavolloffay/gch:latest --oauth-token ${OAUTH_TOKEN} --owner jaegertracing --repo jaeger
 
 .PHONY: install-tools

README.md

@@ -73,7 +73,7 @@ traces with tens of thousands of spans (e.g. we tried a trace with 80,000 spans)
 Jaeger backend is distributed as a collection of Docker images. The binaries support various configuration methods,
 including command line options, environment variables, and configuration files in multiple formats (yaml, toml, etc.)
 Deployment to Kubernetes clusters is assisted by [Kubernetes templates](https://github.com/jaegertracing/jaeger-kubernetes)
-and a [Helm chart](https://github.com/kubernetes/charts/tree/master/incubator/jaeger).
+and a [Helm chart](https://github.com/jaegertracing/helm-charts).
 
 ### Observability
 

RELEASE.md

@@ -1,6 +1,6 @@
 # Jaeger Backend Release Process
 
-1. Create a PR "Preparing release X.Y.Z" against master or maintenance branch ([example](https://github.com/jaegertracing/jaeger/pull/543/files)) by updating CHANGELOG.md to include:
+1. Create a PR "Prepare release X.Y.Z" against master or maintenance branch ([example](https://github.com/jaegertracing/jaeger/pull/543/files)) by updating CHANGELOG.md to include:
     * A new section with the header `<X.Y.Z> (YYYY-MM-DD)`
     * A curated list of notable changes and links to PRs. Do not simply dump git log, select the changes that affect the users. To obtain the list of all changes run `make changelog` or use `scripts/release-notes.py`.
     * The section can be split into sub-section if necessary, e.g. UI Changes, Backend Changes, Bug Fixes, etc.
@@ -11,6 +11,8 @@
         git fetch
         git checkout {new_version} //e.g. v1.5.0
         ```
+      * Even if a submodule does not have a new release, it should be checked to see if there were any changes warranting cutting a new release and then including it.
+    * Rotate the below release managers table placing yourself at the bottom. The date should be the first Wednesday of the month.
 2. Add all merged pull requests to the milestone for the release and create a new milestone for a next release e.g. `Release 1.16`.
 3. After the PR is merged, create a release on Github:
     * Title "Release X.Y.Z"
@@ -36,9 +38,9 @@ Here are the release managers for future versions with the tentative release dat
 
 | Version   | Release Manager  | Tentative release date |
 |-----------|------------------|------------------------|
-| 1.26.0    | @yurishkuro      |  1 September 2021      |
-| 1.27.0    | @joe-elliott     |  6 October   2021      |
 | 1.28.0    | @albertteoh      |  3 November  2021      |
 | 1.29.0    | @jpkrohling      |  1 December  2021      |
 | 1.30.0    | @pavolloffay     |  5 January   2022      |
 | 1.31.0    | @vprithvi        |  2 February  2022      |
+| 1.32.0    | @yurishkuro      |  2 March     2022      |
+| 1.33.0    | @joe-elliott     |  6 April     2022      |

cmd/collector/app/zipkin/fixtures/zipkin_03.json

@@ -0,0 +1,23 @@
+[
+  {
+    "traceId": "091f00370361e578",
+    "parentId": "c26551047c72d19",
+    "id": "188bb8428fc7e477",
+    "kind": "PRODUCER",
+    "name": "send",
+    "timestamp": 1597704629675602,
+    "duration": 9550570,
+    "localEndpoint":
+    {
+        "serviceName": "schemas-service"
+    },
+    "remoteEndpoint":
+    {
+        "serviceName": "kafka"
+    },
+    "tags":
+    {
+        "kafka.topic": "schema-changed"
+    }
+  }
+]

cmd/collector/app/zipkin/jsonv2_test.go

@@ -15,14 +15,15 @@
 package zipkin
 
 import (
-	"fmt"
 	"os"
 	"testing"
 
 	"github.com/go-openapi/swag"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/jaegertracing/jaeger/model"
+	"github.com/jaegertracing/jaeger/model/converter/thrift/zipkin"
 	"github.com/jaegertracing/jaeger/swagger-gen/models"
 	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
@@ -54,7 +55,6 @@ func TestLCFromLocalEndpoint(t *testing.T) {
 	var spans models.ListOfSpans
 	loadJSON(t, "fixtures/zipkin_02.json", &spans)
 	tSpans, err := spansV2ToThrift(spans)
-	fmt.Println(tSpans[0])
 	require.NoError(t, err)
 	assert.Equal(t, len(tSpans), 1)
 	var ts int64 = 1
@@ -67,6 +67,54 @@ func TestLCFromLocalEndpoint(t *testing.T) {
 	assert.Equal(t, tSpan, tSpans[0])
 }
 
+func TestMissingKafkaEndpoint(t *testing.T) {
+	var spans models.ListOfSpans
+	loadJSON(t, "fixtures/zipkin_03.json", &spans)
+	tSpans, err := spansV2ToThrift(spans)
+	require.NoError(t, err)
+	assert.Equal(t, 1, len(tSpans))
+	var ts int64 = 1597704629675602
+	var d int64 = 9550570
+	var parentId int64 = 0xc26551047c72d19
+	var endpoint1 = zipkincore.Endpoint{ServiceName: "schemas-service"}
+	var endpoint2 = zipkincore.Endpoint{ServiceName: "schemas-service"}
+	var endpoint3 = zipkincore.Endpoint{ServiceName: "kafka"}
+
+	tSpan := &zipkincore.Span{ID: 0x188bb8428fc7e477, TraceID: 0x091f00370361e578, ParentID: &parentId,
+		Name: "send", Duration: &d, Timestamp: &ts,
+		Annotations: []*zipkincore.Annotation{
+			{
+				Host:      &endpoint1,
+				Timestamp: ts,
+				Value:     zipkincore.MESSAGE_SEND,
+			},
+		},
+		BinaryAnnotations: []*zipkincore.BinaryAnnotation{
+			{
+				Host:           &endpoint2,
+				Key:            "kafka.topic",
+				Value:          []byte("schema-changed"),
+				AnnotationType: zipkincore.AnnotationType_STRING},
+			{
+
+				Key:            zipkincore.MESSAGE_ADDR,
+				Host:           &endpoint3,
+				AnnotationType: zipkincore.AnnotationType_BOOL,
+			},
+		},
+	}
+	assert.Equal(t, tSpan, tSpans[0])
+
+	tTags := []model.KeyValue{
+		{Key: "kafka.topic", VStr: "schema-changed"},
+		{Key: "peer.service", VStr: "kafka"},
+	}
+	var jaegerspan []*model.Span
+	jaegerspan, err = zipkin.ToDomainSpan(tSpans[0])
+	require.NoError(t, err)
+	assert.Equal(t, tTags, jaegerspan[0].GetTags())
+}
+
 func TestKindToThrift(t *testing.T) {
 	tests := []struct {
 		ts       int64

cmd/es-rollover/app/init/action.go

@@ -94,7 +94,7 @@ func createIndexIfNotExist(c client.IndexAPI, index string) error {
 			}
 			errorMap := jsonError["error"].(map[string]interface{})
 			// check for reason, ignore already exist error
-			if strings.Contains("resource_already_exists_exception", errorMap["type"].(string)) {
+			if strings.Contains(errorMap["type"].(string), "resource_already_exists_exception") {
 				return nil
 			}
 		}

go.mod

@@ -7,16 +7,16 @@ require (
 	github.com/apache/thrift v0.15.0
 	github.com/bsm/sarama-cluster v2.1.13+incompatible
 	github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b
-	github.com/dgraph-io/badger/v3 v3.2103.1
+	github.com/dgraph-io/badger/v3 v3.2103.2
 	github.com/dgraph-io/ristretto v0.1.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/go-openapi/errors v0.20.1
 	github.com/go-openapi/loads v0.20.2
-	github.com/go-openapi/runtime v0.19.28
-	github.com/go-openapi/spec v0.20.3
-	github.com/go-openapi/strfmt v0.20.2
+	github.com/go-openapi/runtime v0.20.0
+	github.com/go-openapi/spec v0.20.4
+	github.com/go-openapi/strfmt v0.20.3
 	github.com/go-openapi/swag v0.19.15
-	github.com/go-openapi/validate v0.20.2
+	github.com/go-openapi/validate v0.20.3
 	github.com/gocql/gocql v0.0.0-20200228163523-cd4b606dd2fb
 	github.com/gogo/googleapis v1.4.1
 	github.com/gogo/protobuf v1.3.2
@@ -48,7 +48,7 @@ require (
 	github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5
 	github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad
 	github.com/xdg-go/scram v1.0.2
-	go.opentelemetry.io/collector/model v0.36.0
+	go.opentelemetry.io/collector/model v0.37.0
 	go.uber.org/atomic v1.9.0
 	go.uber.org/automaxprocs v1.4.0
 	go.uber.org/zap v1.19.1
@@ -82,12 +82,12 @@ require (
 	github.com/go-kit/kit v0.11.0 // indirect
 	github.com/go-openapi/analysis v0.20.1 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.6 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/flatbuffers v1.12.0 // indirect
+	github.com/google/flatbuffers v1.12.1 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
 	github.com/hashicorp/go-uuid v1.0.2 // indirect