-
Notifications
You must be signed in to change notification settings - Fork 534
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into tm-fix-aws-sdk-v3-middleware-stack-break
- Loading branch information
Showing
118 changed files
with
6,581 additions
and
3,066 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.5","detectors/node/opentelemetry-resource-detector-aws":"1.3.5","detectors/node/opentelemetry-resource-detector-azure":"0.2.3","detectors/node/opentelemetry-resource-detector-container":"0.3.5","detectors/node/opentelemetry-resource-detector-gcp":"0.29.5","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.5","metapackages/auto-instrumentations-node":"0.40.3","metapackages/auto-instrumentations-web":"0.35.0","packages/opentelemetry-host-metrics":"0.34.1","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.5","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.35.1","plugins/node/instrumentation-amqplib":"0.33.5","plugins/node/instrumentation-cucumber":"0.2.1","plugins/node/instrumentation-dataloader":"0.5.4","plugins/node/instrumentation-fs":"0.8.4","plugins/node/instrumentation-lru-memoizer":"0.33.5","plugins/node/instrumentation-mongoose":"0.34.0","plugins/node/instrumentation-socket.io":"0.35.0","plugins/node/instrumentation-tedious":"0.6.5","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.4","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.37.2","plugins/node/opentelemetry-instrumentation-bunyan":"0.34.1","plugins/node/opentelemetry-instrumentation-cassandra":"0.34.2","plugins/node/opentelemetry-instrumentation-connect":"0.32.4","plugins/node/opentelemetry-instrumentation-dns":"0.32.5","plugins/node/opentelemetry-instrumentation-express":"0.34.1","plugins/node/opentelemetry-instrumentation-fastify":"0.32.6","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.5","plugins/node/opentelemetry-instrumentation-graphql":"0.36.1","plugins/node/opentelemetry-instrumentation-hapi":"0.33.3","plugins/node/opentelemetry-instrumentation-ioredis":"0.36.1","plugins/node/opentelemetry-instrumentation-knex":"0.32.4","plugins/node/opentelemetry-instrumentation-koa":"0.36.4","plugins/node/opentelemetry-instrumentation-memcached":"0.32.5","plugins/node/opentelemetry-instrumentation-mongodb":"0.38.1","plugins/node/opentelemetry-instrumentation-mysql":"0.34.5","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.5","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.4","plugins/node/opentelemetry-instrumentation-net":"0.32.5","plugins/node/opentelemetry-instrumentation-pg":"0.37.2","plugins/node/opentelemetry-instrumentation-pino":"0.34.5","plugins/node/opentelemetry-instrumentation-redis":"0.35.5","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.6","plugins/node/opentelemetry-instrumentation-restify":"0.34.3","plugins/node/opentelemetry-instrumentation-router":"0.33.4","plugins/node/opentelemetry-instrumentation-winston":"0.33.1","plugins/web/opentelemetry-instrumentation-document-load":"0.34.1","plugins/web/opentelemetry-instrumentation-long-task":"0.34.1","plugins/web/opentelemetry-instrumentation-user-interaction":"0.34.1","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"} | ||
| {"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.6","detectors/node/opentelemetry-resource-detector-aws":"1.3.6","detectors/node/opentelemetry-resource-detector-azure":"0.2.4","detectors/node/opentelemetry-resource-detector-container":"0.3.6","detectors/node/opentelemetry-resource-detector-gcp":"0.29.6","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.6.0","metapackages/auto-instrumentations-node":"0.41.0","metapackages/auto-instrumentations-web":"0.36.0","packages/opentelemetry-host-metrics":"0.35.0","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.6","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.36.0","plugins/node/instrumentation-amqplib":"0.34.0","plugins/node/instrumentation-cucumber":"0.3.0","plugins/node/instrumentation-dataloader":"0.6.0","plugins/node/instrumentation-fs":"0.9.0","plugins/node/instrumentation-lru-memoizer":"0.34.0","plugins/node/instrumentation-mongoose":"0.35.0","plugins/node/instrumentation-socket.io":"0.36.0","plugins/node/instrumentation-tedious":"0.7.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.38.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.38.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.35.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.35.0","plugins/node/opentelemetry-instrumentation-connect":"0.33.0","plugins/node/opentelemetry-instrumentation-dns":"0.33.0","plugins/node/opentelemetry-instrumentation-express":"0.35.0","plugins/node/opentelemetry-instrumentation-fastify":"0.33.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.33.0","plugins/node/opentelemetry-instrumentation-graphql":"0.37.0","plugins/node/opentelemetry-instrumentation-hapi":"0.34.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.37.0","plugins/node/opentelemetry-instrumentation-knex":"0.33.0","plugins/node/opentelemetry-instrumentation-koa":"0.37.0","plugins/node/opentelemetry-instrumentation-memcached":"0.33.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.39.0","plugins/node/opentelemetry-instrumentation-mysql":"0.35.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.35.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.34.0","plugins/node/opentelemetry-instrumentation-net":"0.33.0","plugins/node/opentelemetry-instrumentation-pg":"0.38.0","plugins/node/opentelemetry-instrumentation-pino":"0.35.0","plugins/node/opentelemetry-instrumentation-redis":"0.36.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.36.0","plugins/node/opentelemetry-instrumentation-restify":"0.35.0","plugins/node/opentelemetry-instrumentation-router":"0.34.0","plugins/node/opentelemetry-instrumentation-winston":"0.34.0","plugins/web/opentelemetry-instrumentation-document-load":"0.35.0","plugins/web/opentelemetry-instrumentation-long-task":"0.35.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.35.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,31 @@ | ||
| version: "3" | ||
| services: | ||
| # Collector | ||
| collector: | ||
| image: otel/opentelemetry-collector:0.38.0 | ||
| # image: otel/opentelemetry-collector:latest | ||
| command: ["--config=/conf/collector-config.yaml", "--log-level=DEBUG"] | ||
| image: otel/opentelemetry-collector:0.92.0 | ||
| command: ["--config=/conf/collector-config.yaml"] | ||
| volumes: | ||
| - ./collector-config.yaml:/conf/collector-config.yaml | ||
| ports: | ||
| - "9464:9464" | ||
| - "4317:4317" | ||
| - "4318:4318" | ||
| - "4317:4317" # OTLP-grpc compatible endpoint (used by client/server) | ||
| - "4318:4318" # OTLP-http compatible endpoint (unused in this example) | ||
| depends_on: | ||
| - zipkin-all-in-one | ||
| - jaeger | ||
| - zipkin | ||
|
|
||
| # Zipkin | ||
| zipkin-all-in-one: | ||
| image: openzipkin/zipkin:latest | ||
| jaeger: | ||
| image: jaegertracing/all-in-one:1.52 | ||
| ports: | ||
| - "9411:9411" | ||
| - "16686:16686" # frontend (to inspect traces) | ||
|
|
||
| zipkin: | ||
| image: openzipkin/zipkin:3 | ||
| ports: | ||
| - "9411:9411" # frontend (to inspect traces) | ||
|
|
||
| prometheus: | ||
| container_name: prometheus | ||
| image: prom/prometheus:v2.49.0 | ||
| volumes: | ||
| - ./prometheus.yaml:/etc/prometheus/prometheus.yml | ||
| ports: | ||
| - "9090:9090" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| global: | ||
| scrape_interval: 15s # Default is every 1 minute. | ||
|
|
||
| scrape_configs: | ||
| - job_name: 'collector' | ||
| # metrics_path defaults to '/metrics' | ||
| # scheme defaults to 'http'. | ||
| static_configs: | ||
| - targets: ['collector:9464'] |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| 'use strict'; | ||
|
|
||
| const { | ||
| diag, | ||
| DiagConsoleLogger, | ||
| DiagLogLevel, | ||
| } = require('@opentelemetry/api'); | ||
|
|
||
| diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.WARN); | ||
|
|
||
| const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http'); | ||
| const { FastifyInstrumentation } = require('@opentelemetry/instrumentation-fastify'); | ||
|
|
||
| const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-proto'); | ||
| const { OTLPMetricExporter } = require('@opentelemetry/exporter-metrics-otlp-proto'); | ||
| const { NodeSDK, metrics } = require('@opentelemetry/sdk-node'); | ||
|
|
||
| const sdk = new NodeSDK({ | ||
| instrumentations: [ | ||
| HttpInstrumentation, | ||
| new FastifyInstrumentation(), | ||
| ], | ||
| traceExporter: new OTLPTraceExporter(), | ||
| metricReader: new metrics.PeriodicExportingMetricReader({ | ||
| exporter: new OTLPMetricExporter(), | ||
| }), | ||
| }); | ||
|
|
||
| process.on('beforeExit', async () => { | ||
| await sdk.shutdown(); | ||
| }); | ||
|
|
||
| sdk.start(); |
Oops, something went wrong.