Skip to content

fix(tracing-openobserve): use correct parent_span_id field name #78

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

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

fix(tracing-openobserve): use correct parent_span_id field name #78

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions observability-tracing-openobserve/internal/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ func TestQueryTraces_Success(t *testing.T) {
"span_kind": "SERVER",
"start_time": json.Number(fmt.Sprintf("%d", startNs)),
"end_time": json.Number(fmt.Sprintf("%d", endNs)),
"reference_parent_span_id": "",
"parent_span_id": "",
"service_openchoreo_dev_namespace": "test-ns",
},
{
Expand All @@ -456,7 +456,7 @@ func TestQueryTraces_Success(t *testing.T) {
"span_kind": "CLIENT",
"start_time": json.Number(fmt.Sprintf("%d", startNs+1000)),
"end_time": json.Number(fmt.Sprintf("%d", endNs-1000)),
"reference_parent_span_id": "span-root",
"parent_span_id": "span-root",
},
},
}
Expand Down Expand Up @@ -504,7 +504,7 @@ func TestQuerySpansForTrace_Success(t *testing.T) {
"start_time": json.Number(fmt.Sprintf("%d", startNs)),
"end_time": json.Number(fmt.Sprintf("%d", endNs)),
"duration": json.Number(fmt.Sprintf("%d", endNs-startNs)),
"reference_parent_span_id": "span-root",
"parent_span_id": "span-root",
},
},
}
Expand Down Expand Up @@ -552,7 +552,7 @@ func TestGetSpanDetailsForTrace_Success(t *testing.T) {
"start_time": json.Number(fmt.Sprintf("%d", startNs)),
"end_time": json.Number(fmt.Sprintf("%d", endNs)),
"duration": json.Number(fmt.Sprintf("%d", endNs-startNs)),
"reference_parent_span_id": "span-root",
"parent_span_id": "span-root",
"http.method": "GET",
"service.name": "my-service",
},
Expand Down
7 changes: 3 additions & 4 deletions observability-tracing-openobserve/internal/openobserve/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ func (c *Client) GetTraces(ctx context.Context, params TracesQueryParams) (*Trac
}

