diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 727539d..ea7b0df 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -69,13 +69,12 @@ jobs:
       - name: Install envoy
         if: ${{ matrix.platform == 'chrome' }}
         run: |
-          sudo apt update
-          sudo apt install apt-transport-https ca-certificates curl gnupg-agent software-properties-common
-          curl -sL 'https://getenvoy.io/gpg' | sudo apt-key add -
-          apt-key fingerprint 6FF974DB | grep "5270 CEAC 57F6 3EBD 9EA9  005D 0253 D0B2 6FF9 74DB"
-          sudo add-apt-repository "deb [arch=amd64] https://dl.bintray.com/tetrate/getenvoy-deb $(lsb_release -cs) stable"
-          sudo apt update
-          sudo apt install -y getenvoy-envoy
+          ENVOY_VERSION="1.19.0"
+          wget https://archive.tetratelabs.io/envoy/download/v${ENVOY_VERSION}/envoy-v${ENVOY_VERSION}-linux-amd64.tar.xz
+          tar -xf envoy-v${ENVOY_VERSION}-linux-amd64.tar.xz
+          chmod +x envoy-v${ENVOY_VERSION}-linux-amd64/bin/envoy
+          sudo mv envoy-v${ENVOY_VERSION}-linux-amd64/bin/envoy /usr/bin/envoy
+          rm -rf envoy-v${ENVOY_VERSION}-linux-amd64.tar.xz envoy-v${ENVOY_VERSION}-linux-amd64
         env:
           MATRIX_OS: ${{ matrix.os }}
         shell: bash
diff --git a/example/googleapis/lib/src/generated/google/api/label.pb.dart b/example/googleapis/lib/src/generated/google/api/label.pb.dart
index 1a79408..ef6a9fa 100644
--- a/example/googleapis/lib/src/generated/google/api/label.pb.dart
+++ b/example/googleapis/lib/src/generated/google/api/label.pb.dart
@@ -38,7 +38,10 @@ class LabelDescriptor extends $pb.GeneratedMessage {
         valueOf: LabelDescriptor_ValueType.valueOf,
         enumValues: LabelDescriptor_ValueType.values)
     ..aOS(
-        3, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'description')
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'description')
     ..hasRequiredFields = false;
 
   LabelDescriptor._() : super();
diff --git a/example/googleapis/lib/src/generated/google/api/monitored_resource.pb.dart b/example/googleapis/lib/src/generated/google/api/monitored_resource.pb.dart
index 3e707e0..1c90033 100644
--- a/example/googleapis/lib/src/generated/google/api/monitored_resource.pb.dart
+++ b/example/googleapis/lib/src/generated/google/api/monitored_resource.pb.dart
@@ -40,10 +40,26 @@ class MonitoredResourceDescriptor extends $pb.GeneratedMessage {
             ? ''
             : 'description')
     ..pc<$0.LabelDescriptor>(
-        4, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'labels', $pb.PbFieldType.PM,
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'labels',
+        $pb.PbFieldType.PM,
         subBuilder: $0.LabelDescriptor.create)
-    ..aOS(5, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'name')
-    ..e<$2.LaunchStage>(7, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'launchStage', $pb.PbFieldType.OE, defaultOrMaker: $2.LaunchStage.LAUNCH_STAGE_UNSPECIFIED, valueOf: $2.LaunchStage.valueOf, enumValues: $2.LaunchStage.values)
+    ..aOS(
+        5,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'name')
+    ..e<$2.LaunchStage>(
+        7,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'launchStage',
+        $pb.PbFieldType.OE,
+        defaultOrMaker: $2.LaunchStage.LAUNCH_STAGE_UNSPECIFIED,
+        valueOf: $2.LaunchStage.valueOf,
+        enumValues: $2.LaunchStage.values)
     ..hasRequiredFields = false;
 
   MonitoredResourceDescriptor._() : super();
