Skip to content

Commit

Permalink
Merge branch 'main' into otl-1406-nodejs-doc
Browse files Browse the repository at this point in the history
  • Loading branch information
jvoravong authored Oct 13, 2023
2 parents f97cdc3 + b644e32 commit bc09295
Show file tree
Hide file tree
Showing 19 changed files with 5,580 additions and 3,555 deletions.
12 changes: 12 additions & 0 deletions .chloggen/adopt-splunk-otel-js.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, networkExplorer, operator, chart, other)
component: operator
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: use splunk-otel-js as Docker image for node.js auto-instrumentation
# One or more tracking issues related to the change
issues: [967]
# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
2 changes: 1 addition & 1 deletion .github/workflows/update_instrumentation_dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
matrix:
# Add languages that require version updates here
language: ['java']
language: ['java', 'nodejs']
steps:
- uses: actions/checkout@v4

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ spec:
- name: OTEL_RESOURCE_ATTRIBUTES
value: splunk.zc.method=splunk-otel-java:v1.28.0
nodejs:
image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:0.41.1
image: ghcr.io/signalfx/splunk-otel-js/splunk-otel-js:v2.4.4
env:
- name: OTEL_RESOURCE_ATTRIBUTES
value: splunk.zc.method=autoinstrumentation-nodejs:0.41.1
value: splunk.zc.method=splunk-otel-js:v2.4.4
python:
image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.40b0
env:
Expand Down
Loading

0 comments on commit bc09295

Please sign in to comment.