diff --git a/.github/workflows/ci-plugin-server.yml b/.github/workflows/ci-plugin-server.yml index 7978d81de9c61..a24eaf53d4e69 100644 --- a/.github/workflows/ci-plugin-server.yml +++ b/.github/workflows/ci-plugin-server.yml @@ -234,8 +234,6 @@ jobs: run: | cd plugin-server pnpm install --frozen-lockfile - ls -al node_modules/ - ls -al node_modules/cyclotron-node/ pnpm build - name: Wait for Clickhouse, Redis & Kafka diff --git a/plugin-server/package.json b/plugin-server/package.json index f38a64b03a689..4ce865ed3c3b2 100644 --- a/plugin-server/package.json +++ b/plugin-server/package.json @@ -89,7 +89,7 @@ "v8-profiler-next": "^1.9.0", "vm2": "3.9.18", "detect-browser": "^5.3.0", - "cyclotron-node": "file:../rust/cyclotron-node" + "@posthog/cyclotron": "file:../rust/cyclotron-node" }, "devDependencies": { "0x": "^5.5.0", diff --git a/plugin-server/pnpm-lock.yaml b/plugin-server/pnpm-lock.yaml index 6982a913eea99..f242e25145a74 100644 --- a/plugin-server/pnpm-lock.yaml +++ b/plugin-server/pnpm-lock.yaml @@ -43,6 +43,9 @@ dependencies: '@posthog/clickhouse': specifier: ^1.7.0 version: 1.7.0 + '@posthog/cyclotron': + specifier: file:../rust/cyclotron-node + version: file:../rust/cyclotron-node '@posthog/hogvm': specifier: ^1.0.32 version: 1.0.32(luxon@3.4.4)(re2@1.20.3) @@ -73,9 +76,6 @@ dependencies: aws-sdk: specifier: ^2.927.0 version: 2.1366.0 - cyclotron-node: - specifier: file:../rust/cyclotron-node - version: file:../rust/cyclotron-node detect-browser: specifier: ^5.3.0 version: 5.3.0 @@ -10737,5 +10737,5 @@ packages: file:../rust/cyclotron-node: resolution: {directory: ../rust/cyclotron-node, type: directory} - name: cyclotron-node + name: '@posthog/cyclotron' dev: false diff --git a/plugin-server/src/cdp/async-function-executor.ts b/plugin-server/src/cdp/async-function-executor.ts index 58d750627b2b0..78a9374a78171 100644 --- a/plugin-server/src/cdp/async-function-executor.ts +++ b/plugin-server/src/cdp/async-function-executor.ts @@ -1,4 +1,4 @@ -import cyclotron from 'cyclotron-node' +import cyclotron from '@posthog/cyclotron' import { Histogram } from 'prom-client' import { buildIntegerMatcher } from '../config/config' diff --git a/plugin-server/src/cdp/cdp-consumers.ts b/plugin-server/src/cdp/cdp-consumers.ts index 6f5c6e572eba8..fef401d472927 100644 --- a/plugin-server/src/cdp/cdp-consumers.ts +++ b/plugin-server/src/cdp/cdp-consumers.ts @@ -1,5 +1,5 @@ +import cyclotron from '@posthog/cyclotron' import { captureException } from '@sentry/node' -import cyclotron from 'cyclotron-node' import { features, librdkafkaVersion, Message } from 'node-rdkafka' import { Counter, Histogram } from 'prom-client' diff --git a/rust/cyclotron-node/package.json b/rust/cyclotron-node/package.json index abb730b4c91a8..ce0965f7cc251 100644 --- a/rust/cyclotron-node/package.json +++ b/rust/cyclotron-node/package.json @@ -1,5 +1,5 @@ { - "name": "cyclotron-node", + "name": "@posthog/cyclotron", "version": "0.1.0", "description": "Node bindings for cyclotron", "main": "dist/index.js",