apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Zipkin: Fix key order in flaky test (#99285)

Browse Source 
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
pull/99287/head
Ryan McKinley 6 months ago committed by GitHub
parent 52c95f77cd
commit 2756bc9a87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      pkg/tsdb/zipkin/handler_querydata_test.go
  2. 12
      pkg/tsdb/zipkin/testdata/simple_trace.golden.jsonc

4
pkg/tsdb/zipkin/handler_querydata_test.go
Unescape View File

@ -5,8 +5,9 @@ import (
"testing"
"time"
"github.com/grafana/grafana-plugin-sdk-go/experimental"
"github.com/openzipkin/zipkin-go/model"
"github.com/grafana/grafana-plugin-sdk-go/experimental"
)
func TestTransformResponse(t *testing.T) {
@ -34,7 +35,6 @@ func TestTransformResponse(t *testing.T) {
},
Tags: map[string]string{
"tag1": "val1",
"tag2": "val2",
},
}
span2 := model.SpanModel{

12
pkg/tsdb/zipkin/testdata/simple_trace.golden.jsonc vendored
Unescape View File

@ -12,15 +12,15 @@
// }
// Name: test
// Dimensions: 10 Fields by 3 Rows
// +----------------------------------+------------------+--------------------+---------------------+-------------------+-----------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------+
// +----------------------------------+------------------+--------------------+---------------------+-------------------+-----------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------+
// | Name: traceID | Name: spanID | Name: parentSpanID | Name: operationName | Name: serviceName | Name: serviceTags | Name: startTime | Name: duration | Name: logs | Name: tags |
// | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: |
// | Type: []string | Type: []string | Type: []*string | Type: []string | Type: []string | Type: []json.RawMessage | Type: []float64 | Type: []float64 | Type: []json.RawMessage | Type: []json.RawMessage |
// +----------------------------------+------------------+--------------------+---------------------+-------------------+-----------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------+
// | 000000000000007b00000000000001c8 | 0000000000000001 | null | span 1 | service 1 | [{"key":"ipv4","value":"1.0.0.1"},{"key":"port","value":42},{"key":"endpointType","value":"local"}] | 0.001 | 0.01 | [{"Timestamp":2,"Fields":[{"key":"annotation","value":"annotation text"}]},{"Timestamp":6,"Fields":[{"key":"annotation","value":"annotation text 3"}]}] | [{"key":"kind","value":"CLIENT"},{"key":"tag1","value":"val1"},{"key":"tag2","value":"val2"}] |
// +----------------------------------+------------------+--------------------+---------------------+-------------------+-----------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------+
// | 000000000000007b00000000000001c8 | 0000000000000001 | null | span 1 | service 1 | [{"key":"ipv4","value":"1.0.0.1"},{"key":"port","value":42},{"key":"endpointType","value":"local"}] | 0.001 | 0.01 | [{"Timestamp":2,"Fields":[{"key":"annotation","value":"annotation text"}]},{"Timestamp":6,"Fields":[{"key":"annotation","value":"annotation text 3"}]}] | [{"key":"kind","value":"CLIENT"},{"key":"tag1","value":"val1"}] |
// | 000000000000007b00000000000001c8 | 0000000000000002 | 0000000000000001 | span 2 | service 2 | [{"key":"ipv4","value":"1.0.0.1"},{"key":"endpointType","value":"local"}] | 0.004 | 0.005 | [] | [{"key":"error","value":true},{"key":"errorValue","value":"404"}] |
// | 000000000000007b00000000000001c8 | 0000000000000003 | 0000000000000001 | span 3 | spanstore-jdbc | [{"key":"ipv6","value":"::1"},{"key":"endpointType","value":"remote"}] | 0.006 | 0.007 | [] | [] |
// +----------------------------------+------------------+--------------------+---------------------+-------------------+-----------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------+
// +----------------------------------+------------------+--------------------+---------------------+-------------------+-----------------------------------------------------------------------------------------------------+-----------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------+
//
//
// 🌟 This was machine generated. Do not edit. 🌟
@ -220,10 +220,6 @@
{
"key": "tag1",
"value": "val1"
},
{
"key": "tag2",
"value": "val2"
}
],
[

Write Preview
Loading…
Cancel
Save