Goal

Replace EDOT's forked native + PHP code with upstream opentelemetry-php-distro as a git submodule.
Zero merge conflicts on upstream updates. Elastic customizations live in elastic/ directory only.

Architecture

elastic-otel-php/              (EDOT repo)
├── upstream/                   (git submodule → opentelemetry-php-distro, pinned to tag)
├── elastic/
│   ├── native/libelastic/      (C++ static lib: ElasticVendor, ElasticConfigProvider)
│   └── php/                    (bootstrap_elastic.php wrapper)
├── packaging/                  (EDOT packaging: nfpm.yaml, post-install.sh, smoke tests)
├── tools/                      (EDOT build scripts, thin wrappers to upstream)
└── elastic-otel-php.properties (EDOT version only; build params from upstream)

Key Patterns

• Native: VendorCustomizationsInterface weak symbol — libelastic.a linked with WHOLE_ARCHIVE
• CMake: CMAKE_PROJECT_INCLUDE injection — upstream builds normally, elastic lib injected
• PHP: bootstrap_elastic.php maps ELASTIC_OTEL_* env vars → OTEL_PHP_*, then delegates to upstream bootstrap_php_part.php
• Config: ElasticConfigProvider maps 30+ ELASTIC_OTEL_* env vars → upstream option names (C++ side)
• Scoping: Upstream handles php-scoper (OTelDistroScoped\ prefix) — EDOT just calls upstream's build_php_deps.sh

Phases

Phase 1: Submodule + Directory Structure ✅

Phase 2: Native Vendor Library ✅

Phase 3: PHP Bootstrap Wrapper ✅

Phase 4: Build & Packaging Tooling ✅

#363

Phase 5: Testing & Verification ✅

#364

Phase 6: Cleanup ✅

#365

Phase 7: CI Workflows ✅

#366

Phase 8: Long-term (upstream PRs) ✅

• Enable vendor customizations and custom OpAMP consumers on PHP side open-telemetry/opentelemetry-php-distro#53
• Verify user agent header in OTLP exports

Phase 9: Update documentation

#373
#375

• Add to EDOT component tests for Elastic specific remote configuration options #354