Skip to content

Commit

Permalink
(bug): Flake in TestTelemetrySetup (#2911)
Browse files Browse the repository at this point in the history
* (bug) Flake in TestTelemetrySetup caused by the otel-jeager bundle pulling the latest container images, updated bundle and bundle version

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

---------

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>
  • Loading branch information
schristoff committed Sep 20, 2023
1 parent 513c0a0 commit 458e325
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion cmd/porter/main.go
Expand Up @@ -189,7 +189,6 @@ Try our QuickStart https://getporter.org/quickstart to learn how to use Porter.
// Reload configuration with the now parsed cli flags
p.DataLoader = cli.LoadHierarchicalConfig(cmd)
ctx, err := p.Connect(cmd.Context())

// Extract the parent span from the main command
parentSpan := trace.SpanFromContext(cmd.Context())

Expand Down
3 changes: 2 additions & 1 deletion tests/integration/telemetry_test.go
Expand Up @@ -25,7 +25,7 @@ func TestTelemetrySetup(t *testing.T) {
require.NoError(t, err, "test setup failed")

ctx := context.Background()
_, _, err = test.RunPorter("install", "otel-jaeger", "-r=ghcr.io/getporter/examples/otel-jaeger:v0.1.0", "--allow-docker-host-access")
_, _, err = test.RunPorter("install", "otel-jaeger", "-r=ghcr.io/getporter/examples/otel-jaeger:v0.1.1", "--allow-docker-host-access")
require.NoError(t, err)
defer test.RunPorter("uninstall", "otel-jaeger", "--allow-docker-host-access")

Expand All @@ -34,6 +34,7 @@ func TestTelemetrySetup(t *testing.T) {

// Try to run porter with telemetry enabled
p := porter.New()

defer p.Close()
os.Setenv("PORTER_EXPERIMENTAL", "structured-logs")
os.Setenv("PORTER_TELEMETRY_ENABLED", "true")
Expand Down

0 comments on commit 458e325

Please sign in to comment.