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.

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

Adds log4j configuration for telemetry-otel plugin #8393

Merged
merged 3 commits into from
Jul 4, 2023

Conversation

Gaganjuneja
Copy link
Contributor

@Gaganjuneja Gaganjuneja commented Jul 2, 2023

Description

Adds log4j configuration for telemetry-otel LoggingSpanExporter. We will create our on log4j programatic appender later on to avoid the log file generation on case of LoggingSpanExporter is not configured.

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>
@github-actions
Copy link
Contributor

github-actions bot commented Jul 2, 2023

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>
@github-actions
Copy link
Contributor

github-actions bot commented Jul 2, 2023

Gradle Check (Jenkins) Run Completed with:

@Gaganjuneja
Copy link
Contributor Author

@reta @shwetathareja Please take a look. Thanks!

@reta
Copy link
Collaborator

reta commented Jul 4, 2023

@Gaganjuneja LGTM but Gradke check is failing (spotless), could you please fix that?

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>
@github-actions
Copy link
Contributor

github-actions bot commented Jul 4, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testNodeDropWithOngoingReplication

@codecov
Copy link

codecov bot commented Jul 4, 2023

Codecov Report

Merging #8393 (8eb7939) into main (d5482f7) will increase coverage by 0.13%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main    #8393      +/-   ##
============================================
+ Coverage     70.88%   71.01%   +0.13%     
- Complexity    56926    56976      +50     
============================================
  Files          4757     4757              
  Lines        269102   269109       +7     
  Branches      39396    39397       +1     
============================================
+ Hits         190746   191101     +355     
+ Misses        62284    61884     -400     
- Partials      16072    16124      +52     
Impacted Files Coverage Δ
...pensearch/common/bytes/AbstractBytesReference.java 84.66% <100.00%> (+0.58%) ⬆️
...search/telemetry/tracing/OTelResourceProvider.java 100.00% <100.00%> (ø)

... and 465 files with indirect coverage changes

@reta reta merged commit 7a5c810 into opensearch-project:main Jul 4, 2023
@reta reta added the backport 2.x Backport to 2.x branch label Jul 4, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-8393-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7a5c810a238e0566f0c7bdb6fbc774dafb3674b0
# Push it to GitHub
git push --set-upstream origin backport/backport-8393-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-8393-to-2.x.

@reta
Copy link
Collaborator

reta commented Jul 4, 2023

@Gaganjuneja sadly needs manual backport to 2.x :(

@Gaganjuneja
Copy link
Contributor Author

@Gaganjuneja sadly needs manual backport to 2.x :(

Yes, will do that. Thanks!

Gaganjuneja added a commit to Gaganjuneja/OpenSearch that referenced this pull request Jul 6, 2023
…t#8393)

* Adds log4j configuration for telemetry-otel plugin

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Updates changelog

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fixes spotless

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

---------

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>
Co-authored-by: Gagan Juneja <gjjuneja@amazon.com>
sachinpkale pushed a commit that referenced this pull request Jul 6, 2023
* Adds log4j configuration for telemetry-otel plugin (#8393)

* Adds log4j configuration for telemetry-otel plugin

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Updates changelog

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fixes spotless

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

---------

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>
Co-authored-by: Gagan Juneja <gjjuneja@amazon.com>

* Empty-Commit

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Empty-Commit

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

---------

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>
Co-authored-by: Gagan Juneja <gjjuneja@amazon.com>
buddharajusahil pushed a commit to buddharajusahil/OpenSearch that referenced this pull request Jul 18, 2023
…t#8393)

* Adds log4j configuration for telemetry-otel plugin

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Updates changelog

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fixes spotless

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

---------

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>
Co-authored-by: Gagan Juneja <gjjuneja@amazon.com>
Signed-off-by: sahil buddharaju <sahilbud@amazon.com>
baba-devv pushed a commit to baba-devv/OpenSearch that referenced this pull request Jul 29, 2023
…t#8393)

* Adds log4j configuration for telemetry-otel plugin

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Updates changelog

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fixes spotless

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

---------

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>
Co-authored-by: Gagan Juneja <gjjuneja@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…t#8393)

* Adds log4j configuration for telemetry-otel plugin

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Updates changelog

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

* Fixes spotless

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>

---------

Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>
Co-authored-by: Gagan Juneja <gjjuneja@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants