Code

OpenTelemetry bridge#1631

Code

Merged

SylvainJuge merged 117 commits intoelastic:mainelastic/apm-agent-java:mainfrom felixbarny:opentelemetry-bridgefelixbarny/apm-agent-java:opentelemetry-bridgeCopy head branch name to clipboardMar 21, 2022

+3,535-292

Commits

Commits on Jan 22, 2021

• Fist working draft

  felixbarny

  committed
  27fab55

  Copy full SHA for 27fab55

• Lazily parse tracestate

  felixbarny

  committed
  517e037

  Copy full SHA for 517e037

• Use built-in Context

  felixbarny

  committed
  605c893

  Copy full SHA for 605c893

• Translate OTel attributes to intake API

  felixbarny

  committed
  844f097

  Copy full SHA for 844f097

• Refine instrumentations

  felixbarny

  committed
  1a28319

  Copy full SHA for 1a28319

• Mark as experimental

  felixbarny

  committed
  204bea7

  Copy full SHA for 204bea7

• Add enable_experimental_instrumentations option

  felixbarny

  committed
  a7b65c9

  Copy full SHA for a7b65c9

• polishing

  felixbarny

  committed
  c89b977

  Copy full SHA for c89b977

Commits on Jan 23, 2021

• Extract advice to separate class

  felixbarny

  committed
  87e8420

  Copy full SHA for 87e8420

• more polishing

  felixbarny

  committed
  8f63bf1

  Copy full SHA for 8f63bf1

Commits on Jan 25, 2021

• Map OTel semantic convention attributes to data model

  felixbarny

  committed
  9b2e489

  Copy full SHA for 9b2e489

• Mark spans non-discardable on context propagation

  felixbarny

  committed
  a7899d9

  Copy full SHA for a7899d9

• Remove construction of URL fields that are filled on APM Server

  felixbarny

  committed
  56594eb

  Copy full SHA for 56594eb

• Add license headers

  felixbarny

  committed
  ca4e5a6

  Copy full SHA for ca4e5a6

• Revert "Remove construction of URL fields that are filled on APM Server"

  Show description for 31c5b97
  felixbarny

  committed
  31c5b97

  Copy full SHA for 31c5b97

Commits on Jan 26, 2021

• Map destination details of external spans

  felixbarny

  committed
  f04c94f

  Copy full SHA for f04c94f

• Avoid calling method that's @SInCE Java 9

  felixbarny

  committed
  1d72e4a

  Copy full SHA for 1d72e4a

Commits on Jan 27, 2021

• Fix packaging and shading

  felixbarny

  committed
  316c65b

  Copy full SHA for 316c65b

Commits on Jan 29, 2021

• Add docs

  felixbarny

  committed
  4bf7349

  Copy full SHA for 4bf7349

• Add changelog

  felixbarny

  committed
  083d297

  Copy full SHA for 083d297

• Merge remote-tracking branch 'origin/master' into opentelemetry-bridge

  felixbarny

  committed
  a9788b0

  Copy full SHA for a9788b0

• Document when OTel bridge has been added

  felixbarny

  committed
  5465c38

  Copy full SHA for 5465c38

• Update to OTel 0.15.0 and test older versions too

  Show description for 970e425
  felixbarny

  committed
  970e425

  Copy full SHA for 970e425

Commits on Feb 3, 2021

• Implement review suggestions

  felixbarny

  committed
  233179d

  Copy full SHA for 233179d

Commits on Feb 5, 2021

• Merge remote-tracking branch 'origin/master' into opentelemetry-bridge

  felixbarny

  committed
  d9e5498

  Copy full SHA for d9e5498

• Bubble up operation modes to apis.asciidoc

  felixbarny

  committed
  a85d5f4

  Copy full SHA for a85d5f4

• Log warning once if unsupported APIs are used

  felixbarny

  committed
  b4f69e6

  Copy full SHA for b4f69e6

Commits on Feb 11, 2021

