Merge branch '501-fix-opentracing-init' into 'main'

Fix opentracing setup for gitlab-sshd

Closes #501

See merge request gitlab-org/gitlab-shell!473

1 files changed, 8 insertions, 4 deletions

diff --git a/internal/command/command_test.go b/internal/command/command_test.go
index a70ea84..3617d39 100644
--- a/internal/command/command_test.go
+++ b/internal/command/command_test.go
@@ -168,7 +168,7 @@ func TestFailingNew(t *testing.T) {
 	}
 }
 
-func TestContextWithCorrelationID(t *testing.T) {
+func TestSetup(t *testing.T) {
 	testCases := []struct {
 		name                  string
 		additionalEnv         map[string]string
@@ -190,16 +190,20 @@ func TestContextWithCorrelationID(t *testing.T) {
 			resetEnvironment := addAdditionalEnv(tc.additionalEnv)
 			defer resetEnvironment()
 
-			ctx, finished := ContextWithCorrelationID()
+			ctx, finished := Setup("foo", &config.Config{})
+			defer finished()
+
 			require.NotNil(t, ctx, "ctx is nil")
 			require.NotNil(t, finished, "finished is nil")
+
 			correlationID := correlation.ExtractFromContext(ctx)
 			require.NotEmpty(t, correlationID)
-
 			if tc.expectedCorrelationID != "" {
 				require.Equal(t, tc.expectedCorrelationID, correlationID)
 			}
-			defer finished()
+
+			clientName := correlation.ExtractClientNameFromContext(ctx)
+			require.Equal(t, "foo", clientName)
 		})
 	}
 }