-
Notifications
You must be signed in to change notification settings - Fork 184
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
chore(opentelemetry-operator): upgrade opentelemetry-operator subchart to 0.13.0 #2561
Merged
Merged
Changes from 3 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
75f017f
chore(chart): update version
mat-rumian b53f0d9
chore(tls): remove certificate creation, supported by operator chart
mat-rumian 9978d72
chore(clusterole): add opentelemetry-operator api group
mat-rumian 1bd7de7
chore(instrumentation): add instrumentation configmap and job
mat-rumian c18bf9c
chore(helpers): add instrumentation cr generator, cleanup
mat-rumian 4cef75e
chore(operator): enable webhooks
mat-rumian 9692567
chore(helpers): +\n
mat-rumian cdb1f6c
chore(docs): update instrumentation url
mat-rumian a485431
chore(instrumentation): update configuration for dotnet and java
mat-rumian a2c6daf
chore(tests): update instrumentation cm helm tests
mat-rumian 5e8c596
chore(tests): add instrumentation job helm tests
mat-rumian 46d3d43
chore(tests): cleanup operator tests
mat-rumian e19ac88
chore(instrumentatio-cr): move instrumentation cr to confs
mat-rumian d7e9c53
chore(instrumentation-cr): fix helm tests
mat-rumian 1a471f6
chore(changelog): update
mat-rumian 4dbda75
Merge branch 'main' into update-opentelemetry-operator-chart
mat-rumian 0851115
chore(changelog): fix
mat-rumian 7486256
chore(changelog): fix
mat-rumian c64bd72
chore(tests): update tests
mat-rumian ede0550
chore(opentelemetry-operator): split instrumentation resource creation
mat-rumian 5ed5253
chore(opentelemetry-operator): split instrumentation resource creation
mat-rumian 47d4004
chore(readme): update parameters list
mat-rumian 6383f80
Merge branch 'main' into update-opentelemetry-operator-chart
mat-rumian 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
72 changes: 72 additions & 0 deletions
72
deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml
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,72 @@ | ||
| {{- $ctx := . -}} | ||
| {{ $watchNamespace := index .Values "opentelemetry-operator" "manager" "env" }} | ||
| {{- if eq ( get $watchNamespace "WATCH_NAMESPACE" ) "" }} | ||
| {{ fail "It is mandatory to set value for \"opentelemetry-operator.manager.env.WATCH_NAMESPACE\" when opentelemetry-operator is enabled. Value is comma separated namespaces e.g. \"ns1\\,ns2\"" }} | ||
| {{ else }} | ||
| {{- range $ns := splitList "," ( index .Values "opentelemetry-operator" "manager" "env" "WATCH_NAMESPACE" ) }} | ||
| --- | ||
| apiVersion: opentelemetry.io/v1alpha1 | ||
| kind: Instrumentation | ||
| metadata: | ||
| namespace: {{ $ns }} | ||
| name: {{ template "sumologic.metadata.name.opentelemetry.operator.instrumentation" $ctx }} | ||
| labels: | ||
| app: {{ template "sumologic.labels.app.opentelemetry.operator.instrumentation" $ctx }} | ||
| {{- include "sumologic.labels.common" $ctx | nindent 4 }} | ||
| spec: | ||
| propagators: | ||
| - tracecontext | ||
| - baggage | ||
| - b3 | ||
| - xray | ||
| resource: | ||
| addK8sUIDAttributes: false | ||
| sampler: | ||
| type: always_on | ||
| env: | ||
| - name: OTEL_APPLICATION_NAMESPACE_NAME | ||
| value: {{ $ns }} | ||
| - name: OTEL_RESOURCE_ATTRIBUTES | ||
| value: application={{ $ns }} | ||
| dotnet: | ||
| image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.3.1-beta.1 | ||
| env: | ||
| - name: OTEL_PROPAGATORS | ||
| value: tracecontext,baggage | ||
| - name: OTEL_METRICS_EXPORTER | ||
| value: none | ||
| - name: OTEL_LOGS_EXPORTER | ||
| value: none | ||
| - name: OTEL_TRACES_EXPORTER | ||
| value: otlp | ||
| - name: OTEL_EXPORTER_OTLP_PROTOCOL | ||
| value: http/protobuf | ||
| - name: OTEL_EXPORTER_OTLP_ENDPOINT | ||
| value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318 | ||
| python: | ||
| # Force to use older image because of LOGS exporting issue | ||
| # https://github.com/open-telemetry/opentelemetry-python/issues/2594 | ||
| image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.28b1 | ||
| env: | ||
| - name: OTEL_TRACES_EXPORTER | ||
| value: otlp_proto_http | ||
| - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT | ||
| value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318/v1/traces | ||
| nodejs: | ||
| image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:0.27.0 | ||
| env: | ||
| - name: OTEL_EXPORTER_OTLP_ENDPOINT | ||
| value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4317 | ||
| java: | ||
| image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java:1.16.0 | ||
| env: | ||
| - name: OTEL_METRICS_EXPORTER | ||
| value: none | ||
| - name: OTEL_TRACES_EXPORTER | ||
| value: otlp | ||
| - name: OTEL_EXPORTER_OTLP_PROTOCOL | ||
| value: http/protobuf | ||
| - name: OTEL_EXPORTER_OTLP_ENDPOINT | ||
| value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318 | ||
| {{- end -}} | ||
| {{- end -}} | ||
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
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
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
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
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
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.
Why is this mandatory, actually? A user may not want to use Instrumentation at all and just have the operator manage OT in all namespaces.
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.
If
WATCH_NAMESPACEis not provided then in theory Operator should watch for all namespaces but it doesn't. At least in case ofInstrumentation.Logs say that
Instrumentationresource exists and becamedefaultBut when I add annotation to the e.g.
DeploymentI'm getting this kind of error. Doesn't matter if annotation value istrueorname-of-the-instrumentation-resource.I believe this is something to improve in the upstream.
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.
Hm, but what if you don't want instrumentation at all? I think we used to have a setting to disable default instrumentation.
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.
You're getting instrumentation out of the box. It's just a matter of creation of
Instrumentationresource in the specific namespace.