NH-137757 - Pull upstream vulnerabilities fix - #72
Merged
Conversation
jerrytfleung
changed the title
jerrytfleung
marked this pull request as ready for review
July 16, 2026 19:31
There was a problem hiding this comment.
Pull request overview
This PR pulls in upstream OpenTelemetry Collector/Contrib dependency updates (including Prometheus-related components) to address reported vulnerabilities, and adjusts collector/extension logging behavior and packaging metadata to align with the updated stack.
Changes:
- Bump OpenTelemetry Collector/Contrib, Prometheus, gRPC, and golang.org/x* dependencies across collector modules (
v0.151.0→v0.156.0,v1.57.0→v1.62.0, etc.). - Refactor extension logger initialization into
collector/internal/loggingand update collector log-core wiring/tests to validate collector vs. extension log-level separation. - Update layer publishing/runtime metadata and default collector config (notably removing the Prometheus pull-reader config block).
Reviewed changes
Copilot reviewed 15 out of 21 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| collector/receiver/telemetryapireceiver/go.mod | Bumps receiver module deps to newer otelcol versions. |
| collector/receiver/telemetryapireceiver/go.sum | Updates checksums for bumped receiver dependencies. |
| collector/processor/decoupleprocessor/go.mod | Bumps processor module deps to newer otelcol versions. |
| collector/processor/decoupleprocessor/go.sum | Updates checksums for bumped decoupleprocessor dependencies. |
| collector/processor/coldstartprocessor/go.mod | Bumps coldstartprocessor deps to newer otelcol versions. |
| collector/processor/coldstartprocessor/go.sum | Updates checksums for bumped coldstartprocessor dependencies. |
| collector/lambdacomponents/go.mod | Bumps contrib components (incl. Prometheus) and related indirect deps. |
| collector/go.mod | Bumps top-level collector and provider/component deps to the updated otelcol versions. |
| collector/internal/tools/go.mod | Bumps toolchain dependencies (x/tools, x/exp, etc.). |
| collector/internal/tools/go.sum | Updates checksums for toolchain dependency bumps. |
| collector/main.go | Switches to centralized internal logging package for extension logger setup. |
| collector/main_test.go | Removes tests tied to the old initLogger function. |
| collector/internal/logging/logger.go | Introduces shared logger/core creation for the extension. |
| collector/internal/logging/logger_test.go | Adds unit tests for log-level parsing behavior. |
| collector/internal/collector/collector.go | Changes collector logging core wiring to use logging.NewCore. |
| collector/internal/collector/collector_test.go | Updates/adds tests to assert collector vs. extension log-level separation. |
| collector/internal/collector/testdata/config-info-level.yaml | Adds config fixture for collector telemetry log level = info. |
| collector/Makefile | Updates Lambda layer publish compatible runtimes list (drops python3.9). |
| collector/config.yaml | Removes Prometheus pull-reader telemetry config from the default config. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+46
to
+48
| // parseLevel resolves the extension log level from the env var value, | ||
| // falling back to INFO and returning an error if the value is invalid. | ||
| func parseLevel(envLvl string) (zap.AtomicLevel, error) { |
| "go.uber.org/zap/zapcore" | ||
| ) | ||
|
|
||
| func TestParseLevelDefaultsToInfoWhenUnset(t *testing.T) { |
Comment on lines
+37
to
+41
| func TestParseLevelFallsBackToInfoAndErrorsOnInvalid(t *testing.T) { | ||
| lvl, err := parseLevel("not-a-level") | ||
| require.Error(t, err) | ||
| assert.Equal(t, zapcore.WarnLevel, lvl.Level(), "should fall back to INFO") | ||
| } |
| .PHONY: publish | ||
| publish: | ||
| aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(ARCH).zip --compatible-runtimes nodejs20.x nodejs22.x nodejs24.x java11 java17 java21 java25 python3.9 python3.10 python3.11 python3.12 python3.13 python3.14 --compatible-architectures $(ARCH) --query 'LayerVersionArn' --output text | ||
| aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(ARCH).zip --compatible-runtimes nodejs20.x nodejs22.x nodejs24.x java11 java17 java21 java25 python3.10 python3.11 python3.12 python3.13 python3.14 --compatible-architectures $(ARCH) --query 'LayerVersionArn' --output text |
There was a problem hiding this comment.
This is acknowledged already in APM Python relnotes
Comment on lines
46
to
60
| service: | ||
| extensions: [solarwindsapmsettings] | ||
| pipelines: | ||
| traces: | ||
| receivers: [otlp] | ||
| processors: [resource,resourcedetection,batch] | ||
| exporters: [otlp,debug] | ||
| metrics: | ||
| receivers: [otlp,telemetryapi] | ||
| processors: [resource,resourcedetection,batch] | ||
| exporters: [otlp,debug] | ||
| logs: | ||
| receivers: [otlp,telemetryapi] | ||
| processors: [resource,resourcedetection,batch] | ||
| exporters: [otlp,debug] |
tammy-baylis-swi
approved these changes
Jul 16, 2026
tammy-baylis-swi
left a comment
tammy-baylis-swi
left a comment
There was a problem hiding this comment.
Lgtm. This is a sync so it's simpler to not address copilot nits
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Upstream updated prometheus dependencies. Now we are pulling the change to fix the vulnerabilities
https://swicloud.atlassian.net/browse/NH-137757
SWO: https://my.na-01.cloud.solarwinds.com/140638900734749696/entities/services/e-2749747667679508261/overview?duration=3600