-
Notifications
You must be signed in to change notification settings - Fork 440
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
CRD defs for Apache HTTPD Autoinstrumentation #1305
CRD defs for Apache HTTPD Autoinstrumentation #1305
Conversation
Updated with generated resources (make generate). |
Generated bundle for Apache Httpd CRD (make bundle). |
Version updated for make bundle |
Chngnd repo user to open-telemetry for make bundle |
// Attrs defines Apache HTTPD agent specific attributes. The precedence is: | ||
// `agent default attributes` > `instrument spec attributes` | ||
// +optional | ||
Attrs []corev1.EnvVar `json:"attrs,omitempty"` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what exactly is this configuring?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The OTel module for Apache httpd has number of configurable attributes (listed at https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/instrumentation/otel-webserver-module in Configuration section). There are reasonable defaults and some will be set by the instrumentation process, this gives a means to override those defaults.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we add this link to the godoc?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, good idea.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
…chrlic/opentelemetry-operator into apache-instrumentation-v1.0-crd
linting failed. its fixed in: 5e800c8 |
|
||
// Apache HTTPD server version. One of 2.4 or 2.2. Default is 2.4 | ||
// +optional | ||
Version string `json:"version,omitempty"` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for my curiosity how is this version used?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Apache HTTPD used these days is either version 2.2 or (most of the time) 2.4. The OTel agent is a set of binary loadable modules and those are compiled against specific Apache HTTPD version - different headers etc. Therefore you have to use the specific version of agent.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Based on the version setting, auto-instrumentation configures Apache HTTPD with the proper set of modules to be loaded. The docker image with the agent contains modules for both supported versions.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pavol,
could we move this forward, please?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merged, thanks ❤️
…chrlic/opentelemetry-operator into apache-instrumentation-v1.0-crd
…chrlic/opentelemetry-operator into apache-instrumentation-v1.0-crd
Hi Pavol, |
* CRD defs for Apache HTTPD Autoinstrumentation * Generated resources for Apache Httpd CRD defs * Generated bundle for Apache Httpd CRD * Fixed version for "make bundle" * Makefile and version update * Chngnd repo user to open-telemetry for make bundle * Reverted changes in kustomization.yaml * Reverted changes in kustomization.yaml * Reverted chnages in kustomization.yaml * Apache HTTPD - Link to attributes doc * make bundle sync * ./.chloggen yaml added for open-telemetry#1305 * Version fix
This is a followup PR in Apache HTTPD Autoinstrumentation implementation project to previous PR #1236.
It contains CRD definition, defaults, validations, and test.
Next PR will contain the autoinstrumentation logic itself and e2e tests.