Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace inferred-spans extension with upstream contrib extension #370

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Replace inferred-spans extension with upstream contrib extension #370

wants to merge 5 commits into from

Commits on Aug 15, 2024

  1. Replace inferred-spans extension with upstream contrib extension

    @JonasKunz
    JonasKunz committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    577f4f2 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Merge remote-tracking branch 'elastic/main' into inferred-spans-upstream 

    # Conflicts:
#	inferred-spans/build.gradle.kts
    @JonasKunz
    JonasKunz committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    c607606 View commit details
    Browse the repository at this point in the history

  2. move dependency to catalog

    @JonasKunz
    JonasKunz committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    8aa033c View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Merge remote-tracking branch 'elastic/main' into inferred-spans-upstream 

    # Conflicts:
#	inferred-spans/README.md
#	inferred-spans/src/main/java/co/elastic/otel/profiler/InferredSpansAutoConfig.java
#	inferred-spans/src/test/java/co/elastic/otel/InferredSpansAutoConfigTest.java
#	licenses/more-licences.md
    @JonasKunz
    JonasKunz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    95e3056 View commit details
    Browse the repository at this point in the history

  2. fix merge conflicts

    @JonasKunz
    JonasKunz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    e9ef009 View commit details
    Browse the repository at this point in the history