Skip to content

Commit

Permalink
Delete old e2e tests (#438)
Browse files Browse the repository at this point in the history
We'll be replacing our e2e tests so these are no longer necessary.
  • Loading branch information
jessejlt authored Nov 15, 2024
1 parent 93cb433 commit 0d8f66e
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 1,380 deletions.
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ test:
go test ./...
.PHONY: test

e2e:
KUSTO_INTEGRATION_TEST=true go test -timeout 5m -count=1 -v github.com/Azure/adx-mon/tools/test/logs
.PHONY: e2e

default:
@$(MAKE) test
@$(MAKE) build
31 changes: 12 additions & 19 deletions cmd/ingestor/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"github.com/Azure/adx-mon/pkg/logger"
"github.com/Azure/adx-mon/pkg/tls"
"github.com/Azure/adx-mon/schema"
"github.com/Azure/adx-mon/tools/otlp/logs/kustainer"
"github.com/Azure/azure-kusto-go/kusto"
"github.com/Azure/azure-kusto-go/kusto/ingest"
"github.com/prometheus/client_golang/prometheus/promhttp"
Expand Down Expand Up @@ -528,25 +527,19 @@ func newUploaders(endpoints []string, storageDir string, concurrentUploads int,
if err != nil {
return nil, nil, err
}
if strings.HasPrefix(addr, "http://") {

logger.Warnf("Using Kustainer for endpoint %s", endpoint)
uploaders = append(uploaders, kustainer.New(database, addr))
} else {

client, err := newKustoClient(addr)
if err != nil {
return nil, nil, err
}
uploaders = append(uploaders, adx.NewUploader(client, adx.UploaderOpts{
StorageDir: storageDir,
Database: database,
ConcurrentUploads: concurrentUploads,
DefaultMapping: defaultMapping,
SampleType: sampleType,
FnStore: fnStore,
}))

client, err := newKustoClient(addr)
if err != nil {
return nil, nil, err
}
uploaders = append(uploaders, adx.NewUploader(client, adx.UploaderOpts{
StorageDir: storageDir,
Database: database,
ConcurrentUploads: concurrentUploads,
DefaultMapping: defaultMapping,
SampleType: sampleType,
FnStore: fnStore,
}))

uploadDatabaseNames = append(uploadDatabaseNames, database)
}
Expand Down
20 changes: 0 additions & 20 deletions tools/otlp/logs/README.md

This file was deleted.

58 changes: 0 additions & 58 deletions tools/otlp/logs/collector.toml

This file was deleted.

51 changes: 0 additions & 51 deletions tools/otlp/logs/compose.yaml

This file was deleted.

Loading

0 comments on commit 0d8f66e

Please sign in to comment.