Skip to content

Commit

Permalink
Update Lint
Browse files Browse the repository at this point in the history
Signed-off-by: joeyyy09 <[email protected]>
  • Loading branch information
joeyyy09 committed Jul 20, 2024
1 parent 29581a4 commit 580bdc9
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 30 deletions.
4 changes: 2 additions & 2 deletions cmd/jaeger/internal/integration/e2e_integration.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (s *E2EStorageIntegration) e2eInitialize(t *testing.T, storage string) {
configFile := s.ConfigFile
if !s.SkipStorageCleaner {
configFile = createStorageCleanerConfig(t, s.ConfigFile, storage)
}
}
t.Logf("Starting Jaeger-v2 in the background with config file %s", configFile)

outFile, err := os.OpenFile(
Expand Down Expand Up @@ -194,4 +194,4 @@ func purge(t *testing.T) {
require.NoError(t, err)

require.Equal(t, http.StatusOK, resp.StatusCode, "body: %s", string(body))
}
}
53 changes: 26 additions & 27 deletions cmd/jaeger/internal/integration/kafka_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,37 @@ import (
)

func TestKafkaStorage(t *testing.T) {
integration.SkipUnlessEnv(t, "kafka")
integration.SkipUnlessEnv(t, "kafka")

collectorConfig := "../../collector-with-kafka.yaml"
ingesterConfig := "../../ingester-remote-storage.yaml"
collectorConfig := "../../collector-with-kafka.yaml"
ingesterConfig := "../../ingester-remote-storage.yaml"

collector := &E2EStorageIntegration{
SkipStorageCleaner: true,
ConfigFile: collectorConfig,
}
collector := &E2EStorageIntegration{
SkipStorageCleaner: true,
ConfigFile: collectorConfig,
}

// Initialize and start the collector
collector.e2eInitialize(t, "kafka")
// Initialize and start the collector
collector.e2eInitialize(t, "kafka")


ingester := &E2EStorageIntegration{
ConfigFile: ingesterConfig,
StorageIntegration: integration.StorageIntegration{
CleanUp: purge,
GetDependenciesReturnsSource: true,
SkipArchiveTest: true,
},
}
ingester := &E2EStorageIntegration{
ConfigFile: ingesterConfig,
StorageIntegration: integration.StorageIntegration{
CleanUp: purge,
GetDependenciesReturnsSource: true,
SkipArchiveTest: true,
},
}

// Initialize and start the ingester
ingester.e2eInitialize(t, "kafka")
ingester.e2eInitialize(t, "kafka")

// Set up cleanup for both collector and ingester
t.Cleanup(func() {
collector.e2eCleanUp(t)
ingester.e2eCleanUp(t)
})
// Set up cleanup for both collector and ingester
t.Cleanup(func() {
collector.e2eCleanUp(t)
ingester.e2eCleanUp(t)
})

// Run the span store tests
ingester.RunSpanStoreTests(t)
}
// Run the span store tests
ingester.RunSpanStoreTests(t)
}
2 changes: 1 addition & 1 deletion plugin/storage/integration/integration.go
Original file line number Diff line number Diff line change
Expand Up @@ -541,4 +541,4 @@ func (s *StorageIntegration) RunSpanStoreTests(t *testing.T) {
t.Run("GetTrace", s.testGetTrace)
t.Run("GetLargeSpans", s.testGetLargeSpan)
t.Run("FindTraces", s.testFindTraces)
}
}

0 comments on commit 580bdc9

Please sign in to comment.