diff --git a/.env b/.env index 9eaefeab53..0584bd1810 100644 --- a/.env +++ b/.env @@ -8,6 +8,7 @@ COLLECTOR_ZIPKIN_HOST_PORT=:9411 # Collector OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4317 OTEL_EXPORTER_OTLP_ENDPOINT=${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT} +OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT} # Load Generator USERS=10 @@ -55,4 +56,4 @@ FEATURE_FLAG_GRPC_SERVICE_PORT=50053 PROMETHEUS_SERVICE_PORT=9090 # Grafana -GRAFANA_SERVICE_PORT=3000 \ No newline at end of file +GRAFANA_SERVICE_PORT=3000 diff --git a/CHANGELOG.md b/CHANGELOG.md index ee0eba8147..d5284f8ed2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,3 +41,5 @@ significant modifications will be credited to OpenTelemetry Authors. ([#189](https://github.com/open-telemetry/opentelemetry-demo/pull/189)) * Simplified repo name and dropped the '-webstore' suffix in every place ([#225](https://github.com/open-telemetry/opentelemetry-demo/pull/225)) +* Add metrics endpoint in adservice to send metrics from java agent +([#237](https://github.com/open-telemetry/opentelemetry-demo/pull/237)) diff --git a/docker-compose.yml b/docker-compose.yml index d4dfb150ed..7597929ac4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,6 +60,7 @@ services: environment: - AD_SERVICE_PORT - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + - OTEL_EXPORTER_OTLP_METRICS_ENDPOINT - OTEL_RESOURCE_ATTRIBUTES=service.name=adservice depends_on: - otelcol diff --git a/src/adservice/agent/opentelemetry-javaagent.jar b/src/adservice/agent/opentelemetry-javaagent.jar index 932e27ddda..94cdbb60a3 100644 Binary files a/src/adservice/agent/opentelemetry-javaagent.jar and b/src/adservice/agent/opentelemetry-javaagent.jar differ