Autocomplete: Improve sampling code and prepare for Honeycomb export

lib/shared/src/experimentation/FeatureFlagProvider.ts

@@ -68,6 +68,10 @@ export class FeatureFlagProvider {
         return this.featureFlags[endpoint]?.[flagName]
     }
 
+    public getExposedExperiments(endpoint: string = this.apiClient.endpoint): Record<string, boolean> {
+        return this.featureFlags[endpoint] || {}
+    }
+
     public async evaluateFeatureFlag(flagName: FeatureFlag): Promise<boolean> {
         const endpoint = this.apiClient.endpoint
         if (process.env.BENCHMARK_DISABLE_FEATURE_FLAGS) {

lib/shared/src/sourcegraph-api/graphql/client.ts

@@ -776,11 +776,6 @@ export class SourcegraphGraphQLAPIClient {
                 headers,
             })
                 .then(verifyResponseCode)
-                //.then(response => response.text())
-                //.then(text => {
-                //    console.log('fetched:', text)
-                //    return JSON.parse(text) as T
-                //})
                 .then(response => response.json() as T)
                 .catch(error => {
                     return new Error(`accessing Sourcegraph GraphQL API: ${error} (${url})`)

lib/shared/src/tracing/index.ts

@@ -1,4 +1,10 @@
-import opentelemetry, { SpanStatusCode, context, propagation, type Exception } from '@opentelemetry/api'
+import opentelemetry, {
+    SpanStatusCode,
+    context,
+    propagation,
+    type Exception,
+    Span,
+} from '@opentelemetry/api'
 
 const INSTRUMENTATION_SCOPE_NAME = 'cody'
 const INSTRUMENTATION_SCOPE_VERSION = '0.1'
@@ -17,31 +23,32 @@ export function getActiveTraceAndSpanId(): { traceId: string; spanId: string } |
     return undefined
 }
 
-export function wrapInActiveSpan<R>(name: string, fn: () => R): R {
+export function wrapInActiveSpan<R>(name: string, fn: (span: Span) => R): R {
     return tracer.startActiveSpan(name, (span): R => {
         const handleSuccess = (response: R): R => {
             span.setStatus({ code: SpanStatusCode.OK })
+            span.end()
             return response
         }
 
-        const catchError = (error: unknown): never => {
+        const handleError = (error: unknown): never => {
             span.recordException(error as Exception)
             span.setStatus({ code: SpanStatusCode.ERROR })
+            span.end()
             throw error
         }
 
         try {
-            const response = fn()
+            const response = fn(span)
 
-            if (response instanceof Promise) {
-                return response.then(handleSuccess, catchError) as R
+            if (typeof response === 'object' && response !== null && 'then' in response) {
+                // @ts-ignore Response seems to be a Thenable
+                return response.then(handleSuccess, handleError) as R
             }
 
             return handleSuccess(response)
         } catch (error) {
-            return catchError(error)
-        } finally {
-            span.end()
+            return handleError(error)
         }
     })
 }