• Be more clear about what is and what's not supported

  felixbarny

  committed
  430ca09

  Copy full SHA for 430ca09

• Update and require OTel 0.16.0

  felixbarny

  committed
  39f086c

  Copy full SHA for 39f086c

• Remove smurf naming convention

  felixbarny

  committed
  02cbb45

  Copy full SHA for 02cbb45

• Merge remote-tracking branch 'origin/master' into opentelemetry-bridge

  felixbarny

  committed
  66b4e22

  Copy full SHA for 66b4e22

• Set outcome

  felixbarny

  committed
  4ff5c4f

  Copy full SHA for 4ff5c4f

Commits on Mar 2, 2021

• Merge remote-tracking branch 'origin/master' into opentelemetry-bridge

  felixbarny

  committed
  7398cca

  Copy full SHA for 7398cca

• Update to otel 1.0.0

  felixbarny

  committed
  d8f37df

  Copy full SHA for d8f37df

Commits on Jun 14, 2021

• Merge remote-tracking branch 'upstream/master' into opentelemetry-bridge

  SylvainJuge

  committed
  c03d09f

  Copy full SHA for c03d09f

• fix advice class names

  SylvainJuge

  committed
  21c8002

  Copy full SHA for 21c8002

Commits on Jun 15, 2021

• fix url test

  SylvainJuge

  committed
  6faddb1

  Copy full SHA for 6faddb1

Commits on Aug 19, 2021

• Merge branch 'master' of github.com:elastic/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  bb1b599

  Copy full SHA for bb1b599

• post-merge update

  SylvainJuge

  committed
  27ebcfd

  Copy full SHA for 27ebcfd

Commits on Aug 20, 2021

• add missing ivy test dependency

  SylvainJuge

  committed
  28dd7d5

  Copy full SHA for 28dd7d5

• test versions 1.0.x->1.5.0

  SylvainJuge

  committed
  d021714

  Copy full SHA for d021714

• add few tests for coverage

  SylvainJuge

  committed
  81daba2

  Copy full SHA for 81daba2

• fix doc release version

  SylvainJuge

  committed
  fe86a0a

  Copy full SHA for fe86a0a

• update docs

  SylvainJuge

  committed
  fe0501c

  Copy full SHA for fe0501c

Commits on Sep 7, 2021

• introduce ElasticContext to rule them all

  SylvainJuge

  committed
  a296813

  Copy full SHA for a296813

Commits on Sep 14, 2021

• bridge otel root context

  SylvainJuge

  committed
  ac1d10f

  Copy full SHA for ac1d10f

• code cleanup

  SylvainJuge

  committed
  de91e3f

  Copy full SHA for de91e3f

• code cleanup + update test to 1.6.0

  SylvainJuge

  committed
  2db9716

  Copy full SHA for 2db9716

• Merge branch 'master' of github.com:elastic/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  8d88a51

  Copy full SHA for 8d88a51

• add missing license header

  SylvainJuge

  committed
  717d51f

  Copy full SHA for 717d51f

Commits on Sep 15, 2021

• minor tweaks

  SylvainJuge

  committed
  1b0804b

  Copy full SHA for 1b0804b

Commits on Sep 20, 2021

• Merge branch 'master' of github.com:elastic/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  11964eb

  Copy full SHA for 11964eb

Commits on Sep 21, 2021

• fix doc update test fail msg

  SylvainJuge

  committed
  b86d00e

  Copy full SHA for b86d00e

Commits on Oct 25, 2021

• add span kind + wip on shared spec

  SylvainJuge

  committed
  5c77c00

  Copy full SHA for 5c77c00

• add wip gherkin spec

  SylvainJuge

  committed
  214ae74

  Copy full SHA for 214ae74

• add missing file headers

  SylvainJuge

  committed
  86e5b1c

  Copy full SHA for 86e5b1c

• wip http + db span mapping

  SylvainJuge

  committed
  f0629cc

  Copy full SHA for f0629cc

Commits on Oct 26, 2021

