Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/shiny-mails-exercise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@hyperdx/node-opentelemetry': patch
---

feat: support gRPC protocol
5 changes: 5 additions & 0 deletions .changeset/stupid-pugs-type.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@hyperdx/node-opentelemetry': patch
---

fix: pino trace linking issue
14 changes: 14 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
node_modules
dist
.nx
.git
.github
*.md
.vscode
.idea
*.log
coverage
.eslintcache
smoke-tests/collector/data.json
smoke-tests/collector/data-results
smoke-tests/report.*
4 changes: 3 additions & 1 deletion .github/workflows/smoke.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ jobs:
- name: Setup BATS
uses: mig4/setup-bats@v1
with:
bats-version: 1.10.0
bats-version: 1.12.0
- name: Check out repository
uses: actions/checkout@v4
- name: Build smoke test images
run: make build-smoke-images
- name: Run smoke tests
run: make smoke-sdk
39 changes: 17 additions & 22 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,51 +6,46 @@ clean-smoke-tests:

#: cleans up TS build, smoke test output, and example app detritus
squeaky-clean: clean clean-smoke-tests
rm -rf ./examples/dist
rm -rf ./examples/node_modules
rm -rf ./examples/hello-node/dist
rm -rf ./examples/hello-node/node_modules
rm -rf ./examples/hello-node-express/dist
rm -rf ./examples/hello-node-express/node_modules
rm -rf ./examples/hello-node-express-ts/dist
rm -rf ./examples/hello-node-express-ts/node_modules
rm -rf ./smoke-tests/hello-node-express-ts/dist
rm -rf ./smoke-tests/hello-node-express-ts/node_modules

smoke-tests/collector/data.json:
@echo ""
@echo "+++ Zhuzhing smoke test's Collector data.json"
@touch $@ && chmod o+w $@

smoke-sdk-grpc: smoke-tests/collector/data.json
#: build Docker images for smoke tests (with caching)
build-smoke-images:
@echo ""
@echo "+++ Running gRPC smoke tests."
@echo "+++ Building smoke test Docker images (cached)"
@echo ""
cd smoke-tests && bats ./smoke-sdk-grpc.bats --report-formatter junit --output ./
cd smoke-tests && docker compose build

smoke-sdk-grpc-ts: smoke-tests/collector/data.json
smoke-sdk-grpc-ts: build-smoke-images smoke-tests/collector/data.json
@echo ""
@echo "+++ Running gRPC smoke tests for TypeScript."
@echo ""
cd smoke-tests && bats ./smoke-sdk-grpc-ts.bats --report-formatter junit --output ./
cd smoke-tests && bats ./smoke-sdk-grpc-ts.bats --report-formatter junit --output ./ --verbose-run

smoke-sdk-http: smoke-tests/collector/data.json
smoke-sdk-http-ts: build-smoke-images smoke-tests/collector/data.json
@echo ""
@echo "+++ Running HTTP smoke tests."
@echo "+++ Running HTTP smoke tests for TypeScript."
@echo ""
cd smoke-tests && bats ./smoke-sdk-http.bats --report-formatter junit --output ./
cd smoke-tests && bats ./smoke-sdk-http-ts.bats --report-formatter junit --output ./ --verbose-run

smoke-sdk-http-ts: smoke-tests/collector/data.json
smoke-sdk-http-ts-programmaticImports: build-smoke-images smoke-tests/collector/data.json
@echo ""
@echo "+++ Running HTTP smoke tests for TypeScript."
@echo "+++ Running HTTP programmatic imports smoke tests for TypeScript."
@echo ""
cd smoke-tests && bats ./smoke-sdk-http-ts.bats --report-formatter junit --output ./
cd smoke-tests && bats ./smoke-sdk-http-ts-programmaticImports.bats --report-formatter junit --output ./ --verbose-run

smoke-sdk: smoke-sdk-http smoke-sdk-http-ts
smoke-sdk: smoke-sdk-http-ts smoke-sdk-grpc-ts

smoke: docker_compose_present
@echo ""
@echo "+++ Smoking all the tests."
@echo ""
cd smoke-tests && bats . --report-formatter junit --output ./
cd smoke-tests && bats . --report-formatter junit --output ./ --verbose-run

unsmoke: docker_compose_present
@echo ""
Expand All @@ -61,7 +56,7 @@ unsmoke: docker_compose_present
#: use this for local smoke testing
resmoke: unsmoke smoke

.PHONY: clean-smoke-tests example smoke unsmoke resmoke smoke-sdk-grpc smoke-sdk-http smoke-sdk
.PHONY: clean-smoke-tests build-smoke-images example smoke unsmoke resmoke smoke-sdk-grpc-ts smoke-sdk-http-ts smoke-sdk-http-ts-programmaticImports smoke-sdk

.PHONY: docker_compose_present
docker_compose_present:
Expand Down
7 changes: 0 additions & 7 deletions examples/hello-node-express-ts/instrumentation.ts

This file was deleted.

19 changes: 0 additions & 19 deletions examples/hello-node-express/Dockerfile

This file was deleted.

32 changes: 0 additions & 32 deletions examples/hello-node-express/README.md

This file was deleted.

52 changes: 0 additions & 52 deletions examples/hello-node-express/index.js

This file was deleted.

15 changes: 0 additions & 15 deletions examples/hello-node-express/package.json

This file was deleted.

Loading