[v2] Remove temporary SkipBinaryAttrs flag from e2e tests

cmd/jaeger/internal/integration/badger_test.go

@@ -15,7 +15,6 @@ func TestBadgerStorage(t *testing.T) {
  s := &E2EStorageIntegration{
  ConfigFile: "../../config-badger.yaml",
  StorageIntegration: integration.StorageIntegration{
- SkipBinaryAttrs: true,
  SkipArchiveTest: true,
  CleanUp: purge,
 

cmd/jaeger/internal/integration/cassandra_test.go

@@ -17,7 +17,6 @@ func TestCassandraStorage(t *testing.T) {
  CleanUp: purge,
  GetDependenciesReturnsSource: true,
  SkipArchiveTest: true,
- SkipBinaryAttrs: true,
 
  SkipList: integration.CassandraSkippedTests,
  },

cmd/jaeger/internal/integration/es_test.go

@@ -17,7 +17,6 @@ func TestESStorage(t *testing.T) {
  StorageIntegration: integration.StorageIntegration{
  CleanUp: purge,
  Fixtures: integration.LoadAndParseQueryTestCases(t, "fixtures/queries_es.json"),
- SkipBinaryAttrs: true,
  GetOperationsMissingSpanKind: true,
  },
  }

cmd/jaeger/internal/integration/grpc_test.go

@@ -30,9 +30,6 @@ func TestGRPCStorage(t *testing.T) {
  s := &GRPCStorageIntegration{
  E2EStorageIntegration: E2EStorageIntegration{
  ConfigFile: "../../config-remote-storage.yaml",
- StorageIntegration: integration.StorageIntegration{
- SkipBinaryAttrs: true,
- },
  },
  }
  s.CleanUp = s.cleanUp

cmd/jaeger/internal/integration/os_test.go

@@ -16,7 +16,6 @@ func TestOSStorage(t *testing.T) {
  StorageIntegration: integration.StorageIntegration{
  CleanUp: purge,
  Fixtures: integration.LoadAndParseQueryTestCases(t, "fixtures/queries_es.json"),
- SkipBinaryAttrs: true,
  GetOperationsMissingSpanKind: true,
  },
  }

plugin/storage/integration/integration.go

@@ -71,10 +71,6 @@ type StorageIntegration struct {
  // Skip Archive Test if not supported by the storage backend
  SkipArchiveTest bool
 
- // TODO: remove this after upstream issue in OTEL jaeger translator is fixed
- // Skip testing trace binary tags, logs, and process
- SkipBinaryAttrs bool
-
  // List of tests which has to be skipped, it can be regex too.
  SkipList []string
 
@@ -369,39 +365,7 @@ func (s *StorageIntegration) loadParseAndWriteLargeTrace(t *testing.T) *model.Tr
 
 func (s *StorageIntegration) getTraceFixture(t *testing.T, fixture string) *model.Trace {
  fileName := fmt.Sprintf("fixtures/traces/%s.json", fixture)
- trace := getTraceFixtureExact(t, fileName)
-
- if s.SkipBinaryAttrs {
- t.Logf("Dropped binary type attributes from trace ID: %s", trace.Spans[0].TraceID.String())
- trace = s.dropBinaryAttrs(t, trace)
- }
-
- return trace
-}
-
-func (s *StorageIntegration) dropBinaryAttrs(t *testing.T, trace *model.Trace) *model.Trace {
- for _, span := range trace.Spans {
- span.Tags = s.dropBinaryTags(t, span.Tags)
- span.Process.Tags = s.dropBinaryTags(t, span.Process.Tags)
-
- for i := range span.Logs {
- span.Logs[i].Fields = s.dropBinaryTags(t, span.Logs[i].Fields)
- }
- }
-
- return trace
-}
-
-func (s *StorageIntegration) dropBinaryTags(_ *testing.T, tags []model.KeyValue) []model.KeyValue {
- newTags := make([]model.KeyValue, 0)
- for _, tag := range tags {
- if tag.VType == model.ValueType_BINARY {
- continue
- }
- newTags = append(newTags, tag)
- }
-
- return newTags
+ return getTraceFixtureExact(t, fileName)
 }
 
 func getTraceFixtureExact(t *testing.T, fileName string) *model.Trace {