• finalize 1st tep of bridge

  SylvainJuge

  committed
  73f29a3

  Copy full SHA for 73f29a3

• minor cleanup

  SylvainJuge

  committed
  5bc47b2

  Copy full SHA for 5bc47b2

Commits on Nov 2, 2021

• replace 'custom' with 'unknown' for bridge

  SylvainJuge

  committed
  a2d6da8

  Copy full SHA for a2d6da8

• update json spec for span type/subtype

  SylvainJuge

  committed
  9fd61a0

  Copy full SHA for 9fd61a0

Commits on Nov 15, 2021

• Merge remote-tracking branch 'origin/master' into opentelemetry-bridge

  felixbarny

  committed
  776fb2a

  Copy full SHA for 776fb2a

Commits on Dec 1, 2021

• Use AssignReturned annotations

  felixbarny

  committed
  8b13a40

  Copy full SHA for 8b13a40

• Merge remote-tracking branch 'origin/master' into opentelemetry-bridge

  felixbarny

  committed
  9a8a616

  Copy full SHA for 9a8a616

• Fix parent project version

  felixbarny

  committed
  bcbfef7

  Copy full SHA for bcbfef7

Commits on Dec 6, 2021

• wip main cucumber tasks

  SylvainJuge

  committed
  c058bb2

  Copy full SHA for c058bb2

• Merge branch 'master' into opentelemetry-bridge

  SylvainJuge

  committed
  7c6549c

  Copy full SHA for 7c6549c

• infer on otel span end + basic outcome mapping

  SylvainJuge

  committed
  ab10fbe

  Copy full SHA for ab10fbe

• pom cleanup

  SylvainJuge

  committed
  e38ce0a

  Copy full SHA for e38ce0a

Commits on Dec 7, 2021

• code cleanup

  SylvainJuge

  committed
  dde7cd6

  Copy full SHA for dde7cd6

• set outcome for otel spans

  SylvainJuge

  committed
  fccfd52

  Copy full SHA for fccfd52

• fix tests

  SylvainJuge

  committed
  4c5341f

  Copy full SHA for 4c5341f

• do not infer outcome from lack of exception

  SylvainJuge

  committed
  d08186b

  Copy full SHA for d08186b

• fix documentation

  SylvainJuge

  committed
  5f4ce60

  Copy full SHA for 5f4ce60

• fix/cleanup documentation

  SylvainJuge

  committed
  0ecddde

  Copy full SHA for 0ecddde

• Merge branch 'master' of github.com:elastic/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  a7ab69a

  Copy full SHA for a7ab69a

• update changelog

  SylvainJuge

  committed
  8951c30

  Copy full SHA for 8951c30

Commits on Feb 7, 2022

• Merge branch 'main' of github.com:elastic/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  544d965

  Copy full SHA for 544d965

• fix sdk logger change

  SylvainJuge

  committed
  805b21d

  Copy full SHA for 805b21d

• add latest versions for test coverage

  SylvainJuge

  committed
  6ec3ac3

  Copy full SHA for 6ec3ac3

• update generated doc

  SylvainJuge

  committed
  a318c61

  Copy full SHA for a318c61

• compile agent sdk for java 7

  SylvainJuge

  committed
  a10814d

  Copy full SHA for a10814d

• fix doc links

  SylvainJuge

  committed
  fc5c5e2

  Copy full SHA for fc5c5e2

Commits on Feb 8, 2022

• Apply suggestions from code review (docs links)

  Show description for 64b393b
  

  SylvainJuge

  and

  bmorelli25

  authored
  64b393b

  Copy full SHA for 64b393b

• Merge branch 'main' of github.com:elastic/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  1c94a7b

  Copy full SHA for 1c94a7b

• aim for release in 1.30.0

  SylvainJuge

  committed
  a71e8ad

  Copy full SHA for a71e8ad

• Merge branch 'opentelemetry-bridge' of github.com:felixbarny/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  8f50b8c

  Copy full SHA for 8f50b8c

