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

Fix prometheus imports to match OTel #41014

Merged
merged 11 commits into from
Sep 30, 2024
Merged

Fix prometheus imports to match OTel #41014

merged 11 commits into from
Sep 30, 2024
+1,935 −2,475

Commits on Sep 26, 2024

  1. Fix prometheus imports to match OTel.

    @blakerouse
    blakerouse committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    a6b47ca View commit details
    Browse the repository at this point in the history

  2. Fix imports.

    @blakerouse
    blakerouse committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    fc5eb59 View commit details
    Browse the repository at this point in the history

  3. Fixes.

    @blakerouse
    blakerouse committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    0ee5e77 View commit details
    Browse the repository at this point in the history

  4. Update to docker v27.3.1+incompatible.

    @blakerouse
    blakerouse committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    8d8baf4 View commit details
    Browse the repository at this point in the history

  5. go mod tidy

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

  6. Merge remote-tracking branch 'upstream/main' into fix-prometheus-import

    @blakerouse
    blakerouse committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    0880e8c View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Fix tests.

    @blakerouse
    blakerouse committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    9c4044f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into fix-prometheus-import

    @blakerouse
    blakerouse committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    0937a62 View commit details
    Browse the repository at this point in the history

  3. Fix issues with content-type.

    @blakerouse
    blakerouse committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    f4001b2 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/main' into fix-prometheus-import

    @blakerouse
    blakerouse committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    c0577ad View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Merge remote-tracking branch 'upstream/main' into fix-prometheus-import

    @blakerouse
    blakerouse committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    58a4ea6 View commit details
    Browse the repository at this point in the history