Skip to content

Commit

Permalink
Delete playground files and persistent sub attribute
Browse files Browse the repository at this point in the history 
* Remove unused dependencies
  • Loading branch information
@w1am
w1am committed Apr 30, 2024
1 parent 1928ec7 commit 6dcf717
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 217 deletions.
2 changes: 1 addition & 1 deletion packages/opentelemetry/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ npm install --save @eventstore/opentelemetry

- `[6.x]`

It's likely that the instrumentation would support earlier versions of EventStoreDB, but I haven't tested it.
It's likely that the instrumentation would support earlier versions of EventStoreDB, but this has not been tested.

## Usage

Expand Down
10 changes: 2 additions & 8 deletions packages/opentelemetry/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,10 @@
},
"dependencies": {
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/instrumentation": "^0.50.0",
"@opentelemetry/sdk-node": "^0.50.0",
"@opentelemetry/semantic-conventions": "^1.23.0"
"@opentelemetry/instrumentation": "^0.50.0"
},
"devDependencies": {
"@eventstore/db-client": "*",
"@opentelemetry/context-async-hooks": "^1.23.0",
"@opentelemetry/core": "^1.23.0",
"@opentelemetry/sdk-trace-base": "^1.23.0",
"@opentelemetry/sdk-trace-node": "^1.23.0"
"@eventstore/db-client": "*"
},
"peerDependencies": {
"@eventstore/db-client": "^6"
Expand Down
3 changes: 1 addition & 2 deletions packages/opentelemetry/src/attributes.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ export const EventStoreDBAttributes = {

STREAM_APPEND: `${streams}.append`,
STREAM_SUBSCIBE: `${streams}.subscribe`,
STREAM_PERSISTENT_SUBSCRIBE: `${streams}.persistent_susbcribe`,

EVENT_STORE_STREAM: `${esdb}.stream`,
EVENT_STORE_SUBSCRIPTION_ID: `${esdb}.subscription_id`,
EVENT_STORE_SUBSCRIPTION_ID: `${esdb}.subscription.id`,
EVENT_STORE_EVENT_ID: `${esdb}.event.id`,
EVENT_STORE_EVENT_TYPE: `${esdb}.event.type`,
};
2 changes: 1 addition & 1 deletion packages/opentelemetry/src/instrumentation.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ export class Instrumentation extends InstrumentationBase {

this.resolveUri().then((uri) =>
Instrumentation.applySubscriptionInstrumentation(
EventStoreDBAttributes.STREAM_PERSISTENT_SUBSCRIBE,
EventStoreDBAttributes.STREAM_SUBSCIBE,
subscription,
uri,
operation,
Expand Down
67 changes: 0 additions & 67 deletions packages/opentelemetry/src/main.ts
View file

This file was deleted.

5 changes: 2 additions & 3 deletions packages/test/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@
"ts-jest": "^27.1.5"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^1.23.0",
"@opentelemetry/core": "^1.23.0",
"@opentelemetry/sdk-trace-base": "^1.23.0",
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/sdk-trace-node": "^1.23.0",
"@opentelemetry/semantic-conventions": "^1.23.0",
"@types/jest": "^29.5.12",
"docker-compose": "^0.24.8",
"get-port": "^5.1.1",
Expand Down
10 changes: 4 additions & 6 deletions packages/test/src/opentelemetry/instrumentation.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { createTestNode, Defer, delay, jsonTestEvents } from "@test-utils";
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
import {
NodeTracerProvider,
InMemorySpanExporter,
SimpleSpanProcessor,
} from "@opentelemetry/sdk-trace-base";
} from "@opentelemetry/sdk-trace-node";
import {
SEMATTRS_EXCEPTION_STACKTRACE,
SEMATTRS_EXCEPTION_TYPE,
Expand Down Expand Up @@ -323,8 +323,7 @@ describe("instrumentation", () => {
(span) => span.name === EventStoreDBAttributes.STREAM_APPEND
);
const childSpan = spans.find(
(span) =>
span.name === EventStoreDBAttributes.STREAM_PERSISTENT_SUBSCRIBE
(span) => span.name === EventStoreDBAttributes.STREAM_SUBSCIBE
);

expect(parentSpan).toBeDefined();
Expand Down Expand Up @@ -426,8 +425,7 @@ describe("instrumentation", () => {
(span) => span.name === EventStoreDBAttributes.STREAM_APPEND
);
const childSpan = spans.find(
(span) =>
span.name === EventStoreDBAttributes.STREAM_PERSISTENT_SUBSCRIBE
(span) => span.name === EventStoreDBAttributes.STREAM_SUBSCIBE
);

expect(parentSpan).toBeDefined();
Expand Down
3 changes: 1 addition & 2 deletions packages/test/src/utils/Cluster.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,7 @@ export class Cluster {
},
};
}
// public domain = "client.bespin.dev";
public domain = "localhost";
public domain = "client.bespin.dev";
public get uri(): string {
return `${this.domain}:${this.locations[0].port}`;
}
Expand Down
140 changes: 13 additions & 127 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@
resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==

"@grpc/grpc-js@^1.7.1", "@grpc/grpc-js@^1.9.12":
"@grpc/grpc-js@^1.9.12":
version "1.10.6"
resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.10.6.tgz#1e3eb1af911dc888fbef7452f56a7573b8284d54"
integrity sha512-xP58G7wDQ4TCmN/cMUHh00DS7SRDv/+lC+xFLrTkMIN8h55X5NhZMLYbvy7dSELP15qlI6hPhNCRWVMtZMwqLA==
Expand Down Expand Up @@ -1171,64 +1171,19 @@
resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.8.0.tgz#5aa7abb48f23f693068ed2999ae627d2f7d902ec"
integrity sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==

"@opentelemetry/context-async-hooks@1.23.0", "@opentelemetry/context-async-hooks@^1.23.0":
"@opentelemetry/context-async-hooks@1.23.0":
version "1.23.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-1.23.0.tgz#4c4627fe2857324459b0a78b5a83cbc64a415d14"
integrity sha512-wazGJZDRevibOJ+VgyrT+9+8sybZAxpZx2G7vy30OAtk92OpZCg7HgNxT11NUx0VBDWcRx1dOatMYGOVplQ7QA==

"@opentelemetry/core@1.23.0", "@opentelemetry/core@^1.23.0":
"@opentelemetry/core@1.23.0":
version "1.23.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.23.0.tgz#f2e7ada7f35750f3c1674aef1e52c879005c0731"
integrity sha512-hdQ/a9TMzMQF/BO8Cz1juA43/L5YGtCSiKoOHmrTEf7VMDAZgy8ucpWx3eQTnQ3gBloRcWtzvcrMZABC3PTSKQ==
dependencies:
"@opentelemetry/semantic-conventions" "1.23.0"

"@opentelemetry/exporter-trace-otlp-grpc@0.50.0":
version "0.50.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-grpc/-/exporter-trace-otlp-grpc-0.50.0.tgz#758ee4be1ce8d23f75c24c078976ad78fba46563"
integrity sha512-w/NF4TrwHxx+Uz1M0rCOSVr6KgcoQPv3zF9JRqcebY2euD7ddWnLP0hE8JavyA1uq4UchnMp9faAk9n7hTCePw==
dependencies:
"@grpc/grpc-js" "^1.7.1"
"@opentelemetry/core" "1.23.0"
"@opentelemetry/otlp-grpc-exporter-base" "0.50.0"
"@opentelemetry/otlp-transformer" "0.50.0"
"@opentelemetry/resources" "1.23.0"
"@opentelemetry/sdk-trace-base" "1.23.0"

"@opentelemetry/exporter-trace-otlp-http@0.50.0":
version "0.50.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.50.0.tgz#6f5961edf98ac85654c82c2f60044051cdbb1e7a"
integrity sha512-L7OtIMT7MsFqkmhbQlPBGRXt7152VN5esHpQEJYIBFedOEo3Da+yHpu5ojMZtPzpIvSpB5Xr5lnJUjJCbkttCA==
dependencies:
"@opentelemetry/core" "1.23.0"
"@opentelemetry/otlp-exporter-base" "0.50.0"
"@opentelemetry/otlp-transformer" "0.50.0"
"@opentelemetry/resources" "1.23.0"
"@opentelemetry/sdk-trace-base" "1.23.0"

"@opentelemetry/exporter-trace-otlp-proto@0.50.0":
version "0.50.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-proto/-/exporter-trace-otlp-proto-0.50.0.tgz#13311ef7658c02897201356639e280711c673c88"
integrity sha512-vavD9Ow6yOLiD+ocuS/oeciCsXNdsN41aYUrEljNaLXogvnkfMhJ+JLAhOnRSpzlVtRp7Ciw2BYGdYSebR0OsA==
dependencies:
"@opentelemetry/core" "1.23.0"
"@opentelemetry/otlp-exporter-base" "0.50.0"
"@opentelemetry/otlp-proto-exporter-base" "0.50.0"
"@opentelemetry/otlp-transformer" "0.50.0"
"@opentelemetry/resources" "1.23.0"
"@opentelemetry/sdk-trace-base" "1.23.0"

"@opentelemetry/exporter-zipkin@1.23.0":
version "1.23.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-zipkin/-/exporter-zipkin-1.23.0.tgz#0e3f44007bd1d5040ef7925908b4bfcf1d7f7825"
integrity sha512-2LOGvNUGONuIcWhynFaJorVyqv03uZkURScciLmOxvBf2lWTNPEj77br1dCpShIWBM+YlrH7Tc+JXAs+GC7DqA==
dependencies:
"@opentelemetry/core" "1.23.0"
"@opentelemetry/resources" "1.23.0"
"@opentelemetry/sdk-trace-base" "1.23.0"
"@opentelemetry/semantic-conventions" "1.23.0"

"@opentelemetry/instrumentation@0.50.0", "@opentelemetry/instrumentation@^0.50.0":
"@opentelemetry/instrumentation@^0.50.0":
version "0.50.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.50.0.tgz#c558cfc64b84c11d304f31ccdf0de312ec60a2c9"
integrity sha512-bhGhbJiZKpuu7wTaSak4hyZcFPlnDeuSF/2vglze8B4w2LubcSbbOnkVTzTs5SXtzh4Xz8eRjaNnAm+u2GYufQ==
Expand All @@ -1240,44 +1195,6 @@
semver "^7.5.2"
shimmer "^1.2.1"

"@opentelemetry/otlp-exporter-base@0.50.0":
version "0.50.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.50.0.tgz#28bf0e175a22589f3a113873279bd1e7bb27a204"
integrity sha512-JUmjmrCmE1/fc4LjCQMqLfudgSl5OpUkzx7iA94b4jgeODM7zWxUoVXL7/CT7fWf47Cn+pmKjMvTCSESqZZ3mA==
dependencies:
"@opentelemetry/core" "1.23.0"

"@opentelemetry/otlp-grpc-exporter-base@0.50.0":
version "0.50.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-grpc-exporter-base/-/otlp-grpc-exporter-base-0.50.0.tgz#f3abbc68b4f200ba25f25e076cfa93efcac784a7"
integrity sha512-J500AczSD7xEsjXpwNzSh5HQqxW73PT3CCNsi1VEWCE+8UPgVfkHYIGRHGoch35DV+CMe1svbi7gAk3e5eCSVA==
dependencies:
"@grpc/grpc-js" "^1.7.1"
"@opentelemetry/core" "1.23.0"
"@opentelemetry/otlp-exporter-base" "0.50.0"
protobufjs "^7.2.3"

"@opentelemetry/otlp-proto-exporter-base@0.50.0":
version "0.50.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-proto-exporter-base/-/otlp-proto-exporter-base-0.50.0.tgz#1add1b49dad943cfdc4707315f7713b943e3c794"
integrity sha512-hlbn3eZbhxoK79Sq1ddj1f7qcx+PzsPQC/SFpJvaWgTaqacCbqJmpzWDKfRRCAC7iGX2Hj/sgpf8vysazqyMOw==
dependencies:
"@opentelemetry/core" "1.23.0"
"@opentelemetry/otlp-exporter-base" "0.50.0"
protobufjs "^7.2.3"

"@opentelemetry/otlp-transformer@0.50.0":
version "0.50.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.50.0.tgz#211fe512fcce9d76042680f955336dbde3be03ef"
integrity sha512-s0sl1Yfqd5q1Kjrf6DqXPWzErL+XHhrXOfejh4Vc/SMTNqC902xDsC8JQxbjuramWt/+hibfguIvi7Ns8VLolA==
dependencies:
"@opentelemetry/api-logs" "0.50.0"
"@opentelemetry/core" "1.23.0"
"@opentelemetry/resources" "1.23.0"
"@opentelemetry/sdk-logs" "0.50.0"
"@opentelemetry/sdk-metrics" "1.23.0"
"@opentelemetry/sdk-trace-base" "1.23.0"

"@opentelemetry/propagator-b3@1.23.0":
version "1.23.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/propagator-b3/-/propagator-b3-1.23.0.tgz#436c1e33b68e6b0964853d0dc3e4f5f0b785c47e"
Expand All @@ -1300,43 +1217,7 @@
"@opentelemetry/core" "1.23.0"
"@opentelemetry/semantic-conventions" "1.23.0"

"@opentelemetry/sdk-logs@0.50.0":
version "0.50.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.50.0.tgz#6636492cf626a9666f61d91025e25243d1a43bfc"
integrity sha512-PeUEupBB29p9nlPNqXoa1PUWNLsZnxG0DCDj3sHqzae+8y76B/A5hvZjg03ulWdnvBLYpnJslqzylG9E0IL87g==
dependencies:
"@opentelemetry/core" "1.23.0"
"@opentelemetry/resources" "1.23.0"

"@opentelemetry/sdk-metrics@1.23.0":
version "1.23.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.23.0.tgz#b4cf3cc86b6dedf5c438c67c829df7399bf64be1"
integrity sha512-4OkvW6+wST4h6LFG23rXSTf6nmTf201h9dzq7bE0z5R9ESEVLERZz6WXwE7PSgg1gdjlaznm1jLJf8GttypFDg==
dependencies:
"@opentelemetry/core" "1.23.0"
"@opentelemetry/resources" "1.23.0"
lodash.merge "^4.6.2"

"@opentelemetry/sdk-node@^0.50.0":
version "0.50.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-node/-/sdk-node-0.50.0.tgz#3c06a6284bd3cdd8b024888898b47239e2e38af8"
integrity sha512-LhIXHnvcnhRYcPwG9VG4G6lJ7x4ElYF6UYHHmXA7e4ZWzSUEFmAPfR1IBWv358aD1KwffcEBu7J6zeAR7lPZag==
dependencies:
"@opentelemetry/api-logs" "0.50.0"
"@opentelemetry/core" "1.23.0"
"@opentelemetry/exporter-trace-otlp-grpc" "0.50.0"
"@opentelemetry/exporter-trace-otlp-http" "0.50.0"
"@opentelemetry/exporter-trace-otlp-proto" "0.50.0"
"@opentelemetry/exporter-zipkin" "1.23.0"
"@opentelemetry/instrumentation" "0.50.0"
"@opentelemetry/resources" "1.23.0"
"@opentelemetry/sdk-logs" "0.50.0"
"@opentelemetry/sdk-metrics" "1.23.0"
"@opentelemetry/sdk-trace-base" "1.23.0"
"@opentelemetry/sdk-trace-node" "1.23.0"
"@opentelemetry/semantic-conventions" "1.23.0"

"@opentelemetry/sdk-trace-base@1.23.0", "@opentelemetry/sdk-trace-base@^1.23.0":
"@opentelemetry/sdk-trace-base@1.23.0":
version "1.23.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.23.0.tgz#ff0a0f8ec47205e0b14b3b765ea2a34de1ad01dd"
integrity sha512-PzBmZM8hBomUqvCddF/5Olyyviayka44O5nDWq673np3ctnvwMOvNrsUORZjKja1zJbwEuD9niAGbnVrz3jwRQ==
Expand All @@ -1345,7 +1226,7 @@
"@opentelemetry/resources" "1.23.0"
"@opentelemetry/semantic-conventions" "1.23.0"

"@opentelemetry/sdk-trace-node@1.23.0", "@opentelemetry/sdk-trace-node@^1.23.0":
"@opentelemetry/sdk-trace-node@^1.23.0":
version "1.23.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-node/-/sdk-trace-node-1.23.0.tgz#7787f32722e8c77774bfb8a31b88be03e2df0b0d"
integrity sha512-dwnin5Go2r6VzJZkVc9JBPupssWp7j2EFto+S7qRkwQ00WDykWeq3x2Skk7I1Jr448FeBSvGCQVPgV5e6s6O3w==
Expand All @@ -1357,11 +1238,16 @@
"@opentelemetry/sdk-trace-base" "1.23.0"
semver "^7.5.2"

"@opentelemetry/semantic-conventions@1.23.0", "@opentelemetry/semantic-conventions@^1.23.0":
"@opentelemetry/semantic-conventions@1.23.0":
version "1.23.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.23.0.tgz#627f2721b960fe586b7f72a07912cb7699f06eef"
integrity sha512-MiqFvfOzfR31t8cc74CTP1OZfz7MbqpAnLCra8NqQoaHJX6ncIRTdYOQYBDQ2uFISDq0WY8Y9dDTWvsgzzBYRg==

"@opentelemetry/semantic-conventions@^1.23.0":
version "1.24.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.24.0.tgz#f074db930a7feb4d64103a9a576c5fbad046fcac"
integrity sha512-yL0jI6Ltuz8R+Opj7jClGrul6pOoYrdfVmzQS4SITXRPH7I5IRZbrwe/6/v8v4WYMa6MYZG480S1+uc/IGfqsA==

"@parcel/watcher@2.0.4":
version "2.0.4"
resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.4.tgz#f300fef4cc38008ff4b8c29d92588eced3ce014b"
Expand Down Expand Up @@ -6435,7 +6321,7 @@ proto-list@~1.2.1:
resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==

protobufjs@^7.2.3, protobufjs@^7.2.4:
protobufjs@^7.2.4:
version "7.2.6"
resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.6.tgz#4a0ccd79eb292717aacf07530a07e0ed20278215"
integrity sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==
Expand Down

0 comments on commit 6dcf717

Please sign in to comment.