chore: wired up lambda modules for release (#1375)

* fix: wired up lambda modules for release * add module for xrayconfig * fixed package name * Update versions.yaml Co-authored-by: Anthony Mirabella <[email protected]> * tidied dependencies * hopefully last tidy * updated go.sum * moved lambda detector to experimental Co-authored-by: Anthony Mirabella <[email protected]>
open-telemetry · Oct 26, 2021 · fef1d63 · fef1d63
1 parent 047cf40
commit fef1d63
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 9 deletions.
diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum
@@ -48,8 +48,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
-go.opentelemetry.io/contrib v0.24.0 h1:bVBRFM9tOQkTlf45xEmr29hNyASQeYGrJf4iLzn2WOg=
-go.opentelemetry.io/contrib v0.24.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM=
 go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.25.0 h1:wL62tRqpXoRk770X71RmfgQC1IxO2qQrDas5SD4/pcg=
 go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.25.0/go.mod h1:3nHTn8qI9BjEAw52bJ8YdaogVYNamHZJ1T0Ttv8l3ZA=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2PtTWjvXLHOEnXAoSmkaiXbg3fuvoZAjsAT3Q=

diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/go.mod
@@ -7,7 +7,6 @@ replace go.opentelemetry.io/contrib => ../../../../..
 require (
 	github.com/aws/aws-lambda-go v1.27.0
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/contrib v0.24.0
 	go.opentelemetry.io/otel v1.0.1
 	go.opentelemetry.io/otel/trace v1.0.1
 )
diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/lambda.go b/instrumentation/github.com/aws/aws-lambda-go/otellambda/lambda.go
@@ -22,7 +22,6 @@ import (
 
 	"github.com/aws/aws-lambda-go/lambdacontext"
 
-	"go.opentelemetry.io/contrib"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
@@ -53,7 +52,7 @@ func newInstrumentor(opts ...Option) instrumentor {
 	}
 
 	return instrumentor{configuration: cfg,
-		tracer:   cfg.TracerProvider.Tracer(tracerName, trace.WithInstrumentationVersion(contrib.SemVersion())),
+		tracer:   cfg.TracerProvider.Tracer(tracerName, trace.WithInstrumentationVersion(SemVersion())),
 		resAttrs: []attribute.KeyValue{}}
 }
 

diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.mod
@@ -12,7 +12,6 @@ replace (
 require (
 	github.com/aws/aws-lambda-go v1.27.0
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/contrib v0.24.0
 	go.opentelemetry.io/contrib/detectors/aws/lambda v0.24.0
 	go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.24.0
 	go.opentelemetry.io/contrib/propagators/aws v0.24.0

diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/lambda_test.go b/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/lambda_test.go
@@ -31,7 +31,6 @@ import (
 	"github.com/aws/aws-lambda-go/lambdacontext"
 	"github.com/stretchr/testify/assert"
 
-	"go.opentelemetry.io/contrib"
 	lambdadetector "go.opentelemetry.io/contrib/detectors/aws/lambda"
 	"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda"
 	"go.opentelemetry.io/contrib/propagators/aws/xray"
@@ -150,7 +149,7 @@ var (
 			attribute.String("cloud.region", "us-texas-1"),
 			attribute.String("faas.name", "testFunction"),
 			attribute.String("faas.version", "$LATEST")),
-		InstrumentationLibrary: instrumentation.Library{Name: "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda", Version: contrib.SemVersion()},
+		InstrumentationLibrary: instrumentation.Library{Name: "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda", Version: otellambda.SemVersion()},
 	}
 )
 
@@ -338,7 +337,7 @@ var (
 			attribute.String("cloud.region", "us-texas-1"),
 			attribute.String("faas.name", "testFunction"),
 			attribute.String("faas.version", "$LATEST")),
-		InstrumentationLibrary: instrumentation.Library{Name: "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda", Version: contrib.SemVersion()},
+		InstrumentationLibrary: instrumentation.Library{Name: "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda", Version: otellambda.SemVersion()},
 	}
 )
 

diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/version.go b/instrumentation/github.com/aws/aws-lambda-go/otellambda/version.go
@@ -0,0 +1,26 @@
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package otellambda
+
+// Version is the current release version of the AWS Lambda instrumentation.
+func Version() string {
+	return "0.25.0"
+	// This string is updated by the pre_release.sh script during release
+}
+
+// SemVersion is the semantic version to be supplied to tracer/meter creation.
+func SemVersion() string {
+	return "semver:" + Version()
+}
diff --git a/versions.yaml b/versions.yaml
@@ -29,6 +29,7 @@ module-sets:
   experimental-instrumentation:
     version: v0.25.0
     modules:
+      - go.opentelemetry.io/contrib/detectors/aws/lambda
       - go.opentelemetry.io/contrib/propagators/opencensus
       - go.opentelemetry.io/contrib/propagators/opencensus/examples
       - go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron
@@ -66,6 +67,9 @@ module-sets:
       - go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego
       - go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego/example
       - go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego/test
+      - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda
+      - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/example
+      - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/test
       - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws
       - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example
       - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test