Skip to content
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

Add runner info to job events #1

Merged
merged 2 commits into from
Aug 31, 2021
Merged

Add runner info to job events #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54890d6
Structure event fields info a bit
zoidbergwill Aug 31, 2021
65777aa
Add runner info to jobs
zoidbergwill Aug 31, 2021
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
34 changes: 23 additions & 11 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"log"
"net/http"
"os"
"strings"
"time"

"github.com/honeycombio/libhoney-go"
Expand Down Expand Up @@ -72,16 +73,19 @@ func createTraceFromPipeline(cfg *libhoney.Config, p Pipeline) (*libhoney.Event,
defer ev.Send()
buildURL := fmt.Sprintf("%s/-/pipelines/%d", p.Project.WebURL, p.ObjectAttributes.ID)
ev.Add(map[string]interface{}{
"ci_provider": "GitLab-CI",
// Basic trace information
"service_name": "pipeline",
"trace.span_id": traceID,
"trace.trace_id": traceID,
"name": "build " + traceID,
"branch": p.ObjectAttributes.Ref,
"build_num": p.ObjectAttributes.ID,
"build_url": buildURL,
"pr_number": p.MergeRequest.Iid,
"pr_branch": p.MergeRequest.SourceBranch,

// CI information
"ci_provider": "GitLab-CI",
"branch": p.ObjectAttributes.Ref,
"build_num": p.ObjectAttributes.ID,
"build_url": buildURL,
"pr_number": p.MergeRequest.Iid,
"pr_branch": p.MergeRequest.SourceBranch,
// TODO: Replace project Id with SOURCE_PROJECT_PATH
"pr_repo": p.MergeRequest.SourceProjectID,
"repo": p.Project.WebURL,
Expand Down Expand Up @@ -116,18 +120,26 @@ func createTraceFromJob(cfg *libhoney.Config, j Job) (*libhoney.Event, error) {
ev := createEvent(cfg)
defer ev.Send()
ev.Add(map[string]interface{}{
"ci_provider": "GitLab-CI",
// Basic trace information
"service_name": "job",
"trace.span_id": spanID,
"trace.trace_id": parentTraceID,
"trace.parent_id": parentTraceID,
"name": fmt.Sprintf(j.BuildName),
"branch": j.Ref,
"build_num": j.PipelineID,
"build_id": j.BuildID,
"repo": j.Repository.Homepage,

// CI information
"ci_provider": "GitLab-CI",
"branch": j.Ref,
"build_num": j.PipelineID,
"build_id": j.BuildID,
"repo": j.Repository.Homepage,
// TODO: Something with job status
"status": j.BuildStatus,

// Runner information
"ci_runner": j.Runner.Description,
"ci_runner_id": j.Runner.ID,
"ci_runner_tags": strings.Join(j.Runner.Tags, ","),
})
if j.BuildStatus != "created" && j.BuildStatus != "running" {
ev.AddField("duration_ms", j.BuildDuration*1000)
Expand Down