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

Clarify view conflicts #2462

Merged
merged 14 commits into from
Apr 13, 2022
Merged

Clarify view conflicts #2462

merged 14 commits into from
Apr 13, 2022

Commits on Mar 31, 2022

  1. Clarify view conflicts

    @jack-berg
    jack-berg committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    2122ce5 View commit details
    Browse the repository at this point in the history

  2. SDKs may fail fast on view registration conflict

    @jack-berg
    jack-berg committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    2e0176c View commit details
    Browse the repository at this point in the history

  3. Conflicting views produce metric identity conflicts

    @jack-berg
    jack-berg committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    415e7df View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. Update specification/metrics/sdk.md

    @jmacd
    jmacd authored Apr 1, 2022
    Configuration menu
    Copy the full SHA
    97e43af View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. Clarify view semantic error behavior

    @jack-berg
    jack-berg committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    2695c7d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:open-telemetry/opentelemetry-specif… 

    …ication into view-conflict
    @jack-berg
    jack-berg committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    13bd2fb View commit details
    Browse the repository at this point in the history

  3. Update changelog

    @jack-berg
    jack-berg committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    0151177 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'view-conflict' of https://github.com/jack-berg/opentele… 

    …metry-specification into view-conflict
    @jack-berg
    jack-berg committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    336172c View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. Merge branch 'main' of github.com:open-telemetry/opentelemetry-specif… 

    …ication into view-conflict
    @jack-berg
    jack-berg committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    e4afe10 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2022

  1. Merge branch 'main' into view-conflict

    @reyang
    reyang authored Apr 13, 2022
    Configuration menu
    Copy the full SHA
    67def03 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into view-conflict

    @reyang
    reyang authored Apr 13, 2022
    Configuration menu
    Copy the full SHA
    1194139 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of github.com:open-telemetry/opentelemetry-specif… 

    …ication into view-conflict
    @jack-berg
    jack-berg committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    ef2691b View commit details
    Browse the repository at this point in the history

  4. Fix merge

    @jack-berg
    jack-berg committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    ba43060 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'view-conflict' of https://github.com/jack-berg/opentele… 

    …metry-specification into view-conflict
    @jack-berg
    jack-berg committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    6307e44 View commit details
    Browse the repository at this point in the history