// Identify root span: the span with no parent
parentSpanID, _ := hit["reference_parent_span_id"].(string)
parentSpanID, _ := hit["parent_span_id"].(string)
if parentSpanID == "" {
if v, ok := hit["span_id"].(string); ok {
agg.entry.RootSpanID = v
Expand Down Expand Up @@ -374,7 +374,7 @@ func parseSpanEntry(hit map[string]interface{}) SpanEntry {
if v, ok := hit["duration"].(json.Number); ok {
entry.DurationNs, _ = v.Int64()
}
if v, ok := hit["reference_parent_span_id"].(string); ok {
if v, ok := hit["parent_span_id"].(string); ok {
entry.ParentSpanID = v
}
entry.Status = determineSpanStatus(hit)
Expand Down Expand Up @@ -409,7 +409,6 @@ var internalFields = []string{
"end_time",
"duration",
"parent_span_id",
"reference_parent_span_id",
"trace_id",
"span_status",
}
Expand Down Expand Up @@ -438,7 +437,7 @@ func parseSpanDetail(hit map[string]interface{}) SpanDetail {
if v, ok := hit["duration"].(json.Number); ok {
detail.DurationNs, _ = v.Int64()
}
if v, ok := hit["reference_parent_span_id"].(string); ok {
if v, ok := hit["parent_span_id"].(string); ok {
detail.ParentSpanID = v
}
detail.Status = determineSpanStatus(hit)
Expand Down
20 changes: 10 additions & 10 deletions observability-tracing-openobserve/internal/openobserve/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func TestGetTraces(t *testing.T) {
"span_kind": "SERVER",
"start_time": json.Number(fmt.Sprintf("%d", startNs)),
"end_time": json.Number(fmt.Sprintf("%d", endNs)),
"reference_parent_span_id": "",
"parent_span_id": "",
},
{
"trace_id": "trace-1",
Expand All @@ -123,7 +123,7 @@ func TestGetTraces(t *testing.T) {
"span_kind": "CLIENT",
"start_time": json.Number(fmt.Sprintf("%d", startNs+1000)),
"end_time": json.Number(fmt.Sprintf("%d", endNs-1000)),
"reference_parent_span_id": "span-root",
"parent_span_id": "span-root",
},
{
"trace_id": "trace-2",
Expand All @@ -132,7 +132,7 @@ func TestGetTraces(t *testing.T) {
"span_kind": "SERVER",
"start_time": json.Number(fmt.Sprintf("%d", startNs+5000)),
"end_time": json.Number(fmt.Sprintf("%d", endNs+5000)),
"reference_parent_span_id": "",
"parent_span_id": "",
},
},
}
Expand Down Expand Up @@ -289,7 +289,7 @@ func TestGetSpans(t *testing.T) {
"start_time": json.Number(fmt.Sprintf("%d", startNs)),
"end_time": json.Number(fmt.Sprintf("%d", endNs)),
"duration": json.Number(fmt.Sprintf("%d", endNs-startNs)),
"reference_parent_span_id": "",
"parent_span_id": "",
},
{
"span_id": "span-2",
Expand All @@ -298,7 +298,7 @@ func TestGetSpans(t *testing.T) {
"start_time": json.Number(fmt.Sprintf("%d", startNs+100)),
"end_time": json.Number(fmt.Sprintf("%d", endNs-100)),
"duration": json.Number(fmt.Sprintf("%d", endNs-startNs-200)),
"reference_parent_span_id": "span-1",
"parent_span_id": "span-1",
},
},
}
Expand Down Expand Up @@ -382,7 +382,7 @@ func TestGetSpanDetail(t *testing.T) {
"start_time": json.Number(fmt.Sprintf("%d", startNs)),
"end_time": json.Number(fmt.Sprintf("%d", endNs)),
"duration": json.Number(fmt.Sprintf("%d", endNs-startNs)),
"reference_parent_span_id": "span-root",
"parent_span_id": "span-root",
"http.method": "GET",
"http.status_code": "200",
"service.name": "my-service",
Expand Down Expand Up @@ -481,7 +481,7 @@ func TestParseSpanEntry(t *testing.T) {
"start_time": json.Number(fmt.Sprintf("%d", startNs)),
"end_time": json.Number(fmt.Sprintf("%d", endNs)),
"duration": json.Number(fmt.Sprintf("%d", endNs-startNs)),
"reference_parent_span_id": "span-root",
"parent_span_id": "span-root",
}

entry := parseSpanEntry(hit)
Expand Down Expand Up @@ -536,7 +536,7 @@ func TestParseSpanDetail(t *testing.T) {
"start_time": json.Number(fmt.Sprintf("%d", startNs)),
"end_time": json.Number(fmt.Sprintf("%d", endNs)),
"duration": json.Number(fmt.Sprintf("%d", endNs-startNs)),
"reference_parent_span_id": "span-root",
"parent_span_id": "span-root",
"trace_id": "trace-1",
"_timestamp": json.Number("1234567890"),
"http.method": "GET",
Expand Down Expand Up @@ -769,7 +769,7 @@ func TestGetTraces_HasErrors(t *testing.T) {
"span_kind": "SERVER",
"start_time": json.Number(fmt.Sprintf("%d", startNs)),
"end_time": json.Number(fmt.Sprintf("%d", endNs)),
"reference_parent_span_id": "",
"parent_span_id": "",
"span_status": "error",
},
},
Expand Down Expand Up @@ -952,7 +952,7 @@ func TestParseSpanDetail_NoExtraAttributes(t *testing.T) {
"start_time": json.Number("1000"),
"end_time": json.Number("2000"),
"duration": json.Number("1000"),
"reference_parent_span_id": "",
"parent_span_id": "",
"trace_id": "trace-1",
"_timestamp": json.Number("1234"),
}
Expand Down
4 changes: 2 additions & 2 deletions observability-tracing-openobserve/internal/openobserve/queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func generateTracesListQuery(params TracesQueryParams, stream string, logger *sl

sql := fmt.Sprintf(
"SELECT trace_id, span_id, operation_name, span_kind, "+
"start_time, end_time, reference_parent_span_id, span_status "+
"start_time, end_time, parent_span_id, span_status "+
"FROM %s",
safeStream,
)
Expand Down Expand Up @@ -106,7 +106,7 @@ func generateSpansListQuery(params TracesQueryParams, stream string, logger *slo

sql := fmt.Sprintf(
"SELECT span_id, operation_name, span_kind, start_time, end_time, "+
"end_time - start_time as duration, reference_parent_span_id, span_status "+
"end_time - start_time as duration, parent_span_id, span_status "+
"FROM %s WHERE %s",
safeStream, strings.Join(conditions, " AND "),
)
Expand Down
Loading