Skip to content

Commit

Permalink
get and pass traceparent to osbs tasks
Browse files Browse the repository at this point in the history
This is to enable OpenTelemetry tracing in
`osbs`

Signed-off-by: Harsh Modi <hmodi@redhat.com>
  • Loading branch information
hjmodi committed Sep 12, 2023
1 parent e584447 commit 6941372
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
19 changes: 17 additions & 2 deletions koji_containerbuild/plugins/builder_containerbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,10 @@ def osbs(self):
conf_section = DEFAULT_CONF_BINARY_SECTION
elif self.method in BuildSourceContainerTask.Methods:
conf_section = DEFAULT_CONF_SOURCE_SECTION

os_conf = Configuration(conf_section=conf_section)
self._osbs = OSBS(os_conf)
# figure out where to get this from brew otel
traceparent = ''
self._osbs = OSBS(os_conf, traceparent=traceparent)
if not self._osbs:
msg = 'Could not successfully instantiate `osbs`'
raise ContainerError(msg)
Expand Down Expand Up @@ -1011,6 +1012,13 @@ def handler(self, src, target, opts=None):
userdata=opts.get('userdata', None),
)

# need brew instrumentation to be completed to know where we will get this from
traceparent = ''
if traceparent:
kwargs.update({
'traceparent': traceparent,
})

result = self.createContainer(**kwargs)

self.logger.debug("Result: %r", result)
Expand Down Expand Up @@ -1190,6 +1198,13 @@ def handler(self, target, opts=None):
userdata=opts.get('userdata', None),
)

# need brew instrumentation to be completed to know where we will get this from
traceparent = ''
if traceparent:
kwargs.update({
'traceparent': traceparent,
})

result = self.createSourceContainer(**kwargs)

self.logger.debug("Result: %r", result)
Expand Down
4 changes: 2 additions & 2 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ function setup_kojic() {
# from specified git source (default: upstream master)
$RUN rm -rf /tmp/osbs-client
$RUN git clone --depth 1 --single-branch \
https://github.com/projectatomic/osbs-client --branch master /tmp/osbs-client
https://github.com/hjmodi/osbs-client --branch master /tmp/osbs-client
# RPM install build dependencies for osbs-client
$RUN "${BUILDDEP[@]}" --define "with_python3 ${WITH_PY3}" -y /tmp/osbs-client/osbs-client.spec

# Run pip install with '--no-deps' to avoid compilation.
# This will also ensure all the deps are specified in the spec
# Pip install osbs-client from git master
$RUN "${PIP_INST[@]}" --upgrade --no-deps --force-reinstall \
git+https://github.com/projectatomic/osbs-client
git+https://github.com/hjmodi/osbs-client
# Pip install dockerfile-parse from git master
$RUN "${PIP_INST[@]}" --upgrade --force-reinstall \
git+https://github.com/containerbuildsystem/dockerfile-parse
Expand Down

0 comments on commit 6941372

Please sign in to comment.