IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Dependency: update collector to v.31.0 (#37546)

Browse Source 
* update collector to v.31.0

* Change protobuf unmarshal function after upgrade

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
This commit is contained in:
ying-jeanne
2021-08-04 17:41:07 +02:00
committed by GitHub
parent 800967a413
commit fcd0dac814
5 changed files with 276 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tsdb/tempo/tempo.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins"
ot_pdata "go.opentelemetry.io/collector/consumer/pdata"
otlp "go.opentelemetry.io/collector/model/otlp"
)
type tempoExecutor struct {
@@ -76,7 +76,7 @@ func (e *tempoExecutor) DataQuery(ctx context.Context, dsInfo *models.DataSource
}, nil
}
otTrace, err := ot_pdata.TracesFromOtlpProtoBytes(body)
otTrace, err := otlp.NewProtobufTracesUnmarshaler().UnmarshalTraces(body)
if err != nil {
return plugins.DataResponse{}, fmt.Errorf("failed to convert tempo response to Otlp: %w", err)

2
pkg/tsdb/tempo/trace_transform.go
View File

@@ -6,7 +6,7 @@ import (
"strings"
"github.com/grafana/grafana-plugin-sdk-go/data"
"go.opentelemetry.io/collector/consumer/pdata"
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/translator/conventions"
tracetranslator "go.opentelemetry.io/collector/translator/trace"
)

4
pkg/tsdb/tempo/trace_transform_test.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/stretchr/testify/require"
ot_pdata "go.opentelemetry.io/collector/consumer/pdata"
otlp "go.opentelemetry.io/collector/model/otlp"
)
func TestTraceToFrame(t *testing.T) {
@@ -19,7 +19,7 @@ func TestTraceToFrame(t *testing.T) {
proto, err := ioutil.ReadFile("testData/tempo_proto_response")
require.NoError(t, err)
otTrace, err := ot_pdata.TracesFromOtlpProtoBytes(proto)
otTrace, err := otlp.NewProtobufTracesUnmarshaler().UnmarshalTraces(proto)
require.NoError(t, err)
frame, err := TraceToFrame(otTrace)