Merge branch 'master' into add-timeout-env-for-esrollover

.github/dependabot.yml

@@ -5,11 +5,6 @@ updates:
     schedule:
       interval: daily
 
-  - package-ecosystem: gomod
-    directory: "/v2"
-    schedule:
-      interval: daily
-
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.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
+    - uses: actions/checkout@v2.3.4
       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
+    - uses: actions/checkout@v2.3.4
       with:
         submodules: true
 

.github/workflows/ci-cassandra.yml

@@ -10,7 +10,7 @@ jobs:
   cassandra:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
 
     - 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
+    - uses: actions/checkout@v2.3.4
       with:
         submodules: true
 

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

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

.github/workflows/ci-elasticsearch.yml

@@ -20,7 +20,7 @@ jobs:
           image: 7.3.0
     name: elasticsearch ${{ matrix.version.major }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
       with:
         submodules: true
 

.github/workflows/ci-hotrod.yml

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

.github/workflows/ci-kafka.yml

@@ -10,7 +10,7 @@ jobs:
   kafka:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
 
     - 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
+    - uses: actions/checkout@v2.3.4
 
     - 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
+    - uses: actions/checkout@v2.3.4
       with:
         submodules: true
 

.github/workflows/ci-release.yml

@@ -9,7 +9,7 @@ jobs:
   publish-release:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
       with:
         submodules: true
 
@@ -41,7 +41,7 @@ jobs:
       if: steps.build-binaries.outcome == 'success'
 
     - name: Upload binaries
-      uses: svenstaro/upload-release-action@v2
+      uses: svenstaro/upload-release-action@2.2.1
       with:
         file: deploy/*.tar.gz
         file_glob: true

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

@@ -10,7 +10,7 @@ jobs:
   unit-tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
 
     - uses: actions/setup-go@v2
       with:
@@ -23,7 +23,7 @@ jobs:
       run: make test-ci
 
     - name: Upload coverage to codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v1.5.0
       with:
         file: cover.out
         fail_ci_if_error: true

.github/workflows/codeql.yml

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

.github/workflows/fossa.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - uses: actions/setup-go@v2
         with:
@@ -23,7 +23,7 @@ jobs:
           echo "$GOPATH/bin" >>"$GITHUB_PATH"
           
       - name: Run FOSSA scan and upload report
-        uses: fossa-contrib/fossa-action@v1
+        uses: fossa-contrib/fossa-action@v1.1.4
         with:
           # FOSSA Push-Only API Token
           fossa-api-key: 304657e2357ba57b416b94e6b119131b

Makefile

@@ -230,7 +230,14 @@ jaeger-ui/packages/jaeger-ui/build/index.html:
 	cd jaeger-ui && yarn install --frozen-lockfile && cd packages/jaeger-ui && yarn build
 
 cmd/query/app/ui/actual/gen_assets.go: jaeger-ui/packages/jaeger-ui/build/index.html
-	esc -pkg assets -o cmd/query/app/ui/actual/gen_assets.go -prefix jaeger-ui/packages/jaeger-ui/build jaeger-ui/packages/jaeger-ui/build
+	@if ! command -v esc > /dev/null 2>&1 ; then \
+		echo "esc: Command not found" ; \
+		echo "Check:" ; \
+		echo "- esc is installed: 'make install-tools'" ; \
+		echo "- add \$$GOPATH into \$$PATH: 'export PATH=\$$PATH:\$$(go env GOPATH)/bin'" ; \
+		false ; \
+	fi
+	esc -pkg assets -o cmd/query/app/ui/actual/gen_assets.go -prefix jaeger-ui/packages/jaeger-ui/build jaeger-ui/packages/jaeger-ui/build ; \
 
 .PHONY: build-all-in-one-linux
 build-all-in-one-linux:
@@ -451,6 +458,7 @@ echo-version:
 PROTOC := docker run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD} ${JAEGER_DOCKER_PROTOBUF} --proto_path=${PWD}
 PROTO_INCLUDES := \
 	-Iidl/proto/api_v2 \
+	-Imodel/proto/metrics \
 	-I/usr/include/github.com/gogo/protobuf
 # Remapping of std types to gogo types (must not contain spaces)
 PROTO_GOGO_MAPPINGS := $(shell echo \
@@ -495,6 +503,21 @@ proto:
 		idl/proto/api_v2/query.proto
 		### --swagger_out=allow_merge=true:$(PWD)/proto-gen/openapi/ \
 
+	$(PROTOC) \
+		$(PROTO_INCLUDES) \
+		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2/metrics \
+		model/proto/metrics/otelspankind.proto
+
+	$(PROTOC) \
+		$(PROTO_INCLUDES) \
+		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2/metrics \
+		model/proto/metrics/otelmetric.proto
+
+	$(PROTOC) \
+		$(PROTO_INCLUDES) \
+		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2/metrics \
+		model/proto/metrics/metricsquery.proto
+
 	$(PROTOC) \
 		$(PROTO_INCLUDES) \
 		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2 \

cmd/collector/app/options.go

@@ -125,14 +125,14 @@ func (options) QueueSize(queueSize int) Option {
 	}
 }
 
-// DynQueueSize creates an Option that initializes the queue size
+// DynQueueSizeWarmup creates an Option that initializes the dynamic queue size
 func (options) DynQueueSizeWarmup(dynQueueSizeWarmup uint) Option {
 	return func(b *options) {
 		b.dynQueueSizeWarmup = dynQueueSizeWarmup
 	}
 }
 
-// DynQueueSize creates an Option that initializes the queue size
+// DynQueueSizeMemory creates an Option that initializes the dynamic queue memory
 func (options) DynQueueSizeMemory(dynQueueSizeMemory uint) Option {
 	return func(b *options) {
 		b.dynQueueSizeMemory = dynQueueSizeMemory

cmd/esmapping-generator/app/flags.go

@@ -20,21 +20,23 @@ import (
 
 // Options represent configurable parameters for jaeger-esmapping-generator
 type Options struct {
-	Mapping     string
-	EsVersion   uint
-	Shards      int64
-	Replicas    int64
-	IndexPrefix string
-	UseILM      string // using string as util is being used in python and using bool leads to type issues.
+	Mapping       string
+	EsVersion     uint
+	Shards        int64
+	Replicas      int64
+	IndexPrefix   string
+	UseILM        string // using string as util is being used in python and using bool leads to type issues.
+	ILMPolicyName string
 }
 
 const (
-	mappingFlag     = "mapping"
-	esVersionFlag   = "es-version"
-	shardsFlag      = "shards"
-	replicasFlag    = "replicas"
-	indexPrefixFlag = "index-prefix"
-	useILMFlag      = "use-ilm"
+	mappingFlag       = "mapping"
+	esVersionFlag     = "es-version"
+	shardsFlag        = "shards"
+	replicasFlag      = "replicas"
+	indexPrefixFlag   = "index-prefix"
+	useILMFlag        = "use-ilm"
+	ilmPolicyNameFlag = "ilm-policy-name"
 )
 
 // AddFlags adds flags for esmapping-generator main program
@@ -69,6 +71,11 @@ func (o *Options) AddFlags(command *cobra.Command) {
 		useILMFlag,
 		"false",
 		"Set to true to use ILM for managing lifecycle of jaeger indices")
+	command.Flags().StringVar(
+		&o.ILMPolicyName,
+		ilmPolicyNameFlag,
+		"jaeger-ilm-policy",
+		"The name of the ILM policy to use if ILM is active")
 
 	// mark mapping flag as mandatory
 	command.MarkFlagRequired(mappingFlag)

cmd/esmapping-generator/app/flags_test.go

@@ -33,6 +33,7 @@ func TestOptionsWithDefaultFlags(t *testing.T) {
 	assert.Equal(t, int64(1), o.Replicas)
 	assert.Equal(t, "", o.IndexPrefix)
 	assert.Equal(t, "false", o.UseILM)
+	assert.Equal(t, "jaeger-ilm-policy", o.ILMPolicyName)
 }
 
 func TestOptionsWithFlags(t *testing.T) {
@@ -47,6 +48,7 @@ func TestOptionsWithFlags(t *testing.T) {
 		"--replicas=1",
 		"--index-prefix=test",
 		"--use-ilm=true",
+		"--ilm-policy-name=jaeger-test-policy",
 	})
 	require.NoError(t, err)
 	assert.Equal(t, "jaeger-span", o.Mapping)
@@ -55,4 +57,5 @@ func TestOptionsWithFlags(t *testing.T) {
 	assert.Equal(t, int64(1), o.Replicas)
 	assert.Equal(t, "test", o.IndexPrefix)
 	assert.Equal(t, "true", o.UseILM)
+	assert.Equal(t, "jaeger-test-policy", o.ILMPolicyName)
 }

cmd/esmapping-generator/app/renderer/render.go

@@ -42,6 +42,7 @@ func GetMappingAsString(builder es.TemplateBuilder, opt *app.Options) (string, e
 		EsVersion:       opt.EsVersion,
 		IndexPrefix:     opt.IndexPrefix,
 		UseILM:          enableILM,
+		ILMPolicyName:   opt.ILMPolicyName,
 	}
 	return mappingBuilder.GetMapping(opt.Mapping)
 }

cmd/esmapping-generator/app/renderer/render_test.go

@@ -50,23 +50,23 @@ func Test_getMappingAsString(t *testing.T) {
 		wantErr error
 	}{
 		{
-			name: "ES version 7", args: app.Options{Mapping: "jaeger-span", EsVersion: 7, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "true"},
+			name: "ES version 7", args: app.Options{Mapping: "jaeger-span", EsVersion: 7, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "true", ILMPolicyName: "jaeger-test-policy"},
 			want: "ES version 7",
 		},
 		{
-			name: "ES version 6", args: app.Options{Mapping: "jaeger-span", EsVersion: 6, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "false"},
+			name: "ES version 6", args: app.Options{Mapping: "jaeger-span", EsVersion: 6, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "false", ILMPolicyName: "jaeger-test-policy"},
 			want: "ES version 6",
 		},
 		{
-			name: "Parse Error version 6", args: app.Options{Mapping: "jaeger-span", EsVersion: 6, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "false"},
+			name: "Parse Error version 6", args: app.Options{Mapping: "jaeger-span", EsVersion: 6, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "false", ILMPolicyName: "jaeger-test-policy"},
 			wantErr: errors.New("parse error"),
 		},
 		{
-			name: "Parse Error version 7", args: app.Options{Mapping: "jaeger-span", EsVersion: 7, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "true"},
+			name: "Parse Error version 7", args: app.Options{Mapping: "jaeger-span", EsVersion: 7, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "true", ILMPolicyName: "jaeger-test-policy"},
 			wantErr: errors.New("parse error"),
 		},
 		{
-			name: "Parse bool error", args: app.Options{Mapping: "jaeger-span", EsVersion: 7, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "foo"},
+			name: "Parse bool error", args: app.Options{Mapping: "jaeger-span", EsVersion: 7, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "foo", ILMPolicyName: "jaeger-test-policy"},
 			wantErr: errors.New("strconv.ParseBool: parsing \"foo\": invalid syntax"),
 		},
 	}