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

read resource attributes from annotations #3204

Merged
merged 28 commits into from
Sep 25, 2024
Merged

read resource attributes from annotations #3204

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
7eb63af
read resource attributes from annotations
zeitlinger Aug 7, 2024
407ea97
use labels
zeitlinger Aug 7, 2024
882a9c7
changelog entry
zeitlinger Aug 7, 2024
65d9aa7
fix rebase
zeitlinger Aug 7, 2024
47a7fec
change prefix to "resource.opentelemetry.io/"
zeitlinger Aug 7, 2024
7059349
change prefix to "resource.opentelemetry.io/"
zeitlinger Aug 7, 2024
930dd3d
fix rebase
zeitlinger Aug 12, 2024
ef827b2
update changelog and docs
zeitlinger Aug 14, 2024
7733e72
changes from feedback
zeitlinger Aug 30, 2024
5b0fbde
changes from feedback
zeitlinger Aug 30, 2024
182ee4b
generate
zeitlinger Aug 30, 2024
34c51d6
Update pkg/instrumentation/apachehttpd.go
zeitlinger Aug 30, 2024
9bb63f0
pr review
zeitlinger Aug 30, 2024
091c26f
comments
zeitlinger Aug 30, 2024
063eebe
lint
zeitlinger Aug 30, 2024
4bc7582
lint
zeitlinger Aug 30, 2024
79b79ea
Update README.md
zeitlinger Sep 2, 2024
976f68e
change priority to avoid breaking change
zeitlinger Sep 2, 2024
4366c12
add e2e test
zeitlinger Sep 2, 2024
e549a5b
add e2e test
zeitlinger Sep 2, 2024
2e9f6ec
add e2e test
zeitlinger Sep 3, 2024
c196665
Merge branch 'main' into resource-attribute-from-annotations
zeitlinger Sep 6, 2024
f0b4c6a
pr review
zeitlinger Sep 9, 2024
247720e
Merge branch 'main' into resource-attribute-from-annotations
zeitlinger Sep 11, 2024
1bc62e5
use pod methods
zeitlinger Sep 11, 2024
6e3d2a0
Merge branch 'main' into resource-attribute-from-annotations
zeitlinger Sep 25, 2024
b385810
don't modify the existing chainsaw test
zeitlinger Sep 25, 2024
24919eb
don't modify the existing chainsaw test
zeitlinger Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
generate
  • Loading branch information
@zeitlinger
zeitlinger committed Sep 4, 2024
commit 182ee4b5da41287420c1d42defb292e6f8031fe6
5 changes: 5 additions & 0 deletions bundle/community/manifests/opentelemetry.io_instrumentations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,11 @@ spec:
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
defaults:
properties:
useLabelsForResourceAttributes:
type: boolean
type: object
dotnet:
properties:
env:
Expand Down
5 changes: 5 additions & 0 deletions bundle/openshift/manifests/opentelemetry.io_instrumentations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,11 @@ spec:
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
defaults:
properties:
useLabelsForResourceAttributes:
type: boolean
type: object
dotnet:
properties:
env:
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/opentelemetry.io_instrumentations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,11 @@ spec:
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
defaults:
properties:
useLabelsForResourceAttributes:
type: boolean
type: object
dotnet:
properties:
env:
Expand Down
34 changes: 34 additions & 0 deletions docs/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ InstrumentationSpec defines the desired state of OpenTelemetry SDK and instrumen
ApacheHttpd defines configuration for Apache HTTPD auto-instrumentation.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#instrumentationspecdefaults">defaults</a></b></td>
<td>object</td>
<td>
Defaults defines default values for the instrumentation.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#instrumentationspecdotnet">dotnet</a></b></td>
<td>object</td>
Expand Down Expand Up @@ -887,6 +894,33 @@ only the result of this request.<br/>
</table>


### Instrumentation.spec.defaults
<sup><sup>[↩ Parent](#instrumentationspec)</sup></sup>



Defaults defines default values for the instrumentation.

<table>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Description</th>
<th>Required</th>
</tr>
</thead>
<tbody><tr>
<td><b>useLabelsForResourceAttributes</b></td>
<td>boolean</td>
<td>
UseLabelsForResourceAttributes defines whether to use common labels for resource attributes.<br/>
</td>
<td>false</td>
</tr></tbody>
</table>


### Instrumentation.spec.dotnet
<sup><sup>[↩ Parent](#instrumentationspec)</sup></sup>

Expand Down