Skip to content

Support source-revision populated by a kustomization #1172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Support source-revision populated by a kustomization #1172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions internal/notifier/otel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ func (t *OTLPTracer) Post(ctx context.Context, event eventv1.Event) error {

// Extract revision from event metadata
revision := getRevision(event.Metadata)
logger.Info("Revision ID (former part of Trace ID)", revision)

// Create TraceProvider
tp := sdktrace.NewTracerProvider(
Expand All @@ -146,7 +147,7 @@ func (t *OTLPTracer) Post(ctx context.Context, event eventv1.Event) error {
)

// Generate traceID
logger.V(1).Info("Generating trace IDs", "alertUID", string(alert.UID), "revision", revision)
logger.Info("Generating trace IDs", "alertUID", string(alert.UID), "revision", revision)
var traceID trace.TraceID
traceIDStr := generateID(string(alert.UID), revision)
copy(traceID[:], traceIDStr[:16])
Expand Down Expand Up @@ -235,7 +236,9 @@ func getRevision(eventMetadata map[string]string) string {
ociDigest, hasOCI := eventMetadata["oci-digest"]
appVersion, hasApp := eventMetadata["app-version"]

if hasOCI && hasApp {
if rev, hasRev := eventMetadata["source-revision"]; hasRev {
revision = rev
} else if hasOCI && hasApp {
revision = appVersion + "@" + ociDigest
} else if rev, hasRev := eventMetadata["revision"]; hasRev {
revision = rev
Expand Down