Skip to content

Remove unnecessary public API in testbed #3390

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

Merged
tigrannajaryan merged 1 commit into from
Jun 8, 2021
Merged

Remove unnecessary public API in testbed #3390

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
18 changes: 3 additions & 15 deletions testbed/testbed/data_providers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
package testbed

import (
"encoding/binary"
"log"
"os"
"path/filepath"
Expand All @@ -33,6 +32,7 @@ import (
otlpmetricscol "go.opentelemetry.io/collector/internal/data/protogen/collector/metrics/v1"
otlptracecol "go.opentelemetry.io/collector/internal/data/protogen/collector/trace/v1"
"go.opentelemetry.io/collector/internal/goldendataset"
"go.opentelemetry.io/collector/internal/idutils"
)

// DataProvider defines the interface for generators of test data used to drive various end-to-end tests.
Expand Down Expand Up @@ -86,8 +86,8 @@ func (dp *PerfTestDataProvider) GenerateTraces() (pdata.Traces, bool) {
span := spans.At(i)

// Create a span.
span.SetTraceID(GenerateSequentialTraceID(traceID))
span.SetSpanID(GenerateSequentialSpanID(spanID))
span.SetTraceID(idutils.UInt64ToTraceID(0, traceID))
span.SetSpanID(idutils.UInt64ToSpanID(spanID))
span.SetName("load-generator-span")
span.SetKind(pdata.SpanKindClient)
attrs := span.Attributes()
Expand All @@ -103,18 +103,6 @@ func (dp *PerfTestDataProvider) GenerateTraces() (pdata.Traces, bool) {
return traceData, false
}

func GenerateSequentialTraceID(id uint64) pdata.TraceID {
var traceID [16]byte
binary.PutUvarint(traceID[:], id)
return pdata.NewTraceID(traceID)
}

func GenerateSequentialSpanID(id uint64) pdata.SpanID {
var spanID [8]byte
binary.PutUvarint(spanID[:], id)
return pdata.NewSpanID(spanID)
}

func (dp *PerfTestDataProvider) GenerateMetrics() (pdata.Metrics, bool) {

// Generate 7 data points per metric.
Expand Down
5 changes: 3 additions & 2 deletions testbed/tests/trace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (

"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/consumer/pdata"
"go.opentelemetry.io/collector/internal/idutils"
"go.opentelemetry.io/collector/testbed/testbed"
"go.opentelemetry.io/collector/translator/conventions"
)
Expand Down Expand Up @@ -337,8 +338,8 @@ func verifySingleSpan(
conventions.AttributeServiceName: pdata.NewAttributeValueString(serviceName),
})
span := rs.InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty()
span.SetTraceID(testbed.GenerateSequentialTraceID(1))
span.SetSpanID(testbed.GenerateSequentialSpanID(1))
span.SetTraceID(idutils.UInt64ToTraceID(0, 1))
span.SetSpanID(idutils.UInt64ToSpanID(1))
span.SetName(spanName)

sender := tc.Sender.(testbed.TraceDataSender)
Expand Down