Skip to content

Commit

Permalink
OTEL Support (#60)
Browse files Browse the repository at this point in the history
* move to 1.20
* make extra attr optional
* updated dep versions
  • Loading branch information
eeisegn authored Jun 20, 2024
1 parent 74ab3d2 commit 5ac287f
Show file tree
Hide file tree
Showing 7 changed files with 125 additions and 61 deletions.
49 changes: 49 additions & 0 deletions .github/workflows/version-bump.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Version Bump
# Create the next available tag (based on commit comment)

on:
workflow_dispatch:
inputs:
run_for_real:
required: true
default: false
type: boolean
description: "Apply next tag (or Dry Run)"
default_bump:
required: true
default: "minor"
type: choice
options: ['major', 'minor', 'patch', 'none']
description: "Default Version Bump"

concurrency: production

jobs:
Tagging:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
env:
GITHUB_TOKEN: ${{ secrets.SC_GH_TAG_TOKEN }}
with:
fetch-depth: '0'
- name: Determine Tag Details
id: taggerDryRun
uses: anothrNick/github-tag-action@v1
env:
GITHUB_TOKEN: ${{ secrets.SC_GH_TAG_TOKEN }}
DEFAULT_BUMP: ${{ inputs.default_bump }}
WITH_V: true
DRY_RUN: true
- name: Tag Details
run: |
echo "The next tag version will be: ${{ steps.taggerDryRun.outputs.new_tag }}"
echo "The version increment was: ${{ steps.taggerDryRun.outputs.part }}"
- name: Run Tagging
if: ${{ inputs.run_for_real }}
id: taggerApply
uses: anothrNick/github-tag-action@v1
env:
GITHUB_TOKEN: ${{ secrets.SC_GH_TAG_TOKEN }}
DEFAULT_BUMP: ${{ inputs.default_bump }}
WITH_V: true
6 changes: 6 additions & 0 deletions .idea/golinter.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ go 1.20

require (
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
github.com/jmoiron/sqlx v1.4.0
github.com/lib/pq v1.10.9
github.com/mattn/go-sqlite3 v1.14.22
github.com/scanoss/ipfilter/v2 v2.0.2
github.com/scanoss/zap-logging-helper v0.3.2
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0
go.opentelemetry.io/otel/sdk v1.24.0
go.opentelemetry.io/otel/sdk/metric v1.24.0
go.uber.org/zap v1.27.0
golang.org/x/net v0.24.0
google.golang.org/grpc v1.63.2
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0
go.opentelemetry.io/otel/sdk v1.21.0
go.opentelemetry.io/otel/sdk/metric v1.21.0
golang.org/x/net v0.26.0
google.golang.org/grpc v1.64.0
)

//replace github.com/scanoss/ipfilter => ../../../oss/ipfilter
Expand All @@ -37,12 +36,13 @@ require (
github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/multierr v1.10.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/protobuf v1.33.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 5ac287f

Please sign in to comment.