Skip to content
Closed
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
6 changes: 3 additions & 3 deletions infra/docker/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ COMPOSE_PATH_SEPARATOR=:
# Infra dependencies — pinned for reproducibility.
CLICKHOUSE_IMAGE_NAME=clickhouse/clickhouse-server:24.3.15.72-alpine
KAFKA_IMAGE_NAME=confluentinc/cp-kafka:7.7.0
OTEL_COLLECTOR_BUILD_IMAGE_NAME=alpine:3.21.3
OTEL_COLLECTOR_IMAGE_NAME=otel/opentelemetry-collector-contrib:0.128.0
POSTGRES_IMAGE_NAME=ankane/pgvector:v0.5.1
# OTEL collector image vars removed — HOL-21 dropped the collector container.
# Backend hosts the OTLP receiver at /otel/v1/{logs,traces,metrics}.
REDIS_IMAGE_NAME=redis:8.0.2
ZOOKEEPER_IMAGE_NAME=confluentinc/cp-zookeeper:7.7.0

Expand Down Expand Up @@ -52,7 +52,7 @@ REACT_APP_DISABLE_ANALYTICS=false
REACT_APP_FRONTEND_ORG=1
REACT_APP_FRONTEND_URI=http://localhost:3000
REACT_APP_IN_DOCKER=true
REACT_APP_OTLP_ENDPOINT=http://localhost:4318
REACT_APP_OTLP_ENDPOINT=http://localhost:8082/otel
REACT_APP_PRIVATE_GRAPH_URI=http://localhost:8082/private
REACT_APP_PUBLIC_GRAPH_URI=http://localhost:8082/public

Expand Down
19 changes: 0 additions & 19 deletions infra/docker/collector.Dockerfile

This file was deleted.

158 changes: 0 additions & 158 deletions infra/docker/collector.yml

This file was deleted.

23 changes: 4 additions & 19 deletions infra/docker/compose.hobby-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,9 @@ services:
timeout: 5s
retries: 10

collector:
container_name: collector
build:
context: ../..
dockerfile: infra/docker/collector.Dockerfile
args:
- IN_DOCKER_GO=true
- SSL=false
restart: on-failure
extra_hosts:
- 'host.docker.internal:host-gateway'
ports:
- '0.0.0.0:4317:4317'
- '0.0.0.0:4318:4318'
- '0.0.0.0:4319:4319'
depends_on:
backend:
condition: service_healthy
# Collector removed in HOL-21 — backend has its own OTLP receiver at
# /otel/v1/{logs,traces,metrics}. SDKs should target the backend's
# OTLP endpoint (default http://backend:8082/otel).

