Rewrite NPM packages using Rollup

autometrics-dev · Oct 30, 2023 · d2d12c5 · d2d12c5
1 parent cef6a72
commit d2d12c5
Show file tree

Hide file tree

Showing 20 changed files with 577 additions and 131 deletions.
diff --git a/deno.json b/deno.json
@@ -4,6 +4,12 @@
     "strict": true
   },
   "imports": {
-    "$std/": "https://deno.land/[email protected]/"
+    "$std/": "https://deno.land/[email protected]/",
+    "$otel/api": "npm:@opentelemetry/api@^1.6.0",
+    "$otel/core": "npm:@opentelemetry/core@^1.17.0",
+    "$otel/exporter-metrics-otlp-http": "npm:@opentelemetry/exporter-metrics-otlp-http@^0.43.0",
+    "$otel/exporter-prometheus": "npm:@opentelemetry/exporter-prometheus@^0.43.0",
+    "$otel/resources": "npm:@opentelemetry/resources@^1.17.0",
+    "$otel/sdk-metrics": "npm:@opentelemetry/sdk-metrics@^1.17.0"
   }
 }
diff --git a/deno.lock b/deno.lock
diff --git a/examples/deno-fresh/deno.json b/examples/deno-fresh/deno.json
@@ -8,11 +8,16 @@
   "imports": {
     "$autometrics/": "../../packages/autometrics/",
     "$fresh/": "https://deno.land/x/[email protected]/",
+    "$otel/api": "npm:@opentelemetry/api@^1.6.0",
+    "$otel/core": "npm:@opentelemetry/core@^1.17.0",
+    "$otel/exporter-metrics-otlp-http": "npm:@opentelemetry/exporter-metrics-otlp-http@^0.43.0",
+    "$otel/resources": "npm:@opentelemetry/resources@^1.17.0",
+    "$otel/sdk-metrics": "npm:@opentelemetry/sdk-metrics@^1.17.0",
+    "$std/": "https://deno.land/[email protected]/",
     "preact": "https://esm.sh/[email protected]",
     "preact/": "https://esm.sh/[email protected]/",
     "preact-render-to-string": "https://esm.sh/*[email protected]",
     "@preact/signals": "https://esm.sh/*@preact/[email protected]",
-    "@preact/signals-core": "https://esm.sh/*@preact/[email protected]",
-    "$std/": "https://deno.land/[email protected]/"
+    "@preact/signals-core": "https://esm.sh/*@preact/[email protected]"
   }
 }
diff --git a/justfile b/justfile
@@ -11,7 +11,7 @@ test_permissions := "--allow-env --allow-net --allow-read --allow-sys"
 build: (build-npm "")
 
 build-npm version:
-    deno run --allow-env --allow-net=deno.land --allow-read --allow-run=yarn --allow-write=dist scripts/build_npm.ts {{version}}
+    deno run --allow-env --allow-ffi --allow-net=deno.land --allow-read --allow-run --allow-sys --allow-write=dist scripts/build_npm.ts {{version}}
 
 build-examples:
     #!/usr/bin/env bash

diff --git a/packages/autometrics/src/buildInfo.ts b/packages/autometrics/src/buildInfo.ts
@@ -1,4 +1,4 @@
-import type { UpDownCounter } from "npm:@opentelemetry/api@^1.6.0";
+import type { UpDownCounter } from "$otel/api";
 
 import { BUILD_INFO_DESCRIPTION, BUILD_INFO_NAME } from "./constants.ts";
 import { getMeter } from "./instrumentation.ts";

diff --git a/packages/autometrics/src/exporter-otlp-http/mod.ts b/packages/autometrics/src/exporter-otlp-http/mod.ts
@@ -1,8 +1,8 @@
 import {
   AggregationTemporalityPreference,
   OTLPMetricExporter,
-} from "npm:@opentelemetry/exporter-metrics-otlp-http@^0.43.0";
-import { PeriodicExportingMetricReader } from "npm:@opentelemetry/sdk-metrics@^1.17.0";
+} from "$otel/exporter-metrics-otlp-http";
+import { PeriodicExportingMetricReader } from "$otel/sdk-metrics";
 
 import {
   BuildInfo,

diff --git a/packages/autometrics/src/exporter-otlp-http/registerExporterInternal.ts b/packages/autometrics/src/exporter-otlp-http/registerExporterInternal.ts
@@ -1,4 +1,4 @@
-import { MetricReader } from "npm:@opentelemetry/sdk-metrics@^1.17.0";
+import { MetricReader } from "$otel/sdk-metrics";
 
 import { ExporterOptions, registerExporter } from "../../mod.ts";
 

diff --git a/packages/autometrics/src/exporter-prometheus-push-gateway/mod.ts b/packages/autometrics/src/exporter-prometheus-push-gateway/mod.ts
@@ -1,4 +1,4 @@
-import { PeriodicExportingMetricReader } from "npm:@opentelemetry/sdk-metrics@^1.17.0";
+import { PeriodicExportingMetricReader } from "$otel/sdk-metrics";
 
 import {
   BuildInfo,

diff --git a/packages/autometrics/src/exporter-prometheus-push-gateway/pushGatewayExporter.ts b/packages/autometrics/src/exporter-prometheus-push-gateway/pushGatewayExporter.ts
@@ -1,14 +1,10 @@
-import {
-  BindOnceFuture,
-  ExportResult,
-  ExportResultCode,
-} from "npm:@opentelemetry/core@^1.17.0";
+import { BindOnceFuture, ExportResult, ExportResultCode } from "$otel/core";
 import {
   AggregationTemporality,
   InstrumentType,
   PushMetricExporter,
   ResourceMetrics,
-} from "npm:@opentelemetry/sdk-metrics@^1.17.0";
+} from "$otel/sdk-metrics";
 
 import { amLogger } from "../../mod.ts";
 import { PrometheusSerializer } from "../exporter-prometheus/PrometheusSerializer.ts";

diff --git a/packages/autometrics/src/exporter-prometheus/PrometheusExporter.ts b/packages/autometrics/src/exporter-prometheus/PrometheusExporter.ts
@@ -18,7 +18,7 @@ import {
   Aggregation,
   AggregationTemporality,
   MetricReader,
-} from "npm:@opentelemetry/sdk-metrics@^1.17.0";
+} from "$otel/sdk-metrics";
 
 import { amLogger } from "../../mod.ts";
 import { PrometheusSerializer } from "./PrometheusSerializer.ts";