@@ -270,7 +286,10 @@ class MonitoredResourceMetadata extends $pb.GeneratedMessage {
             : 'systemLabels',
         subBuilder: $1.Struct.create)
     ..m<$core.String, $core.String>(
-        2, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'userLabels',
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'userLabels',
         entryClassName: 'MonitoredResourceMetadata.UserLabelsEntry',
         keyFieldType: $pb.PbFieldType.OS,
         valueFieldType: $pb.PbFieldType.OS,
diff --git a/example/googleapis/lib/src/generated/google/logging/type/http_request.pb.dart b/example/googleapis/lib/src/generated/google/logging/type/http_request.pb.dart
index 741ce53..bb1017c 100644
--- a/example/googleapis/lib/src/generated/google/logging/type/http_request.pb.dart
+++ b/example/googleapis/lib/src/generated/google/logging/type/http_request.pb.dart
@@ -39,19 +39,66 @@ class HttpRequest extends $pb.GeneratedMessage {
             : 'requestSize')
     ..a<$core.int>(
         4,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'status',
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'status',
         $pb.PbFieldType.O3)
-    ..aInt64(5, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'responseSize')
-    ..aOS(6, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'userAgent')
-    ..aOS(7, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'remoteIp')
-    ..aOS(8, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'referer')
-    ..aOB(9, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'cacheHit')
-    ..aOB(10, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'cacheValidatedWithOriginServer')
-    ..aOB(11, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'cacheLookup')
-    ..aInt64(12, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'cacheFillBytes')
-    ..aOS(13, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'serverIp')
-    ..aOM<$0.Duration>(14, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'latency', subBuilder: $0.Duration.create)
-    ..aOS(15, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'protocol')
+    ..aInt64(
+        5,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'responseSize')
+    ..aOS(
+        6,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'userAgent')
+    ..aOS(
+        7,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'remoteIp')
+    ..aOS(
+        8,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'referer')
+    ..aOB(
+        9,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'cacheHit')
+    ..aOB(
+        10,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'cacheValidatedWithOriginServer')
+    ..aOB(
+        11,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'cacheLookup')
+    ..aInt64(
+        12,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'cacheFillBytes')
+    ..aOS(
+        13,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'serverIp')
+    ..aOM<$0.Duration>(
+        14,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'latency',
+        subBuilder: $0.Duration.create)
+    ..aOS(
+        15,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'protocol')
     ..hasRequiredFields = false;
 
   HttpRequest._() : super();
diff --git a/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pb.dart b/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pb.dart
index 6bb82bb..136fcdf 100644
--- a/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pb.dart
+++ b/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pb.dart
@@ -43,22 +43,96 @@ class LogEntry extends $pb.GeneratedMessage {
             ? ''
             : 'protoPayload',
         subBuilder: $0.Any.create)
-    ..aOS(3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'textPayload')
-    ..aOS(4, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'insertId')
-    ..aOM<$1.Struct>(6, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'jsonPayload', subBuilder: $1.Struct.create)
-    ..aOM<$2.HttpRequest>(7, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'httpRequest', subBuilder: $2.HttpRequest.create)
-    ..aOM<$3.MonitoredResource>(8, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'resource', subBuilder: $3.MonitoredResource.create)
-    ..aOM<$4.Timestamp>(9, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'timestamp', subBuilder: $4.Timestamp.create)
-    ..e<$5.LogSeverity>(10, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'severity', $pb.PbFieldType.OE, defaultOrMaker: $5.LogSeverity.DEFAULT, valueOf: $5.LogSeverity.valueOf, enumValues: $5.LogSeverity.values)
-    ..m<$core.String, $core.String>(11, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'labels', entryClassName: 'LogEntry.LabelsEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('google.logging.v2'))
-    ..aOS(12, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'logName')
-    ..aOM<LogEntryOperation>(15, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'operation', subBuilder: LogEntryOperation.create)
-    ..aOS(22, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'trace')
-    ..aOM<LogEntrySourceLocation>(23, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'sourceLocation', subBuilder: LogEntrySourceLocation.create)
-    ..aOM<$4.Timestamp>(24, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'receiveTimestamp', subBuilder: $4.Timestamp.create)
-    ..aOS(27, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'spanId')
-    ..aOB(30, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'traceSampled')
+    ..aOS(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'textPayload')
+    ..aOS(
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'insertId')
+    ..aOM<$1.Struct>(
+        6,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'jsonPayload',
+        subBuilder: $1.Struct.create)
+    ..aOM<$2.HttpRequest>(
+        7,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'httpRequest',
+        subBuilder: $2.HttpRequest.create)
+    ..aOM<$3.MonitoredResource>(
+        8,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'resource',
+        subBuilder: $3.MonitoredResource.create)
+    ..aOM<$4.Timestamp>(
+        9,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'timestamp',
+        subBuilder: $4.Timestamp.create)
+    ..e<$5.LogSeverity>(
+        10,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'severity',
+        $pb.PbFieldType.OE,
+        defaultOrMaker: $5.LogSeverity.DEFAULT,
+        valueOf: $5.LogSeverity.valueOf,
+        enumValues: $5.LogSeverity.values)
+    ..m<$core.String, $core.String>(
+        11,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'labels',
+        entryClassName: 'LogEntry.LabelsEntry',
+        keyFieldType: $pb.PbFieldType.OS,
+        valueFieldType: $pb.PbFieldType.OS,
+        packageName: const $pb.PackageName('google.logging.v2'))
+    ..aOS(
+        12,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'logName')
+    ..aOM<LogEntryOperation>(
+        15,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'operation',
+        subBuilder: LogEntryOperation.create)
+    ..aOS(
+        22,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'trace')
+    ..aOM<LogEntrySourceLocation>(
+        23,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'sourceLocation',
+        subBuilder: LogEntrySourceLocation.create)
+    ..aOM<$4.Timestamp>(
+        24,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'receiveTimestamp',
+        subBuilder: $4.Timestamp.create)
+    ..aOS(
+        27,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'spanId')
+    ..aOB(
+        30,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'traceSampled')
     ..hasRequiredFields = false;
 
   LogEntry._() : super();
@@ -385,8 +459,11 @@ class LogEntryOperation extends $pb.GeneratedMessage {
         const $core.bool.fromEnvironment('protobuf.omit_field_names')
             ? ''
             : 'first')
-    ..aOB(4,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'last')
+    ..aOB(
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'last')
     ..hasRequiredFields = false;
 
   LogEntryOperation._() : super();
diff --git a/example/googleapis/lib/src/generated/google/logging/v2/logging.pb.dart b/example/googleapis/lib/src/generated/google/logging/v2/logging.pb.dart
index b9384cf..939933d 100644
--- a/example/googleapis/lib/src/generated/google/logging/v2/logging.pb.dart
+++ b/example/googleapis/lib/src/generated/google/logging/v2/logging.pb.dart
@@ -86,7 +86,10 @@ class DeleteLogRequest extends $pb.GeneratedMessage {
 }
 
 class WriteLogEntriesRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'WriteLogEntriesRequest',
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'WriteLogEntriesRequest',
       package: const $pb.PackageName(
           const $core.bool.fromEnvironment('protobuf.omit_message_names')
               ? ''
@@ -98,21 +101,37 @@ class WriteLogEntriesRequest extends $pb.GeneratedMessage {
             ? ''
             : 'logName')
     ..aOM<$3.MonitoredResource>(
-        2, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'resource',
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'resource',
         subBuilder: $3.MonitoredResource.create)
     ..m<$core.String, $core.String>(
-        3, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'labels',
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'labels',
         entryClassName: 'WriteLogEntriesRequest.LabelsEntry',
         keyFieldType: $pb.PbFieldType.OS,
         valueFieldType: $pb.PbFieldType.OS,
         packageName: const $pb.PackageName('google.logging.v2'))
     ..pc<$4.LogEntry>(
         4,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'entries',
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'entries',
         $pb.PbFieldType.PM,
         subBuilder: $4.LogEntry.create)
-    ..aOB(5, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'partialSuccess')
-    ..aOB(6, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'dryRun')
+    ..aOB(
+        5,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'partialSuccess')
+    ..aOB(
+        6,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'dryRun')
     ..hasRequiredFields = false;
 
   WriteLogEntriesRequest._() : super();
@@ -368,8 +387,15 @@ class ListLogEntriesRequest extends $pb.GeneratedMessage {
             : 'pageSize',
         $pb.PbFieldType.O3)
     ..aOS(
-        5, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'pageToken')
-    ..pPS(8, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'resourceNames')
+        5,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'pageToken')
+    ..pPS(
+        8,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'resourceNames')
     ..hasRequiredFields = false;
 
   ListLogEntriesRequest._() : super();
@@ -496,8 +522,11 @@ class ListLogEntriesResponse extends $pb.GeneratedMessage {
             : 'entries',
         $pb.PbFieldType.PM,
         subBuilder: $4.LogEntry.create)
-    ..aOS(2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'nextPageToken')
+    ..aOS(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'nextPageToken')
     ..hasRequiredFields = false;
 
   ListLogEntriesResponse._() : super();
@@ -670,8 +699,11 @@ class ListMonitoredResourceDescriptorsResponse extends $pb.GeneratedMessage {
             : 'resourceDescriptors',
         $pb.PbFieldType.PM,
         subBuilder: $3.MonitoredResourceDescriptor.create)
-    ..aOS(2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'nextPageToken')
+    ..aOS(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'nextPageToken')
     ..hasRequiredFields = false;
 
   ListMonitoredResourceDescriptorsResponse._() : super();
@@ -764,7 +796,11 @@ class ListLogsRequest extends $pb.GeneratedMessage {
         const $core.bool.fromEnvironment('protobuf.omit_field_names')
             ? ''
             : 'pageToken')
-    ..pPS(8, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'resourceNames')
+    ..pPS(
+        8,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'resourceNames')
     ..hasRequiredFields = false;
 
   ListLogsRequest._() : super();
@@ -1051,14 +1087,20 @@ class TailLogEntriesResponse_SuppressionInfo extends $pb.GeneratedMessage {
               : 'google.logging.v2'),
       createEmptyInstance: create)
     ..e<TailLogEntriesResponse_SuppressionInfo_Reason>(
-        1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'reason', $pb.PbFieldType.OE,
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'reason',
+        $pb.PbFieldType.OE,
         defaultOrMaker:
             TailLogEntriesResponse_SuppressionInfo_Reason.REASON_UNSPECIFIED,
         valueOf: TailLogEntriesResponse_SuppressionInfo_Reason.valueOf,
         enumValues: TailLogEntriesResponse_SuppressionInfo_Reason.values)
     ..a<$core.int>(
         2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'suppressedCount',
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'suppressedCount',
         $pb.PbFieldType.O3)
     ..hasRequiredFields = false;
 
@@ -1143,7 +1185,12 @@ class TailLogEntriesResponse extends $pb.GeneratedMessage {
               ? ''
               : 'google.logging.v2'),
       createEmptyInstance: create)
