dd-trace 5.99.1 → 5.101.0

package/packages/dd-trace/src/config/generated-config-types.d.ts

@@ -5,7 +5,6 @@ export interface GeneratedConfig {
   _DD_APM_TRACING_AGENTLESS_ENABLED: boolean;
   apiKey: string | undefined;
   apmTracingEnabled: boolean;
-  appKey: string | undefined;
   appsec: {
     apiSecurity: {
       downstreamBodyAnalysisSampleRate: number;
@@ -63,9 +62,6 @@ export interface GeneratedConfig {
       };
     };
   };
-  crashtracking: {
-    enabled: boolean;
-  };
   dbm: {
     injectSqlBaseHash: boolean;
   };
@@ -74,6 +70,7 @@ export interface GeneratedConfig {
   DD_AGENTLESS_LOG_SUBMISSION_ENABLED: boolean;
   DD_AGENTLESS_LOG_SUBMISSION_URL: string | undefined;
   DD_APM_FLUSH_DEADLINE_MILLISECONDS: number;
+  DD_APP_KEY: string | undefined;
   DD_AZURE_RESOURCE_GROUP: string | undefined;
   DD_CIVISIBILITY_AGENTLESS_ENABLED: boolean;
   DD_CIVISIBILITY_AGENTLESS_URL: string | undefined;
@@ -87,9 +84,11 @@ export interface GeneratedConfig {
   DD_CIVISIBILITY_TEST_COMMAND: string | undefined;
   DD_CIVISIBILITY_TEST_MODULE_ID: string | undefined;
   DD_CIVISIBILITY_TEST_SESSION_ID: string | undefined;
+  DD_CRASHTRACKING_ENABLED: boolean;
   DD_CUSTOM_TRACE_ID: string | undefined;
   DD_ENABLE_LAGE_PACKAGE_NAME: boolean;
   DD_ENABLE_NX_SERVICE_NAME: boolean;
+  DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED: boolean;
   DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_DIR: string;
   DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_ENABLED: boolean;
   DD_EXPERIMENTAL_TEST_OPT_SETTINGS_CACHE: string;
@@ -111,12 +110,22 @@ export interface GeneratedConfig {
   DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA: string | undefined;
   DD_GIT_REPOSITORY_URL: string | undefined;
   DD_GIT_TAG: string | undefined;
+  DD_GRPC_CLIENT_ERROR_STATUSES: number[];
+  DD_GRPC_SERVER_ERROR_STATUSES: number[];
+  DD_HEAP_SNAPSHOT_COUNT: number;
+  DD_HEAP_SNAPSHOT_DESTINATION: string;
+  DD_HEAP_SNAPSHOT_INTERVAL: number;
   DD_INJECT_FORCE: boolean;
   DD_INJECTION_ENABLED: string | undefined;
   DD_INSTRUMENTATION_CONFIG_ID: string | undefined;
+  DD_INSTRUMENTATION_INSTALL_ID: string | undefined;
+  DD_INSTRUMENTATION_INSTALL_TIME: string | undefined;
+  DD_INSTRUMENTATION_INSTALL_TYPE: string | undefined;
+  DD_INTERNAL_PROFILING_LONG_LIVED_THRESHOLD: number;
   DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED: boolean;
   DD_LAMBDA_HANDLER: string | undefined;
   DD_LOGS_OTEL_ENABLED: boolean;
+  DD_METRICS_OTEL_ENABLED: boolean;
   DD_MINI_AGENT_PATH: string | undefined;
   DD_PIPELINE_EXECUTION_ID: string | undefined;
   DD_PLAYWRIGHT_WORKER: string | undefined;
@@ -166,6 +175,7 @@ export interface GeneratedConfig {
   DD_TRACE_APOLLO_SERVER_FASTIFY_ENABLED: boolean;
   DD_TRACE_APOLLO_SUBGRAPH_ENABLED: boolean;
   DD_TRACE_AVSC_ENABLED: boolean;
+  DD_TRACE_AWS_ADD_SPAN_POINTERS: boolean;
   DD_TRACE_AWS_SDK_AWS_BATCH_PROPAGATION_ENABLED: boolean;
   DD_TRACE_AWS_SDK_AWS_ENABLED: boolean;
   DD_TRACE_AWS_SDK_BATCH_PROPAGATION_ENABLED: boolean;
@@ -229,6 +239,7 @@ export interface GeneratedConfig {
   DD_TRACE_DISABLED_INSTRUMENTATIONS: string;
   DD_TRACE_DISABLED_PLUGINS: string | undefined;
   DD_TRACE_DNS_ENABLED: boolean;
+  DD_TRACE_DYNAMODB_TABLE_PRIMARY_KEYS: string | undefined;
   DD_TRACE_ELASTIC_ELASTICSEARCH_ENABLED: boolean;
   DD_TRACE_ELASTIC_TRANSPORT_ENABLED: boolean;
   DD_TRACE_ELASTICSEARCH_ENABLED: boolean;
@@ -316,6 +327,7 @@ export interface GeneratedConfig {
   DD_TRACE_MULTER_ENABLED: boolean;
   DD_TRACE_MYSQL_ENABLED: boolean;
   DD_TRACE_MYSQL2_ENABLED: boolean;
+  DD_TRACE_NATIVE_SPAN_EVENTS: boolean;
   DD_TRACE_NET_ENABLED: boolean;
   DD_TRACE_NEXT_ENABLED: boolean;
   DD_TRACE_NODE_CHILD_PROCESS_ENABLED: boolean;
@@ -344,6 +356,7 @@ export interface GeneratedConfig {
   DD_TRACE_PROCESS_ENABLED: boolean;
   DD_TRACE_PROMISE_ENABLED: boolean;
   DD_TRACE_PROMISE_JS_ENABLED: boolean;
+  DD_TRACE_PROPAGATION_BEHAVIOR_EXTRACT: "continue" | "restart" | "ignore";
   DD_TRACE_PROPAGATION_EXTRACT_FIRST: boolean;
   DD_TRACE_PROPAGATION_STYLE: string[];
   DD_TRACE_PROTOBUFJS_ENABLED: boolean;
@@ -417,24 +430,7 @@ export interface GeneratedConfig {
   flakyTestRetriesCount: number;
   flushInterval: number;
   flushMinSpans: number;
-  grpc: {
-    client: {
-      error: {
-        statuses: number[];
-      };
-    };
-    server: {
-      error: {
-        statuses: number[];
-      };
-    };
-  };
   headerTags: string[];
-  heapSnapshot: {
-    count: number;
-    destination: string;
-    interval: number;
-  };
   hostname: string;
   iast: {
     dbRowsToTaint: number;
@@ -453,11 +449,6 @@ export interface GeneratedConfig {
     telemetryVerbosity: string;
   };
   inferredProxyServicesEnabled: boolean;
-  installSignature: {
-    id: string | undefined;
-    time: string | undefined;
-    type: string | undefined;
-  };
   isEarlyFlakeDetectionEnabled: boolean;
   isFlakyTestRetriesEnabled: boolean;
   isGitUploadEnabled: boolean;
@@ -511,15 +502,10 @@ export interface GeneratedConfig {
   OTEL_TRACES_EXPORTER: "none" | "otlp" | undefined;
   OTEL_TRACES_SAMPLER: "always_on" | "always_off" | "traceidratio" | "parentbased_always_on" | "parentbased_always_off" | "parentbased_traceidratio";
   OTEL_TRACES_SAMPLER_ARG: number | undefined;
-  otelMetricsEnabled: boolean;
   peerServiceMapping: Record<string, string>;
   port: string | number;
   profiling: {
     enabled: 'true' | 'false' | 'auto';
-    longLivedThreshold: number;
-  };
-  propagateProcessTags: {
-    enabled: boolean;
   };
   protocolVersion: string;
   queryStringObfuscation: string;
@@ -562,18 +548,8 @@ export interface GeneratedConfig {
     metrics: boolean;
   };
   testManagementAttemptToFixRetries: number;
-  trace: {
-    aws: {
-      addSpanPointers: boolean;
-    };
-    dynamoDb: {
-      tablePrimaryKeys: string | undefined;
-    };
-    nativeSpanEvents: boolean;
-  };
   traceId128BitGenerationEnabled: boolean;
   traceId128BitLoggingEnabled: boolean;
-  tracePropagationBehaviorExtract: "continue" | "restart" | "ignore";
   tracePropagationStyle: {
     extract: string[];
     inject: string[];

package/packages/dd-trace/src/config/index.js

@@ -3,7 +3,6 @@
 const fs = require('node:fs')
 const os = require('node:os')
 const { URL } = require('node:url')
-const path = require('node:path')
 
 const rfdc = require('../../../../vendor/dist/rfdc')({ proto: false, circles: false })
 const uuid = require('../../../../vendor/dist/crypto-randomuuid') // we need to keep the old uuid dep because of cypress
@@ -12,7 +11,6 @@ const { DD_MAJOR } = require('../../../../version')
 const log = require('../log')
 const pkg = require('../pkg')
 const { isTrue } = require('../util')
-const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
 const telemetry = require('../telemetry')
 const telemetryMetrics = require('../telemetry/metrics')
 const {
@@ -22,8 +20,6 @@ const {
 } = require('../serverless')
 const { ORIGIN_KEY, DATADOG_MINI_AGENT_PATH } = require('../constants')
 const { appendRules } = require('../payload-tagging/config')
-const { getGitMetadataFromGitProperties, removeUserSensitiveInfo, getRemoteOriginURL, resolveGitHeadSHA } =
-  require('./git_properties')
 const ConfigBase = require('./config-base')
 const {
   getEnvironmentVariable,
@@ -39,6 +35,7 @@ const {
   parseErrors,
   generateTelemetry,
 } = require('./defaults')
+const { normalizeService } = require('./normalize-service')
 const { transformers } = require('./parsers')
 
 const RUNTIME_ID = uuid()
@@ -214,10 +211,6 @@ class Config extends ConfigBase {
 
     warnWrongOtelSettings()
 
-    if (this.DD_TRACE_GIT_METADATA_ENABLED) {
-      this.#loadGitMetadata()
-    }
-
     parseErrors.clear()
   }
 
@@ -358,10 +351,10 @@ class Config extends ConfigBase {
     if (this.DD_LOGS_OTEL_ENABLED) {
       setAndTrack(this, 'logInjection', false)
     }
-    if (this.otelMetricsEnabled &&
+    if (this.DD_METRICS_OTEL_ENABLED &&
         trackedConfigOrigins.has('OTEL_METRICS_EXPORTER') &&
         this.OTEL_METRICS_EXPORTER === 'none') {
-      setAndTrack(this, 'otelMetricsEnabled', false)
+      setAndTrack(this, 'DD_METRICS_OTEL_ENABLED', false)
     }
 
     if (this.OTEL_TRACES_EXPORTER === 'otlp' && this.protocolVersion && this.protocolVersion !== '0.4') {
@@ -512,8 +505,8 @@ class Config extends ConfigBase {
       } else {
         const NX_TASK_TARGET_PROJECT = getEnvironmentVariable('NX_TASK_TARGET_PROJECT')
         if (NX_TASK_TARGET_PROJECT) {
-          if (this.DD_ENABLE_NX_SERVICE_NAME) {
-            setAndTrack(this, 'service', NX_TASK_TARGET_PROJECT)
+          if (DD_MAJOR >= 6 || this.DD_ENABLE_NX_SERVICE_NAME) {
+            setAndTrack(this, 'service', normalizeService(NX_TASK_TARGET_PROJECT) || 'node')
             isServiceNameInferred = true
           } else if (DD_MAJOR < 6) {
             log.warn(
@@ -536,7 +529,7 @@ class Config extends ConfigBase {
             )
           : undefined
 
-        setAndTrack(this, 'service', serverlessName || pkg.name || 'node')
+        setAndTrack(this, 'service', normalizeService(serverlessName) || normalizeService(pkg.name) || 'node')
         this.tags.service ??= /** @type {string} */ (this.service)
         isServiceNameInferred = true
       }
@@ -560,7 +553,7 @@ class Config extends ConfigBase {
 
     if (IS_SERVERLESS) {
       setAndTrack(this, 'telemetry.enabled', false)
-      setAndTrack(this, 'crashtracking.enabled', false)
+      setAndTrack(this, 'DD_CRASHTRACKING_ENABLED', false)
       setAndTrack(this, 'remoteConfig.enabled', false)
     }
 
@@ -627,52 +620,6 @@ class Config extends ConfigBase {
 
     telemetry.updateConfig([...configWithOrigin.values()], this)
   }
-
-  // TODO: Move outside of config. This is unrelated to the config system.
-  #loadGitMetadata () {
-    // Try to read Git metadata from the environment variables
-    this.repositoryUrl = removeUserSensitiveInfo(this.DD_GIT_REPOSITORY_URL ?? this.tags[GIT_REPOSITORY_URL])
-    this.commitSHA = this.DD_GIT_COMMIT_SHA ?? this.tags[GIT_COMMIT_SHA]
-
-    // Otherwise, try to read Git metadata from the git.properties file
-    if (!this.repositoryUrl || !this.commitSHA) {
-      const DD_GIT_PROPERTIES_FILE = this.DD_GIT_PROPERTIES_FILE
-      const gitPropertiesFile = DD_GIT_PROPERTIES_FILE ?? `${process.cwd()}/git.properties`
-      try {
-        const gitPropertiesString = fs.readFileSync(gitPropertiesFile, 'utf8')
-        const { commitSHA, repositoryUrl } = getGitMetadataFromGitProperties(gitPropertiesString)
-        this.commitSHA ??= commitSHA
-        this.repositoryUrl ??= repositoryUrl
-      } catch (error) {
-        // Only log error if the user has set a git.properties path
-        if (DD_GIT_PROPERTIES_FILE) {
-          log.error('Error reading DD_GIT_PROPERTIES_FILE: %s', gitPropertiesFile, error)
-        }
-      }
-    }
-
-    // Otherwise, try to read Git metadata from the .git/ folder
-    const DD_GIT_FOLDER_PATH = this.DD_GIT_FOLDER_PATH
-    const gitFolderPath = DD_GIT_FOLDER_PATH ?? path.join(process.cwd(), '.git')
-
-    if (!this.repositoryUrl) {
-      // Try to read git config (repository URL)
-      const gitConfigPath = path.join(gitFolderPath, 'config')
-      try {
-        const gitConfigContent = fs.readFileSync(gitConfigPath, 'utf8')
-        if (gitConfigContent) {
-          this.repositoryUrl = getRemoteOriginURL(gitConfigContent)
-        }
-      } catch (error) {
-        // Only log error if the user has set a .git/ path
-        if (DD_GIT_FOLDER_PATH) {
-          log.error('Error reading git config: %s', gitConfigPath, error)
-        }
-      }
-    }
-    // Try to read git HEAD (commit SHA)
-    this.commitSHA ??= resolveGitHeadSHA(gitFolderPath)
-  }
 }
 
 /**

package/packages/dd-trace/src/config/normalize-service.js

@@ -0,0 +1,31 @@
+'use strict'
+
+const MAX_SERVICE_LENGTH = 100
+
+/**
+ * Normalize an inferred service name so APM and runtime metrics agree.
+ *
+ * The trace agent normalizes span service names on the wire, but the
+ * DogStatsD client uses a different tag-value sanitizer, so an inferred
+ * `@scope/name` package name appears as `scope/name` in APM and
+ * `_scope/name` in runtime metrics. Pre-normalizing pins both consumers
+ * (and telemetry / process tags) to the same value.
+ *
+ * @see https://github.com/DataDog/datadog-agent/blob/main/pkg/trace/traceutil/normalize.go
+ * @param {string | undefined} name
+ */
+function normalizeService (name) {
+  if (!name) return
+
+  let normalized = name.toLowerCase()
+    .replaceAll(/[^a-z0-9_:./-]/g, '_')
+    .replace(/^[^a-z0-9]+/, '')
+
+  if (normalized.length > MAX_SERVICE_LENGTH) {
+    normalized = normalized.slice(0, MAX_SERVICE_LENGTH)
+  }
+
+  return normalized
+}
+
+module.exports = { normalizeService }

package/packages/dd-trace/src/config/supported-configurations.json

@@ -421,8 +421,7 @@
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "appKey"
+        "default": null
       }
     ],
     "DD_AZURE_RESOURCE_GROUP": [
@@ -595,8 +594,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "true",
-        "internalPropertyName": "crashtracking.enabled"
+        "default": "true"
       }
     ],
     "DD_CUSTOM_TRACE_ID": [
@@ -770,8 +768,7 @@
       {
         "implementation": "B",
         "type": "boolean",
-        "default": "true",
-        "internalPropertyName": "propagateProcessTags.enabled"
+        "default": "true"
       }
     ],
     "DD_EXPERIMENTAL_TEST_OPT_SETTINGS_CACHE": [
@@ -926,7 +923,6 @@
         "implementation": "C",
         "type": "string",
         "default": "1-16",
-        "internalPropertyName": "grpc.client.error.statuses",
         "transform": "setGRPCRange"
       }
     ],
@@ -935,7 +931,6 @@
         "implementation": "C",
         "type": "string",
         "default": "2-16",
-        "internalPropertyName": "grpc.server.error.statuses",
         "transform": "setGRPCRange"
       }
     ],
@@ -943,24 +938,21 @@
       {
         "implementation": "A",
         "type": "int",
-        "default": "0",
-        "internalPropertyName": "heapSnapshot.count"
+        "default": "0"
       }
     ],
     "DD_HEAP_SNAPSHOT_DESTINATION": [
       {
         "implementation": "A",
         "type": "string",
-        "default": "",
-        "internalPropertyName": "heapSnapshot.destination"
+        "default": ""
       }
     ],
     "DD_HEAP_SNAPSHOT_INTERVAL": [
       {
         "implementation": "A",
         "type": "int",
-        "default": "3600",
-        "internalPropertyName": "heapSnapshot.interval"
+        "default": "3600"
       }
     ],
     "DD_IAST_DB_ROWS_TO_TAINT": [
@@ -1124,24 +1116,21 @@
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "installSignature.id"
+        "default": null
       }
     ],
     "DD_INSTRUMENTATION_INSTALL_TIME": [
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "installSignature.time"
+        "default": null
       }
     ],
     "DD_INSTRUMENTATION_INSTALL_TYPE": [
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "installSignature.type"
+        "default": null
       }
     ],
     "DD_INSTRUMENTATION_TELEMETRY_ENABLED": [
@@ -1159,8 +1148,7 @@
       {
         "implementation": "A",
         "type": "int",
-        "default": "30000",
-        "internalPropertyName": "profiling.longLivedThreshold"
+        "default": "30000"
       }
     ],
     "DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED": [
@@ -1257,8 +1245,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "otelMetricsEnabled"
+        "default": "false"
       }
     ],
     "DD_MINI_AGENT_PATH": [
@@ -1942,8 +1929,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "true",
-        "internalPropertyName": "trace.aws.addSpanPointers"
+        "default": "true"
       }
     ],
     "DD_TRACE_AWS_SDK_AWS_BATCH_PROPAGATION_ENABLED": [
@@ -2475,8 +2461,7 @@
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "trace.dynamoDb.tablePrimaryKeys"
+        "default": null
       }
     ],
     "DD_TRACE_ELASTICSEARCH_ENABLED": [
@@ -3174,8 +3159,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "trace.nativeSpanEvents"
+        "default": "false"
       }
     ],
     "DD_TRACE_NET_ENABLED": [
@@ -3418,8 +3402,7 @@
         "type": "string",
         "allowed": "continue|restart|ignore",
         "transform": "toLowerCase",
-        "default": "continue",
-        "internalPropertyName": "tracePropagationBehaviorExtract"
+        "default": "continue"
       }
     ],
     "DD_TRACE_PROPAGATION_EXTRACT_FIRST": [

package/packages/dd-trace/src/datastreams/checkpointer.js

@@ -19,10 +19,9 @@ class DataStreamsCheckpointer {
     if (!this.config.dsmEnabled) return
 
     const ctx = this.dsmProcessor.setCheckpoint(
-      ['type:' + type, 'topic:' + target, 'direction:out', 'manual_checkpoint:true'],
+      ['direction:out', 'type:' + type, 'topic:' + target, 'manual_checkpoint:true'],
       null,
-      DataStreamsContext.getDataStreamsContext(),
-      null
+      DataStreamsContext.getDataStreamsContext()
     )
     DataStreamsContext.setDataStreamsContext(ctx)
 
@@ -45,17 +44,12 @@ class DataStreamsCheckpointer {
     const parentCtx = this.tracer.extract('text_map_dsm', carrier)
     DataStreamsContext.setDataStreamsContext(parentCtx)
 
-    const tags = ['type:' + type, 'topic:' + source, 'direction:in']
+    const tags = ['direction:in', 'type:' + type, 'topic:' + source]
     if (manualCheckpoint) {
       tags.push('manual_checkpoint:true')
     }
 
-    const ctx = this.dsmProcessor.setCheckpoint(
-      tags,
-      null,
-      parentCtx,
-      null
-    )
+    const ctx = this.dsmProcessor.setCheckpoint(tags, null, parentCtx)
     DataStreamsContext.setDataStreamsContext(ctx)
 
     return ctx

package/packages/dd-trace/src/datastreams/encoding.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const maxVarLen64 = 9
+
 /**
  * Encodes positive and negative numbers, using zig zag encoding to reduce the size of the variable length encoding.
  * Uses high and low part to ensure those parts are under the limit for byte operations in javascript (32 bits)
@@ -8,15 +10,45 @@
  * @returns {Uint8Array|undefined}
  */
 function encodeVarint (v) {
-  const sign = v >= 0 ? 0 : 1
+  const result = new Uint8Array(maxVarLen64)
+  const written = encodeVarintInto(result, 0, v)
+  if (written === 0) {
+    return
+  }
+  return result.slice(0, written)
+}
+
+/**
+ * Writes a zig-zag varint at `target[offset..]` and returns the offset just past the last
+ * byte written. Returns `offset` unchanged when the value exceeds MAX_SAFE_INTEGER/2, mirroring
+ * the `encodeVarint` overflow contract. Used on the DSM checkpoint hot path to avoid
+ * per-call Uint8Array / Buffer allocations.
+ * @param {Uint8Array | Buffer} target
+ * @param {number} offset
+ * @param {number} value
+ * @returns {number}
+ */
+function encodeVarintInto (target, offset, value) {
+  const sign = value >= 0 ? 0 : 1
   // We leave the least significant bit for the sign.
-  const double = Math.abs(v) * 2
+  const double = Math.abs(value) * 2
   if (double > Number.MAX_SAFE_INTEGER) {
-    return
+    return offset
   }
-  const high = Math.floor(double / 0x1_00_00_00_00)
-  const low = (double & 0xFF_FF_FF_FF) | sign
-  return encodeUvarint64(low, high)
+  let high = Math.floor(double / 0x1_00_00_00_00)
+  let low = (double & 0xFF_FF_FF_FF) | sign
+  let i = offset
+  const limit = offset + maxVarLen64 - 1
+  // if first byte is 1, the number is negative in javascript, but we want to interpret it as positive
+  while ((high !== 0 || low < 0 || low > 0x80) && i < limit) {
+    target[i] = (low & 0x7F) | 0x80
+    low >>>= 7
+    low |= (high & 0x7F) << 25
+    high >>>= 7
+    i++
+  }
+  target[i] = low & 0x7F
+  return i + 1
 }
 
 /**
@@ -35,28 +67,6 @@ function decodeVarint (b) {
   return [positive ? abs : -abs, bytes]
 }
 
-const maxVarLen64 = 9
-
-/**
- * @param {number} low
- * @param {number} high
- * @returns {Uint8Array}
- */
-function encodeUvarint64 (low, high) {
-  const result = new Uint8Array(maxVarLen64)
-  let i = 0
-  // if first byte is 1, the number is negative in javascript, but we want to interpret it as positive
-  while ((high !== 0 || low < 0 || low > 0x80) && i < maxVarLen64 - 1) {
-    result[i] = (low & 0x7F) | 0x80
-    low >>>= 7
-    low |= (high & 0x7F) << 25
-    high >>>= 7
-    i++
-  }
-  result[i] = low & 0x7F
-  return result.slice(0, i + 1)
-}
-
 /**
  * @param {Uint8Array} bytes
  * @returns {[number|undefined, number|undefined, Uint8Array]}
@@ -95,5 +105,6 @@ function decodeUvarint64 (
 
 module.exports = {
   encodeVarint,
+  encodeVarintInto,
   decodeVarint,
 }