-
Notifications
You must be signed in to change notification settings - Fork 600
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate jobrunner to cloudevent v2 (#2867)
* use go client v2 * port jobrunner to cloudevent v2 * format * leave the cloudevent client under adapter * rebase * Use !IsACK * fix unit test
- Loading branch information
1 parent
49789a8
commit 6386f24
Showing
13 changed files
with
272 additions
and
167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| Copyright 2020 The Knative Authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
| package metrics | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/cloudevents/sdk-go/v2/protocol/http" | ||
|
|
||
| cloudevents "github.com/cloudevents/sdk-go/v2" | ||
| "knative.dev/pkg/source" | ||
| ) | ||
|
|
||
| type StatsReporterAdapter interface { | ||
| ReportCount(ctx context.Context, event cloudevents.Event, result cloudevents.Result) error | ||
| } | ||
|
|
||
| type statsReporterAdapter struct { | ||
| source.StatsReporter | ||
| } | ||
|
|
||
| func NewStatsReporterAdapter(reporter source.StatsReporter) StatsReporterAdapter { | ||
| return &statsReporterAdapter{StatsReporter: reporter} | ||
| } | ||
|
|
||
| func (c *statsReporterAdapter) ReportCount(ctx context.Context, event cloudevents.Event, result cloudevents.Result) error { | ||
| tags := MetricTagFromContext(ctx) | ||
| reportArgs := &source.ReportArgs{ | ||
| Namespace: tags.Namespace, | ||
| EventSource: event.Source(), | ||
| EventType: event.Type(), | ||
| Name: tags.Name, | ||
| ResourceGroup: tags.ResourceGroup, | ||
| } | ||
|
|
||
| if cloudevents.IsACK(result) { | ||
| var res *http.Result | ||
| if !cloudevents.ResultAs(result, &res) { | ||
| return fmt.Errorf("protocol.Result is not http.Result") | ||
| } | ||
|
|
||
| _ = c.ReportEventCount(reportArgs, res.StatusCode) | ||
| } else { | ||
| var res *http.Result | ||
| if !cloudevents.ResultAs(result, &res) { | ||
| return result | ||
| } | ||
|
|
||
| if rErr := c.ReportEventCount(reportArgs, res.StatusCode); rErr != nil { | ||
| // metrics is not important enough to return an error if it is setup wrong. | ||
| // So combine reporter error with ce error if not nil. | ||
| if result != nil { | ||
| result = fmt.Errorf("%w\nmetrics reporter errror: %s", result, rErr) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return result | ||
| } | ||
|
|
||
| // Metric context | ||
|
|
||
| type MetricTag struct { | ||
| Name string | ||
| Namespace string | ||
| ResourceGroup string | ||
| } | ||
|
|
||
| type metricKey struct{} | ||
|
|
||
| // ContextWithMetricTag returns a copy of parent context in which the | ||
| // value associated with metric key is the supplied metric tag. | ||
| func ContextWithMetricTag(ctx context.Context, metric *MetricTag) context.Context { | ||
| return context.WithValue(ctx, metricKey{}, metric) | ||
| } | ||
|
|
||
| // MetricTagFromContext returns the metric tag stored in context. | ||
| // Returns nil if no metric tag is set in context, or if the stored value is | ||
| // not of correct type. | ||
| func MetricTagFromContext(ctx context.Context) *MetricTag { | ||
| if logger, ok := ctx.Value(metricKey{}).(*MetricTag); ok { | ||
| return logger | ||
| } | ||
| return &MetricTag{ | ||
| Name: "unknown", | ||
| Namespace: "unknown", | ||
| ResourceGroup: "unknown", | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| Copyright 2020 The Knative Authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
| package metrics | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| cloudevents "github.com/cloudevents/sdk-go/v2" | ||
| rectesting "knative.dev/eventing/pkg/reconciler/testing" | ||
| ) | ||
|
|
||
| func TestStatsReporterAdapter(t *testing.T) { | ||
| stats := &rectesting.MockStatsReporter{} | ||
| reporter := NewStatsReporterAdapter(stats) | ||
|
|
||
| event := cloudevents.NewEvent() | ||
| event.SetID("abc-123") | ||
| event.SetSource("unit/test") | ||
| event.SetType("unit.type") | ||
|
|
||
| ctx := ContextWithMetricTag(context.Background(), &MetricTag{ | ||
| Name: "test-name", | ||
| Namespace: "test-ns", | ||
| ResourceGroup: "test-rg", | ||
| }) | ||
|
|
||
| if result := reporter.ReportCount(ctx, event, cloudevents.NewHTTPResult(200, "%w", cloudevents.ResultACK)); !cloudevents.IsACK(result) { | ||
| t.Errorf("unexpected result %v", result) | ||
| } | ||
|
|
||
| if err := stats.ValidateEventCount(1); err != nil { | ||
| t.Errorf("unexpected error %v", err) | ||
| } | ||
| } |
Oops, something went wrong.