-    ..pc<$4.LogEntry>(1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'entries', $pb.PbFieldType.PM,
+    ..pc<$4.LogEntry>(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'entries',
+        $pb.PbFieldType.PM,
         subBuilder: $4.LogEntry.create)
     ..pc<TailLogEntriesResponse_SuppressionInfo>(
         2,
diff --git a/example/googleapis/lib/src/generated/google/protobuf/struct.pb.dart b/example/googleapis/lib/src/generated/google/protobuf/struct.pb.dart
index a4fa3b2..6db1f79 100644
--- a/example/googleapis/lib/src/generated/google/protobuf/struct.pb.dart
+++ b/example/googleapis/lib/src/generated/google/protobuf/struct.pb.dart
@@ -102,9 +102,10 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
       const $core.bool.fromEnvironment('protobuf.omit_message_names')
           ? ''
           : 'Value',
-      package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'google.protobuf'),
+      package: const $pb.PackageName(
+          const $core.bool.fromEnvironment('protobuf.omit_message_names')
+              ? ''
+              : 'google.protobuf'),
       createEmptyInstance: create,
       toProto3Json: $mixin.ValueMixin.toProto3JsonHelper,
       fromProto3Json: $mixin.ValueMixin.fromProto3JsonHelper)
@@ -120,12 +121,32 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
         enumValues: NullValue.values)
     ..a<$core.double>(
         2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'numberValue',
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'numberValue',
         $pb.PbFieldType.OD)
