Code

Integrate ES with APM#87696

Code

Closed

pugnascotia wants to merge 109 commits intoelastic:mainelastic/elasticsearch:mainfrom pugnascotia:apm-integration-with-agentpugnascotia/elasticsearch:apm-integration-with-agentCopy head branch name to clipboard

+4,821-797

Commits

Commits on Nov 15, 2021

• Base module for APM Tracing (elastic#80705)

  tlrx

  authored
  9325cbf

• First set of deps (elastic#80720)

  tlrx

  authored
  22ecf6f

• Integrate tracer with task manager (elastic#80721)

  DaveCTurner

  authored
  ba34d70

• Merge branch 'master' into feature/apm-integration

  DaveCTurner

  committed
  13eddb9

Commits on Nov 17, 2021

• Use OpenTelemetry with HTTP/gRPC exporters in apm-integration (elastic#80762)

  Show description for d5a2503
  tlrx

  authored
  d5a2503

• Add Traceable interface (elastic#80788)

  Show description for 34239d4
  ywangd

  authored
  34239d4

• Capture task span context in thread context to parent nested tasks (elastic#80758)

  Show description for 2f51e5f
  dimitris-athanasiou

  authored
  2f51e5f

• [APM] Add multi-shard search test case (elastic#80792)

  Show description for a23bf66
  DaveCTurner

  authored
  a23bf66

Commits on Nov 18, 2021

• Merge branch 'master' into feature/apm-integration

  DaveCTurner

  committed
  69caefd

• Remove unused TracingPlugin interface (elastic#80799)

  DaveCTurner

  authored
  3a304f2

• single service + few attributes

  SylvainJuge

  committed
  8bd8a24

• tune a few minor things

  SylvainJuge

  committed
  110bb00

• adding dynamic setting xpack.apm.tracing.enabled (elastic#80796)

  idegtiarenko

  authored
  4a1a899

• Merge branch 'feature/apm-integration' into sylvain

  DaveCTurner

  committed
  d03a457

• Spotless

  DaveCTurner

  committed
  9f68a26

Commits on Nov 19, 2021

• Merge remote-tracking branch 'origin/master' into feature/apm-integration

  ywangd

  committed
  76a9414

• Add tracing for authorization (elastic#80815)

  Show description for f3f9835
  ywangd

  authored
  f3f9835

• Merge branch 'feature/apm-integration' of github.com:elastic/elasticsearch into feature/apm-integration

  SylvainJuge

  committed
  a7e2359

• use otel sem attributes when we can

  SylvainJuge

  committed
  ed6223c

Commits on Nov 22, 2021

• Merge branch 'master' into feature/apm-integration

  DaveCTurner

  committed
  79f0da3

• Trace recoveries and cluster state updates (elastic#80875)

  DaveCTurner

  authored
  d95c634

• Add xpack.apm.tracing.names.include setting for filtering (elastic#80871)

  Show description for 0d58db7
  dimitris-athanasiou

  authored
  0d58db7

Commits on Mar 1, 2022

• Merge remote-tracking branch 'upstream/master' into feature/apm-integration

  pugnascotia

  committed
  04c76c6

Commits on Mar 3, 2022

• Merge remote-tracking branch 'upstream/master' into feature/apm-integration

  pugnascotia

  committed
  7e0c606

• Fix compilation issue

  pugnascotia

  committed
  8132527

• Update SHAs

  pugnascotia

  committed
  84b558d

• Compilation fix

  pugnascotia

  committed
  3badd42

• Tweaks

  pugnascotia

  committed
  3d35bd4

• Formatting

  pugnascotia

  committed
  2e3aba1

• Fix 3rd party errors

  pugnascotia

  committed
  36c8943

Commits on Mar 8, 2022

• Merge remote-tracking branch 'upstream/master' into feature/apm-integration

  pugnascotia

  committed
  eed58a6

Commits on Mar 11, 2022

• WIP - hacks to make distributed tracing work

  pugnascotia

  committed
  99b948c

Commits on Mar 15, 2022

• WIP - trying to get REST tracing working

  pugnascotia

  committed
  2dec258

Commits on Mar 16, 2022

• WIP - more messing around

  pugnascotia

  committed
  4e7f9dc

• HACK HACK HACK

  pugnascotia

  committed
  11dc5e1

• OMG I think it's working

  pugnascotia

  committed
  e7cca58

Commits on Mar 17, 2022

• Seems to be working now 🎉

  pugnascotia

  committed
  461226b

• Hacks to try to use the APM Java agent

  pugnascotia

  committed
  b646a69

Commits on Mar 18, 2022

• Merge remote-tracking branch 'upstream/master' into feature/apm-integration

  pugnascotia

  committed
  fddc9e8

• Formatting

  pugnascotia

  committed
  64adb49

Commits on Mar 21, 2022

• Improve REST tracing

  pugnascotia

  committed
  cd6f1ef

Commits on Mar 22, 2022

• Update to latest APM agent

  pugnascotia

  committed
  f04c6ff

Commits on Mar 23, 2022

• Don't log graphviz by default

  pugnascotia

  committed
  b772714

• Tweaks

  pugnascotia

  committed
  2f45a51

Commits on Mar 29, 2022

• Rework trace header stashing

  Show description for ec612a6
  pugnascotia

  committed
  ec612a6

• Merge branch 'feature/apm-integration' into apm-integration-with-agent

  pugnascotia

  committed
  6ee831f

• Fixes

  pugnascotia

  committed
  b633f7e

Commits on Mar 30, 2022

• Managed to get traces to ship if I hack the APM agent

  pugnascotia

  committed
  4810a7f

• Move java agent CLI option into plugin descriptor

  pugnascotia

  committed
  bda6ea2

• Tweak for adding java opts via modules

  pugnascotia

  committed
  fb87e79

• Header fixes

  pugnascotia

  committed
  b76910b

• Add run script

  pugnascotia

  committed
  a7266b3

• Header fixes

  pugnascotia

  committed
  48bebd3

Commits on Mar 31, 2022

• Tweaks

  pugnascotia

  committed
  1436637

• Detach tracing when starting an index's background tasks

  pugnascotia

  committed
  dfb8f8b

• Detach tracing when starting an index's background tasks

  pugnascotia

  committed
  d94ec59

• Start a doc about tracing

  pugnascotia

  committed
  d834dd5

• Span attribte tweaks

  pugnascotia

  committed
  b611835

• Span attribte tweaks

  pugnascotia

  committed
  53058b3

• Add extra docker tag

  pugnascotia

  committed
  0989f17

Commits on Apr 1, 2022

• Tweaks

  pugnascotia

  committed
  1be7e7e

Commits on Apr 12, 2022

• Bump APM agent

  pugnascotia

  committed
  fd5f3cb

Commits on Apr 13, 2022

• Get tracing across nodes working again

  Show description for ef6ae5f
  pugnascotia

  committed
  ef6ae5f

• Compilation fixes

  pugnascotia

  committed
  a0978c9

• Merge remote-tracking branch 'upstream/master' into feature/apm-integration

  pugnascotia

  committed
  48a6486

• Bump version in run.sh

  pugnascotia

  committed
  ca896fb

• Merge branch 'feature/apm-integration' into apm-integration-with-agent

  pugnascotia

  committed
  7e0c535

• Fix

  pugnascotia

  committed
  01d9c42

• Fixes for using latest agent version

  pugnascotia

  committed
  fdbe843

Commits on Apr 14, 2022

• Fully configure the APM via config file in the module

  pugnascotia

  committed
  6a23b24

• Tidy up

  pugnascotia

  committed
  694180b

Commits on Apr 18, 2022

• Mass-refactoring

  Show description for 89f90c2
  pugnascotia

  committed
  89f90c2

• Fixes

  pugnascotia

  committed
  d2efa7e

• Formatting

  pugnascotia

  committed
  6bb80b6

Commits on Apr 20, 2022

• Beginnings of an end-to-end APM test

  pugnascotia

  committed
  eefb53a

Commits on Apr 21, 2022

• Get the APM integration test working

  Show description for e9695d2
  pugnascotia

  committed
  e9695d2

Commits on Apr 26, 2022

• Test fixes

  pugnascotia

  committed
  7164dd8

• Merge remote-tracking branch 'upstream/master' into apm-integration-with-agent

  pugnascotia

  committed
  e6d5e4f

Commits on Apr 27, 2022

• Add support for opening Scope via the Tracer

  pugnascotia

  committed
  e56427b

Commits on Apr 29, 2022

• Make it possible to configure APM agent via settings API

  pugnascotia

  committed
  aad7f4c

• Fix apm settings to work under assertions

  pugnascotia

  committed
  08da3a3

• Updates to TRACING.md

  pugnascotia

  committed
  f63a154

• Tweaks

  pugnascotia

  committed
  31ff299

• More testing

  pugnascotia

  committed
  fd6a9a9

Commits on May 2, 2022

• More testing

  pugnascotia

  committed
  562e6ed

• More TaskManager unit tests

  pugnascotia

  committed
  f8431e7

Commits on May 3, 2022

• Add unit testing

  pugnascotia

  committed
  c55632a

• Make qa test work again

  pugnascotia

  committed
  d329b7a

• Merge remote-tracking branch 'origin/apm-integration-with-agent' into apm-integration-with-agent

  pugnascotia

  committed
  854c8c0

• More notes on tracing

  pugnascotia

  committed
  9dcf369

Commits on May 6, 2022

• Merge remote-tracking branch 'upstream/master' into apm-integration-with-agent

  pugnascotia

  committed
  e0f70de

Commits on May 11, 2022

• Add an exclude filter and filtering unit tests

  pugnascotia

  committed
  3c4e323

Commits on May 12, 2022

• Switch to automaton instead of regexes

  pugnascotia

  committed
  76ebf99

Commits on Jun 2, 2022

• Redact sensitive http headers

  pugnascotia

  committed
  ccc47c6

Commits on Jun 6, 2022

• Merge remote-tracking branch 'upstream/master' into apm-integration-with-agent

  pugnascotia

  committed
  0b911af

Commits on Jun 8, 2022

• Post-merge fixes

  pugnascotia

  committed
  f0dbe4a

• Tweak log4j security policy

  pugnascotia

  committed
  55772a2

Commits on Jun 14, 2022

• Switch to auto-generating an APM config

  Show description for 8be329f
  pugnascotia

  committed
  8be329f

• Shorten APM settings prefix

  pugnascotia

  committed
  feb3b3f

• Bump APM agent to 1.32.0

  pugnascotia

  committed
  762d6fe

Commits on Jun 15, 2022

• Upgrade opentelemetry

  pugnascotia

  committed
  9b2685d

• Javadoc

  pugnascotia

  committed
  e21346c

• Merge remote-tracking branch 'upstream/master' into apm-integration-with-agent

  pugnascotia

  committed
  7c3084e

• Update TRACING.md

  pugnascotia

  committed
  8f98e7e

• General fixing and polishing

  pugnascotia

  committed
  2d3b30b

• Merge remote-tracking branch 'upstream/master' into apm-integration-with-agent

  pugnascotia

  committed
  15a1baf

• Remove debug gradle config

  pugnascotia

  committed
  52fd4d3

• Fix typo

  pugnascotia

  committed
  5e0892b

• Remove run script

  pugnascotia

  committed
  4912eec