Set OTEL_EXPORTER_OTLP_METRICS_ENDPOINT needed for Java agent (open-t…

…elemetry#237) * Set OTEL_EXPORTER_OTLP_METRICS_ENDPOINT needed for Java agent * Remove unneeded line + add Changelog Co-authored-by: Austin Parker <austin@ap2.io>
jmichalak9 · Aug 2, 2022 · cea323d · cea323d
1 parent 0f7a1c4
commit cea323d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git 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
+GRAFANA_SERVICE_PORT=3000
diff --git 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
@@ -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