Commits on Feb 11, 2022

• add missing otel attributes & kind serialization

  SylvainJuge

  committed
  097ab8a

  Copy full SHA for 097ab8a

Commits on Feb 21, 2022

• Merge branch 'main' of github.com:elastic/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  1d874fb

  Copy full SHA for 1d874fb

Commits on Feb 22, 2022

• prevent NPE when Context.root() is not called first

  SylvainJuge

  committed
  8099d37

  Copy full SHA for 8099d37

Commits on Feb 24, 2022

• move to a single module for opentelemetry

  SylvainJuge

  committed
  a4fd963

  Copy full SHA for a4fd963

• move to dedicated sub-module for opentelemetry

  SylvainJuge

  committed
  6bae41e

  Copy full SHA for 6bae41e

Commits on Feb 28, 2022

• capture OTel API version when possible

  SylvainJuge

  committed
  54d961f

  Copy full SHA for 54d961f

Commits on Mar 3, 2022

• minimize changelog diff

  SylvainJuge

  committed
  6b55f88

  Copy full SHA for 6b55f88

• clarify some comments/doc

  SylvainJuge

  committed
  bf95b39

  Copy full SHA for bf95b39

• properly reformat

  SylvainJuge

  committed
  71b53fa

  Copy full SHA for 71b53fa

• minor fix to otel mvn dependencies

  SylvainJuge

  committed
  42751d9

  Copy full SHA for 42751d9

• remove unused context propagator

  SylvainJuge

  committed
  1f59e49

  Copy full SHA for 1f59e49

• bump version to 1.30.0

  SylvainJuge

  committed
  f91dcdf

  Copy full SHA for f91dcdf

• Merge branch 'main' of github.com:elastic/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  eaf672a

  Copy full SHA for eaf672a

• Merge branch 'main' of github.com:elastic/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  5506146

  Copy full SHA for 5506146

Commits on Mar 15, 2022

• prevent multiple root contexts

  SylvainJuge

  committed
  26a7d60

  Copy full SHA for 26a7d60

• fix pebkc

  SylvainJuge

  committed
  f5cdebc

  Copy full SHA for f5cdebc

• set implicit active parent only at startSpan

  SylvainJuge

  committed
  984d375

  Copy full SHA for 984d375

• fix docs (attempt for menu)

  SylvainJuge

  committed
  4070339

  Copy full SHA for 4070339

Commits on Mar 16, 2022

• fix API docs menu integration

  SylvainJuge

  committed
  e1a00e5

  Copy full SHA for e1a00e5

• trim whitespace

  SylvainJuge

  committed
  72bce1f

  Copy full SHA for 72bce1f

• Merge branch 'main' of github.com:elastic/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  404b0ce

  Copy full SHA for 404b0ce

• fix links to public-api

  SylvainJuge

  committed
  3493ee1

  Copy full SHA for 3493ee1

Commits on Mar 17, 2022

• Merge branch 'main' of github.com:elastic/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  89ec40f

  Copy full SHA for 89ec40f

• Merge branch 'main' of github.com:elastic/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  6e63eef

  Copy full SHA for 6e63eef

• fix generated doc

  SylvainJuge

  committed
  e4b85c1

  Copy full SHA for e4b85c1

• doc: try removing float blocks

  SylvainJuge

  committed
  72e5d24

  Copy full SHA for 72e5d24

• fix API menu

  SylvainJuge

  committed
  eaaa292

  Copy full SHA for eaaa292

Commits on Mar 18, 2022

• Merge branch 'main' of github.com:elastic/apm-agent-java into opentelemetry-bridge

  SylvainJuge

  committed
  1481a3a

  Copy full SHA for 1481a3a

• fix new module version

  SylvainJuge

  committed
  020ed20

  Copy full SHA for 020ed20

Commits on Mar 21, 2022

• Merge branch 'main' into opentelemetry-bridge

  SylvainJuge

  authored
  c887091

  Copy full SHA for c887091