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

Nginx docker #167

Merged
merged 2 commits into from
Jun 1, 2022
Merged

Conversation

kpratyus
Copy link
Member

Changing docker compose for nginx

@kpratyus kpratyus requested a review from DebajitDas as a code owner May 30, 2022 18:59
@kpratyus kpratyus requested a review from a team May 30, 2022 18:59
Copy link
Member

@DebajitDas DebajitDas left a comment

Choose a reason for hiding this comment

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

LGTM

@DebajitDas DebajitDas changed the title Nginx docker[WIP] Nginx docker Jun 1, 2022
@DebajitDas DebajitDas merged commit 62c0092 into open-telemetry:nginx-contrib Jun 1, 2022
DebajitDas added a commit that referenced this pull request Jul 4, 2022
* Added dependencies of Nginx Build (#158)

* updated nginx build directory (#159)

* nginx source code (#160)

* Add license (#162)

* Add license

* removing Ubuntu condition

* Nomenclature changes from Appdynamics to OpenTelemetry (#163)

* Changed appd to otel

* Added build command for Nginx Module

* Added a missing file to be built

* Incorporated Review comments

* Nginx docker (#167)

* Changing docker compose

* centos7

* Updated README for Nginx instrumentation (#168)

* Updated README for Nginx instrumentation

* Updated README.md

* Updated README.md

* Set span status according to Semantic Conventions of Http (#164) (#169)

* Set span status according to http semantics

* Set span status changes part-2

* Set span status according to http semantics spaces

* Review comments addressed for span status

* Moved error status from Apache hooks to Request processing engine

Co-authored-by: Narasimha <ngonapa@cisco.com>

* Updated error codes (#170)

* Merged from Main branch (#172)

* Set span status according to Semantic Conventions of Http (#164)

* Set span status according to http semantics

* Set span status changes part-2

* Set span status according to http semantics spaces

* Review comments addressed for span status

* Moved error status from Apache hooks to Request processing engine

* Fixed UT failure  (#171)

* Set span status according to http semantics

* Set span status changes part-2

* Set span status according to http semantics spaces

* Review comments addressed for span status

* Moved error status from Apache hooks to Request processing engine

* Fixed unit test failure

Co-authored-by: Narasimha <ngonapa@cisco.com>

* Merge from main (#181)

* Set span status according to Semantic Conventions of Http (#164)

* Set span status according to http semantics

* Set span status changes part-2

* Set span status according to http semantics spaces

* Review comments addressed for span status

* Moved error status from Apache hooks to Request processing engine

* Fixed UT failure  (#171)

* Set span status according to http semantics

* Set span status changes part-2

* Set span status according to http semantics spaces

* Review comments addressed for span status

* Moved error status from Apache hooks to Request processing engine

* Fixed unit test failure

Co-authored-by: Narasimha <ngonapa@cisco.com>

Co-authored-by: DEBAJIT DAS <85024550+DebajitDas@users.noreply.github.com>
Co-authored-by: Narasimha <ngonapa@cisco.com>
kpratyus added a commit that referenced this pull request Jul 15, 2022
…cation. (#174)

* Added dependencies of Nginx Build (#158)

* updated nginx build directory (#159)

* nginx source code (#160)

* Add license (#162)

* Add license

* removing Ubuntu condition

* Nomenclature changes from Appdynamics to OpenTelemetry (#163)

* Changed appd to otel

* Added build command for Nginx Module

* Added a missing file to be built

* Incorporated Review comments

* Nginx docker (#167)

* Changing docker compose

* centos7

* Updated README for Nginx instrumentation (#168)

* Updated README for Nginx instrumentation

* Updated README.md

* Updated README.md

* Set span status according to Semantic Conventions of Http (#164) (#169)

* Set span status according to http semantics

* Set span status changes part-2

* Set span status according to http semantics spaces

* Review comments addressed for span status

* Moved error status from Apache hooks to Request processing engine

Co-authored-by: Narasimha <ngonapa@cisco.com>

* Updated error codes (#170)

* Merged from Main branch (#172)

* Set span status according to Semantic Conventions of Http (#164)

* Set span status according to http semantics

* Set span status changes part-2

* Set span status according to http semantics spaces

* Review comments addressed for span status

* Moved error status from Apache hooks to Request processing engine

* Fixed UT failure  (#171)

* Set span status according to http semantics

* Set span status changes part-2

* Set span status according to http semantics spaces

* Review comments addressed for span status

* Moved error status from Apache hooks to Request processing engine

* Fixed unit test failure

Co-authored-by: Narasimha <ngonapa@cisco.com>

* Handling span creation/end on Nginx internal redirection and named location, related to bug WEBSRV-721

* Fix for try files modules

* Added minor changes

* Incorporated some review comments

Co-authored-by: Kumar Pratyush <95214718+kpratyus@users.noreply.github.com>
Co-authored-by: Narasimha <ngonapa@cisco.com>
@marcalff marcalff added the Webserver This represents the otel-webserver-module in the instrumentation directory label May 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Webserver This represents the otel-webserver-module in the instrumentation directory
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants