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

feat: merge user supplied and default plugin configs #980

Merged
merged 22 commits into from
May 27, 2020
Merged

feat: merge user supplied and default plugin configs #980

merged 22 commits into from
May 27, 2020

Commits on May 15, 2020

  1. feat: merge user supplied and default plugin configs 

    By merging user supplied config two levels deep, a user can now only configure the diff
from the default auto enablement of installed plugins, rather than
having to explicitly re enable all plugins if at least one of their
configurations require are edited.

Furthermore, user supplied plugins not listed in default plugins are
implicitly enabled.

Signed-off-by: Naseem <[email protected]>
    Naseem committed May 15, 2020
    Configuration menu
    Copy the full SHA
    d6a0902 View commit details
    Browse the repository at this point in the history

  2. test: a default plugin grpc is loaded unaffected by user supplied plu… 

    …gin config

Signed-off-by: Naseem <[email protected]>
    Naseem committed May 15, 2020
    Configuration menu
    Copy the full SHA
    754bb1d View commit details
    Browse the repository at this point in the history

  3. refactor: factor our mergePlugins and export it for use in test 

    Signed-off-by: Naseem <[email protected]>
    Naseem committed May 15, 2020
    Configuration menu
    Copy the full SHA
    0b538b4 View commit details
    Browse the repository at this point in the history

  4. fix: mergePlugins tests 

    Signed-off-by: Naseem <[email protected]>
    Naseem committed May 15, 2020
    Configuration menu
    Copy the full SHA
    9f310d1 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2020

  1. refactor: mergePlugins logic to enable any configured plugin by default 

    Signed-off-by: Naseem <[email protected]>
    Naseem committed May 18, 2020
    Configuration menu
    Copy the full SHA
    bd040ce View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into merge-tracer-config

    Naseem authored May 18, 2020
    Configuration menu
    Copy the full SHA
    e564e22 View commit details
    Browse the repository at this point in the history

  3. ci: rerun build 

    Signed-off-by: Naseem <[email protected]>
    Naseem committed May 18, 2020
    Configuration menu
    Copy the full SHA
    a1e0efe View commit details
    Browse the repository at this point in the history

  4. fix: let to const 

    Signed-off-by: Naseem <[email protected]>
    Naseem committed May 18, 2020
    Configuration menu
    Copy the full SHA
    b2fcafb View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. refactor: make mergePlugins a private member of the class which can b… 

    …e called in tests using the instance[_privateFunction]() syntax

Signed-off-by: Naseem <[email protected]>
    Naseem committed May 20, 2020
    Configuration menu
    Copy the full SHA
    03d6a48 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into merge-tracer-config

    Naseem authored May 20, 2020
    Configuration menu
    Copy the full SHA
    639d163 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2020

  1. refactor: make mergePlugins a private member of the class which can b… 

    …e called in tests using the instance[_privateFunction]() syntax

Signed-off-by: Naseem <[email protected]>
    Naseem committed May 21, 2020
    Configuration menu
    Copy the full SHA
    2004a72 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into merge-tracer-config

    Naseem authored May 21, 2020
    Configuration menu
    Copy the full SHA
    a64a1b8 View commit details
    Browse the repository at this point in the history

  3. docs: fix spacing 

    Signed-off-by: Naseem <[email protected]>
    Naseem committed May 21, 2020
    Configuration menu
    Copy the full SHA
    246624a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'merge-tracer-config' of github.com:naseemkullah/opentel… 

    …emetry-js into merge-tracer-config
    Naseem committed May 21, 2020
    Configuration menu
    Copy the full SHA
    be745a1 View commit details
    Browse the repository at this point in the history

  5. docs: explain plugin configuration 

    Signed-off-by: Naseem <[email protected]>
    Naseem committed May 21, 2020
    Configuration menu
    Copy the full SHA
    b8805b7 View commit details
    Browse the repository at this point in the history

  6. refactor: remove implicit config 

    Signed-off-by: Naseem <[email protected]>
    Naseem committed May 21, 2020
    Configuration menu
    Copy the full SHA
    132d9dd View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into merge-tracer-config

    @mayurkale22
    mayurkale22 authored May 21, 2020
    Configuration menu
    Copy the full SHA
    bc82593 View commit details
    Browse the repository at this point in the history

  8. test: lint -- use single quotes 

    Signed-off-by: Naseem <[email protected]>
    Naseem committed May 21, 2020
    Configuration menu
    Copy the full SHA
    2267684 View commit details
    Browse the repository at this point in the history

  9. fix: lint 

    Signed-off-by: Naseem <[email protected]>
    Naseem committed May 21, 2020
    Configuration menu
    Copy the full SHA
    7bf7b1e View commit details
    Browse the repository at this point in the history

  10. fix: lint 

    Signed-off-by: Naseem <[email protected]>
    Naseem committed May 21, 2020
    Configuration menu
    Copy the full SHA
    bb75768 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into merge-tracer-config

    @mayurkale22
    mayurkale22 authored May 21, 2020
    Configuration menu
    Copy the full SHA
    3dcd797 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2020

  1. Merge branch 'master' into merge-tracer-config

    @mayurkale22
    mayurkale22 authored May 27, 2020
    Configuration menu
    Copy the full SHA
    6d00f88 View commit details
    Browse the repository at this point in the history