chore: fix PR 3448

.changeset/changelog1.md

@@ -0,0 +1,6 @@
+---
+"@graphql-yoga/plugin-apollo-usage-report": patch
+---
+
+### Fixed
+- do not set default values for `clientName` and `clientVersion`

.changeset/changelog2.md

@@ -0,0 +1,6 @@
+---
+'graphql-yoga': patch
+---
+
+### Fixed
+- propagation of Yoga `version`

package.json

@@ -30,7 +30,7 @@
     "apollo"
   ],
   "scripts": {
-    "build": "pnpm --filter=@graphql-yoga/graphiql run build && pnpm --filter=@graphql-yoga/render-graphiql run build && pnpm --filter=graphql-yoga run generate-graphiql-html&& pnpm --filter=graphql-yoga run inject-version && bob build",
+    "build": "pnpm --filter=@graphql-yoga/graphiql run build && pnpm --filter=@graphql-yoga/render-graphiql run build && pnpm --filter=graphql-yoga run generate-graphiql-html && bob build && pnpm --filter=graphql-yoga run inject-version",
     "build-website": "pnpm build && cd website && pnpm build",
     "changeset": "changeset",
     "check": "pnpm -r run check",

packages/plugins/apollo-usage-report/src/index.ts

@@ -48,11 +48,11 @@ type ApolloUsageReportOptions = ApolloInlineTracePluginOptions & {
   /**
    * Client name to report to the usage reporting API
    */
-  clientName?: StringFromRequestFn | string;
+  clientName?: StringFromRequestFn;
   /**
    * Client version to report to the usage reporting API
    */
-  clientVersion?: StringFromRequestFn | string;
+  clientVersion?: StringFromRequestFn;
 };
 
 export interface ApolloUsageReportRequestContext extends ApolloInlineRequestTraceContext {
@@ -88,23 +88,14 @@ export function useApolloUsageReport(options: ApolloUsageReportOptions = {}): Pl
     ]),
   ) as YogaLogger;
 
-  let clientNameFactory: StringFromRequestFn = req =>
-    req.headers.get('apollographql-client-name') || 'graphql-yoga';
-
-  if (typeof options.clientName === 'string') {
-    const clientName = options.clientName;
-    clientNameFactory = () => clientName;
-  } else if (typeof options.clientName === 'function') {
+  let clientNameFactory: StringFromRequestFn = req => req.headers.get('apollographql-client-name');
+  if (typeof options.clientName === 'function') {
     clientNameFactory = options.clientName;
   }
 
   let clientVersionFactory: StringFromRequestFn = req =>
-    req.headers.get('apollographql-client-version') || yoga.version;
-
-  if (typeof options.clientVersion === 'string') {
-    const clientVersion = options.clientVersion;
-    clientVersionFactory = () => clientVersion;
-  } else if (typeof options.clientVersion === 'function') {
+    req.headers.get('apollographql-client-version');
+  if (typeof options.clientVersion === 'function') {
     clientVersionFactory = options.clientVersion;
   }