-    ..aOS(3, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'stringValue')
-    ..aOB(4, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'boolValue')
-    ..aOM<Struct>(5, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'structValue', subBuilder: Struct.create)
-    ..aOM<ListValue>(6, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'listValue', subBuilder: ListValue.create)
+    ..aOS(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'stringValue')
+    ..aOB(
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'boolValue')
+    ..aOM<Struct>(
+        5,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'structValue',
+        subBuilder: Struct.create)
+    ..aOM<ListValue>(
+        6,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'listValue',
+        subBuilder: ListValue.create)
     ..hasRequiredFields = false;
 
   Value._() : super();
diff --git a/example/googleapis/lib/src/generated/google/rpc/status.pb.dart b/example/googleapis/lib/src/generated/google/rpc/status.pb.dart
index fbc4be9..21441ba 100644
--- a/example/googleapis/lib/src/generated/google/rpc/status.pb.dart
+++ b/example/googleapis/lib/src/generated/google/rpc/status.pb.dart
@@ -12,32 +12,34 @@ import 'package:protobuf/protobuf.dart' as $pb;
 import '../protobuf/any.pb.dart' as $0;
 
 class Status extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i =
-      $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'Status',
-          package: const $pb.PackageName(
-              const $core.bool.fromEnvironment('protobuf.omit_message_names')
-                  ? ''
-                  : 'google.rpc'),
-          createEmptyInstance: create)
-        ..a<$core.int>(
-            1,
-            const $core.bool.fromEnvironment('protobuf.omit_field_names')
-                ? ''
-                : 'code',
-            $pb.PbFieldType.O3)
-        ..aOS(
-            2,
-            const $core.bool.fromEnvironment('protobuf.omit_field_names')
-                ? ''
-                : 'message')
-        ..pc<$0.Any>(
-            3,
-            const $core.bool.fromEnvironment('protobuf.omit_field_names')
-                ? ''
-                : 'details',
-            $pb.PbFieldType.PM,
-            subBuilder: $0.Any.create)
-        ..hasRequiredFields = false;
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'Status',
+      package: const $pb.PackageName(
+          const $core.bool.fromEnvironment('protobuf.omit_message_names')
+              ? ''
+              : 'google.rpc'),
+      createEmptyInstance: create)
+    ..a<$core.int>(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'code',
+        $pb.PbFieldType.O3)
+    ..aOS(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'message')
+    ..pc<$0.Any>(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'details',
+        $pb.PbFieldType.PM,
+        subBuilder: $0.Any.create)
+    ..hasRequiredFields = false;
 
   Status._() : super();
   factory Status({
diff --git a/example/route_guide/lib/src/generated/route_guide.pb.dart b/example/route_guide/lib/src/generated/route_guide.pb.dart
index d832e70..b18a663 100644
--- a/example/route_guide/lib/src/generated/route_guide.pb.dart
+++ b/example/route_guide/lib/src/generated/route_guide.pb.dart
@@ -107,11 +107,17 @@ class Rectangle extends $pb.GeneratedMessage {
               ? ''
               : 'routeguide'),
       createEmptyInstance: create)
-    ..aOM<Point>(1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'lo',
+    ..aOM<Point>(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'lo',
         subBuilder: Point.create)
-    ..aOM<Point>(2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'hi',
+    ..aOM<Point>(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'hi',
         subBuilder: Point.create)
     ..hasRequiredFields = false;
 
@@ -388,9 +394,16 @@ class RouteSummary extends $pb.GeneratedMessage {
         $pb.PbFieldType.O3)
     ..a<$core.int>(
         3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'distance',
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'distance',
+        $pb.PbFieldType.O3)
+    ..a<$core.int>(
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'elapsedTime',
         $pb.PbFieldType.O3)
-    ..a<$core.int>(4, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'elapsedTime', $pb.PbFieldType.O3)
     ..hasRequiredFields = false;
 
   RouteSummary._() : super();
diff --git a/interop/lib/src/generated/messages.pb.dart b/interop/lib/src/generated/messages.pb.dart
index 38f020a..b659a1c 100644
--- a/interop/lib/src/generated/messages.pb.dart
+++ b/interop/lib/src/generated/messages.pb.dart
@@ -100,7 +100,9 @@ class Payload extends $pb.GeneratedMessage {
         enumValues: PayloadType.values)
     ..a<$core.List<$core.int>>(
         2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'body',
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'body',
         $pb.PbFieldType.OY)
     ..hasRequiredFields = false;
 
@@ -262,9 +264,10 @@ class SimpleRequest extends $pb.GeneratedMessage {
       const $core.bool.fromEnvironment('protobuf.omit_message_names')
           ? ''
           : 'SimpleRequest',
-      package: const $pb.PackageName(const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'grpc.testing'),
+      package: const $pb.PackageName(
+          const $core.bool.fromEnvironment('protobuf.omit_message_names')
+              ? ''
+              : 'grpc.testing'),
       createEmptyInstance: create)
     ..e<PayloadType>(
         1,
@@ -277,14 +280,44 @@ class SimpleRequest extends $pb.GeneratedMessage {
         enumValues: PayloadType.values)
     ..a<$core.int>(
         2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'responseSize',
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'responseSize',
         $pb.PbFieldType.O3)
-    ..aOM<Payload>(3, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'payload', subBuilder: Payload.create)
-    ..aOB(4, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'fillUsername')
-    ..aOB(5, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'fillOauthScope')
-    ..aOM<BoolValue>(6, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'responseCompressed', subBuilder: BoolValue.create)
-    ..aOM<EchoStatus>(7, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'responseStatus', subBuilder: EchoStatus.create)
-    ..aOM<BoolValue>(8, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'expectCompressed', subBuilder: BoolValue.create)
+    ..aOM<Payload>(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'payload',
+        subBuilder: Payload.create)
+    ..aOB(
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'fillUsername')
+    ..aOB(
+        5,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'fillOauthScope')
+    ..aOM<BoolValue>(
+        6,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'responseCompressed',
+        subBuilder: BoolValue.create)
+    ..aOM<EchoStatus>(
+        7,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'responseStatus',
+        subBuilder: EchoStatus.create)
+    ..aOM<BoolValue>(
+        8,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'expectCompressed',
+        subBuilder: BoolValue.create)
     ..hasRequiredFields = false;
 
   SimpleRequest._() : super();
@@ -467,15 +500,22 @@ class SimpleResponse extends $pb.GeneratedMessage {
               ? ''
               : 'grpc.testing'),
       createEmptyInstance: create)
-    ..aOM<Payload>(1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'payload',
+    ..aOM<Payload>(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'payload',
         subBuilder: Payload.create)
     ..aOS(
         2,
         const $core.bool.fromEnvironment('protobuf.omit_field_names')
             ? ''
             : 'username')
-    ..aOS(3, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'oauthScope')
+    ..aOS(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'oauthScope')
     ..hasRequiredFields = false;
 
   SimpleResponse._() : super();
@@ -573,7 +613,10 @@ class StreamingInputCallRequest extends $pb.GeneratedMessage {
               : 'grpc.testing'),
       createEmptyInstance: create)
     ..aOM<Payload>(
-        1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'payload',
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'payload',
         subBuilder: Payload.create)
     ..aOM<BoolValue>(
         2,
@@ -749,7 +792,10 @@ class ResponseParameters extends $pb.GeneratedMessage {
             : 'intervalUs',
         $pb.PbFieldType.O3)
     ..aOM<BoolValue>(
-        3, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'compressed',
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'compressed',
         subBuilder: BoolValue.create)
     ..hasRequiredFields = false;
 
@@ -848,17 +894,33 @@ class StreamingOutputCallRequest extends $pb.GeneratedMessage {
               : 'grpc.testing'),
       createEmptyInstance: create)
     ..e<PayloadType>(
-        1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'responseType', $pb.PbFieldType.OE,
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'responseType',
+        $pb.PbFieldType.OE,
         defaultOrMaker: PayloadType.COMPRESSABLE,
         valueOf: PayloadType.valueOf,
         enumValues: PayloadType.values)
     ..pc<ResponseParameters>(
         2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'responseParameters',
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'responseParameters',
         $pb.PbFieldType.PM,
         subBuilder: ResponseParameters.create)
-    ..aOM<Payload>(3, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'payload', subBuilder: Payload.create)
-    ..aOM<EchoStatus>(7, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'responseStatus', subBuilder: EchoStatus.create)
+    ..aOM<Payload>(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'payload',
+        subBuilder: Payload.create)
+    ..aOM<EchoStatus>(
+        7,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'responseStatus',
+        subBuilder: EchoStatus.create)
     ..hasRequiredFields = false;
 
   StreamingOutputCallRequest._() : super();
diff --git a/lib/src/generated/google/rpc/error_details.pb.dart b/lib/src/generated/google/rpc/error_details.pb.dart
index b6859b6..59dd91d 100644
--- a/lib/src/generated/google/rpc/error_details.pb.dart
+++ b/lib/src/generated/google/rpc/error_details.pb.dart
@@ -845,8 +845,11 @@ class ResourceInfo extends $pb.GeneratedMessage {
         const $core.bool.fromEnvironment('protobuf.omit_field_names')
             ? ''
             : 'owner')
-    ..aOS(4,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'description')
+    ..aOS(
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'description')
     ..hasRequiredFields = false;
 
   ResourceInfo._() : super();
diff --git a/lib/src/generated/google/rpc/status.pb.dart b/lib/src/generated/google/rpc/status.pb.dart
index 86261f3..718cc9c 100644
--- a/lib/src/generated/google/rpc/status.pb.dart
+++ b/lib/src/generated/google/rpc/status.pb.dart
@@ -12,32 +12,34 @@ import 'package:protobuf/protobuf.dart' as $pb;
 import '../protobuf/any.pb.dart' as $0;
 
 class Status extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i =
-      $pb.BuilderInfo(const $core.bool.fromEnvironment('protobuf.omit_message_names') ? '' : 'Status',
-          package: const $pb.PackageName(
-              const $core.bool.fromEnvironment('protobuf.omit_message_names')
-                  ? ''
-                  : 'google.rpc'),
-          createEmptyInstance: create)
-        ..a<$core.int>(
-            1,
-            const $core.bool.fromEnvironment('protobuf.omit_field_names')
-                ? ''
-                : 'code',
-            $pb.PbFieldType.O3)
-        ..aOS(
-            2,
-            const $core.bool.fromEnvironment('protobuf.omit_field_names')
-                ? ''
-                : 'message')
-        ..pc<$0.Any>(
-            3,
-            const $core.bool.fromEnvironment('protobuf.omit_field_names')
-                ? ''
-                : 'details',
-            $pb.PbFieldType.PM,
-            subBuilder: $0.Any.create)
-        ..hasRequiredFields = false;
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'Status',
+      package: const $pb.PackageName(
+          const $core.bool.fromEnvironment('protobuf.omit_message_names')
+              ? ''
+              : 'google.rpc'),
+      createEmptyInstance: create)
+    ..a<$core.int>(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'code',
+        $pb.PbFieldType.O3)
+    ..aOS(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'message')
+    ..pc<$0.Any>(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'details',
+        $pb.PbFieldType.PM,
+        subBuilder: $0.Any.create)
+    ..hasRequiredFields = false;
 
   Status._() : super();
   factory Status({
diff --git a/lib/src/server/handler.dart b/lib/src/server/handler.dart
index c5d036e..2842f5c 100644
--- a/lib/src/server/handler.dart
+++ b/lib/src/server/handler.dart
@@ -305,7 +305,9 @@ class ServerHandler_ extends ServiceCall {
   void sendHeaders() {
     if (_headersSent) throw GrpcError.internal('Headers already sent');
 
-    _customHeaders!..remove(':status')..remove('content-type');
+    _customHeaders!
+      ..remove(':status')
+      ..remove('content-type');
 
     // TODO(jakobr): Should come from package:http2?
     final outgoingHeadersMap = <String, String>{
@@ -335,12 +337,16 @@ class ServerHandler_ extends ServiceCall {
       outgoingTrailersMap[':status'] = '200';
       outgoingTrailersMap['content-type'] = 'application/grpc';
 
-      _customHeaders!..remove(':status')..remove('content-type');
+      _customHeaders!
+        ..remove(':status')
+        ..remove('content-type');
       outgoingTrailersMap.addAll(_customHeaders!);
       _customHeaders = null;
       _headersSent = true;
     }
-    _customTrailers!..remove(':status')..remove('content-type');
+    _customTrailers!
+      ..remove(':status')
+      ..remove('content-type');
     outgoingTrailersMap.addAll(_customTrailers!);
     _customTrailers = null;
     outgoingTrailersMap['grpc-status'] = status.toString();