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.

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

Deprecate OpenCensus-based internal data structures #1843

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions consumer/consumerdata/consumerdata.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@ import (
)

// MetricsData is a struct that groups proto metrics with a unique node and a resource.
// Deprecated: use pdata.Metrics instead.
type MetricsData struct {
Node *commonpb.Node
Resource *resourcepb.Resource
Metrics []*metricspb.Metric
}

// TraceData is a struct that groups proto spans with a unique node and a resource.
// Deprecated: use pdata.Traces instead.
type TraceData struct {
Node *commonpb.Node
Resource *resourcepb.Resource
Expand Down
2 changes: 2 additions & 0 deletions translator/internaldata/metrics_to_oc.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ type labelKeys struct {
keyIndices map[string]int
}

// MetricsToOC may be used only by OpenCensus receiver and exporter implementations.
// TODO: move this function to OpenCensus package.
func MetricsToOC(md pdata.Metrics) []consumerdata.MetricsData {
resourceMetrics := md.ResourceMetrics()

Expand Down
3 changes: 3 additions & 0 deletions translator/internaldata/oc_to_metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
)

// OCSliceToMetricData converts a slice of OC data format to data.MetricData.
// Deprecated: use pdata.Metrics instead.
func OCSliceToMetrics(ocmds []consumerdata.MetricsData) pdata.Metrics {
metricData := pdata.NewMetrics()
if len(ocmds) == 0 {
Expand All @@ -35,6 +36,8 @@ func OCSliceToMetrics(ocmds []consumerdata.MetricsData) pdata.Metrics {
}

// OCToMetricData converts OC data format to data.MetricData.
// Deprecated: use pdata.Metrics instead. OCToMetrics may be used only by OpenCensus
// receiver and exporter implementations.
func OCToMetrics(md consumerdata.MetricsData) pdata.Metrics {
metricData := pdata.NewMetrics()
appendOcToMetrics(md, metricData)
Expand Down
2 changes: 2 additions & 0 deletions translator/internaldata/oc_to_traces.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import (
)

// OCToTraceData converts OC data format to Traces.
// Deprecated: use pdata.Traces instead. OCToTraceData may be used only by OpenCensus
// receiver and exporter implementations.
func OCToTraceData(td consumerdata.TraceData) pdata.Traces {
traceData := pdata.NewTraces()
if td.Node == nil && td.Resource == nil && len(td.Spans) == 0 {
Expand Down
6 changes: 4 additions & 2 deletions translator/internaldata/traces_to_oc.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ var (
defaultProcessID = 0
)

// TraceDataToOC may be used only by OpenCensus receiver and exporter implementations.
// TODO: move this function to OpenCensus package.
func TraceDataToOC(td pdata.Traces) []consumerdata.TraceData {
resourceSpans := td.ResourceSpans()

Expand All @@ -47,13 +49,13 @@ func TraceDataToOC(td pdata.Traces) []consumerdata.TraceData {
if rs.IsNil() {
continue
}
ocResourceSpansList = append(ocResourceSpansList, ResourceSpansToOC(rs))
ocResourceSpansList = append(ocResourceSpansList, resourceSpansToOC(rs))
}

return ocResourceSpansList
}

func ResourceSpansToOC(rs pdata.ResourceSpans) consumerdata.TraceData {
func resourceSpansToOC(rs pdata.ResourceSpans) consumerdata.TraceData {
ocTraceData := consumerdata.TraceData{
SourceFormat: sourceFormat,
}
Expand Down