1 change: 1 addition & 0 deletions 1 .github/ISSUE_TEMPLATE/4_release_tracker.md

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,6 +32,7 @@ We aim to release this release in the week of <week range, example March 27-31>.
		- [ ] Publish new documentation version
		- [ ] Setup continuous container scanning with Snyk
		- [ ] Prepare & ship Helm chart
		- [ ] Create a new issue in [KEDA OLM repository](https://github.com/kedacore/keda-olm-operator/issues/new/choose)
		- [ ] Prepare next release
		- [ ] Provide update in Slack
		- [ ] Tweet about new release

2 changes: 1 addition & 1 deletion 2 .github/workflows/pr-e2e.yml

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -219,7 +219,7 @@ jobs:
		details_url: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
		- name: Upload test logs
		uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4
		uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
		with:
		name: e2e-test-logs
		path: "${{ github.workspace }}/**/*.log"
Expand Down

2 changes: 1 addition & 1 deletion 2 .github/workflows/template-main-e2e-test.yml

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,7 +48,7 @@ jobs:
		NODE_POOL_SIZE: 1
		- name: Upload test logs
		uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4
		uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
		if: ${{ always() }}
		with:
		name: e2e-test-logs
Expand Down

2 changes: 1 addition & 1 deletion 2 .github/workflows/template-smoke-tests.yml

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,7 +44,7 @@ jobs:
		run: make smoke-test
		- name: Upload test logs
		uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4
		uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
		if: ${{ always() }}
		with:
		name: smoke-test-logs ${{ inputs.runs-on }}-${{ inputs.kubernetesVersion }}
Expand Down

8 changes: 6 additions & 2 deletions 8 CHANGELOG.md

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,10 +62,13 @@ Here is an overview of all new **experimental** features:
		### Improvements
		- **General**: Add command-line flag in Adapter to allow override of gRPC Authority Header ([#5449](https://github.com/kedacore/keda/issues/5449))
		- **General**: Add OPENTELEMETRY flag in e2e test YAML ([#5375](https://github.com/kedacore/keda/issues/5375))
		### Fixes
		- **GCP Scalers**: Properly close the connection during the scaler cleaning process ([#5448](https://github.com/kedacore/keda/issues/5448))
		- **GCP Scalers**: Restore previous time horizon to prevent querying issues ([#5429](https://github.com/kedacore/keda/issues/5429))
		- **Prometheus Scaler**: Fix for missing AWS region from metadata ([#5419](https://github.com/kedacore/keda/issues/5419))
		### Deprecations
Expand All		@@ -83,8 +86,9 @@ New deprecation(s):
		### Other
		- **General**: Introduce ENABLE_OPENTELEMETRY in deploying/testing process ([#5375](https://github.com/kedacore/keda/issues/5375))
		- **General**: Improve readability of utility function getParameterFromConfigV2 ([#5037](https://github.com/kedacore/keda/issues/5037))
		- **General**: Migrate away from unmaintained golang/mock and use uber/gomock ([#5440](https://github.com/kedacore/keda/issues/5440))
		- **General**: Minor refactor to reduce copy/paste code in ScaledObject webhook ([#5397](https://github.com/kedacore/keda/issues/5397))
		- **General**: TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX))
		## v2.13.0
Expand Down Expand Up		@@ -134,6 +138,7 @@ Here is an overview of all new **experimental** features:
		- **General**: Fix CVE-2023-39325 in golang.org/x/net ([#5122](https://github.com/kedacore/keda/issues/5122))
		- **General**: Fix otelgrpc DoS vulnerability ([#5208](https://github.com/kedacore/keda/issues/5208))
		- **General**: Fix Pod identity not being considered when scaled target is a CRD ([#5021](https://github.com/kedacore/keda/issues/5021))
		- **General**: Fix release asset should specify the version in `keda-*-core.yaml`([#5484](https://github.com/kedacore/keda/issues/5484))
		- **General**: Prevented memory leak generated by not correctly cleaning http connections ([#5248](https://github.com/kedacore/keda/issues/5248))
		- **General**: Prevented stuck status due to timeouts during scalers generation ([#5083](https://github.com/kedacore/keda/issues/5083))
		- **General**: ScaledObject Validating Webhook should support `dry-run=server` requests ([#5306](https://github.com/kedacore/keda/issues/5306))
Expand Down Expand Up		@@ -164,7 +169,6 @@ New deprecation(s):
		### Other
		- **General**: Bump K8s deps to 0.28.5 ([#5346](https://github.com/kedacore/keda/pull/5346))
		- **General**: Create a common utility function to get parameter value from config ([#5037](https://github.com/kedacore/keda/issues/5037))
		- **General**: Fix CVE-2023-45142 in OpenTelemetry ([#5089](https://github.com/kedacore/keda/issues/5089))
		- **General**: Fix logger in OpenTelemetry collector ([#5094](https://github.com/kedacore/keda/issues/5094))
		- **General**: Fix lost commit from the newly created utility function ([#5037](https://github.com/kedacore/keda/issues/5037))
Expand Down

3 changes: 2 additions & 1 deletion 3 Makefile

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -233,6 +233,7 @@ release: manifests kustomize set-version ## Produce new KEDA release in keda-$(V
		# Need this workaround to mitigate a problem with inserting labels into selectors,
		# until this issue is solved: https://github.com/kubernetes-sigs/kustomize/issues/1009
		@sed -i".out" -e 's@version:[ ].*@version: $(VERSION)@g' config/default/kustomize-config/metadataLabelTransformer.yaml
		@sed -i".out" -e 's@version:[ ].*@version: $(VERSION)@g' config/minimal/kustomize-config/metadataLabelTransformer.yaml
		rm -rf config/default/kustomize-config/metadataLabelTransformer.yaml.out
		$(KUSTOMIZE) build config/default > keda-$(VERSION).yaml
		$(KUSTOMIZE) build config/minimal > keda-$(VERSION)-core.yaml
Expand Down Expand Up		@@ -336,7 +337,7 @@ $(ENVTEST): $(LOCALBIN)
		.PHONY: mockgen
		mockgen: $(MOCKGEN) ## Install mockgen from vendor dir if necessary.
		$(MOCKGEN): $(LOCALBIN)
		test -s $(LOCALBIN)/mockgen || GOBIN=$(LOCALBIN) go install github.com/golang/mock/mockgen
		test -s $(LOCALBIN)/mockgen || GOBIN=$(LOCALBIN) go install go.uber.org/mock/mockgen
		.PHONY: protoc-gen
		protoc-gen: $(PROTOCGEN) $(PROTOCGEN_GRPC) ## Install protoc-gen from vendor dir if necessary.
Expand Down

8 changes: 6 additions & 2 deletions 8 RELEASE-PROCESS.md

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -117,7 +117,11 @@ Before we can release our new Helm chart version, we need to prepare it:
		Guidance on how to release it can be found in our [contribution guide](https://github.com/kedacore/charts/blob/master/CONTRIBUTING.md#shipping-a-new-version).
		## 8. Prepare next release
		## 8. Trigger KEDA OLM release
		Create a new issue in [KEDA OLM repository](https://github.com/kedacore/keda-olm-operator/issues/new/choose) stating that there should be a new release mirroring KEDA core release.
		## 9. Prepare next release
		As per our [release governance](https://github.com/kedacore/governance/blob/main/RELEASES.md), we need to create a new shipping cycle in our [project settings](https://github.com/orgs/kedacore/projects/2/settings/fields/1647216) with a target date in 3 months after the last cycle.
Expand All		@@ -127,7 +131,7 @@ Lastly, the `Upcoming Release Cycles` overview in `ROADMAP.md` should be updated
		In case of minor releases, we need to create the version branch (`release/v2.x`) from the release tag which will be used to include any required hotfix in the future.
		## 9. Tweet! 🐦
		## 10. Tweet! 🐦
		Prepare a tweet with some highlights and send it out on [@kedaorg](https://twitter.com/kedaorg)!
Expand Down

18 changes: 10 additions & 8 deletions 18 cmd/adapter/main.go

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -56,12 +56,13 @@ type Adapter struct {
		var logger = klogr.New().WithName("keda_metrics_adapter")
		var (
		adapterClientRequestQPS float32
		adapterClientRequestBurst int
		metricsAPIServerPort int
		disableCompression bool
		metricsServiceAddr string
		profilingAddr string
		adapterClientRequestQPS float32
		adapterClientRequestBurst int
		metricsAPIServerPort int
		disableCompression bool
		metricsServiceAddr string
		profilingAddr string
		metricsServiceGRPCAuthority string
		)
		func (a *Adapter) makeProvider(ctx context.Context) (provider.ExternalMetricsProvider, <-chan struct{}, error) {
Expand Down Expand Up		@@ -123,7 +124,7 @@ func (a *Adapter) makeProvider(ctx context.Context) (provider.ExternalMetricsPro
		}
		logger.Info("Connecting Metrics Service gRPC client to the server", "address", metricsServiceAddr)
		grpcClient, err := metricsservice.NewGrpcClient(metricsServiceAddr, a.SecureServing.ServerCert.CertDirectory)
		grpcClient, err := metricsservice.NewGrpcClient(metricsServiceAddr, a.SecureServing.ServerCert.CertDirectory, metricsServiceGRPCAuthority)
		if err != nil {
		logger.Error(err, "error connecting Metrics Service gRPC client to the server", "address", metricsServiceAddr)
		return nil, nil, err
Expand Down Expand Up		@@ -232,7 +233,8 @@ func main() {
		cmd.Flags().StringVar(&cmd.Message, "msg", "starting adapter...", "startup message")
		cmd.Flags().AddGoFlagSet(flag.CommandLine) // make sure we get the klog flags
		cmd.Flags().IntVar(&metricsAPIServerPort, "port", 8080, "Set the port for the metrics API server")
		cmd.Flags().StringVar(&metricsServiceAddr, "metrics-service-address", generateDefaultMetricsServiceAddr(), "The address of the gRPRC Metrics Service Server.")
		cmd.Flags().StringVar(&metricsServiceAddr, "metrics-service-address", generateDefaultMetricsServiceAddr(), "The address of the GRPC Metrics Service Server.")
		cmd.Flags().StringVar(&metricsServiceGRPCAuthority, "metrics-service-grpc-authority", "", "Host Authority override for the Metrics Service if the Host Authority is not the same as the address used for the GRPC Metrics Service Server.")
		cmd.Flags().StringVar(&profilingAddr, "profiling-bind-address", "", "The address the profiling would be exposed on.")
		cmd.Flags().Float32Var(&adapterClientRequestQPS, "kube-api-qps", 20.0, "Set the QPS rate for throttling requests sent to the apiserver")
		cmd.Flags().IntVar(&adapterClientRequestBurst, "kube-api-burst", 30, "Set the burst for throttling requests sent to the apiserver")
Expand Down

2 changes: 1 addition & 1 deletion 2 config/samples/keda_v1alpha1_triggerauthentication.yaml

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,6 +4,6 @@ metadata:
		name: example-triggerauthentication
		spec:
		secretTargetRef:
		- parameter: exmaple-secret-parameter
		- parameter: example-secret-parameter
		name: example-secret-name
		key: example-role-key

2 changes: 1 addition & 1 deletion 2 controllers/keda/hpa_test.go

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,9 +20,9 @@ import (
		"context"
		"github.com/go-logr/logr"
		"github.com/golang/mock/gomock"
		. "github.com/onsi/ginkgo/v2"
		. "github.com/onsi/gomega"
		"go.uber.org/mock/gomock"
		v2 "k8s.io/api/autoscaling/v2"
		v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down

2 changes: 1 addition & 1 deletion 2 controllers/keda/scaledobject_controller_test.go

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,9 +22,9 @@ import (
		"sync/atomic"
		"time"
		"github.com/golang/mock/gomock"
		. "github.com/onsi/ginkgo/v2"
		. "github.com/onsi/gomega"
		"go.uber.org/mock/gomock"
		appsv1 "k8s.io/api/apps/v1"
		autoscalingv2 "k8s.io/api/autoscaling/v2"
		corev1 "k8s.io/api/core/v1"
Expand Down

2 changes: 1 addition & 1 deletion 2 go.mod

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,7 +49,6 @@ require (
		github.com/go-sql-driver/mysql v1.7.1
		github.com/gobwas/glob v0.2.3
		github.com/gocql/gocql v1.6.0
		github.com/golang/mock v1.6.0
		github.com/google/go-cmp v0.6.0
		github.com/google/go-github/v50 v50.2.0
		github.com/google/uuid v1.6.0
Expand Down Expand Up		@@ -88,6 +87,7 @@ require (
		go.opentelemetry.io/otel v1.22.0
		go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0
		go.opentelemetry.io/otel/metric v1.22.0
		go.uber.org/mock v0.4.0
		golang.org/x/oauth2 v0.16.0
		golang.org/x/sync v0.6.0
		google.golang.org/api v0.161.0
Expand Down

2 changes: 2 additions & 0 deletions 2 go.sum

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -1857,6 +1857,8 @@ go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A
		go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
		go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
		go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
		go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
		go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
		go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
		go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
		go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
Expand Down

2 changes: 1 addition & 1 deletion 2 hack/tools.go

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,7 @@ package tools
		import (
		// Import code-generator to use in build tools
		_ "github.com/golang/mock/mockgen"
		_ "go.uber.org/mock/mockgen"
		_ "google.golang.org/grpc/cmd/protoc-gen-go-grpc"
		_ "google.golang.org/protobuf/cmd/protoc-gen-go"
		_ "k8s.io/code-generator"
Expand Down

2 changes: 1 addition & 1 deletion 2 pkg/eventemitter/eventemitter_test.go

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,7 +23,7 @@ import (
		"testing"
		"time"
		"github.com/golang/mock/gomock"
		"go.uber.org/mock/gomock"
		metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
		"k8s.io/client-go/tools/record"
Expand Down

26 changes: 13 additions & 13 deletions 26 pkg/fallback/fallback_test.go

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,10 +22,10 @@ import (
		"fmt"
		"testing"
		"github.com/golang/mock/gomock"
		. "github.com/onsi/ginkgo/v2"
		. "github.com/onsi/gomega"
		"github.com/onsi/gomega/types"
		"go.uber.org/mock/gomock"
		v2 "k8s.io/api/autoscaling/v2"
		"k8s.io/apimachinery/pkg/api/resource"
		metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up		@@ -110,7 +110,7 @@ var _ = Describe("fallback", func() {
		})
		It("should propagate the error when fallback is disabled", func() {
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("Some error"))
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("some error"))
		so := buildScaledObject(nil, nil)
		metricSpec := createMetricSpec(3)
Expand All		@@ -120,11 +120,11 @@ var _ = Describe("fallback", func() {
		_, _, err = GetMetricsWithFallback(context.Background(), client, metrics, err, metricName, so, metricSpec)
		Expect(err).ShouldNot(BeNil())
		Expect(err.Error()).Should(Equal("Some error"))
		Expect(err.Error()).Should(Equal("some error"))
		})
		It("should bump the number of failures when metrics call fails", func() {
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("Some error"))
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("some error"))
		startingNumberOfFailures := int32(0)
		so := buildScaledObject(
Expand All		@@ -149,12 +149,12 @@ var _ = Describe("fallback", func() {
		_, _, err = GetMetricsWithFallback(context.Background(), client, metrics, err, metricName, so, metricSpec)
		Expect(err).ShouldNot(BeNil())
		Expect(err.Error()).Should(Equal("Some error"))
		Expect(err.Error()).Should(Equal("some error"))
		Expect(so.Status.Health[metricName]).To(haveFailureAndStatus(1, kedav1alpha1.HealthStatusFailing))
		})
		It("should return a normalised metric when number of failures are beyond threshold", func() {
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("Some error"))
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("some error"))
		startingNumberOfFailures := int32(3)
		expectedMetricValue := float64(100)
Expand Down Expand Up		@@ -207,7 +207,7 @@ var _ = Describe("fallback", func() {
		})
		It("should ignore error if we fail to update kubernetes status", func() {
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("Some error"))
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("some error"))
		startingNumberOfFailures := int32(3)
		expectedMetricValue := float64(100)
Expand All		@@ -228,7 +228,7 @@ var _ = Describe("fallback", func() {
		metricSpec := createMetricSpec(10)
		statusWriter := mock_client.NewMockStatusWriter(ctrl)
		statusWriter.EXPECT().Patch(gomock.Any(), gomock.Any(), gomock.Any()).Return(errors.New("Some error"))
		statusWriter.EXPECT().Patch(gomock.Any(), gomock.Any(), gomock.Any()).Return(errors.New("some error"))
		client.EXPECT().Status().Return(statusWriter)
		metrics, _, err := scaler.GetMetricsAndActivity(context.Background(), metricName)
Expand All		@@ -241,7 +241,7 @@ var _ = Describe("fallback", func() {
		})
		It("should return error when fallback is enabled but scaledobject has invalid parameter", func() {
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("Some error"))
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("some error"))
		startingNumberOfFailures := int32(3)
		so := buildScaledObject(
Expand All		@@ -265,11 +265,11 @@ var _ = Describe("fallback", func() {
		_, _, err = GetMetricsWithFallback(context.Background(), client, metrics, err, metricName, so, metricSpec)
		Expect(err).ShouldNot(BeNil())
		Expect(err.Error()).Should(Equal("Some error"))
		Expect(err.Error()).Should(Equal("some error"))
		})
		It("should set the fallback condition when a fallback exists in the scaled object", func() {
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("Some error"))
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("some error"))
		startingNumberOfFailures := int32(3)
		failingNumberOfFailures := int32(6)
		anotherMetricName := "another metric name"
Expand Down Expand Up		@@ -303,7 +303,7 @@ var _ = Describe("fallback", func() {
		})
		It("should set the fallback condition to false if the config is invalid", func() {
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("Some error"))
		scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("some error"))
		startingNumberOfFailures := int32(3)
		failingNumberOfFailures := int32(6)
		anotherMetricName := "another metric name"
Expand Down Expand Up		@@ -332,7 +332,7 @@ var _ = Describe("fallback", func() {
		metrics, _, err := scaler.GetMetricsAndActivity(context.Background(), metricName)
		_, _, err = GetMetricsWithFallback(context.Background(), client, metrics, err, metricName, so, metricSpec)
		Expect(err).ShouldNot(BeNil())
		Expect(err.Error()).Should(Equal("Some error"))
		Expect(err.Error()).Should(Equal("some error"))
		condition := so.Status.Conditions.GetFallbackCondition()
		Expect(condition.IsTrue()).Should(BeFalse())
		})
Expand Down

4 changes: 2 additions & 2 deletions 4 pkg/metricscollector/opentelemetry.go

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -379,7 +379,7 @@ func (o *OtelMetrics) RecordCloudEventEmitted(namespace string, cloudeventsource
		otCloudEventEmittedCounter.Add(context.Background(), 1, opt)
		}
		// RecordCloudEventEmitted counts the number of errors occurred in trying emit cloudevent
		// RecordCloudEventEmittedError counts the number of errors occurred in trying emit cloudevent
		func (o *OtelMetrics) RecordCloudEventEmittedError(namespace string, cloudeventsource string, eventsink string) {
		opt := api.WithAttributes(
		attribute.Key("namespace").String(namespace),
Expand All		@@ -398,7 +398,7 @@ func CloudeventQueueStatusCallback(_ context.Context, obsrv api.Float64Observer)
		return nil
		}
		// RecordCloudEventSourceQueueStatus record the number of cloudevents that are waiting for emitting
		// RecordCloudEventQueueStatus record the number of cloudevents that are waiting for emitting
		func (o *OtelMetrics) RecordCloudEventQueueStatus(namespace string, value int) {
		opt := api.WithAttributes(
		attribute.Key("namespace").String(namespace),
Expand Down

2 changes: 1 addition & 1 deletion 2 pkg/metricscollector/prommetrics.go

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -325,7 +325,7 @@ func (p *PromMetrics) RecordCloudEventEmittedError(namespace string, cloudevents
		cloudeventEmitted.With(labels).Inc()
		}
		// RecordCloudEventSourceQueueStatus record the number of cloudevents that are waiting for emitting
		// RecordCloudEventQueueStatus record the number of cloudevents that are waiting for emitting
		func (p *PromMetrics) RecordCloudEventQueueStatus(namespace string, value int) {
		cloudeventQueueStatus.With(prometheus.Labels{"namespace": namespace}).Set(float64(value))
		}

10 changes: 9 additions & 1 deletion 10 pkg/metricsservice/client.go

Show comments

View file Edit file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,7 +36,7 @@ type GrpcClient struct {
		connection *grpc.ClientConn
		}
		func NewGrpcClient(url, certDir string) (*GrpcClient, error) {
		func NewGrpcClient(url, certDir, authority string) (*GrpcClient, error) {
		defaultConfig := `{
		"methodConfig": [{
		"timeout": "3s",
Expand All		@@ -57,6 +57,14 @@ func NewGrpcClient(url, certDir string) (*GrpcClient, error) {
		grpc.WithTransportCredentials(creds),
		grpc.WithDefaultServiceConfig(defaultConfig),
		}
		if authority != "" {
		// If an Authority header override is specified, add it to the client so it is set on every request.
		// This is useful when the address used to dial the GRPC server does not match any hosts provided in the TLS certificate's
		// SAN
		opts = append(opts, grpc.WithAuthority(authority))
		}
		conn, err := grpc.Dial(url, opts...)
		if err != nil {
		return nil, err
Expand Down

Loading