diff --git a/packages/autometrics/src/exporter-prometheus/PrometheusSerializer.ts b/packages/autometrics/src/exporter-prometheus/PrometheusSerializer.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import type { AttributeValue, Attributes } from "npm:@opentelemetry/api@^1.6.0";
-import { hrTimeToMilliseconds } from "npm:@opentelemetry/core@^1.17.0";
-import type { IResource } from "npm:@opentelemetry/resources@^1.17.0";
+import type { AttributeValue, Attributes } from "$otel/api";
+import { hrTimeToMilliseconds } from "$otel/core";
+import type { IResource } from "$otel/resources";
 import {
   DataPoint,
   DataPointType,
@@ -25,7 +25,7 @@ import {
   MetricData,
   ResourceMetrics,
   ScopeMetrics,
-} from "npm:@opentelemetry/sdk-metrics@^1.17.0";
+} from "$otel/sdk-metrics";
 
 import { amLogger } from "../../mod.ts";
 

diff --git a/packages/autometrics/src/exporter-prometheus/mod.ts b/packages/autometrics/src/exporter-prometheus/mod.ts
@@ -1,4 +1,4 @@
-import { MetricReader } from "npm:@opentelemetry/sdk-metrics@^1.17.0";
+import { MetricReader } from "$otel/sdk-metrics";
 
 import {
   BuildInfo,

diff --git a/packages/autometrics/src/histograms.ts b/packages/autometrics/src/histograms.ts
@@ -1,7 +1,4 @@
-import {
-  ExplicitBucketHistogramAggregation,
-  View,
-} from "npm:@opentelemetry/sdk-metrics@^1.17.0";
+import { ExplicitBucketHistogramAggregation, View } from "$otel/sdk-metrics";
 
 import { HISTOGRAM_NAME } from "./constants.ts";
 

diff --git a/packages/autometrics/src/instrumentation.ts b/packages/autometrics/src/instrumentation.ts
@@ -1,8 +1,5 @@
-import type { Meter } from "npm:@opentelemetry/api@^1.6.0";
-import {
-  MeterProvider,
-  MetricReader,
-} from "npm:@opentelemetry/sdk-metrics@^1.17.0";
+import type { Meter } from "$otel/api";
+import { MeterProvider, MetricReader } from "$otel/sdk-metrics";
 
 import { createDefaultHistogramView } from "./histograms.ts";
 import { TemporaryMeter } from "./temporaryMeter.ts";

diff --git a/packages/autometrics/src/temporaryMeter.ts b/packages/autometrics/src/temporaryMeter.ts
@@ -13,7 +13,7 @@ import {
   ObservableUpDownCounter,
   UpDownCounter,
   createNoopMeter,
-} from "npm:@opentelemetry/api@^1.6.0";
+} from "$otel/api";
 
 import { warn } from "./logger.ts";
 

diff --git a/packages/autometrics/src/wrappers.ts b/packages/autometrics/src/wrappers.ts
@@ -1,6 +1,5 @@
-import { Attributes, ValueType } from "npm:@opentelemetry/api@^1.6.0";
+import { Attributes, ValueType } from "$otel/api";
 
-import { amLogger } from "../mod.ts";
 import {
   COUNTER_DESCRIPTION,
   COUNTER_NAME,
@@ -517,9 +516,7 @@ export function Autometrics<T extends FunctionSig>(
       }
 
       default:
-        amLogger.warn(
-          "Autometrics decorator can only be used on classes and methods",
-        );
+        warn("Autometrics decorator can only be used on classes and methods");
     }
   };
 }

diff --git a/packages/autometrics/tests/temporality.test.ts b/packages/autometrics/tests/temporality.test.ts
@@ -1,6 +1,6 @@
 import { assertEquals } from "$std/assert/mod.ts";
 
-import { MetricData } from "npm:@opentelemetry/sdk-metrics@^1.17.0";
+import { MetricData } from "$otel/sdk-metrics";
 import { autometrics } from "../mod.ts";
 import { COUNTER_NAME } from "../src/constants.ts";
 import {

diff --git a/packages/autometrics/tests/testUtils.ts b/packages/autometrics/tests/testUtils.ts
@@ -3,7 +3,7 @@ import {
   InMemoryMetricExporter,
   MetricReader,
   PeriodicExportingMetricReader,
-} from "npm:@opentelemetry/sdk-metrics@^1.17.0";
+} from "$otel/sdk-metrics";
 
 import { registerExporter } from "../mod.ts";
 import { PrometheusSerializer } from "../src/exporter-prometheus/PrometheusSerializer.ts";