frontend:
container_name: frontend
Expand All @@ -74,7 +59,7 @@ services:
- REACT_APP_FRONTEND_URI=${REACT_APP_FRONTEND_URI:-http://localhost:3000}
- REACT_APP_PRIVATE_GRAPH_URI=${REACT_APP_PRIVATE_GRAPH_URI:-http://localhost:8082/private}
- REACT_APP_PUBLIC_GRAPH_URI=${REACT_APP_PUBLIC_GRAPH_URI:-http://localhost:8082/public}
- REACT_APP_OTLP_ENDPOINT=${REACT_APP_OTLP_ENDPOINT:-http://localhost:4318}
- REACT_APP_OTLP_ENDPOINT=${REACT_APP_OTLP_ENDPOINT:-http://localhost:8082/otel}

volumes:
highlight-data:
35 changes: 5 additions & 30 deletions infra/docker/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,36 +90,11 @@ services:
- clickhouse-data:/var/lib/clickhouse
- clickhouse-logs:/var/log/clickhouse-server

collector:
logging: *local-logging
restart: on-failure
build:
dockerfile: ./infra/docker/collector.Dockerfile
pull: true
target: collector
context: ../..
args:
- IN_DOCKER_GO
- SSL
container_name: collector
extra_hosts:
- 'host.docker.internal:host-gateway'
volumes:
- ../../src/backend/localhostssl/server.crt:/server.crt
- ../../src/backend/localhostssl/server.key:/server.key
ports:
- '0.0.0.0:24224:24224'
- '0.0.0.0:34302:34302'
- '0.0.0.0:4317:4317'
- '0.0.0.0:4318:4318'
- '0.0.0.0:4319:4319'
- '0.0.0.0:4433:4433'
- '0.0.0.0:4434:4434'
- '0.0.0.0:4435:4435'
- '0.0.0.0:6513:6513'
- '0.0.0.0:6514:6514'
- '0.0.0.0:8318:8318'
- '0.0.0.0:8889:8888'
# Collector removed in HOL-21. The backend has a full OTLP HTTP receiver
# at /otel/v1/{logs,traces,metrics} (JSON + protobuf, gzip + snappy
# decompression). Self-hosted deployments don't need the SaaS-shaped
# multi-protocol relay (fluentforward, syslog, AWS Firehose, etc).
# Point SDKs at http://<host>:8082/otel instead of http://<host>:4318.

volumes:
postgres-data:
Expand Down
27 changes: 0 additions & 27 deletions infra/docker/configure-collector.sh

This file was deleted.

9 changes: 5 additions & 4 deletions infra/docker/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,18 @@ if [[ "$*" == *"--go-docker"* ]]; then
export KAFKA_ADVERTISED_LISTENERS="PLAINTEXT://kafka:9092"
export KAFKA_SERVERS=kafka:9092
export ON_PREM=true
export OTLP_DOGFOOD_ENDPOINT=http://collector:4318
export OTLP_ENDPOINT=http://collector:4318
# HOL-21: collector container removed; backend hosts the OTLP receiver.
export OTLP_DOGFOOD_ENDPOINT=http://backend:8082/otel
export OTLP_ENDPOINT=http://backend:8082/otel
export PSQL_HOST=postgres
export REDIS_EVENTS_STAGING_ENDPOINT=redis:6379
echo "Using docker-internal infra."
else
export CLICKHOUSE_ADDRESS=localhost:9000
export KAFKA_ADVERTISED_LISTENERS="PLAINTEXT://localhost:9092"
export KAFKA_SERVERS=localhost:9092
export OTLP_DOGFOOD_ENDPOINT=http://localhost:4318
export OTLP_ENDPOINT=http://localhost:4318
export OTLP_DOGFOOD_ENDPOINT=http://localhost:8082/otel
export OTLP_ENDPOINT=http://localhost:8082/otel
export PSQL_HOST=localhost
export REDIS_EVENTS_STAGING_ENDPOINT=localhost:6379
fi
Expand Down
2 changes: 1 addition & 1 deletion infra/docker/start-infra.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source env.sh

# startup the infra

SERVICES="clickhouse kafka postgres redis zookeeper collector"
SERVICES="clickhouse kafka postgres redis zookeeper"
BUILD_ARGS="--build-arg OTEL_COLLECTOR_ALPINE_IMAGE_NAME=${OTEL_COLLECTOR_ALPINE_IMAGE_NAME} \
--build-arg OTEL_COLLECTOR_IMAGE_NAME=${OTEL_COLLECTOR_IMAGE_NAME}"

Expand Down
5 changes: 4 additions & 1 deletion sdk/highlight-run/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,12 @@ const H: HighlightPublicInterface = {
setupBrowserTracing({
backendUrl:
options?.backendUrl ?? 'http://localhost:8082/public',
// HOL-21: backend hosts the OTLP receiver at /otel.
// The previous :4318 default targeted the dedicated
// collector container, which was removed.
otlpEndpoint:
options?.otlpEndpoint ??
'http://localhost:4318',
'http://localhost:8082/otel',
projectId: projectID,
sessionSecureId: sessionSecureID,
environment: options?.environment ?? 'production',
Expand Down
Loading