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.

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

Sept2023 updates #171

Merged
merged 5 commits into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
check-links:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
11 changes: 6 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# Changelog

All notable changes to this repository are documented in this file.
## [Unreleased]

The format is based on the [Splunk GDI specification](https://github.com/signalfx/gdi-specification/blob/v1.0.0/specification/repository.md),
and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-

## Unreleased
## 0.6.5

### General
- Updated python to splunk-otel 1.12.0
- Updated java dependencies, including otel-java 1.29.0
- Updated to latest upstream otel-lambda
12 changes: 6 additions & 6 deletions java/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
plugins {
id "java"
id "com.diffplug.spotless" version "6.18.0" apply false
id "com.diffplug.spotless" version "6.21.0" apply false
}

group = 'com.splunk.public'
description = "Splunk distribution of OpenTelemetry Lambda"

ext {
versions = [
opentelemetry: '1.27.0',
opentelemetryalpha: '1.27.0-alpha'
opentelemetry: '1.29.0',
opentelemetryalpha: '1.29.0-alpha'
]
}

Expand Down Expand Up @@ -43,12 +43,12 @@ dependencies {
implementation("io.opentelemetry:opentelemetry-exporter-otlp")

// auto service (loaded by SDK)
annotationProcessor("com.google.auto.service:auto-service:1.0.1")
compileOnly("com.google.auto.service:auto-service:1.0.1")
annotationProcessor("com.google.auto.service:auto-service:1.1.1")
compileOnly("com.google.auto.service:auto-service:1.1.1")

// AWS lambda
// events
implementation("com.amazonaws:aws-lambda-java-events:3.11.2")
implementation("com.amazonaws:aws-lambda-java-events:3.11.3")
// lambda logging
implementation("com.amazonaws:aws-lambda-java-log4j2:1.5.1")
implementation("org.apache.logging.log4j:log4j-slf4j18-impl:2.18.0")
Expand Down
2 changes: 1 addition & 1 deletion java/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'com.gradle.enterprise' version '3.13.4'
id 'com.gradle.enterprise' version '3.14.1'
}

gradleEnterprise {
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-lambda
Submodule opentelemetry-lambda updated 37 files
+21 −0 .github/dependabot.yml
+3 −3 .github/workflows/ci-collector.yml
+97 −0 .github/workflows/codeql.yml
+1 −1 .github/workflows/layer-publish.yml
+3 −3 .github/workflows/pr-python.yml
+1 −1 .github/workflows/release-layer-collector.yml
+1 −1 .github/workflows/release-layer-python.yml
+1 −0 .gitignore
+3 −4 collector/Makefile
+1 −1 collector/VERSION
+101 −78 collector/go.mod
+210 −171 collector/go.sum
+1 −2 collector/internal/tools/go.mod
+2 −3 collector/internal/tools/go.sum
+0 −1 collector/internal/tools/tools.go
+98 −76 collector/lambdacomponents/go.mod
+207 −169 collector/lambdacomponents/go.sum
+23 −21 collector/processor/coldstartprocessor/go.mod
+45 −47 collector/processor/coldstartprocessor/go.sum
+23 −23 collector/receiver/telemetryapireceiver/go.mod
+44 −53 collector/receiver/telemetryapireceiver/go.sum
+3 −3 go/sample-apps/function/go.mod
+975 −5 go/sample-apps/function/go.sum
+4 −4 java/dependencyManagement/build.gradle.kts
+0 −0 java/layer-wrapper/scripts/otel-sqs-handler
+2 −2 java/settings.gradle.kts
+6 −6 nodejs/package.json
+24 −24 nodejs/packages/layer/package.json
+4 −4 nodejs/sample-apps/aws-sdk/package.json
+10 −10 python/README.md
+2 −0 python/sample-apps/template.yml
+1 −1 python/src/otel/Dockerfile
+1 −1 python/src/otel/otel_sdk/otel-instrument
+29 −29 python/src/otel/otel_sdk/requirements-nodeps.txt
+3 −3 python/src/otel/otel_sdk/requirements.txt
+2 −0 python/src/template.yml
+1 −1 python/src/tox.ini
8 changes: 4 additions & 4 deletions python/build-layer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ echo "Modify dependencies and script for Splunk integration"
pushd "$OTEL_PYTHON_DIR"

cd "$SOURCES_DIR"
sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==1.11.0/g' requirements.txt
sed -i 's/^opentelemetry-exporter-otlp-proto-http.*/opentelemetry-exporter-otlp-proto-http==1.18.0/g' requirements.txt
sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==1.12.0/g' requirements.txt
sed -i 's/^opentelemetry-exporter-otlp-proto-http.*/opentelemetry-exporter-otlp-proto-http==1.19.0/g' requirements.txt
# Even if this regex does nothing, leave these lines in to make later updates easier
sed -i 's/0.39b0/0.39b0/g' requirements-nodeps.txt
sed -i 's/0.39b0/0.39b0/g' requirements.txt
sed -i 's/0.40b0/0.40b0/g' requirements-nodeps.txt
sed -i 's/0.40b0/0.40b0/g' requirements.txt
sed -i 's/^docker run --rm/docker run/g' ../../build.sh
sed -i 's/opentelemetry-instrument/splunk-py-trace/g' otel-instrument
echo "Modified python wrapper requirements:"
Expand Down