-
Notifications
You must be signed in to change notification settings - Fork 451
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
Apache instrumentation v1.0 #1236
Merged
pavolloffay
merged 7 commits into
open-telemetry:main
from
chrlic:apache-instrumentation-v1.0
Nov 26, 2022
Merged
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
07e73cc
Apache Instrumentation - Agent Image Build
chrlic 454b9a2
Rename deafult image name
chrlic 52a4ccd
Github bld action for Apache HTTPD autoinstr img
chrlic 8af31a9
Added Apache HTTPD image to publish images act
chrlic 2030473
Merge branch 'open-telemetry:main' into apache-instrumentation-v1.0
chrlic c4c6cbd
Heading change
chrlic 1019871
Merge branch 'apache-instrumentation-v1.0' of https://github.com/chrl…
chrlic File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
|
||
############################ | ||
# STEP 1 download the webserver agent | ||
############################ | ||
FROM alpine:latest as agent | ||
|
||
ARG version | ||
|
||
RUN mkdir /opt/opentelemetry | ||
WORKDIR /opt/opentelemetry | ||
|
||
RUN wget https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/download/webserver%2Fv$version/opentelemetry-webserver-sdk-x64-linux.tgz.zip | ||
RUN unzip opentelemetry-webserver-sdk-x64-linux.tgz.zip | ||
RUN mkdir agent | ||
RUN tar -xvf opentelemetry-webserver-sdk-x64-linux.tgz -C agent | ||
|
||
############################ | ||
# STEP 2 download the webserver agent | ||
############################ | ||
FROM alpine:latest | ||
|
||
COPY --from=agent /opt/opentelemetry/agent/opentelemetry-webserver-sdk /opt/opentelemetry | ||
|
||
RUN chmod a+w /opt/opentelemetry/logs | ||
|
||
CMD ["cat", "Just delivering the Opentelemetry Apache/Nginx agent"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# How to build Apache auto-instrumentation docker image | ||
|
||
To build image for Apache auto instrumentation, use the following commands | ||
|
||
``` | ||
export REPO_NAME="<your-docker-image-repo-name>" | ||
export IMAGE_NAME_PREFIX="opentelemetry-apache-agent" | ||
export IMAGE_VERSION=`cat version.txt` | ||
export IMAGE_NAME=${REPO_NAME}/${IMAGE_NAME_PREFIX}:${IMAGE_VERSION} | ||
docker build --build-arg version=${IMAGE_VERSION} . -t ${IMAGE_NAME} -t ${REPO_NAME}/${IMAGE_NAME_PREFIX}:latest | ||
docker push ${IMAGE_NAME} | ||
docker push ${REPO_NAME}/${IMAGE_NAME_PREFIX}:latest | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
1.0.2 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
can we come up with a more explicit name (for the directory/image/readme name)? Apache is just too generic