diff --git a/.env.sample b/.env.sample index 05998d1..cf79fbc 100644 --- a/.env.sample +++ b/.env.sample @@ -4,3 +4,8 @@ GREETING_SERVICE_URL=localhost:50052 PERSON_SERVICE_URL=localhost:50051 OTEL_SERVICE_NAME=acme-node +OTEL_LOG_LEVEL=debug +OTEL_TRACES_EXPORTER=otlp +OTEL_METRICS_EXPORTER=none +OTEL_LOGS_EXPORTER=none +OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4318 diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 2516967..3237fcd 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -4,6 +4,7 @@ on: - opened - reopened - labeled + - unlabeled - synchronize branches: - main @@ -13,7 +14,8 @@ concurrency: cancel-in-progress: true permissions: - contents: read + contents: write + pull-requests: write packages: write attestations: write id-token: write @@ -23,13 +25,19 @@ name: Integration jobs: lint: + if: ${{ !contains(fromJSON('["labeled", "unlabeled"]'), github.event.action) }} name: Integrate uses: gitops-ci-cd/.github/.github/workflows/lint.yaml@main test: + if: ${{ !contains(fromJSON('["labeled", "unlabeled"]'), github.event.action) }} name: Integrate uses: gitops-ci-cd/.github/.github/workflows/test.yaml@main + bump: + name: Integrate + uses: gitops-ci-cd/.github/.github/workflows/bump.yaml@main + deploy: if: github.event.action == 'labeled' && github.event.label.name == 'preview' || github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'preview') name: Deploy diff --git a/compose.yaml b/compose.yaml index 1fa2ed5..e50c472 100644 --- a/compose.yaml +++ b/compose.yaml @@ -57,6 +57,17 @@ services: volumes: - node_modules:/node_modules:cached + jaeger: + image: jaegertracing/jaeger:latest + ports: + - 16686:16686 # UI http://localhost:16686/ + - 4317:4317 + - 4318:4318 + - 5778:5778 + - 9411:9411 + environment: + - LOG_LEVEL=debug + install: <<: *npm profiles: [tasks] diff --git a/package.json b/package.json index 1d53354..5524dfa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "0.6.1", + "version": "0.7.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js",