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

docker-compose: add possibility for a local Nginx module. #68

Merged
merged 7 commits into from
Jul 15, 2024
Merged

docker-compose: add possibility for a local Nginx module. #68

merged 7 commits into from
Jul 15, 2024

Conversation

teresanovielloatinstana
Copy link
Contributor

WHAT

  • Modify docker-compose file to use a local Nginx module
  • Modify docker-compose file to enable the debug of agent's spans

WHY

Improvements

sriemer
sriemer requested changes Jun 19, 2024
View reviewed changes
Copy link
Contributor

@sriemer sriemer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your work on this one, Teresa. 😃
Please address the required changes that I've noticed. TIA

Also have you noticed the high duplication in your short git commit messages?
"Modify docker-compose file to " should be shrunk to "docker-compose: ".

  • docker-compose: enable the debug of agent's spans
  • docker-compose: use a local Nginx module

This is much better and faster readable.

agent/logs/_keep Outdated Show resolved Hide resolved
agent/com.instana.agent.main.sender.File.cfg Outdated Show resolved Hide resolved
docker-compose.yml Outdated Show resolved Hide resolved
docker-compose.yml Outdated Show resolved Hide resolved
docker-compose.yml Outdated Show resolved Hide resolved
docker-compose.yml Outdated Show resolved Hide resolved
@sriemer sriemer changed the title Modify docker-compose file to use a local Nginx module docker-compose: Add possibility for a local Nginx module Jun 19, 2024
@sriemer
Copy link
Contributor

sriemer commented Jun 19, 2024

You are actually only adding the possibility for a local NGINX module.
So the commit should be docker-compose: add possibility for a local Nginx module.
I renamed the PR accordingly.

Teresa Noviello and others added 4 commits June 20, 2024 01:05
@teresanovielloatinstana
docker-compose: enable the debug of agent's spans
53b09e0 
Add the debug of produced spans in the agent's configuration
@teresanovielloatinstana
docker-compose: mount a local Nginx module
1ec2b61 
Modify docker-compose file to run the testing with a locally
compiled Nginx module, found in nginx/ngx_http_opentracing_module.so.
Local development and testing of a module can highly benefit from this
light change. The mounting of the module can be enabled uncommenting
this option.
@teresanovielloatinstana
Rename the file _keep in .keep
8650c33
@teresanovielloatinstana
docker-compose: security fix for volumes mounting
4120810 
Mount volumes as readonly whenever possible.
Mount only necessary volumes.
@teresanovielloatinstana
Copy link
Contributor Author

docker-compose: add possibility for a local Nginx module

Thanks Sebastian, I have produced the requested changes and solved the relative conversations. Also, I have modified the .gitignore file.
I have tested again on this branch and the test runs smoothly.
I will squash with the commit message docker-compose: add possibility for a local Nginx module

sriemer
sriemer requested changes Jul 11, 2024
View reviewed changes
Copy link
Contributor

@sriemer sriemer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Teresa, just some finishing touches.
Please notify me once the issues I've found are addressed. TIA

docker-compose.yml Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@teresanovielloatinstana teresanovielloatinstana changed the title docker-compose: Add possibility for a local Nginx module docker-compose: Add possibility for a new nginx configuration, debug traces Jul 11, 2024
@teresanovielloatinstana
README: spans debug, local NGINX module
b7937e3 
Add to the README file info on:
1. Where to find spans debug on the local host
@teresanovielloatinstana
gitignore: ignore agent's logs
1ca17ad
@teresanovielloatinstana @sriemer
doc: reword complex sentences
7a079db 
Co-authored-by: Sebastian Parschauer <Sebastian.Parschauer@ibm.com>
@teresanovielloatinstana teresanovielloatinstana changed the title docker-compose: Add possibility for a new nginx configuration, debug traces docker-compose: Add possibility for a new nginx configuration, debug agent's logs Jul 11, 2024
@teresanovielloatinstana teresanovielloatinstana changed the title docker-compose: Add possibility for a new nginx configuration, debug agent's logs docker-compose: add possibility for a local Nginx module. Jul 11, 2024
sriemer
sriemer approved these changes Jul 15, 2024
View reviewed changes
Copy link
Contributor

@sriemer sriemer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM now. Thanks.

@sriemer sriemer merged commit 3d2063c into main Jul 15, 2024
@sriemer sriemer deleted the update_nginx branch July 15, 2024 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sriemer sriemer sriemer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@teresanovielloatinstana @sriemer